From 6b9fb8c0a4cef142ea19dcf04fc04e449b30d8d7 Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Fri, 27 Apr 2018 13:15:14 -0700
Subject: [PATCH 01/29] Generated from c0def97e9fc1e839db7727fd31c2f583f6cf04d6
 (#2486)

updated OS Upgrade History API

(cherry picked from commit e784ecac207c88dda10fa0986609907486994913)
---
 .../v2015_06_15/compute_management_client.py  |  6 +--
 .../v2016_03_30/compute_management_client.py  |  6 +--
 .../compute_management_client.py              |  6 +--
 .../v2017_03_30/compute_management_client.py  |  6 +--
 .../v2017_09_01/compute_management_client.py  |  6 +--
 .../v2017_12_01/compute_management_client.py  |  6 +--
 .../compute/v2017_12_01/models/__init__.py    | 15 +++---
 .../models/rollback_status_info.py            | 48 +++++++++++++++++++
 .../models/rollback_status_info_py3.py        | 48 +++++++++++++++++++
 ...ation_historical_status_info_properties.py |  6 +++
 ...n_historical_status_info_properties_py3.py |  6 +++
 .../v2018_04_01/compute_management_client.py  |  6 +--
 12 files changed, 138 insertions(+), 27 deletions(-)
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/rollback_status_info.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/rollback_status_info_py3.py

diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/compute_management_client.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/compute_management_client.py
index cfda081b1567..ffcfe0787b8c 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/compute_management_client.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/compute_management_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -59,7 +59,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class ComputeManagementClient(object):
+class ComputeManagementClient(SDKClient):
     """Compute Client
 
     :ivar config: Configuration for client.
@@ -98,7 +98,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = ComputeManagementClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(ComputeManagementClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self.api_version = '2015-06-15'
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/compute_management_client.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/compute_management_client.py
index fd70594a902c..403c3f4449d9 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/compute_management_client.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/compute_management_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -59,7 +59,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class ComputeManagementClient(object):
+class ComputeManagementClient(SDKClient):
     """Compute Client
 
     :ivar config: Configuration for client.
@@ -98,7 +98,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = ComputeManagementClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(ComputeManagementClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self.api_version = '2016-03-30'
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/compute_management_client.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/compute_management_client.py
index c58b204ba4d0..2c43eb9b0c1a 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/compute_management_client.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/compute_management_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -62,7 +62,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class ComputeManagementClient(object):
+class ComputeManagementClient(SDKClient):
     """Compute Client
 
     :ivar config: Configuration for client.
@@ -107,7 +107,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = ComputeManagementClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(ComputeManagementClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self.api_version = '2016-04-30-preview'
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/compute_management_client.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/compute_management_client.py
index 1b2633721f7e..d671c7a363df 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/compute_management_client.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/compute_management_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -66,7 +66,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class ComputeManagementClient(object):
+class ComputeManagementClient(SDKClient):
     """Compute Client
 
     :ivar config: Configuration for client.
@@ -119,7 +119,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = ComputeManagementClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(ComputeManagementClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self.api_version = '2017-03-30'
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_09_01/compute_management_client.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_09_01/compute_management_client.py
index fd0c043a6b79..0dc37e4ed0a2 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_09_01/compute_management_client.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_09_01/compute_management_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -51,7 +51,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class ComputeManagementClient(object):
+class ComputeManagementClient(SDKClient):
     """Compute Client
 
     :ivar config: Configuration for client.
@@ -74,7 +74,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = ComputeManagementClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(ComputeManagementClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self.api_version = '2017-09-01'
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/compute_management_client.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/compute_management_client.py
index 3fcf22e996e6..fcd609539a4e 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/compute_management_client.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/compute_management_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -65,7 +65,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class ComputeManagementClient(object):
+class ComputeManagementClient(SDKClient):
     """Compute Client
 
     :ivar config: Configuration for client.
@@ -116,7 +116,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = ComputeManagementClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(ComputeManagementClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self.api_version = '2017-12-01'
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 54fd6fca22fd..d9f5c5707555 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
@@ -106,11 +106,12 @@
     from .virtual_machine_scale_set_instance_view_py3 import VirtualMachineScaleSetInstanceView
     from .virtual_machine_scale_set_sku_capacity_py3 import VirtualMachineScaleSetSkuCapacity
     from .virtual_machine_scale_set_sku_py3 import VirtualMachineScaleSetSku
-    from .upgrade_operation_history_status_py3 import UpgradeOperationHistoryStatus
-    from .rolling_upgrade_progress_info_py3 import RollingUpgradeProgressInfo
     from .api_error_base_py3 import ApiErrorBase
     from .inner_error_py3 import InnerError
     from .api_error_py3 import ApiError
+    from .rollback_status_info_py3 import RollbackStatusInfo
+    from .upgrade_operation_history_status_py3 import UpgradeOperationHistoryStatus
+    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_scale_set_vm_py3 import VirtualMachineScaleSetVM
@@ -232,11 +233,12 @@
     from .virtual_machine_scale_set_instance_view import VirtualMachineScaleSetInstanceView
     from .virtual_machine_scale_set_sku_capacity import VirtualMachineScaleSetSkuCapacity
     from .virtual_machine_scale_set_sku import VirtualMachineScaleSetSku
-    from .upgrade_operation_history_status import UpgradeOperationHistoryStatus
-    from .rolling_upgrade_progress_info import RollingUpgradeProgressInfo
     from .api_error_base import ApiErrorBase
     from .inner_error import InnerError
     from .api_error import ApiError
+    from .rollback_status_info import RollbackStatusInfo
+    from .upgrade_operation_history_status import UpgradeOperationHistoryStatus
+    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_scale_set_vm import VirtualMachineScaleSetVM
@@ -397,11 +399,12 @@
     'VirtualMachineScaleSetInstanceView',
     'VirtualMachineScaleSetSkuCapacity',
     'VirtualMachineScaleSetSku',
-    'UpgradeOperationHistoryStatus',
-    'RollingUpgradeProgressInfo',
     'ApiErrorBase',
     'InnerError',
     'ApiError',
+    'RollbackStatusInfo',
+    'UpgradeOperationHistoryStatus',
+    'RollingUpgradeProgressInfo',
     'UpgradeOperationHistoricalStatusInfoProperties',
     'UpgradeOperationHistoricalStatusInfo',
     'VirtualMachineScaleSetVM',
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/rollback_status_info.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/rollback_status_info.py
new file mode 100644
index 000000000000..83b559715648
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/rollback_status_info.py
@@ -0,0 +1,48 @@
+# 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 RollbackStatusInfo(Model):
+    """Information about rollback on failed VM instances after a OS Upgrade
+    operation.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar successfully_rolledback_instance_count: The number of instances
+     which have been successfully rolled back.
+    :vartype successfully_rolledback_instance_count: int
+    :ivar failed_rolledback_instance_count: The number of instances which
+     failed to rollback.
+    :vartype failed_rolledback_instance_count: int
+    :ivar rollback_error: Error Details if OS rollback failed.
+    :vartype rollback_error: ~azure.mgmt.compute.v2017_12_01.models.ApiError
+    """
+
+    _validation = {
+        'successfully_rolledback_instance_count': {'readonly': True},
+        'failed_rolledback_instance_count': {'readonly': True},
+        'rollback_error': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'successfully_rolledback_instance_count': {'key': 'successfullyRolledbackInstanceCount', 'type': 'int'},
+        'failed_rolledback_instance_count': {'key': 'failedRolledbackInstanceCount', 'type': 'int'},
+        'rollback_error': {'key': 'rollbackError', 'type': 'ApiError'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RollbackStatusInfo, self).__init__(**kwargs)
+        self.successfully_rolledback_instance_count = None
+        self.failed_rolledback_instance_count = None
+        self.rollback_error = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/rollback_status_info_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/rollback_status_info_py3.py
new file mode 100644
index 000000000000..5edbb3f476d9
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/rollback_status_info_py3.py
@@ -0,0 +1,48 @@
+# 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 RollbackStatusInfo(Model):
+    """Information about rollback on failed VM instances after a OS Upgrade
+    operation.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar successfully_rolledback_instance_count: The number of instances
+     which have been successfully rolled back.
+    :vartype successfully_rolledback_instance_count: int
+    :ivar failed_rolledback_instance_count: The number of instances which
+     failed to rollback.
+    :vartype failed_rolledback_instance_count: int
+    :ivar rollback_error: Error Details if OS rollback failed.
+    :vartype rollback_error: ~azure.mgmt.compute.v2017_12_01.models.ApiError
+    """
+
+    _validation = {
+        'successfully_rolledback_instance_count': {'readonly': True},
+        'failed_rolledback_instance_count': {'readonly': True},
+        'rollback_error': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'successfully_rolledback_instance_count': {'key': 'successfullyRolledbackInstanceCount', 'type': 'int'},
+        'failed_rolledback_instance_count': {'key': 'failedRolledbackInstanceCount', 'type': 'int'},
+        'rollback_error': {'key': 'rollbackError', 'type': 'ApiError'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(RollbackStatusInfo, self).__init__(**kwargs)
+        self.successfully_rolledback_instance_count = None
+        self.failed_rolledback_instance_count = None
+        self.rollback_error = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/upgrade_operation_historical_status_info_properties.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/upgrade_operation_historical_status_info_properties.py
index 3c5d883f1b9c..a0c1af8046e9 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/upgrade_operation_historical_status_info_properties.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/upgrade_operation_historical_status_info_properties.py
@@ -34,6 +34,9 @@ class UpgradeOperationHistoricalStatusInfoProperties(Model):
     :ivar target_image_reference: Image Reference details
     :vartype target_image_reference:
      ~azure.mgmt.compute.v2017_12_01.models.ImageReference
+    :ivar rollback_info: Information about OS rollback if performed
+    :vartype rollback_info:
+     ~azure.mgmt.compute.v2017_12_01.models.RollbackStatusInfo
     """
 
     _validation = {
@@ -42,6 +45,7 @@ class UpgradeOperationHistoricalStatusInfoProperties(Model):
         'error': {'readonly': True},
         'started_by': {'readonly': True},
         'target_image_reference': {'readonly': True},
+        'rollback_info': {'readonly': True},
     }
 
     _attribute_map = {
@@ -50,6 +54,7 @@ class UpgradeOperationHistoricalStatusInfoProperties(Model):
         'error': {'key': 'error', 'type': 'ApiError'},
         'started_by': {'key': 'startedBy', 'type': 'UpgradeOperationInvoker'},
         'target_image_reference': {'key': 'targetImageReference', 'type': 'ImageReference'},
+        'rollback_info': {'key': 'rollbackInfo', 'type': 'RollbackStatusInfo'},
     }
 
     def __init__(self, **kwargs):
@@ -59,3 +64,4 @@ def __init__(self, **kwargs):
         self.error = None
         self.started_by = None
         self.target_image_reference = None
+        self.rollback_info = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/upgrade_operation_historical_status_info_properties_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/upgrade_operation_historical_status_info_properties_py3.py
index beadceadf33a..d623b4968ad4 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/upgrade_operation_historical_status_info_properties_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/upgrade_operation_historical_status_info_properties_py3.py
@@ -34,6 +34,9 @@ class UpgradeOperationHistoricalStatusInfoProperties(Model):
     :ivar target_image_reference: Image Reference details
     :vartype target_image_reference:
      ~azure.mgmt.compute.v2017_12_01.models.ImageReference
+    :ivar rollback_info: Information about OS rollback if performed
+    :vartype rollback_info:
+     ~azure.mgmt.compute.v2017_12_01.models.RollbackStatusInfo
     """
 
     _validation = {
@@ -42,6 +45,7 @@ class UpgradeOperationHistoricalStatusInfoProperties(Model):
         'error': {'readonly': True},
         'started_by': {'readonly': True},
         'target_image_reference': {'readonly': True},
+        'rollback_info': {'readonly': True},
     }
 
     _attribute_map = {
@@ -50,6 +54,7 @@ class UpgradeOperationHistoricalStatusInfoProperties(Model):
         'error': {'key': 'error', 'type': 'ApiError'},
         'started_by': {'key': 'startedBy', 'type': 'UpgradeOperationInvoker'},
         'target_image_reference': {'key': 'targetImageReference', 'type': 'ImageReference'},
+        'rollback_info': {'key': 'rollbackInfo', 'type': 'RollbackStatusInfo'},
     }
 
     def __init__(self, **kwargs) -> None:
@@ -59,3 +64,4 @@ def __init__(self, **kwargs) -> None:
         self.error = None
         self.started_by = None
         self.target_image_reference = None
+        self.rollback_info = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/compute_management_client.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/compute_management_client.py
index 382bad2d0135..d815c08ac257 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/compute_management_client.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/compute_management_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
@@ -52,7 +52,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class ComputeManagementClient(object):
+class ComputeManagementClient(SDKClient):
     """Compute Client
 
     :ivar config: Configuration for client.
@@ -77,7 +77,7 @@ def __init__(
             self, credentials, subscription_id, base_url=None):
 
         self.config = ComputeManagementClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
+        super(ComputeManagementClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
         self.api_version = '2018-04-01'

From f434626c9550bb3a7fe4b587663bcde054e72696 Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Tue, 1 May 2018 17:10:33 -0700
Subject: [PATCH 02/29] Generated from 8fe96075f82faeec0c0e316e0dd1a1c0ee77e376
 (#2501)

fixed formatting
---
 .../mgmt/compute/v2017_12_01/models/data_disk.py   | 14 +++++++-------
 .../compute/v2017_12_01/models/data_disk_py3.py    | 14 +++++++-------
 .../mgmt/compute/v2017_12_01/models/os_disk.py     | 14 +++++++-------
 .../mgmt/compute/v2017_12_01/models/os_disk_py3.py | 14 +++++++-------
 .../models/virtual_machine_scale_set_os_disk.py    | 10 +++++-----
 .../virtual_machine_scale_set_os_disk_py3.py       | 10 +++++-----
 6 files changed, 38 insertions(+), 38 deletions(-)

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..654ccf054d19 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
@@ -39,13 +39,13 @@ class DataDisk(Model):
      should be enabled or disabled on the disk.
     :type write_accelerator_enabled: bool
     :param create_option: Required. Specifies how the virtual machine should
-     be created.<br><br> Possible values are:<br><br> **Attach** \\u2013 This
-     value is used when you are using a specialized disk to create the virtual
-     machine.<br><br> **FromImage** \\u2013 This value is used when you are
-     using an image to create the virtual machine. If you are using a platform
-     image, you also use the imageReference element described above. If you are
-     using a marketplace image, you  also use the plan element previously
-     described. Possible values include: 'FromImage', 'Empty', 'Attach'
+     be created.<br><br> Possible values are:<br><br> **Attach**  This value is
+     used when you are using a specialized disk to create the virtual
+     machine.<br><br> **FromImage**  This value is used when you are using an
+     image to create the virtual machine. If you are using a platform image,
+     you also use the imageReference element described above. If you are using
+     a marketplace image, you  also use the plan element previously described.
+     Possible values include: 'FromImage', 'Empty', 'Attach'
     :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
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..575decdd5860 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
@@ -39,13 +39,13 @@ class DataDisk(Model):
      should be enabled or disabled on the disk.
     :type write_accelerator_enabled: bool
     :param create_option: Required. Specifies how the virtual machine should
-     be created.<br><br> Possible values are:<br><br> **Attach** \\u2013 This
-     value is used when you are using a specialized disk to create the virtual
-     machine.<br><br> **FromImage** \\u2013 This value is used when you are
-     using an image to create the virtual machine. If you are using a platform
-     image, you also use the imageReference element described above. If you are
-     using a marketplace image, you  also use the plan element previously
-     described. Possible values include: 'FromImage', 'Empty', 'Attach'
+     be created.<br><br> Possible values are:<br><br> **Attach**  This value is
+     used when you are using a specialized disk to create the virtual
+     machine.<br><br> **FromImage**  This value is used when you are using an
+     image to create the virtual machine. If you are using a platform image,
+     you also use the imageReference element described above. If you are using
+     a marketplace image, you  also use the plan element previously described.
+     Possible values include: 'FromImage', 'Empty', 'Attach'
     :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
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..a265f209401b 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
@@ -48,13 +48,13 @@ class OSDisk(Model):
      should be enabled or disabled on the disk.
     :type write_accelerator_enabled: bool
     :param create_option: Required. Specifies how the virtual machine should
-     be created.<br><br> Possible values are:<br><br> **Attach** \\u2013 This
-     value is used when you are using a specialized disk to create the virtual
-     machine.<br><br> **FromImage** \\u2013 This value is used when you are
-     using an image to create the virtual machine. If you are using a platform
-     image, you also use the imageReference element described above. If you are
-     using a marketplace image, you  also use the plan element previously
-     described. Possible values include: 'FromImage', 'Empty', 'Attach'
+     be created.<br><br> Possible values are:<br><br> **Attach**  This value is
+     used when you are using a specialized disk to create the virtual
+     machine.<br><br> **FromImage**  This value is used when you are using an
+     image to create the virtual machine. If you are using a platform image,
+     you also use the imageReference element described above. If you are using
+     a marketplace image, you  also use the plan element previously described.
+     Possible values include: 'FromImage', 'Empty', 'Attach'
     :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
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..00c3e7ec0b16 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
@@ -48,13 +48,13 @@ class OSDisk(Model):
      should be enabled or disabled on the disk.
     :type write_accelerator_enabled: bool
     :param create_option: Required. Specifies how the virtual machine should
-     be created.<br><br> Possible values are:<br><br> **Attach** \\u2013 This
-     value is used when you are using a specialized disk to create the virtual
-     machine.<br><br> **FromImage** \\u2013 This value is used when you are
-     using an image to create the virtual machine. If you are using a platform
-     image, you also use the imageReference element described above. If you are
-     using a marketplace image, you  also use the plan element previously
-     described. Possible values include: 'FromImage', 'Empty', 'Attach'
+     be created.<br><br> Possible values are:<br><br> **Attach**  This value is
+     used when you are using a specialized disk to create the virtual
+     machine.<br><br> **FromImage**  This value is used when you are using an
+     image to create the virtual machine. If you are using a platform image,
+     you also use the imageReference element described above. If you are using
+     a marketplace image, you  also use the plan element previously described.
+     Possible values include: 'FromImage', 'Empty', 'Attach'
     :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
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_os_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_os_disk.py
index 24fa8103eef7..f4eadf1343cb 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_os_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_os_disk.py
@@ -29,11 +29,11 @@ class VirtualMachineScaleSetOSDisk(Model):
     :type write_accelerator_enabled: bool
     :param create_option: Required. Specifies how the virtual machines in the
      scale set should be created.<br><br> The only allowed value is:
-     **FromImage** \\u2013 This value is used when you are using an image to
-     create the virtual machine. If you are using a platform image, you also
-     use the imageReference element described above. If you are using a
-     marketplace image, you  also use the plan element previously described.
-     Possible values include: 'FromImage', 'Empty', 'Attach'
+     **FromImage**  This value is used when you are using an image to create
+     the virtual machine. If you are using a platform image, you also use the
+     imageReference element described above. If you are using a marketplace
+     image, you  also use the plan element previously described. Possible
+     values include: 'FromImage', 'Empty', 'Attach'
     :type create_option: str or
      ~azure.mgmt.compute.v2017_12_01.models.DiskCreateOptionTypes
     :param os_type: This property allows you to specify the type of the OS
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_os_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_os_disk_py3.py
index cd6f8e0254fd..a660b60652b4 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_os_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_os_disk_py3.py
@@ -29,11 +29,11 @@ class VirtualMachineScaleSetOSDisk(Model):
     :type write_accelerator_enabled: bool
     :param create_option: Required. Specifies how the virtual machines in the
      scale set should be created.<br><br> The only allowed value is:
-     **FromImage** \\u2013 This value is used when you are using an image to
-     create the virtual machine. If you are using a platform image, you also
-     use the imageReference element described above. If you are using a
-     marketplace image, you  also use the plan element previously described.
-     Possible values include: 'FromImage', 'Empty', 'Attach'
+     **FromImage**  This value is used when you are using an image to create
+     the virtual machine. If you are using a platform image, you also use the
+     imageReference element described above. If you are using a marketplace
+     image, you  also use the plan element previously described. Possible
+     values include: 'FromImage', 'Empty', 'Attach'
     :type create_option: str or
      ~azure.mgmt.compute.v2017_12_01.models.DiskCreateOptionTypes
     :param os_type: This property allows you to specify the type of the OS

From 755e121d81fbaa0a72b7e871954109c0fdcfc86c Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Tue, 8 May 2018 16:10:57 -0700
Subject: [PATCH 03/29] [AutoPR compute/resource-manager] added
 autoOSUpgradePolicy to UpgradePolicy (#2505)

* Generated from 57e4037bd66b30a7f95fda331085521b2d669c94

added autoOSUpgradePolicy

* Generated from 27752fd2417b688d4aba3bcde1ada9231659d208

added deafult value as false

* Generated from 27752fd2417b688d4aba3bcde1ada9231659d208

added deafult value as false
---
 .../compute/v2017_12_01/models/__init__.py    |  3 ++
 .../models/auto_os_upgrade_policy.py          | 29 +++++++++++++++++++
 .../models/auto_os_upgrade_policy_py3.py      | 29 +++++++++++++++++++
 .../v2017_12_01/models/upgrade_policy.py      |  6 ++++
 .../v2017_12_01/models/upgrade_policy_py3.py  |  8 ++++-
 5 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/auto_os_upgrade_policy.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/auto_os_upgrade_policy_py3.py

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 d9f5c5707555..9f65b3c2c1e2 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
@@ -65,6 +65,7 @@
     from .virtual_machine_instance_view_py3 import VirtualMachineInstanceView
     from .virtual_machine_py3 import VirtualMachine
     from .virtual_machine_update_py3 import VirtualMachineUpdate
+    from .auto_os_upgrade_policy_py3 import AutoOSUpgradePolicy
     from .rolling_upgrade_policy_py3 import RollingUpgradePolicy
     from .upgrade_policy_py3 import UpgradePolicy
     from .image_os_disk_py3 import ImageOSDisk
@@ -192,6 +193,7 @@
     from .virtual_machine_instance_view import VirtualMachineInstanceView
     from .virtual_machine import VirtualMachine
     from .virtual_machine_update import VirtualMachineUpdate
+    from .auto_os_upgrade_policy import AutoOSUpgradePolicy
     from .rolling_upgrade_policy import RollingUpgradePolicy
     from .upgrade_policy import UpgradePolicy
     from .image_os_disk import ImageOSDisk
@@ -358,6 +360,7 @@
     'VirtualMachineInstanceView',
     'VirtualMachine',
     'VirtualMachineUpdate',
+    'AutoOSUpgradePolicy',
     'RollingUpgradePolicy',
     'UpgradePolicy',
     'ImageOSDisk',
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/auto_os_upgrade_policy.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/auto_os_upgrade_policy.py
new file mode 100644
index 000000000000..2c74af408892
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/auto_os_upgrade_policy.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 AutoOSUpgradePolicy(Model):
+    """The configuration parameters used for performing automatic OS upgrade.
+
+    :param disable_auto_rollback: Whether OS image rollback feature should be
+     disabled. Default value is false.
+    :type disable_auto_rollback: bool
+    """
+
+    _attribute_map = {
+        'disable_auto_rollback': {'key': 'disableAutoRollback', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(AutoOSUpgradePolicy, self).__init__(**kwargs)
+        self.disable_auto_rollback = kwargs.get('disable_auto_rollback', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/auto_os_upgrade_policy_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/auto_os_upgrade_policy_py3.py
new file mode 100644
index 000000000000..3e3e751838a8
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/auto_os_upgrade_policy_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 AutoOSUpgradePolicy(Model):
+    """The configuration parameters used for performing automatic OS upgrade.
+
+    :param disable_auto_rollback: Whether OS image rollback feature should be
+     disabled. Default value is false.
+    :type disable_auto_rollback: bool
+    """
+
+    _attribute_map = {
+        'disable_auto_rollback': {'key': 'disableAutoRollback', 'type': 'bool'},
+    }
+
+    def __init__(self, *, disable_auto_rollback: bool=None, **kwargs) -> None:
+        super(AutoOSUpgradePolicy, self).__init__(**kwargs)
+        self.disable_auto_rollback = disable_auto_rollback
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/upgrade_policy.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/upgrade_policy.py
index 209ab85eda51..1f73bc7f23b5 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/upgrade_policy.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/upgrade_policy.py
@@ -30,12 +30,17 @@ class UpgradePolicy(Model):
      applied to scale set instances in a rolling fashion when a newer version
      of the image becomes available.
     :type automatic_os_upgrade: bool
+    :param auto_os_upgrade_policy: Configuration parameters used for
+     performing automatic OS Upgrade.
+    :type auto_os_upgrade_policy:
+     ~azure.mgmt.compute.v2017_12_01.models.AutoOSUpgradePolicy
     """
 
     _attribute_map = {
         'mode': {'key': 'mode', 'type': 'UpgradeMode'},
         'rolling_upgrade_policy': {'key': 'rollingUpgradePolicy', 'type': 'RollingUpgradePolicy'},
         'automatic_os_upgrade': {'key': 'automaticOSUpgrade', 'type': 'bool'},
+        'auto_os_upgrade_policy': {'key': 'autoOSUpgradePolicy', 'type': 'AutoOSUpgradePolicy'},
     }
 
     def __init__(self, **kwargs):
@@ -43,3 +48,4 @@ def __init__(self, **kwargs):
         self.mode = kwargs.get('mode', None)
         self.rolling_upgrade_policy = kwargs.get('rolling_upgrade_policy', None)
         self.automatic_os_upgrade = kwargs.get('automatic_os_upgrade', None)
+        self.auto_os_upgrade_policy = kwargs.get('auto_os_upgrade_policy', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/upgrade_policy_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/upgrade_policy_py3.py
index 3441201b6197..7c0b91a3180d 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/upgrade_policy_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/upgrade_policy_py3.py
@@ -30,16 +30,22 @@ class UpgradePolicy(Model):
      applied to scale set instances in a rolling fashion when a newer version
      of the image becomes available.
     :type automatic_os_upgrade: bool
+    :param auto_os_upgrade_policy: Configuration parameters used for
+     performing automatic OS Upgrade.
+    :type auto_os_upgrade_policy:
+     ~azure.mgmt.compute.v2017_12_01.models.AutoOSUpgradePolicy
     """
 
     _attribute_map = {
         'mode': {'key': 'mode', 'type': 'UpgradeMode'},
         'rolling_upgrade_policy': {'key': 'rollingUpgradePolicy', 'type': 'RollingUpgradePolicy'},
         'automatic_os_upgrade': {'key': 'automaticOSUpgrade', 'type': 'bool'},
+        'auto_os_upgrade_policy': {'key': 'autoOSUpgradePolicy', 'type': 'AutoOSUpgradePolicy'},
     }
 
-    def __init__(self, *, mode=None, rolling_upgrade_policy=None, automatic_os_upgrade: bool=None, **kwargs) -> None:
+    def __init__(self, *, mode=None, rolling_upgrade_policy=None, automatic_os_upgrade: bool=None, auto_os_upgrade_policy=None, **kwargs) -> None:
         super(UpgradePolicy, self).__init__(**kwargs)
         self.mode = mode
         self.rolling_upgrade_policy = rolling_upgrade_policy
         self.automatic_os_upgrade = automatic_os_upgrade
+        self.auto_os_upgrade_policy = auto_os_upgrade_policy

From eee2ad2dc83f092eb920be1890937ac5d1fce37e Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Wed, 16 May 2018 23:13:28 -0700
Subject: [PATCH 04/29] Generated from 87e0684ac67bc015bf82c1f1227093265c2e1233
 (#2562)

added older examples
---
 .../mgmt/compute/v2015_06_15/models/availability_set_py3.py     | 2 +-
 .../v2015_06_15/models/network_interface_reference_py3.py       | 2 +-
 .../v2015_06_15/models/virtual_machine_capture_result_py3.py    | 2 +-
 .../v2015_06_15/models/virtual_machine_extension_image_py3.py   | 2 +-
 .../compute/v2015_06_15/models/virtual_machine_extension_py3.py | 2 +-
 .../v2015_06_15/models/virtual_machine_extension_update_py3.py  | 2 +-
 .../compute/v2015_06_15/models/virtual_machine_image_py3.py     | 2 +-
 .../v2015_06_15/models/virtual_machine_image_resource_py3.py    | 2 +-
 .../mgmt/compute/v2015_06_15/models/virtual_machine_py3.py      | 2 +-
 .../models/virtual_machine_scale_set_extension_py3.py           | 2 +-
 .../models/virtual_machine_scale_set_ip_configuration_py3.py    | 2 +-
 .../virtual_machine_scale_set_network_configuration_py3.py      | 2 +-
 .../compute/v2015_06_15/models/virtual_machine_scale_set_py3.py | 2 +-
 .../v2015_06_15/models/virtual_machine_scale_set_vm_py3.py      | 2 +-
 .../mgmt/compute/v2016_03_30/models/availability_set_py3.py     | 2 +-
 .../v2016_03_30/models/network_interface_reference_py3.py       | 2 +-
 .../v2016_03_30/models/virtual_machine_capture_result_py3.py    | 2 +-
 .../v2016_03_30/models/virtual_machine_extension_image_py3.py   | 2 +-
 .../compute/v2016_03_30/models/virtual_machine_extension_py3.py | 2 +-
 .../v2016_03_30/models/virtual_machine_extension_update_py3.py  | 2 +-
 .../compute/v2016_03_30/models/virtual_machine_image_py3.py     | 2 +-
 .../v2016_03_30/models/virtual_machine_image_resource_py3.py    | 2 +-
 .../mgmt/compute/v2016_03_30/models/virtual_machine_py3.py      | 2 +-
 .../models/virtual_machine_scale_set_extension_py3.py           | 2 +-
 .../models/virtual_machine_scale_set_ip_configuration_py3.py    | 2 +-
 .../virtual_machine_scale_set_network_configuration_py3.py      | 2 +-
 .../compute/v2016_03_30/models/virtual_machine_scale_set_py3.py | 2 +-
 .../v2016_03_30/models/virtual_machine_scale_set_vm_py3.py      | 2 +-
 .../compute/v2016_04_30_preview/models/availability_set_py3.py  | 2 +-
 .../azure/mgmt/compute/v2016_04_30_preview/models/disk_py3.py   | 2 +-
 .../mgmt/compute/v2016_04_30_preview/models/disk_update_py3.py  | 2 +-
 .../azure/mgmt/compute/v2016_04_30_preview/models/image_py3.py  | 2 +-
 .../compute/v2016_04_30_preview/models/image_reference_py3.py   | 2 +-
 .../v2016_04_30_preview/models/managed_disk_parameters_py3.py   | 2 +-
 .../models/network_interface_reference_py3.py                   | 2 +-
 .../mgmt/compute/v2016_04_30_preview/models/snapshot_py3.py     | 2 +-
 .../compute/v2016_04_30_preview/models/snapshot_update_py3.py   | 2 +-
 .../models/virtual_machine_capture_result_py3.py                | 2 +-
 .../models/virtual_machine_extension_image_py3.py               | 2 +-
 .../v2016_04_30_preview/models/virtual_machine_extension_py3.py | 2 +-
 .../models/virtual_machine_extension_update_py3.py              | 2 +-
 .../v2016_04_30_preview/models/virtual_machine_image_py3.py     | 2 +-
 .../models/virtual_machine_image_resource_py3.py                | 2 +-
 .../compute/v2016_04_30_preview/models/virtual_machine_py3.py   | 2 +-
 .../models/virtual_machine_scale_set_extension_py3.py           | 2 +-
 .../models/virtual_machine_scale_set_ip_configuration_py3.py    | 2 +-
 .../virtual_machine_scale_set_network_configuration_py3.py      | 2 +-
 .../v2016_04_30_preview/models/virtual_machine_scale_set_py3.py | 2 +-
 .../models/virtual_machine_scale_set_vm_py3.py                  | 2 +-
 .../mgmt/compute/v2017_03_30/models/availability_set_py3.py     | 2 +-
 .../azure/mgmt/compute/v2017_03_30/models/disk_py3.py           | 2 +-
 .../azure/mgmt/compute/v2017_03_30/models/disk_update_py3.py    | 2 +-
 .../azure/mgmt/compute/v2017_03_30/models/image_py3.py          | 2 +-
 .../mgmt/compute/v2017_03_30/models/image_reference_py3.py      | 2 +-
 .../compute/v2017_03_30/models/managed_disk_parameters_py3.py   | 2 +-
 .../v2017_03_30/models/network_interface_reference_py3.py       | 2 +-
 .../v2017_03_30/models/rolling_upgrade_status_info_py3.py       | 2 +-
 .../mgmt/compute/v2017_03_30/models/run_command_document_py3.py | 2 +-
 .../mgmt/compute/v2017_03_30/models/run_command_result_py3.py   | 2 +-
 .../azure/mgmt/compute/v2017_03_30/models/snapshot_py3.py       | 2 +-
 .../mgmt/compute/v2017_03_30/models/snapshot_update_py3.py      | 2 +-
 .../v2017_03_30/models/virtual_machine_capture_result_py3.py    | 2 +-
 .../v2017_03_30/models/virtual_machine_extension_image_py3.py   | 2 +-
 .../compute/v2017_03_30/models/virtual_machine_extension_py3.py | 2 +-
 .../v2017_03_30/models/virtual_machine_extension_update_py3.py  | 2 +-
 .../compute/v2017_03_30/models/virtual_machine_image_py3.py     | 2 +-
 .../v2017_03_30/models/virtual_machine_image_resource_py3.py    | 2 +-
 .../mgmt/compute/v2017_03_30/models/virtual_machine_py3.py      | 2 +-
 .../models/virtual_machine_scale_set_extension_py3.py           | 2 +-
 .../models/virtual_machine_scale_set_ip_configuration_py3.py    | 2 +-
 .../virtual_machine_scale_set_network_configuration_py3.py      | 2 +-
 .../compute/v2017_03_30/models/virtual_machine_scale_set_py3.py | 2 +-
 .../virtual_machine_scale_set_update_ip_configuration_py3.py    | 2 +-
 ...irtual_machine_scale_set_update_network_configuration_py3.py | 2 +-
 .../v2017_03_30/models/virtual_machine_scale_set_update_py3.py  | 2 +-
 .../v2017_03_30/models/virtual_machine_scale_set_vm_py3.py      | 2 +-
 .../mgmt/compute/v2017_12_01/models/availability_set_py3.py     | 2 +-
 .../compute/v2017_12_01/models/availability_set_update_py3.py   | 2 +-
 .../azure/mgmt/compute/v2017_12_01/models/image_py3.py          | 2 +-
 .../mgmt/compute/v2017_12_01/models/image_reference_py3.py      | 2 +-
 .../azure/mgmt/compute/v2017_12_01/models/image_update_py3.py   | 2 +-
 .../v2017_12_01/models/log_analytics_operation_result_py3.py    | 2 +-
 .../compute/v2017_12_01/models/managed_disk_parameters_py3.py   | 2 +-
 .../v2017_12_01/models/network_interface_reference_py3.py       | 2 +-
 .../v2017_12_01/models/request_rate_by_interval_input_py3.py    | 2 +-
 .../v2017_12_01/models/rolling_upgrade_status_info_py3.py       | 2 +-
 .../mgmt/compute/v2017_12_01/models/run_command_document_py3.py | 2 +-
 .../mgmt/compute/v2017_12_01/models/run_command_result_py3.py   | 2 +-
 .../compute/v2017_12_01/models/throttled_requests_input_py3.py  | 2 +-
 .../v2017_12_01/models/virtual_machine_capture_result_py3.py    | 2 +-
 .../v2017_12_01/models/virtual_machine_extension_image_py3.py   | 2 +-
 .../compute/v2017_12_01/models/virtual_machine_extension_py3.py | 2 +-
 .../v2017_12_01/models/virtual_machine_extension_update_py3.py  | 2 +-
 .../compute/v2017_12_01/models/virtual_machine_image_py3.py     | 2 +-
 .../v2017_12_01/models/virtual_machine_image_resource_py3.py    | 2 +-
 .../mgmt/compute/v2017_12_01/models/virtual_machine_py3.py      | 2 +-
 .../models/virtual_machine_scale_set_extension_py3.py           | 2 +-
 .../models/virtual_machine_scale_set_ip_configuration_py3.py    | 2 +-
 .../virtual_machine_scale_set_network_configuration_py3.py      | 2 +-
 .../compute/v2017_12_01/models/virtual_machine_scale_set_py3.py | 2 +-
 .../virtual_machine_scale_set_update_ip_configuration_py3.py    | 2 +-
 ...irtual_machine_scale_set_update_network_configuration_py3.py | 2 +-
 .../v2017_12_01/models/virtual_machine_scale_set_update_py3.py  | 2 +-
 .../v2017_12_01/models/virtual_machine_scale_set_vm_py3.py      | 2 +-
 .../compute/v2017_12_01/models/virtual_machine_update_py3.py    | 2 +-
 .../azure/mgmt/compute/v2018_04_01/models/disk_py3.py           | 2 +-
 .../azure/mgmt/compute/v2018_04_01/models/disk_update_py3.py    | 2 +-
 .../azure/mgmt/compute/v2018_04_01/models/snapshot_py3.py       | 2 +-
 .../mgmt/compute/v2018_04_01/models/snapshot_update_py3.py      | 2 +-
 109 files changed, 109 insertions(+), 109 deletions(-)

diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/availability_set_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/availability_set_py3.py
index 3df77ebfa38c..8442490c0e7a 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/availability_set_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/availability_set_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class AvailabilitySet(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/network_interface_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/network_interface_reference_py3.py
index f42ead50fc36..47da29278832 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/network_interface_reference_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/network_interface_reference_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class NetworkInterfaceReference(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_capture_result_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_capture_result_py3.py
index da449b8e9154..f2aba4286bb0 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_capture_result_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_capture_result_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class VirtualMachineCaptureResult(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_extension_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_extension_image_py3.py
index 217accab02f0..3d48c3a87fb0 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_extension_image_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_extension_image_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class VirtualMachineExtensionImage(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_extension_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_extension_py3.py
index a3bbe0510df7..9aad21dc36fc 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_extension_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_extension_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class VirtualMachineExtension(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_extension_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_extension_update_py3.py
index a5b8ea8c1104..c32c18d32759 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_extension_update_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_extension_update_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .update_resource import UpdateResource
+from .update_resource_py3 import UpdateResource
 
 
 class VirtualMachineExtensionUpdate(UpdateResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_image_py3.py
index fb55ba3fa039..61fa10d90a3c 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_image_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_image_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .virtual_machine_image_resource import VirtualMachineImageResource
+from .virtual_machine_image_resource_py3 import VirtualMachineImageResource
 
 
 class VirtualMachineImage(VirtualMachineImageResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_image_resource_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_image_resource_py3.py
index 48a968bf2fbf..b9d63a8bc9e0 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_image_resource_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_image_resource_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class VirtualMachineImageResource(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_py3.py
index 6691e50e4b9e..0097f5df2c7f 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class VirtualMachine(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_scale_set_extension_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_scale_set_extension_py3.py
index 5523e0444c59..5c0ffe9af348 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_scale_set_extension_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_scale_set_extension_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class VirtualMachineScaleSetExtension(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_scale_set_ip_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_scale_set_ip_configuration_py3.py
index e075f019a729..91e163b09412 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_scale_set_ip_configuration_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_scale_set_ip_configuration_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class VirtualMachineScaleSetIPConfiguration(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_scale_set_network_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_scale_set_network_configuration_py3.py
index 77933661de7f..939cb61499ab 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_scale_set_network_configuration_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_scale_set_network_configuration_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class VirtualMachineScaleSetNetworkConfiguration(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_scale_set_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_scale_set_py3.py
index 7ef6ab297883..9d7545f85c01 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_scale_set_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_scale_set_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class VirtualMachineScaleSet(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_scale_set_vm_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_scale_set_vm_py3.py
index d69fd86bc0cf..5d83f88fe97d 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_scale_set_vm_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_scale_set_vm_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class VirtualMachineScaleSetVM(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/availability_set_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/availability_set_py3.py
index 610f6ab71d8c..cde87ba77ccb 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/availability_set_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/availability_set_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class AvailabilitySet(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/network_interface_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/network_interface_reference_py3.py
index f42ead50fc36..47da29278832 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/network_interface_reference_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/network_interface_reference_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class NetworkInterfaceReference(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_capture_result_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_capture_result_py3.py
index da449b8e9154..f2aba4286bb0 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_capture_result_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_capture_result_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class VirtualMachineCaptureResult(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_extension_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_extension_image_py3.py
index 217accab02f0..3d48c3a87fb0 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_extension_image_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_extension_image_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class VirtualMachineExtensionImage(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_extension_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_extension_py3.py
index 32c448ecd2c2..ef8a5ef965ec 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_extension_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_extension_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class VirtualMachineExtension(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_extension_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_extension_update_py3.py
index a5b8ea8c1104..c32c18d32759 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_extension_update_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_extension_update_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .update_resource import UpdateResource
+from .update_resource_py3 import UpdateResource
 
 
 class VirtualMachineExtensionUpdate(UpdateResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_image_py3.py
index efc8c3d8394e..4c8bd1482541 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_image_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_image_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .virtual_machine_image_resource import VirtualMachineImageResource
+from .virtual_machine_image_resource_py3 import VirtualMachineImageResource
 
 
 class VirtualMachineImage(VirtualMachineImageResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_image_resource_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_image_resource_py3.py
index 48a968bf2fbf..b9d63a8bc9e0 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_image_resource_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_image_resource_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class VirtualMachineImageResource(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_py3.py
index 4348f94e375d..1ec46e1a52e6 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class VirtualMachine(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_scale_set_extension_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_scale_set_extension_py3.py
index 5523e0444c59..5c0ffe9af348 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_scale_set_extension_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_scale_set_extension_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class VirtualMachineScaleSetExtension(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_scale_set_ip_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_scale_set_ip_configuration_py3.py
index 4e2c36c30e6c..f9b9d9b3a188 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_scale_set_ip_configuration_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_scale_set_ip_configuration_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class VirtualMachineScaleSetIPConfiguration(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_scale_set_network_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_scale_set_network_configuration_py3.py
index 1d82ed5e0c03..58f07fde6097 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_scale_set_network_configuration_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_scale_set_network_configuration_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class VirtualMachineScaleSetNetworkConfiguration(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_scale_set_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_scale_set_py3.py
index 5ca8108adb6e..fcca789186fa 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_scale_set_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_scale_set_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class VirtualMachineScaleSet(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_scale_set_vm_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_scale_set_vm_py3.py
index b5d22478c827..f759b6c80e4e 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_scale_set_vm_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_scale_set_vm_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class VirtualMachineScaleSetVM(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/availability_set_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/availability_set_py3.py
index f9e977dbe70c..3b647797b6e2 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/availability_set_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/availability_set_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class AvailabilitySet(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/disk_py3.py
index cf3b3dab5351..eba7a71b12db 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/disk_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class Disk(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/disk_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/disk_update_py3.py
index 545c2a218368..628867dc9093 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/disk_update_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/disk_update_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource_update import ResourceUpdate
+from .resource_update_py3 import ResourceUpdate
 
 
 class DiskUpdate(ResourceUpdate):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/image_py3.py
index d035e3eb9106..87f57c1b86c3 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/image_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/image_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class Image(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/image_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/image_reference_py3.py
index f44047d4c087..1d7eefe5ac65 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/image_reference_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/image_reference_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class ImageReference(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/managed_disk_parameters_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/managed_disk_parameters_py3.py
index ffce009881d2..2be83953da18 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/managed_disk_parameters_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/managed_disk_parameters_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class ManagedDiskParameters(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/network_interface_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/network_interface_reference_py3.py
index f42ead50fc36..47da29278832 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/network_interface_reference_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/network_interface_reference_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class NetworkInterfaceReference(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/snapshot_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/snapshot_py3.py
index 325b6544e35e..0cbf1f525fdf 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/snapshot_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/snapshot_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class Snapshot(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/snapshot_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/snapshot_update_py3.py
index 22c491d39f6a..9832ce687fae 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/snapshot_update_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/snapshot_update_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource_update import ResourceUpdate
+from .resource_update_py3 import ResourceUpdate
 
 
 class SnapshotUpdate(ResourceUpdate):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_capture_result_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_capture_result_py3.py
index da449b8e9154..f2aba4286bb0 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_capture_result_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_capture_result_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class VirtualMachineCaptureResult(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_extension_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_extension_image_py3.py
index 217accab02f0..3d48c3a87fb0 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_extension_image_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_extension_image_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class VirtualMachineExtensionImage(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_extension_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_extension_py3.py
index 342cb444d9ce..b2ccf18662b8 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_extension_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_extension_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class VirtualMachineExtension(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_extension_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_extension_update_py3.py
index a5b8ea8c1104..c32c18d32759 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_extension_update_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_extension_update_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .update_resource import UpdateResource
+from .update_resource_py3 import UpdateResource
 
 
 class VirtualMachineExtensionUpdate(UpdateResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_image_py3.py
index 04d6563b63b3..98fc935fa42d 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_image_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_image_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .virtual_machine_image_resource import VirtualMachineImageResource
+from .virtual_machine_image_resource_py3 import VirtualMachineImageResource
 
 
 class VirtualMachineImage(VirtualMachineImageResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_image_resource_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_image_resource_py3.py
index 48a968bf2fbf..b9d63a8bc9e0 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_image_resource_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_image_resource_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class VirtualMachineImageResource(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_py3.py
index c34a5e057c9a..d9fcdb6bbdd2 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class VirtualMachine(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_extension_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_extension_py3.py
index 7d903d24994d..885120fef0d8 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_extension_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_extension_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource_read_only import SubResourceReadOnly
+from .sub_resource_read_only_py3 import SubResourceReadOnly
 
 
 class VirtualMachineScaleSetExtension(SubResourceReadOnly):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_ip_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_ip_configuration_py3.py
index e3c09703cdf1..6b1f921db4d7 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_ip_configuration_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_ip_configuration_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class VirtualMachineScaleSetIPConfiguration(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_network_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_network_configuration_py3.py
index 10a0d88b296e..960adde3f070 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_network_configuration_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_network_configuration_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class VirtualMachineScaleSetNetworkConfiguration(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_py3.py
index f6125f581a42..a20bbbcba30a 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class VirtualMachineScaleSet(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_vm_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_vm_py3.py
index 79793f66dac7..f2a8ded088ed 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_vm_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_vm_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class VirtualMachineScaleSetVM(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/availability_set_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/availability_set_py3.py
index a096e28adcdc..b6bb617466f9 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/availability_set_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/availability_set_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class AvailabilitySet(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/disk_py3.py
index 979613707c9f..8f76ec8c2165 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/disk_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class Disk(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/disk_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/disk_update_py3.py
index ce585313920e..fc4d7781ba58 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/disk_update_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/disk_update_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource_update import ResourceUpdate
+from .resource_update_py3 import ResourceUpdate
 
 
 class DiskUpdate(ResourceUpdate):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/image_py3.py
index 103ab400bb6a..92e3680ef6dd 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/image_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/image_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class Image(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/image_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/image_reference_py3.py
index f44047d4c087..1d7eefe5ac65 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/image_reference_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/image_reference_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class ImageReference(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/managed_disk_parameters_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/managed_disk_parameters_py3.py
index d28adf8baf36..16d4a9339b5c 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/managed_disk_parameters_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/managed_disk_parameters_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class ManagedDiskParameters(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/network_interface_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/network_interface_reference_py3.py
index f42ead50fc36..47da29278832 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/network_interface_reference_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/network_interface_reference_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class NetworkInterfaceReference(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/rolling_upgrade_status_info_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/rolling_upgrade_status_info_py3.py
index bae19f30c775..f287b4db2e5b 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/rolling_upgrade_status_info_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/rolling_upgrade_status_info_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class RollingUpgradeStatusInfo(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/run_command_document_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/run_command_document_py3.py
index 8148374fdfd1..61ac7898e294 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/run_command_document_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/run_command_document_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .run_command_document_base import RunCommandDocumentBase
+from .run_command_document_base_py3 import RunCommandDocumentBase
 
 
 class RunCommandDocument(RunCommandDocumentBase):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/run_command_result_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/run_command_result_py3.py
index e33ea085e641..d73bc6086e0c 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/run_command_result_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/run_command_result_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .operation_status_response import OperationStatusResponse
+from .operation_status_response_py3 import OperationStatusResponse
 
 
 class RunCommandResult(OperationStatusResponse):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/snapshot_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/snapshot_py3.py
index efa9b70bfefe..4538d2b84d83 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/snapshot_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/snapshot_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class Snapshot(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/snapshot_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/snapshot_update_py3.py
index 5890514da5aa..380ddaf2ef73 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/snapshot_update_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/snapshot_update_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource_update import ResourceUpdate
+from .resource_update_py3 import ResourceUpdate
 
 
 class SnapshotUpdate(ResourceUpdate):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_capture_result_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_capture_result_py3.py
index da449b8e9154..f2aba4286bb0 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_capture_result_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_capture_result_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class VirtualMachineCaptureResult(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_extension_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_extension_image_py3.py
index 217accab02f0..3d48c3a87fb0 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_extension_image_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_extension_image_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class VirtualMachineExtensionImage(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_extension_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_extension_py3.py
index 90ac643e6af3..4c3ca49d093b 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_extension_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_extension_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class VirtualMachineExtension(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_extension_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_extension_update_py3.py
index a5b8ea8c1104..c32c18d32759 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_extension_update_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_extension_update_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .update_resource import UpdateResource
+from .update_resource_py3 import UpdateResource
 
 
 class VirtualMachineExtensionUpdate(UpdateResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_image_py3.py
index 91c71128968d..0140c64c7c4f 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_image_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_image_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .virtual_machine_image_resource import VirtualMachineImageResource
+from .virtual_machine_image_resource_py3 import VirtualMachineImageResource
 
 
 class VirtualMachineImage(VirtualMachineImageResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_image_resource_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_image_resource_py3.py
index 48a968bf2fbf..b9d63a8bc9e0 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_image_resource_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_image_resource_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class VirtualMachineImageResource(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_py3.py
index 791291568f1b..03753b4cf274 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class VirtualMachine(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_extension_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_extension_py3.py
index 8c56cf6fe20d..27392a2de9fd 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_extension_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_extension_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource_read_only import SubResourceReadOnly
+from .sub_resource_read_only_py3 import SubResourceReadOnly
 
 
 class VirtualMachineScaleSetExtension(SubResourceReadOnly):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_ip_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_ip_configuration_py3.py
index f11b3584d844..70bf6a5ee613 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_ip_configuration_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_ip_configuration_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class VirtualMachineScaleSetIPConfiguration(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_network_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_network_configuration_py3.py
index 0f184fa10b2f..e44253a9a9b9 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_network_configuration_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_network_configuration_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class VirtualMachineScaleSetNetworkConfiguration(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_py3.py
index f1058061da23..a1ea651839eb 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class VirtualMachineScaleSet(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_update_ip_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_update_ip_configuration_py3.py
index f7860d495575..c1f9f663572d 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_update_ip_configuration_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_update_ip_configuration_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class VirtualMachineScaleSetUpdateIPConfiguration(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_update_network_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_update_network_configuration_py3.py
index 9ff9c77dc275..b688e9e2ca59 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_update_network_configuration_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_update_network_configuration_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class VirtualMachineScaleSetUpdateNetworkConfiguration(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_update_py3.py
index c27c33be47de..e9471fed120a 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_update_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_update_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .update_resource import UpdateResource
+from .update_resource_py3 import UpdateResource
 
 
 class VirtualMachineScaleSetUpdate(UpdateResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_vm_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_vm_py3.py
index ee6d74113a2b..7a92604b6f19 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_vm_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_vm_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class VirtualMachineScaleSetVM(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/availability_set_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/availability_set_py3.py
index 0c9c9d33e2a9..0c47c63718b3 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/availability_set_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/availability_set_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class AvailabilitySet(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/availability_set_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/availability_set_update_py3.py
index cc3cbdfe39ff..0feeb62c51dc 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/availability_set_update_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/availability_set_update_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .update_resource import UpdateResource
+from .update_resource_py3 import UpdateResource
 
 
 class AvailabilitySetUpdate(UpdateResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/image_py3.py
index 382edb4e40bd..65e29e15d43f 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/image_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/image_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class Image(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/image_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/image_reference_py3.py
index f44047d4c087..1d7eefe5ac65 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/image_reference_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/image_reference_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class ImageReference(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/image_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/image_update_py3.py
index ce8ddec32170..a1d5db473166 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/image_update_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/image_update_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .update_resource import UpdateResource
+from .update_resource_py3 import UpdateResource
 
 
 class ImageUpdate(UpdateResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/log_analytics_operation_result_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/log_analytics_operation_result_py3.py
index f03b2b57cc75..bab57ba54ad9 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/log_analytics_operation_result_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/log_analytics_operation_result_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .operation_status_response import OperationStatusResponse
+from .operation_status_response_py3 import OperationStatusResponse
 
 
 class LogAnalyticsOperationResult(OperationStatusResponse):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/managed_disk_parameters_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/managed_disk_parameters_py3.py
index cd11679f5f8d..8941c0baa651 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/managed_disk_parameters_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/managed_disk_parameters_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class ManagedDiskParameters(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/network_interface_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/network_interface_reference_py3.py
index f42ead50fc36..47da29278832 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/network_interface_reference_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/network_interface_reference_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class NetworkInterfaceReference(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/request_rate_by_interval_input_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/request_rate_by_interval_input_py3.py
index 5e931a0379aa..c59fafd6859b 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/request_rate_by_interval_input_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/request_rate_by_interval_input_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .log_analytics_input_base import LogAnalyticsInputBase
+from .log_analytics_input_base_py3 import LogAnalyticsInputBase
 
 
 class RequestRateByIntervalInput(LogAnalyticsInputBase):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/rolling_upgrade_status_info_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/rolling_upgrade_status_info_py3.py
index a2fd0b7b6c02..7f5e4ba43de5 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/rolling_upgrade_status_info_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/rolling_upgrade_status_info_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class RollingUpgradeStatusInfo(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/run_command_document_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/run_command_document_py3.py
index 6dc3cd6c8a01..cb2631691b22 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/run_command_document_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/run_command_document_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .run_command_document_base import RunCommandDocumentBase
+from .run_command_document_base_py3 import RunCommandDocumentBase
 
 
 class RunCommandDocument(RunCommandDocumentBase):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/run_command_result_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/run_command_result_py3.py
index 2e2cf9f33125..4868e9fd3159 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/run_command_result_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/run_command_result_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .operation_status_response import OperationStatusResponse
+from .operation_status_response_py3 import OperationStatusResponse
 
 
 class RunCommandResult(OperationStatusResponse):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/throttled_requests_input_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/throttled_requests_input_py3.py
index 31ed921240e2..025900705375 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/throttled_requests_input_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/throttled_requests_input_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .log_analytics_input_base import LogAnalyticsInputBase
+from .log_analytics_input_base_py3 import LogAnalyticsInputBase
 
 
 class ThrottledRequestsInput(LogAnalyticsInputBase):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_capture_result_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_capture_result_py3.py
index da449b8e9154..f2aba4286bb0 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_capture_result_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_capture_result_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class VirtualMachineCaptureResult(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_extension_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_extension_image_py3.py
index 217accab02f0..3d48c3a87fb0 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_extension_image_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_extension_image_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class VirtualMachineExtensionImage(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_extension_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_extension_py3.py
index ae11b2009578..7800d917ccfc 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_extension_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_extension_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class VirtualMachineExtension(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_extension_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_extension_update_py3.py
index a5b8ea8c1104..c32c18d32759 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_extension_update_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_extension_update_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .update_resource import UpdateResource
+from .update_resource_py3 import UpdateResource
 
 
 class VirtualMachineExtensionUpdate(UpdateResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_image_py3.py
index d1172470ece7..7c05b2469d1e 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_image_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_image_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .virtual_machine_image_resource import VirtualMachineImageResource
+from .virtual_machine_image_resource_py3 import VirtualMachineImageResource
 
 
 class VirtualMachineImage(VirtualMachineImageResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_image_resource_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_image_resource_py3.py
index 48a968bf2fbf..b9d63a8bc9e0 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_image_resource_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_image_resource_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class VirtualMachineImageResource(SubResource):
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 cfae95db0776..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
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class VirtualMachine(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_extension_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_extension_py3.py
index 8c56cf6fe20d..27392a2de9fd 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_extension_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_extension_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource_read_only import SubResourceReadOnly
+from .sub_resource_read_only_py3 import SubResourceReadOnly
 
 
 class VirtualMachineScaleSetExtension(SubResourceReadOnly):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_ip_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_ip_configuration_py3.py
index f1a96384fd52..060b37a14daa 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_ip_configuration_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_ip_configuration_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class VirtualMachineScaleSetIPConfiguration(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_network_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_network_configuration_py3.py
index 78d8564906c3..995a1db4437e 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_network_configuration_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_network_configuration_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class VirtualMachineScaleSetNetworkConfiguration(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_py3.py
index 6894911e1e4b..bf8d6f68d357 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class VirtualMachineScaleSet(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_update_ip_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_update_ip_configuration_py3.py
index 73d1bef780ad..508b342da128 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_update_ip_configuration_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_update_ip_configuration_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class VirtualMachineScaleSetUpdateIPConfiguration(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_update_network_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_update_network_configuration_py3.py
index 9d4109287ec2..cccdbeb9c314 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_update_network_configuration_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_update_network_configuration_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .sub_resource import SubResource
+from .sub_resource_py3 import SubResource
 
 
 class VirtualMachineScaleSetUpdateNetworkConfiguration(SubResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_update_py3.py
index a4654e1b277c..cbcb433d0173 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_update_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_update_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .update_resource import UpdateResource
+from .update_resource_py3 import UpdateResource
 
 
 class VirtualMachineScaleSetUpdate(UpdateResource):
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 1f8c9ce7d927..24d0acda8dcb 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
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class VirtualMachineScaleSetVM(Resource):
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 7dbab0a47e9f..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
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .update_resource import UpdateResource
+from .update_resource_py3 import UpdateResource
 
 
 class VirtualMachineUpdate(UpdateResource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_py3.py
index 34dd0febdc77..8fa2d4b9828d 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class Disk(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update_py3.py
index 0764da0e7f0c..b2445fda4cc9 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource_update import ResourceUpdate
+from .resource_update_py3 import ResourceUpdate
 
 
 class DiskUpdate(ResourceUpdate):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_py3.py
index ac1163f8980f..d44887e1c702 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class Snapshot(Resource):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update_py3.py
index f4d48cddbd67..c1a7cec5da8c 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource_update import ResourceUpdate
+from .resource_update_py3 import ResourceUpdate
 
 
 class SnapshotUpdate(ResourceUpdate):

From 85f3a3914ec631dec536522f91db5741047ccf2e Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Mon, 21 May 2018 10:55:40 -0700
Subject: [PATCH 05/29] Generated from 7014b952af241255afcf4e2b620cfd40737a3ea1
 (#2580)

Upgrade Compute API version to 2018-04-01 and Fix the response of all POST operation.
---
 .../compute/v2018_04_01/models/__init__.py    | 12 ----
 .../compute/v2018_04_01/models/access_uri.py  |  2 +-
 .../v2018_04_01/models/access_uri_py3.py      |  2 +-
 .../compute/v2018_04_01/models/api_error.py   | 44 ---------------
 .../v2018_04_01/models/api_error_base.py      | 36 ------------
 .../v2018_04_01/models/api_error_base_py3.py  | 36 ------------
 .../v2018_04_01/models/api_error_py3.py       | 44 ---------------
 .../compute/v2018_04_01/models/inner_error.py | 32 -----------
 .../v2018_04_01/models/inner_error_py3.py     | 32 -----------
 .../models/operation_status_response.py       | 55 -------------------
 .../models/operation_status_response_py3.py   | 55 -------------------
 .../operations/disks_operations.py            | 50 ++++-------------
 .../operations/snapshots_operations.py        | 50 ++++-------------
 13 files changed, 26 insertions(+), 424 deletions(-)
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/operation_status_response.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/operation_status_response_py3.py

diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/__init__.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/__init__.py
index e9b76b3dc97d..a9b68bd118f4 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/__init__.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/__init__.py
@@ -26,10 +26,6 @@
     from .access_uri_py3 import AccessUri
     from .snapshot_py3 import Snapshot
     from .snapshot_update_py3 import SnapshotUpdate
-    from .api_error_base_py3 import ApiErrorBase
-    from .inner_error_py3 import InnerError
-    from .api_error_py3 import ApiError
-    from .operation_status_response_py3 import OperationStatusResponse
 except (SyntaxError, ImportError):
     from .resource import Resource
     from .disk_sku import DiskSku
@@ -47,10 +43,6 @@
     from .access_uri import AccessUri
     from .snapshot import Snapshot
     from .snapshot_update import SnapshotUpdate
-    from .api_error_base import ApiErrorBase
-    from .inner_error import InnerError
-    from .api_error import ApiError
-    from .operation_status_response import OperationStatusResponse
 from .disk_paged import DiskPaged
 from .snapshot_paged import SnapshotPaged
 from .compute_management_client_enums import (
@@ -78,10 +70,6 @@
     'AccessUri',
     'Snapshot',
     'SnapshotUpdate',
-    'ApiErrorBase',
-    'InnerError',
-    'ApiError',
-    'OperationStatusResponse',
     'DiskPaged',
     'SnapshotPaged',
     'StorageAccountTypes',
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/api_error.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error.py
deleted file mode 100644
index 6c3ce23571f7..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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 ApiError(Model):
-    """Api error.
-
-    :param details: The Api error details
-    :type details: list[~azure.mgmt.compute.v2018_04_01.models.ApiErrorBase]
-    :param innererror: The Api inner error
-    :type innererror: ~azure.mgmt.compute.v2018_04_01.models.InnerError
-    :param code: The error code.
-    :type code: str
-    :param target: The target of the particular error.
-    :type target: str
-    :param message: The error message.
-    :type message: str
-    """
-
-    _attribute_map = {
-        'details': {'key': 'details', 'type': '[ApiErrorBase]'},
-        'innererror': {'key': 'innererror', 'type': 'InnerError'},
-        'code': {'key': 'code', 'type': 'str'},
-        'target': {'key': 'target', 'type': 'str'},
-        'message': {'key': 'message', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(ApiError, self).__init__(**kwargs)
-        self.details = kwargs.get('details', None)
-        self.innererror = kwargs.get('innererror', None)
-        self.code = kwargs.get('code', None)
-        self.target = kwargs.get('target', None)
-        self.message = kwargs.get('message', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base.py
deleted file mode 100644
index 655c08638905..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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 ApiErrorBase(Model):
-    """Api error base.
-
-    :param code: The error code.
-    :type code: str
-    :param target: The target of the particular error.
-    :type target: str
-    :param message: The error message.
-    :type message: str
-    """
-
-    _attribute_map = {
-        'code': {'key': 'code', 'type': 'str'},
-        'target': {'key': 'target', 'type': 'str'},
-        'message': {'key': 'message', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(ApiErrorBase, self).__init__(**kwargs)
-        self.code = kwargs.get('code', None)
-        self.target = kwargs.get('target', None)
-        self.message = kwargs.get('message', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base_py3.py
deleted file mode 100644
index 5ba95aa0283e..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base_py3.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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 ApiErrorBase(Model):
-    """Api error base.
-
-    :param code: The error code.
-    :type code: str
-    :param target: The target of the particular error.
-    :type target: str
-    :param message: The error message.
-    :type message: str
-    """
-
-    _attribute_map = {
-        'code': {'key': 'code', 'type': 'str'},
-        'target': {'key': 'target', 'type': 'str'},
-        'message': {'key': 'message', 'type': 'str'},
-    }
-
-    def __init__(self, *, code: str=None, target: str=None, message: str=None, **kwargs) -> None:
-        super(ApiErrorBase, self).__init__(**kwargs)
-        self.code = code
-        self.target = target
-        self.message = message
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_py3.py
deleted file mode 100644
index ad665ba38599..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_py3.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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 ApiError(Model):
-    """Api error.
-
-    :param details: The Api error details
-    :type details: list[~azure.mgmt.compute.v2018_04_01.models.ApiErrorBase]
-    :param innererror: The Api inner error
-    :type innererror: ~azure.mgmt.compute.v2018_04_01.models.InnerError
-    :param code: The error code.
-    :type code: str
-    :param target: The target of the particular error.
-    :type target: str
-    :param message: The error message.
-    :type message: str
-    """
-
-    _attribute_map = {
-        'details': {'key': 'details', 'type': '[ApiErrorBase]'},
-        'innererror': {'key': 'innererror', 'type': 'InnerError'},
-        'code': {'key': 'code', 'type': 'str'},
-        'target': {'key': 'target', 'type': 'str'},
-        'message': {'key': 'message', 'type': 'str'},
-    }
-
-    def __init__(self, *, details=None, innererror=None, code: str=None, target: str=None, message: str=None, **kwargs) -> None:
-        super(ApiError, self).__init__(**kwargs)
-        self.details = details
-        self.innererror = innererror
-        self.code = code
-        self.target = target
-        self.message = message
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error.py
deleted file mode 100644
index 6324249d7c19..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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 InnerError(Model):
-    """Inner error details.
-
-    :param exceptiontype: The exception type.
-    :type exceptiontype: str
-    :param errordetail: The internal error message or exception dump.
-    :type errordetail: str
-    """
-
-    _attribute_map = {
-        'exceptiontype': {'key': 'exceptiontype', 'type': 'str'},
-        'errordetail': {'key': 'errordetail', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(InnerError, self).__init__(**kwargs)
-        self.exceptiontype = kwargs.get('exceptiontype', None)
-        self.errordetail = kwargs.get('errordetail', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error_py3.py
deleted file mode 100644
index ccec30d7b53f..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error_py3.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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 InnerError(Model):
-    """Inner error details.
-
-    :param exceptiontype: The exception type.
-    :type exceptiontype: str
-    :param errordetail: The internal error message or exception dump.
-    :type errordetail: str
-    """
-
-    _attribute_map = {
-        'exceptiontype': {'key': 'exceptiontype', 'type': 'str'},
-        'errordetail': {'key': 'errordetail', 'type': 'str'},
-    }
-
-    def __init__(self, *, exceptiontype: str=None, errordetail: str=None, **kwargs) -> None:
-        super(InnerError, self).__init__(**kwargs)
-        self.exceptiontype = exceptiontype
-        self.errordetail = errordetail
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/operation_status_response.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/operation_status_response.py
deleted file mode 100644
index 3fc201f5913a..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/operation_status_response.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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 OperationStatusResponse(Model):
-    """Operation status response.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar name: Operation ID
-    :vartype name: str
-    :ivar status: Operation status
-    :vartype status: str
-    :ivar start_time: Start time of the operation
-    :vartype start_time: datetime
-    :ivar end_time: End time of the operation
-    :vartype end_time: datetime
-    :ivar error: Api error
-    :vartype error: ~azure.mgmt.compute.v2018_04_01.models.ApiError
-    """
-
-    _validation = {
-        'name': {'readonly': True},
-        'status': {'readonly': True},
-        'start_time': {'readonly': True},
-        'end_time': {'readonly': True},
-        'error': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'status': {'key': 'status', 'type': 'str'},
-        'start_time': {'key': 'startTime', 'type': 'iso-8601'},
-        'end_time': {'key': 'endTime', 'type': 'iso-8601'},
-        'error': {'key': 'error', 'type': 'ApiError'},
-    }
-
-    def __init__(self, **kwargs):
-        super(OperationStatusResponse, self).__init__(**kwargs)
-        self.name = None
-        self.status = None
-        self.start_time = None
-        self.end_time = None
-        self.error = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/operation_status_response_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/operation_status_response_py3.py
deleted file mode 100644
index 914868a01954..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/operation_status_response_py3.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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 OperationStatusResponse(Model):
-    """Operation status response.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar name: Operation ID
-    :vartype name: str
-    :ivar status: Operation status
-    :vartype status: str
-    :ivar start_time: Start time of the operation
-    :vartype start_time: datetime
-    :ivar end_time: End time of the operation
-    :vartype end_time: datetime
-    :ivar error: Api error
-    :vartype error: ~azure.mgmt.compute.v2018_04_01.models.ApiError
-    """
-
-    _validation = {
-        'name': {'readonly': True},
-        'status': {'readonly': True},
-        'start_time': {'readonly': True},
-        'end_time': {'readonly': True},
-        'error': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'status': {'key': 'status', 'type': 'str'},
-        'start_time': {'key': 'startTime', 'type': 'iso-8601'},
-        'end_time': {'key': 'endTime', 'type': 'iso-8601'},
-        'error': {'key': 'error', 'type': 'ApiError'},
-    }
-
-    def __init__(self, **kwargs) -> None:
-        super(OperationStatusResponse, self).__init__(**kwargs)
-        self.name = None
-        self.status = None
-        self.start_time = None
-        self.end_time = None
-        self.error = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/disks_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/disks_operations.py
index c066a2195933..fbc2afa3489b 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/disks_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/disks_operations.py
@@ -351,17 +351,10 @@ def _delete_initial(
             exp.request_id = response.headers.get('x-ms-request-id')
             raise exp
 
-        deserialized = None
-
-        if response.status_code == 200:
-            deserialized = self._deserialize('OperationStatusResponse', response)
-
         if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
+            client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
 
-        return deserialized
-
     def delete(
             self, resource_group_name, disk_name, custom_headers=None, raw=False, polling=True, **operation_config):
         """Deletes a disk.
@@ -378,12 +371,10 @@ def delete(
          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 OperationStatusResponse
-         or ClientRawResponse<OperationStatusResponse> if raw==True
-        :rtype:
-         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.OperationStatusResponse]
-         or
-         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.OperationStatusResponse]]
+        :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(
@@ -395,14 +386,10 @@ def delete(
         )
 
         def get_long_running_output(response):
-            deserialized = self._deserialize('OperationStatusResponse', response)
-
             if raw:
-                client_raw_response = ClientRawResponse(deserialized, response)
+                client_raw_response = ClientRawResponse(None, response)
                 return client_raw_response
 
-            return deserialized
-
         lro_delay = operation_config.get(
             'long_running_operation_timeout',
             self.config.long_running_operation_timeout)
@@ -690,17 +677,10 @@ def _revoke_access_initial(
             exp.request_id = response.headers.get('x-ms-request-id')
             raise exp
 
-        deserialized = None
-
-        if response.status_code == 200:
-            deserialized = self._deserialize('OperationStatusResponse', response)
-
         if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
+            client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
 
-        return deserialized
-
     def revoke_access(
             self, resource_group_name, disk_name, custom_headers=None, raw=False, polling=True, **operation_config):
         """Revokes access to a disk.
@@ -717,12 +697,10 @@ def revoke_access(
          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 OperationStatusResponse
-         or ClientRawResponse<OperationStatusResponse> if raw==True
-        :rtype:
-         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.OperationStatusResponse]
-         or
-         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.OperationStatusResponse]]
+        :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(
@@ -734,14 +712,10 @@ def revoke_access(
         )
 
         def get_long_running_output(response):
-            deserialized = self._deserialize('OperationStatusResponse', response)
-
             if raw:
-                client_raw_response = ClientRawResponse(deserialized, response)
+                client_raw_response = ClientRawResponse(None, response)
                 return client_raw_response
 
-            return deserialized
-
         lro_delay = operation_config.get(
             'long_running_operation_timeout',
             self.config.long_running_operation_timeout)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/snapshots_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/snapshots_operations.py
index b6c4d1bf4b74..c65e1d1dc86b 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/snapshots_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/snapshots_operations.py
@@ -351,17 +351,10 @@ def _delete_initial(
             exp.request_id = response.headers.get('x-ms-request-id')
             raise exp
 
-        deserialized = None
-
-        if response.status_code == 200:
-            deserialized = self._deserialize('OperationStatusResponse', response)
-
         if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
+            client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
 
-        return deserialized
-
     def delete(
             self, resource_group_name, snapshot_name, custom_headers=None, raw=False, polling=True, **operation_config):
         """Deletes a snapshot.
@@ -378,12 +371,10 @@ def delete(
          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 OperationStatusResponse
-         or ClientRawResponse<OperationStatusResponse> if raw==True
-        :rtype:
-         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.OperationStatusResponse]
-         or
-         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.OperationStatusResponse]]
+        :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(
@@ -395,14 +386,10 @@ def delete(
         )
 
         def get_long_running_output(response):
-            deserialized = self._deserialize('OperationStatusResponse', response)
-
             if raw:
-                client_raw_response = ClientRawResponse(deserialized, response)
+                client_raw_response = ClientRawResponse(None, response)
                 return client_raw_response
 
-            return deserialized
-
         lro_delay = operation_config.get(
             'long_running_operation_timeout',
             self.config.long_running_operation_timeout)
@@ -690,17 +677,10 @@ def _revoke_access_initial(
             exp.request_id = response.headers.get('x-ms-request-id')
             raise exp
 
-        deserialized = None
-
-        if response.status_code == 200:
-            deserialized = self._deserialize('OperationStatusResponse', response)
-
         if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
+            client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
 
-        return deserialized
-
     def revoke_access(
             self, resource_group_name, snapshot_name, custom_headers=None, raw=False, polling=True, **operation_config):
         """Revokes access to a snapshot.
@@ -717,12 +697,10 @@ def revoke_access(
          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 OperationStatusResponse
-         or ClientRawResponse<OperationStatusResponse> if raw==True
-        :rtype:
-         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.OperationStatusResponse]
-         or
-         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.OperationStatusResponse]]
+        :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(
@@ -734,14 +712,10 @@ def revoke_access(
         )
 
         def get_long_running_output(response):
-            deserialized = self._deserialize('OperationStatusResponse', response)
-
             if raw:
-                client_raw_response = ClientRawResponse(deserialized, response)
+                client_raw_response = ClientRawResponse(None, response)
                 return client_raw_response
 
-            return deserialized
-
         lro_delay = operation_config.get(
             'long_running_operation_timeout',
             self.config.long_running_operation_timeout)

From 74044899c695474a33b001a598630ba1b269e0ae Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Wed, 23 May 2018 12:50:34 -0700
Subject: [PATCH 06/29] [AutoPR compute/resource-manager] Added the swagger
 file for the new service Gallery. (#2563)

* Generated from b48862551b5e97eb40acb3da63e55522a9db566c

Added the swagger file for the new service Gallery.

* Generated from d2537a58b0496d8860759d47a9c344c19d217995

Gallery Python conf

* Generated from 29d0c5762aad64243a021fac44d65b8610304e4e

Fixed description for 202 response.

* Generated from 29d0c5762aad64243a021fac44d65b8610304e4e

Fixed description for 202 response.

* Generated from b74f3ee0fdca928bf92a7fdd2bcd17994deadca9

Changed the operationId to conform to naming convention.

* Generated from 664c041aeed346e4fdc3a2c8c29c1c59e7505b66

Fixed some typos.

* Generated from e7ab96432e0bfc7c49839ca5d1194ec1be0c23a9

Add default error response. Make provisioningInfo a enum type.

* Generated from c26feda2acff5be97893b6e5db4270e09dbf1c25

Fixed comments according to CR.

* Generated from b757a4ec5fd9e1a35bedefd53fe3d92e111db5eb

Resolved merge conflicts.
---
 .../mgmt/compute/compute_management_client.py |  43 ++
 .../mgmt/compute/v2018_06_01/__init__.py      |  18 +
 .../v2018_06_01/compute_management_client.py  |  95 ++++
 .../compute/v2018_06_01/models/__init__.py    | 108 +++++
 .../compute/v2018_06_01/models/api_error.py   |  44 ++
 .../v2018_06_01/models/api_error_base.py      |  36 ++
 .../v2018_06_01/models/api_error_base_py3.py  |  36 ++
 .../v2018_06_01/models/api_error_py3.py       |  44 ++
 .../models/compute_management_client_enums.py |  52 +++
 .../compute/v2018_06_01/models/disallowed.py  |  28 ++
 .../v2018_06_01/models/disallowed_py3.py      |  28 ++
 .../compute/v2018_06_01/models/gallery.py     |  68 +++
 ...allery_artifact_publishing_profile_base.py |  32 ++
 ...ry_artifact_publishing_profile_base_py3.py |  32 ++
 .../models/gallery_artifact_source.py         |  29 ++
 .../models/gallery_artifact_source_py3.py     |  29 ++
 .../models/gallery_data_disk_image.py         |  39 ++
 .../models/gallery_data_disk_image_py3.py     |  39 ++
 .../v2018_06_01/models/gallery_disk_image.py  |  35 ++
 .../models/gallery_disk_image_py3.py          |  35 ++
 .../v2018_06_01/models/gallery_identifier.py  |  35 ++
 .../models/gallery_identifier_py3.py          |  35 ++
 .../v2018_06_01/models/gallery_image.py       | 114 +++++
 .../models/gallery_image_identifier.py        |  36 ++
 .../models/gallery_image_identifier_py3.py    |  36 ++
 .../v2018_06_01/models/gallery_image_paged.py |  27 ++
 .../v2018_06_01/models/gallery_image_py3.py   | 114 +++++
 .../models/gallery_image_version.py           |  76 +++
 .../models/gallery_image_version_paged.py     |  27 ++
 ...allery_image_version_publishing_profile.py |  52 +++
 ...ry_image_version_publishing_profile_py3.py |  52 +++
 .../models/gallery_image_version_py3.py       |  76 +++
 .../gallery_image_version_storage_profile.py  |  34 ++
 ...llery_image_version_storage_profile_py3.py |  34 ++
 .../models/gallery_os_disk_image.py           |  33 ++
 .../models/gallery_os_disk_image_py3.py       |  33 ++
 .../v2018_06_01/models/gallery_paged.py       |  27 ++
 .../compute/v2018_06_01/models/gallery_py3.py |  68 +++
 .../v2018_06_01/models/image_purchase_plan.py |  37 ++
 .../models/image_purchase_plan_py3.py         |  37 ++
 .../compute/v2018_06_01/models/inner_error.py |  32 ++
 .../v2018_06_01/models/inner_error_py3.py     |  32 ++
 .../v2018_06_01/models/managed_artifact.py    |  28 ++
 .../models/managed_artifact_py3.py            |  28 ++
 .../models/operation_status_response.py       |  55 +++
 .../models/operation_status_response_py3.py   |  55 +++
 .../recommended_machine_configuration.py      |  32 ++
 .../recommended_machine_configuration_py3.py  |  32 ++
 .../models/regional_replication_status.py     |  42 ++
 .../models/regional_replication_status_py3.py |  42 ++
 .../v2018_06_01/models/replication_status.py  |  36 ++
 .../models/replication_status_py3.py          |  36 ++
 .../compute/v2018_06_01/models/resource.py    |  56 +++
 .../v2018_06_01/models/resource_py3.py        |  56 +++
 .../v2018_06_01/models/resource_range.py      |  32 ++
 .../v2018_06_01/models/resource_range_py3.py  |  32 ++
 .../v2018_06_01/operations/__init__.py        |  20 +
 .../operations/galleries_operations.py        | 431 ++++++++++++++++++
 .../gallery_image_versions_operations.py      | 404 ++++++++++++++++
 .../operations/gallery_images_operations.py   | 381 ++++++++++++++++
 .../azure/mgmt/compute/v2018_06_01/version.py |  13 +
 61 files changed, 3728 insertions(+)
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/__init__.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/compute_management_client.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/__init__.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/api_error.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/api_error_base.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/api_error_base_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/api_error_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/compute_management_client_enums.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disallowed.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disallowed_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_artifact_publishing_profile_base.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_artifact_publishing_profile_base_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_artifact_source.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_artifact_source_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_identifier.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_identifier_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_publishing_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_publishing_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_purchase_plan.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_purchase_plan_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/inner_error.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/inner_error_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/managed_artifact.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/managed_artifact_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/recommended_machine_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/recommended_machine_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/resource.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/resource_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/resource_range.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/resource_range_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/__init__.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/galleries_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_image_versions_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_images_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/version.py

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 d23dace4f604..6c6f04ec9351 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py
@@ -121,6 +121,7 @@ def models(cls, api_version=DEFAULT_API_VERSION):
            * 2017-09-01: :mod:`v2017_09_01.models<azure.mgmt.compute.v2017_09_01.models>`
            * 2017-12-01: :mod:`v2017_12_01.models<azure.mgmt.compute.v2017_12_01.models>`
            * 2018-04-01: :mod:`v2018_04_01.models<azure.mgmt.compute.v2018_04_01.models>`
+           * 2018-06-01: :mod:`v2018_06_01.models<azure.mgmt.compute.v2018_06_01.models>`
         """
         if api_version == '2015-06-15':
             from .v2015_06_15 import models
@@ -143,6 +144,9 @@ def models(cls, api_version=DEFAULT_API_VERSION):
         elif api_version == '2018-04-01':
             from .v2018_04_01 import models
             return models
+        elif api_version == '2018-06-01':
+            from .v2018_06_01 import models
+            return models
         raise NotImplementedError("APIVersion {} is not available".format(api_version))
     
     @property
@@ -189,6 +193,45 @@ def disks(self):
             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)))
 
+    @property
+    def galleries(self):
+        """Instance depends on the API version:
+
+           * 2018-06-01: :class:`GalleriesOperations<azure.mgmt.compute.v2018_06_01.operations.GalleriesOperations>`
+        """
+        api_version = self._get_api_version('galleries')
+        if api_version == '2018-06-01':
+            from .v2018_06_01.operations import GalleriesOperations 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)))
+
+    @property
+    def gallery_image_versions(self):
+        """Instance depends on the API version:
+
+           * 2018-06-01: :class:`GalleryImageVersionsOperations<azure.mgmt.compute.v2018_06_01.operations.GalleryImageVersionsOperations>`
+        """
+        api_version = self._get_api_version('gallery_image_versions')
+        if api_version == '2018-06-01':
+            from .v2018_06_01.operations import GalleryImageVersionsOperations 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)))
+
+    @property
+    def gallery_images(self):
+        """Instance depends on the API version:
+
+           * 2018-06-01: :class:`GalleryImagesOperations<azure.mgmt.compute.v2018_06_01.operations.GalleryImagesOperations>`
+        """
+        api_version = self._get_api_version('gallery_images')
+        if api_version == '2018-06-01':
+            from .v2018_06_01.operations import GalleryImagesOperations 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)))
+
     @property
     def images(self):
         """Instance depends on the API version:
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/__init__.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/__init__.py
new file mode 100644
index 000000000000..88ded2f640de
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/__init__.py
@@ -0,0 +1,18 @@
+# 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 .compute_management_client import ComputeManagementClient
+from .version import VERSION
+
+__all__ = ['ComputeManagementClient']
+
+__version__ = VERSION
+
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
new file mode 100644
index 000000000000..a0928105b324
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/compute_management_client.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 msrest.service_client import SDKClient
+from msrest import Serializer, Deserializer
+from msrestazure import AzureConfiguration
+from .version import VERSION
+from .operations.galleries_operations import GalleriesOperations
+from .operations.gallery_images_operations import GalleryImagesOperations
+from .operations.gallery_image_versions_operations import GalleryImageVersionsOperations
+from . import models
+
+
+class ComputeManagementClientConfiguration(AzureConfiguration):
+    """Configuration for ComputeManagementClient
+    Note that all parameters used to create this instance are saved as instance
+    attributes.
+
+    :param credentials: Credentials needed for the client to connect to Azure.
+    :type credentials: :mod:`A msrestazure Credentials
+     object<msrestazure.azure_active_directory>`
+    :param subscription_id: Subscription credentials which uniquely identify
+     Microsoft Azure subscription. The subscription ID forms part of the URI
+     for every service call.
+    :type subscription_id: str
+    :param str base_url: Service URL
+    """
+
+    def __init__(
+            self, credentials, subscription_id, base_url=None):
+
+        if credentials is None:
+            raise ValueError("Parameter 'credentials' must not be None.")
+        if subscription_id is None:
+            raise ValueError("Parameter 'subscription_id' must not be None.")
+        if not base_url:
+            base_url = 'https://management.azure.com'
+
+        super(ComputeManagementClientConfiguration, self).__init__(base_url)
+
+        self.add_user_agent('azure-mgmt-compute/{}'.format(VERSION))
+        self.add_user_agent('Azure-SDK-For-Python')
+
+        self.credentials = credentials
+        self.subscription_id = subscription_id
+
+
+class ComputeManagementClient(SDKClient):
+    """Compute Client
+
+    :ivar config: Configuration for client.
+    :vartype config: ComputeManagementClientConfiguration
+
+    :ivar galleries: Galleries operations
+    :vartype galleries: azure.mgmt.compute.v2018_06_01.operations.GalleriesOperations
+    :ivar gallery_images: GalleryImages operations
+    :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
+
+    :param credentials: Credentials needed for the client to connect to Azure.
+    :type credentials: :mod:`A msrestazure Credentials
+     object<msrestazure.azure_active_directory>`
+    :param subscription_id: Subscription credentials which uniquely identify
+     Microsoft Azure subscription. The subscription ID forms part of the URI
+     for every service call.
+    :type subscription_id: str
+    :param str base_url: Service URL
+    """
+
+    def __init__(
+            self, credentials, subscription_id, base_url=None):
+
+        self.config = ComputeManagementClientConfiguration(credentials, subscription_id, base_url)
+        super(ComputeManagementClient, self).__init__(self.config.credentials, self.config)
+
+        client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
+        self.api_version = '2018-06-01'
+        self._serialize = Serializer(client_models)
+        self._deserialize = Deserializer(client_models)
+
+        self.galleries = GalleriesOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.gallery_images = GalleryImagesOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.gallery_image_versions = GalleryImageVersionsOperations(
+            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
new file mode 100644
index 000000000000..204dfcec1d1e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/__init__.py
@@ -0,0 +1,108 @@
+# 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.
+# --------------------------------------------------------------------------
+
+try:
+    from .gallery_identifier_py3 import GalleryIdentifier
+    from .gallery_py3 import Gallery
+    from .gallery_image_identifier_py3 import GalleryImageIdentifier
+    from .resource_range_py3 import ResourceRange
+    from .recommended_machine_configuration_py3 import RecommendedMachineConfiguration
+    from .disallowed_py3 import Disallowed
+    from .image_purchase_plan_py3 import ImagePurchasePlan
+    from .gallery_image_py3 import GalleryImage
+    from .gallery_image_version_publishing_profile_py3 import GalleryImageVersionPublishingProfile
+    from .gallery_os_disk_image_py3 import GalleryOSDiskImage
+    from .gallery_data_disk_image_py3 import GalleryDataDiskImage
+    from .gallery_image_version_storage_profile_py3 import GalleryImageVersionStorageProfile
+    from .regional_replication_status_py3 import RegionalReplicationStatus
+    from .replication_status_py3 import ReplicationStatus
+    from .gallery_image_version_py3 import GalleryImageVersion
+    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 .api_error_base_py3 import ApiErrorBase
+    from .inner_error_py3 import InnerError
+    from .api_error_py3 import ApiError
+    from .operation_status_response_py3 import OperationStatusResponse
+    from .resource_py3 import Resource
+except (SyntaxError, ImportError):
+    from .gallery_identifier import GalleryIdentifier
+    from .gallery import Gallery
+    from .gallery_image_identifier import GalleryImageIdentifier
+    from .resource_range import ResourceRange
+    from .recommended_machine_configuration import RecommendedMachineConfiguration
+    from .disallowed import Disallowed
+    from .image_purchase_plan import ImagePurchasePlan
+    from .gallery_image import GalleryImage
+    from .gallery_image_version_publishing_profile import GalleryImageVersionPublishingProfile
+    from .gallery_os_disk_image import GalleryOSDiskImage
+    from .gallery_data_disk_image import GalleryDataDiskImage
+    from .gallery_image_version_storage_profile import GalleryImageVersionStorageProfile
+    from .regional_replication_status import RegionalReplicationStatus
+    from .replication_status import ReplicationStatus
+    from .gallery_image_version import GalleryImageVersion
+    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 .api_error_base import ApiErrorBase
+    from .inner_error import InnerError
+    from .api_error import ApiError
+    from .operation_status_response import OperationStatusResponse
+    from .resource import Resource
+from .gallery_paged import GalleryPaged
+from .gallery_image_paged import GalleryImagePaged
+from .gallery_image_version_paged import GalleryImageVersionPaged
+from .compute_management_client_enums import (
+    OperatingSystemTypes,
+    OperatingSystemStateTypes,
+    AggregatedReplicationState,
+    ReplicationState,
+    HostCaching,
+    ReplicationStatusTypes,
+)
+
+__all__ = [
+    'GalleryIdentifier',
+    'Gallery',
+    'GalleryImageIdentifier',
+    'ResourceRange',
+    'RecommendedMachineConfiguration',
+    'Disallowed',
+    'ImagePurchasePlan',
+    'GalleryImage',
+    'GalleryImageVersionPublishingProfile',
+    'GalleryOSDiskImage',
+    'GalleryDataDiskImage',
+    'GalleryImageVersionStorageProfile',
+    'RegionalReplicationStatus',
+    'ReplicationStatus',
+    'GalleryImageVersion',
+    'ManagedArtifact',
+    'GalleryArtifactSource',
+    'GalleryArtifactPublishingProfileBase',
+    'GalleryDiskImage',
+    'ApiErrorBase',
+    'InnerError',
+    'ApiError',
+    'OperationStatusResponse',
+    'Resource',
+    'GalleryPaged',
+    'GalleryImagePaged',
+    'GalleryImageVersionPaged',
+    'OperatingSystemTypes',
+    'OperatingSystemStateTypes',
+    'AggregatedReplicationState',
+    'ReplicationState',
+    'HostCaching',
+    'ReplicationStatusTypes',
+]
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/api_error.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/api_error.py
new file mode 100644
index 000000000000..8771ac2086c0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/api_error.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 ApiError(Model):
+    """Api error.
+
+    :param details: The Api error details
+    :type details: list[~azure.mgmt.compute.v2018_06_01.models.ApiErrorBase]
+    :param innererror: The Api inner error
+    :type innererror: ~azure.mgmt.compute.v2018_06_01.models.InnerError
+    :param code: The error code.
+    :type code: str
+    :param target: The target of the particular error.
+    :type target: str
+    :param message: The error message.
+    :type message: str
+    """
+
+    _attribute_map = {
+        'details': {'key': 'details', 'type': '[ApiErrorBase]'},
+        'innererror': {'key': 'innererror', 'type': 'InnerError'},
+        'code': {'key': 'code', 'type': 'str'},
+        'target': {'key': 'target', 'type': 'str'},
+        'message': {'key': 'message', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ApiError, self).__init__(**kwargs)
+        self.details = kwargs.get('details', None)
+        self.innererror = kwargs.get('innererror', None)
+        self.code = kwargs.get('code', None)
+        self.target = kwargs.get('target', None)
+        self.message = kwargs.get('message', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/api_error_base.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/api_error_base.py
new file mode 100644
index 000000000000..655c08638905
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/api_error_base.py
@@ -0,0 +1,36 @@
+# 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 ApiErrorBase(Model):
+    """Api error base.
+
+    :param code: The error code.
+    :type code: str
+    :param target: The target of the particular error.
+    :type target: str
+    :param message: The error message.
+    :type message: str
+    """
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'str'},
+        'target': {'key': 'target', 'type': 'str'},
+        'message': {'key': 'message', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ApiErrorBase, self).__init__(**kwargs)
+        self.code = kwargs.get('code', None)
+        self.target = kwargs.get('target', None)
+        self.message = kwargs.get('message', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/api_error_base_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/api_error_base_py3.py
new file mode 100644
index 000000000000..5ba95aa0283e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/api_error_base_py3.py
@@ -0,0 +1,36 @@
+# 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 ApiErrorBase(Model):
+    """Api error base.
+
+    :param code: The error code.
+    :type code: str
+    :param target: The target of the particular error.
+    :type target: str
+    :param message: The error message.
+    :type message: str
+    """
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'str'},
+        'target': {'key': 'target', 'type': 'str'},
+        'message': {'key': 'message', 'type': 'str'},
+    }
+
+    def __init__(self, *, code: str=None, target: str=None, message: str=None, **kwargs) -> None:
+        super(ApiErrorBase, self).__init__(**kwargs)
+        self.code = code
+        self.target = target
+        self.message = message
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/api_error_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/api_error_py3.py
new file mode 100644
index 000000000000..c09870827f5f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/api_error_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 ApiError(Model):
+    """Api error.
+
+    :param details: The Api error details
+    :type details: list[~azure.mgmt.compute.v2018_06_01.models.ApiErrorBase]
+    :param innererror: The Api inner error
+    :type innererror: ~azure.mgmt.compute.v2018_06_01.models.InnerError
+    :param code: The error code.
+    :type code: str
+    :param target: The target of the particular error.
+    :type target: str
+    :param message: The error message.
+    :type message: str
+    """
+
+    _attribute_map = {
+        'details': {'key': 'details', 'type': '[ApiErrorBase]'},
+        'innererror': {'key': 'innererror', 'type': 'InnerError'},
+        'code': {'key': 'code', 'type': 'str'},
+        'target': {'key': 'target', 'type': 'str'},
+        'message': {'key': 'message', 'type': 'str'},
+    }
+
+    def __init__(self, *, details=None, innererror=None, code: str=None, target: str=None, message: str=None, **kwargs) -> None:
+        super(ApiError, self).__init__(**kwargs)
+        self.details = details
+        self.innererror = innererror
+        self.code = code
+        self.target = target
+        self.message = message
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
new file mode 100644
index 000000000000..b8906c280b6e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/compute_management_client_enums.py
@@ -0,0 +1,52 @@
+# 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 enum import Enum
+
+
+class OperatingSystemTypes(str, Enum):
+
+    windows = "Windows"
+    linux = "Linux"
+
+
+class OperatingSystemStateTypes(str, Enum):
+
+    generalized = "Generalized"
+    specialized = "Specialized"
+
+
+class AggregatedReplicationState(str, Enum):
+
+    unknown = "Unknown"
+    in_progress = "InProgress"
+    completed = "Completed"
+    failed = "Failed"
+
+
+class ReplicationState(str, Enum):
+
+    unknown = "Unknown"
+    replicating = "Replicating"
+    completed = "Completed"
+    failed = "Failed"
+
+
+class HostCaching(str, Enum):
+
+    none = "None"
+    read_only = "ReadOnly"
+    read_write = "ReadWrite"
+
+
+class ReplicationStatusTypes(str, Enum):
+
+    replication_status = "ReplicationStatus"
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disallowed.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disallowed.py
new file mode 100644
index 000000000000..4269dd604e66
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disallowed.py
@@ -0,0 +1,28 @@
+# 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 Disallowed(Model):
+    """Describes the disallowed disk types.
+
+    :param disk_types: A list of disk types.
+    :type disk_types: list[str]
+    """
+
+    _attribute_map = {
+        'disk_types': {'key': 'diskTypes', 'type': '[str]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(Disallowed, self).__init__(**kwargs)
+        self.disk_types = kwargs.get('disk_types', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disallowed_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disallowed_py3.py
new file mode 100644
index 000000000000..95e07d7a7533
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disallowed_py3.py
@@ -0,0 +1,28 @@
+# 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 Disallowed(Model):
+    """Describes the disallowed disk types.
+
+    :param disk_types: A list of disk types.
+    :type disk_types: list[str]
+    """
+
+    _attribute_map = {
+        'disk_types': {'key': 'diskTypes', 'type': '[str]'},
+    }
+
+    def __init__(self, *, disk_types=None, **kwargs) -> None:
+        super(Disallowed, self).__init__(**kwargs)
+        self.disk_types = disk_types
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery.py
new file mode 100644
index 000000000000..5dfdc18e1734
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery.py
@@ -0,0 +1,68 @@
+# 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 Gallery(Resource):
+    """Specifies information about the gallery that you want to create or update.
+
+    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]
+    :param description: The description of this gallery resource.
+    :type description: str
+    :param identifier:
+    :type identifier: ~azure.mgmt.compute.v2018_06_01.models.GalleryIdentifier
+    :ivar provisioning_state: The current state of the gallery. The
+     provisioning state, which only appears in the response. Possible values
+     include: 'Creating', 'Updating', 'Failed', 'Succeeded', 'Deleting',
+     'Migrating'
+    :vartype provisioning_state: str or
+     ~azure.mgmt.compute.v2018_06_01.models.enum
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'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}'},
+        'description': {'key': 'properties.description', 'type': 'str'},
+        'identifier': {'key': 'properties.identifier', 'type': 'GalleryIdentifier'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(Gallery, self).__init__(**kwargs)
+        self.description = kwargs.get('description', None)
+        self.identifier = kwargs.get('identifier', None)
+        self.provisioning_state = None
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
new file mode 100644
index 000000000000..8b01e7c2da2c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_artifact_publishing_profile_base.py
@@ -0,0 +1,32 @@
+# 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 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:
+    :type source: ~azure.mgmt.compute.v2018_06_01.models.GalleryArtifactSource
+    """
+
+    _attribute_map = {
+        'regions': {'key': 'regions', 'type': '[str]'},
+        'source': {'key': 'source', 'type': 'GalleryArtifactSource'},
+    }
+
+    def __init__(self, **kwargs):
+        super(GalleryArtifactPublishingProfileBase, self).__init__(**kwargs)
+        self.regions = kwargs.get('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
new file mode 100644
index 000000000000..5a69aa10ec9e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_artifact_publishing_profile_base_py3.py
@@ -0,0 +1,32 @@
+# 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 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:
+    :type source: ~azure.mgmt.compute.v2018_06_01.models.GalleryArtifactSource
+    """
+
+    _attribute_map = {
+        'regions': {'key': 'regions', 'type': '[str]'},
+        'source': {'key': 'source', 'type': 'GalleryArtifactSource'},
+    }
+
+    def __init__(self, *, regions=None, source=None, **kwargs) -> None:
+        super(GalleryArtifactPublishingProfileBase, self).__init__(**kwargs)
+        self.regions = 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
new file mode 100644
index 000000000000..a4b32f9ccb89
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_artifact_source.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 GalleryArtifactSource(Model):
+    """The source of the gallery artifact.
+
+    :param managed_image:
+    :type managed_image:
+     ~azure.mgmt.compute.v2018_06_01.models.ManagedArtifact
+    """
+
+    _attribute_map = {
+        'managed_image': {'key': 'managedImage', 'type': 'ManagedArtifact'},
+    }
+
+    def __init__(self, **kwargs):
+        super(GalleryArtifactSource, self).__init__(**kwargs)
+        self.managed_image = kwargs.get('managed_image', None)
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
new file mode 100644
index 000000000000..77e793f91b43
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_artifact_source_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 GalleryArtifactSource(Model):
+    """The source of the gallery artifact.
+
+    :param managed_image:
+    :type managed_image:
+     ~azure.mgmt.compute.v2018_06_01.models.ManagedArtifact
+    """
+
+    _attribute_map = {
+        'managed_image': {'key': 'managedImage', 'type': 'ManagedArtifact'},
+    }
+
+    def __init__(self, *, managed_image=None, **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_data_disk_image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image.py
new file mode 100644
index 000000000000..a62ec5101821
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image.py
@@ -0,0 +1,39 @@
+# 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 .gallery_disk_image import GalleryDiskImage
+
+
+class GalleryDataDiskImage(GalleryDiskImage):
+    """This is the data disk image.
+
+    :param sized_in_gb: It indicates the size of the VHD to create.
+    :type sized_in_gb: int
+    :param host_caching: The host caching of the disk. Valid values are
+     'None', 'ReadOnly', and 'ReadWrite'. Possible values include: 'None',
+     'ReadOnly', 'ReadWrite'
+    :type host_caching: str or
+     ~azure.mgmt.compute.v2018_06_01.models.HostCaching
+    :param lun: Specifies the logical unit number of the data disk. This value
+     is used to identify data disks within the VM and therefore must be unique
+     for each data disk attached to a VM.
+    :type lun: int
+    """
+
+    _attribute_map = {
+        'sized_in_gb': {'key': 'sizedInGB', 'type': 'int'},
+        'host_caching': {'key': 'hostCaching', 'type': 'HostCaching'},
+        'lun': {'key': 'lun', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs):
+        super(GalleryDataDiskImage, self).__init__(**kwargs)
+        self.lun = kwargs.get('lun', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image_py3.py
new file mode 100644
index 000000000000..0b698ea162db
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image_py3.py
@@ -0,0 +1,39 @@
+# 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 .gallery_disk_image_py3 import GalleryDiskImage
+
+
+class GalleryDataDiskImage(GalleryDiskImage):
+    """This is the data disk image.
+
+    :param sized_in_gb: It indicates the size of the VHD to create.
+    :type sized_in_gb: int
+    :param host_caching: The host caching of the disk. Valid values are
+     'None', 'ReadOnly', and 'ReadWrite'. Possible values include: 'None',
+     'ReadOnly', 'ReadWrite'
+    :type host_caching: str or
+     ~azure.mgmt.compute.v2018_06_01.models.HostCaching
+    :param lun: Specifies the logical unit number of the data disk. This value
+     is used to identify data disks within the VM and therefore must be unique
+     for each data disk attached to a VM.
+    :type lun: int
+    """
+
+    _attribute_map = {
+        'sized_in_gb': {'key': 'sizedInGB', 'type': 'int'},
+        'host_caching': {'key': 'hostCaching', 'type': 'HostCaching'},
+        'lun': {'key': 'lun', 'type': 'int'},
+    }
+
+    def __init__(self, *, sized_in_gb: int=None, host_caching=None, lun: int=None, **kwargs) -> None:
+        super(GalleryDataDiskImage, self).__init__(sized_in_gb=sized_in_gb, host_caching=host_caching, **kwargs)
+        self.lun = lun
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image.py
new file mode 100644
index 000000000000..b65868a89800
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image.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 GalleryDiskImage(Model):
+    """This is the disk image base class.
+
+    :param sized_in_gb: It indicates the size of the VHD to create.
+    :type sized_in_gb: int
+    :param host_caching: The host caching of the disk. Valid values are
+     'None', 'ReadOnly', and 'ReadWrite'. Possible values include: 'None',
+     'ReadOnly', 'ReadWrite'
+    :type host_caching: str or
+     ~azure.mgmt.compute.v2018_06_01.models.HostCaching
+    """
+
+    _attribute_map = {
+        'sized_in_gb': {'key': 'sizedInGB', 'type': 'int'},
+        'host_caching': {'key': 'hostCaching', 'type': 'HostCaching'},
+    }
+
+    def __init__(self, **kwargs):
+        super(GalleryDiskImage, self).__init__(**kwargs)
+        self.sized_in_gb = kwargs.get('sized_in_gb', None)
+        self.host_caching = kwargs.get('host_caching', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image_py3.py
new file mode 100644
index 000000000000..97f8b4780743
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image_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 GalleryDiskImage(Model):
+    """This is the disk image base class.
+
+    :param sized_in_gb: It indicates the size of the VHD to create.
+    :type sized_in_gb: int
+    :param host_caching: The host caching of the disk. Valid values are
+     'None', 'ReadOnly', and 'ReadWrite'. Possible values include: 'None',
+     'ReadOnly', 'ReadWrite'
+    :type host_caching: str or
+     ~azure.mgmt.compute.v2018_06_01.models.HostCaching
+    """
+
+    _attribute_map = {
+        'sized_in_gb': {'key': 'sizedInGB', 'type': 'int'},
+        'host_caching': {'key': 'hostCaching', 'type': 'HostCaching'},
+    }
+
+    def __init__(self, *, sized_in_gb: int=None, host_caching=None, **kwargs) -> None:
+        super(GalleryDiskImage, self).__init__(**kwargs)
+        self.sized_in_gb = sized_in_gb
+        self.host_caching = host_caching
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier.py
new file mode 100644
index 000000000000..a5099bc73cd0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier.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 GalleryIdentifier(Model):
+    """GalleryIdentifier.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar unique_name: The unique name of the gallery
+    :vartype unique_name: str
+    """
+
+    _validation = {
+        'unique_name': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'unique_name': {'key': 'uniqueName', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(GalleryIdentifier, self).__init__(**kwargs)
+        self.unique_name = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier_py3.py
new file mode 100644
index 000000000000..680d47368cd5
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier_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 GalleryIdentifier(Model):
+    """GalleryIdentifier.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar unique_name: The unique name of the gallery
+    :vartype unique_name: str
+    """
+
+    _validation = {
+        'unique_name': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'unique_name': {'key': 'uniqueName', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(GalleryIdentifier, self).__init__(**kwargs)
+        self.unique_name = None
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
new file mode 100644
index 000000000000..b5e470292d58
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image.py
@@ -0,0 +1,114 @@
+# 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 GalleryImage(Resource):
+    """Specifies information about the gallery image that you want to create or
+    update.
+
+    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]
+    :param description: The description of this gallery image resource.
+    :type description: str
+    :param eula: The Eula agreement for the gallery image.
+    :type eula: str
+    :param privacy_statement_uri: The privacy statement uri.
+    :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
+     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'
+    :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: date
+    :param identifier:
+    :type identifier:
+     ~azure.mgmt.compute.v2018_06_01.models.GalleryImageIdentifier
+    :param recommended:
+    :type recommended:
+     ~azure.mgmt.compute.v2018_06_01.models.RecommendedMachineConfiguration
+    :param disallowed:
+    :type disallowed: ~azure.mgmt.compute.v2018_06_01.models.Disallowed
+    :param purchase_plan:
+    :type purchase_plan:
+     ~azure.mgmt.compute.v2018_06_01.models.ImagePurchasePlan
+    :ivar provisioning_state: The current state of the gallery image. The
+     provisioning state, which only appears in the response. Possible values
+     include: 'Creating', 'Updating', 'Failed', 'Succeeded', 'Deleting',
+     'Migrating'
+    :vartype provisioning_state: str or
+     ~azure.mgmt.compute.v2018_06_01.models.enum
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'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}'},
+        'description': {'key': 'properties.description', 'type': 'str'},
+        'eula': {'key': 'properties.eula', 'type': 'str'},
+        'privacy_statement_uri': {'key': 'properties.privacyStatementUri', 'type': 'str'},
+        'release_note_uri': {'key': 'properties.releaseNoteUri', 'type': 'str'},
+        'os_type': {'key': 'properties.osType', 'type': 'OperatingSystemTypes'},
+        'os_state': {'key': 'properties.osState', 'type': 'OperatingSystemStateTypes'},
+        'end_of_life_date': {'key': 'properties.endOfLifeDate', 'type': 'date'},
+        'identifier': {'key': 'properties.identifier', 'type': 'GalleryImageIdentifier'},
+        'recommended': {'key': 'properties.recommended', 'type': 'RecommendedMachineConfiguration'},
+        'disallowed': {'key': 'properties.disallowed', 'type': 'Disallowed'},
+        'purchase_plan': {'key': 'properties.purchasePlan', 'type': 'ImagePurchasePlan'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(GalleryImage, self).__init__(**kwargs)
+        self.description = kwargs.get('description', None)
+        self.eula = kwargs.get('eula', None)
+        self.privacy_statement_uri = kwargs.get('privacy_statement_uri', None)
+        self.release_note_uri = kwargs.get('release_note_uri', None)
+        self.os_type = kwargs.get('os_type', None)
+        self.os_state = kwargs.get('os_state', None)
+        self.end_of_life_date = kwargs.get('end_of_life_date', None)
+        self.identifier = kwargs.get('identifier', None)
+        self.recommended = kwargs.get('recommended', None)
+        self.disallowed = kwargs.get('disallowed', None)
+        self.purchase_plan = kwargs.get('purchase_plan', None)
+        self.provisioning_state = None
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
new file mode 100644
index 000000000000..2f27b4d520aa
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_identifier.py
@@ -0,0 +1,36 @@
+# 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 GalleryImageIdentifier(Model):
+    """This is the gallery image identifier.
+
+    :param publisher: The gallery image publisher name.
+    :type publisher: str
+    :param offer: The gallery image offer name.
+    :type offer: str
+    :param sku: The gallery image sku name.
+    :type sku: str
+    """
+
+    _attribute_map = {
+        'publisher': {'key': 'publisher', 'type': 'str'},
+        'offer': {'key': 'offer', 'type': 'str'},
+        'sku': {'key': 'sku', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(GalleryImageIdentifier, self).__init__(**kwargs)
+        self.publisher = kwargs.get('publisher', None)
+        self.offer = kwargs.get('offer', None)
+        self.sku = kwargs.get('sku', None)
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
new file mode 100644
index 000000000000..b858e464271c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_identifier_py3.py
@@ -0,0 +1,36 @@
+# 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 GalleryImageIdentifier(Model):
+    """This is the gallery image identifier.
+
+    :param publisher: The gallery image publisher name.
+    :type publisher: str
+    :param offer: The gallery image offer name.
+    :type offer: str
+    :param sku: The gallery image sku name.
+    :type sku: str
+    """
+
+    _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:
+        super(GalleryImageIdentifier, self).__init__(**kwargs)
+        self.publisher = publisher
+        self.offer = offer
+        self.sku = sku
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_paged.py
new file mode 100644
index 000000000000..33a318d5f30d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_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 GalleryImagePaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`GalleryImage <azure.mgmt.compute.v2018_06_01.models.GalleryImage>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[GalleryImage]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(GalleryImagePaged, self).__init__(*args, **kwargs)
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
new file mode 100644
index 000000000000..e9d172fe981e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_py3.py
@@ -0,0 +1,114 @@
+# 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 GalleryImage(Resource):
+    """Specifies information about the gallery image that you want to create or
+    update.
+
+    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]
+    :param description: The description of this gallery image resource.
+    :type description: str
+    :param eula: The Eula agreement for the gallery image.
+    :type eula: str
+    :param privacy_statement_uri: The privacy statement uri.
+    :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
+     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'
+    :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: date
+    :param identifier:
+    :type identifier:
+     ~azure.mgmt.compute.v2018_06_01.models.GalleryImageIdentifier
+    :param recommended:
+    :type recommended:
+     ~azure.mgmt.compute.v2018_06_01.models.RecommendedMachineConfiguration
+    :param disallowed:
+    :type disallowed: ~azure.mgmt.compute.v2018_06_01.models.Disallowed
+    :param purchase_plan:
+    :type purchase_plan:
+     ~azure.mgmt.compute.v2018_06_01.models.ImagePurchasePlan
+    :ivar provisioning_state: The current state of the gallery image. The
+     provisioning state, which only appears in the response. Possible values
+     include: 'Creating', 'Updating', 'Failed', 'Succeeded', 'Deleting',
+     'Migrating'
+    :vartype provisioning_state: str or
+     ~azure.mgmt.compute.v2018_06_01.models.enum
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'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}'},
+        'description': {'key': 'properties.description', 'type': 'str'},
+        'eula': {'key': 'properties.eula', 'type': 'str'},
+        'privacy_statement_uri': {'key': 'properties.privacyStatementUri', 'type': 'str'},
+        'release_note_uri': {'key': 'properties.releaseNoteUri', 'type': 'str'},
+        'os_type': {'key': 'properties.osType', 'type': 'OperatingSystemTypes'},
+        'os_state': {'key': 'properties.osState', 'type': 'OperatingSystemStateTypes'},
+        'end_of_life_date': {'key': 'properties.endOfLifeDate', 'type': 'date'},
+        'identifier': {'key': 'properties.identifier', 'type': 'GalleryImageIdentifier'},
+        'recommended': {'key': 'properties.recommended', 'type': 'RecommendedMachineConfiguration'},
+        'disallowed': {'key': 'properties.disallowed', 'type': 'Disallowed'},
+        'purchase_plan': {'key': 'properties.purchasePlan', 'type': 'ImagePurchasePlan'},
+        '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:
+        super(GalleryImage, self).__init__(location=location, tags=tags, **kwargs)
+        self.description = description
+        self.eula = eula
+        self.privacy_statement_uri = privacy_statement_uri
+        self.release_note_uri = release_note_uri
+        self.os_type = os_type
+        self.os_state = os_state
+        self.end_of_life_date = end_of_life_date
+        self.identifier = identifier
+        self.recommended = recommended
+        self.disallowed = disallowed
+        self.purchase_plan = purchase_plan
+        self.provisioning_state = None
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
new file mode 100644
index 000000000000..34b3ff35e8a6
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version.py
@@ -0,0 +1,76 @@
+# 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 GalleryImageVersion(Resource):
+    """Specifies information about the gallery image version that you want to
+    create or update.
+
+    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]
+    :param publishing_profile:
+    :type publishing_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.GalleryImageVersionPublishingProfile
+    :ivar provisioning_state: The current state of the gallery image version.
+     The provisioning state, which only appears in the response. Possible
+     values include: 'Creating', 'Updating', 'Failed', 'Succeeded', 'Deleting',
+     'Migrating'
+    :vartype provisioning_state: str or
+     ~azure.mgmt.compute.v2018_06_01.models.enum
+    :param storage_profile:
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.GalleryImageVersionStorageProfile
+    :param replication_status:
+    :type replication_status:
+     ~azure.mgmt.compute.v2018_06_01.models.ReplicationStatus
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'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}'},
+        'publishing_profile': {'key': 'properties.publishingProfile', 'type': 'GalleryImageVersionPublishingProfile'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'GalleryImageVersionStorageProfile'},
+        'replication_status': {'key': 'properties.replicationStatus', 'type': 'ReplicationStatus'},
+    }
+
+    def __init__(self, **kwargs):
+        super(GalleryImageVersion, self).__init__(**kwargs)
+        self.publishing_profile = kwargs.get('publishing_profile', None)
+        self.provisioning_state = None
+        self.storage_profile = kwargs.get('storage_profile', None)
+        self.replication_status = kwargs.get('replication_status', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_paged.py
new file mode 100644
index 000000000000..3e87c3b3f77f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_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 GalleryImageVersionPaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`GalleryImageVersion <azure.mgmt.compute.v2018_06_01.models.GalleryImageVersion>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[GalleryImageVersion]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(GalleryImageVersionPaged, self).__init__(*args, **kwargs)
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
new file mode 100644
index 000000000000..4ca5bae74c72
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_publishing_profile.py
@@ -0,0 +1,52 @@
+# 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 .gallery_artifact_publishing_profile_base import GalleryArtifactPublishingProfileBase
+
+
+class GalleryImageVersionPublishingProfile(GalleryArtifactPublishingProfileBase):
+    """The publishing profile of a gallery image version.
+
+    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:
+    :type source: ~azure.mgmt.compute.v2018_06_01.models.GalleryArtifactSource
+    :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
+    :ivar published_date: The time when the gallery image version is
+     published.
+    :vartype published_date: date
+    :param end_of_life_date: The end of life date of the gallery image
+     version.
+    :type end_of_life_date: date
+    """
+
+    _validation = {
+        'published_date': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'regions': {'key': 'regions', 'type': '[str]'},
+        'source': {'key': 'source', 'type': 'GalleryArtifactSource'},
+        'exclude_from_latest': {'key': 'excludeFromLatest', 'type': 'bool'},
+        'published_date': {'key': 'publishedDate', 'type': 'date'},
+        'end_of_life_date': {'key': 'endOfLifeDate', 'type': 'date'},
+    }
+
+    def __init__(self, **kwargs):
+        super(GalleryImageVersionPublishingProfile, self).__init__(**kwargs)
+        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
new file mode 100644
index 000000000000..478b8d780317
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_publishing_profile_py3.py
@@ -0,0 +1,52 @@
+# 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 .gallery_artifact_publishing_profile_base_py3 import GalleryArtifactPublishingProfileBase
+
+
+class GalleryImageVersionPublishingProfile(GalleryArtifactPublishingProfileBase):
+    """The publishing profile of a gallery image version.
+
+    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:
+    :type source: ~azure.mgmt.compute.v2018_06_01.models.GalleryArtifactSource
+    :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
+    :ivar published_date: The time when the gallery image version is
+     published.
+    :vartype published_date: date
+    :param end_of_life_date: The end of life date of the gallery image
+     version.
+    :type end_of_life_date: date
+    """
+
+    _validation = {
+        'published_date': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'regions': {'key': 'regions', 'type': '[str]'},
+        'source': {'key': 'source', 'type': 'GalleryArtifactSource'},
+        'exclude_from_latest': {'key': 'excludeFromLatest', 'type': 'bool'},
+        'published_date': {'key': 'publishedDate', 'type': 'date'},
+        'end_of_life_date': {'key': 'endOfLifeDate', 'type': 'date'},
+    }
+
+    def __init__(self, *, regions=None, source=None, exclude_from_latest: bool=None, end_of_life_date=None, **kwargs) -> None:
+        super(GalleryImageVersionPublishingProfile, self).__init__(regions=regions, source=source, **kwargs)
+        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
new file mode 100644
index 000000000000..dd86bc5f911f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_py3.py
@@ -0,0 +1,76 @@
+# 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 GalleryImageVersion(Resource):
+    """Specifies information about the gallery image version that you want to
+    create or update.
+
+    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]
+    :param publishing_profile:
+    :type publishing_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.GalleryImageVersionPublishingProfile
+    :ivar provisioning_state: The current state of the gallery image version.
+     The provisioning state, which only appears in the response. Possible
+     values include: 'Creating', 'Updating', 'Failed', 'Succeeded', 'Deleting',
+     'Migrating'
+    :vartype provisioning_state: str or
+     ~azure.mgmt.compute.v2018_06_01.models.enum
+    :param storage_profile:
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.GalleryImageVersionStorageProfile
+    :param replication_status:
+    :type replication_status:
+     ~azure.mgmt.compute.v2018_06_01.models.ReplicationStatus
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'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}'},
+        'publishing_profile': {'key': 'properties.publishingProfile', 'type': 'GalleryImageVersionPublishingProfile'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'GalleryImageVersionStorageProfile'},
+        'replication_status': {'key': 'properties.replicationStatus', 'type': 'ReplicationStatus'},
+    }
+
+    def __init__(self, *, location: str, tags=None, publishing_profile=None, storage_profile=None, replication_status=None, **kwargs) -> None:
+        super(GalleryImageVersion, self).__init__(location=location, tags=tags, **kwargs)
+        self.publishing_profile = publishing_profile
+        self.provisioning_state = None
+        self.storage_profile = storage_profile
+        self.replication_status = replication_status
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile.py
new file mode 100644
index 000000000000..20d969c702e8
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile.py
@@ -0,0 +1,34 @@
+# 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 GalleryImageVersionStorageProfile(Model):
+    """This is the storage profile of a gallery image version.
+
+    :param os_disk_image:
+    :type os_disk_image:
+     ~azure.mgmt.compute.v2018_06_01.models.GalleryOSDiskImage
+    :param data_disk_images: A list of data disk images.
+    :type data_disk_images:
+     list[~azure.mgmt.compute.v2018_06_01.models.GalleryDataDiskImage]
+    """
+
+    _attribute_map = {
+        'os_disk_image': {'key': 'osDiskImage', 'type': 'GalleryOSDiskImage'},
+        'data_disk_images': {'key': 'dataDiskImages', 'type': '[GalleryDataDiskImage]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(GalleryImageVersionStorageProfile, self).__init__(**kwargs)
+        self.os_disk_image = kwargs.get('os_disk_image', None)
+        self.data_disk_images = kwargs.get('data_disk_images', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile_py3.py
new file mode 100644
index 000000000000..8d0814e207ed
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile_py3.py
@@ -0,0 +1,34 @@
+# 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 GalleryImageVersionStorageProfile(Model):
+    """This is the storage profile of a gallery image version.
+
+    :param os_disk_image:
+    :type os_disk_image:
+     ~azure.mgmt.compute.v2018_06_01.models.GalleryOSDiskImage
+    :param data_disk_images: A list of data disk images.
+    :type data_disk_images:
+     list[~azure.mgmt.compute.v2018_06_01.models.GalleryDataDiskImage]
+    """
+
+    _attribute_map = {
+        'os_disk_image': {'key': 'osDiskImage', 'type': 'GalleryOSDiskImage'},
+        'data_disk_images': {'key': 'dataDiskImages', 'type': '[GalleryDataDiskImage]'},
+    }
+
+    def __init__(self, *, os_disk_image=None, data_disk_images=None, **kwargs) -> None:
+        super(GalleryImageVersionStorageProfile, self).__init__(**kwargs)
+        self.os_disk_image = os_disk_image
+        self.data_disk_images = data_disk_images
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image.py
new file mode 100644
index 000000000000..ee00cee1f1b9
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image.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 .gallery_disk_image import GalleryDiskImage
+
+
+class GalleryOSDiskImage(GalleryDiskImage):
+    """This is the OS disk image.
+
+    :param sized_in_gb: It indicates the size of the VHD to create.
+    :type sized_in_gb: int
+    :param host_caching: The host caching of the disk. Valid values are
+     'None', 'ReadOnly', and 'ReadWrite'. Possible values include: 'None',
+     'ReadOnly', 'ReadWrite'
+    :type host_caching: str or
+     ~azure.mgmt.compute.v2018_06_01.models.HostCaching
+    """
+
+    _attribute_map = {
+        'sized_in_gb': {'key': 'sizedInGB', 'type': 'int'},
+        'host_caching': {'key': 'hostCaching', 'type': 'HostCaching'},
+    }
+
+    def __init__(self, **kwargs):
+        super(GalleryOSDiskImage, self).__init__(**kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image_py3.py
new file mode 100644
index 000000000000..e0907ddbf47e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image_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 .gallery_disk_image_py3 import GalleryDiskImage
+
+
+class GalleryOSDiskImage(GalleryDiskImage):
+    """This is the OS disk image.
+
+    :param sized_in_gb: It indicates the size of the VHD to create.
+    :type sized_in_gb: int
+    :param host_caching: The host caching of the disk. Valid values are
+     'None', 'ReadOnly', and 'ReadWrite'. Possible values include: 'None',
+     'ReadOnly', 'ReadWrite'
+    :type host_caching: str or
+     ~azure.mgmt.compute.v2018_06_01.models.HostCaching
+    """
+
+    _attribute_map = {
+        'sized_in_gb': {'key': 'sizedInGB', 'type': 'int'},
+        'host_caching': {'key': 'hostCaching', 'type': 'HostCaching'},
+    }
+
+    def __init__(self, *, sized_in_gb: int=None, host_caching=None, **kwargs) -> None:
+        super(GalleryOSDiskImage, self).__init__(sized_in_gb=sized_in_gb, host_caching=host_caching, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_paged.py
new file mode 100644
index 000000000000..4b9ba1b78cee
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_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 GalleryPaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`Gallery <azure.mgmt.compute.v2018_06_01.models.Gallery>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[Gallery]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(GalleryPaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_py3.py
new file mode 100644
index 000000000000..87dcabacdbe7
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_py3.py
@@ -0,0 +1,68 @@
+# 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 Gallery(Resource):
+    """Specifies information about the gallery that you want to create or update.
+
+    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]
+    :param description: The description of this gallery resource.
+    :type description: str
+    :param identifier:
+    :type identifier: ~azure.mgmt.compute.v2018_06_01.models.GalleryIdentifier
+    :ivar provisioning_state: The current state of the gallery. The
+     provisioning state, which only appears in the response. Possible values
+     include: 'Creating', 'Updating', 'Failed', 'Succeeded', 'Deleting',
+     'Migrating'
+    :vartype provisioning_state: str or
+     ~azure.mgmt.compute.v2018_06_01.models.enum
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'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}'},
+        'description': {'key': 'properties.description', 'type': 'str'},
+        'identifier': {'key': 'properties.identifier', 'type': 'GalleryIdentifier'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+    }
+
+    def __init__(self, *, location: str, tags=None, description: str=None, identifier=None, **kwargs) -> None:
+        super(Gallery, self).__init__(location=location, tags=tags, **kwargs)
+        self.description = description
+        self.identifier = identifier
+        self.provisioning_state = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_purchase_plan.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_purchase_plan.py
new file mode 100644
index 000000000000..842a22340e45
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_purchase_plan.py
@@ -0,0 +1,37 @@
+# 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 ImagePurchasePlan(Model):
+    """Describes the gallery image purchase plan. This is used by marketplace
+    images.
+
+    :param name: The plan ID.
+    :type name: str
+    :param publisher: The publisher ID.
+    :type publisher: str
+    :param product: The product ID.
+    :type product: str
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'publisher': {'key': 'publisher', 'type': 'str'},
+        'product': {'key': 'product', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ImagePurchasePlan, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.publisher = kwargs.get('publisher', None)
+        self.product = kwargs.get('product', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_purchase_plan_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_purchase_plan_py3.py
new file mode 100644
index 000000000000..228dcc61c77c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_purchase_plan_py3.py
@@ -0,0 +1,37 @@
+# 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 ImagePurchasePlan(Model):
+    """Describes the gallery image purchase plan. This is used by marketplace
+    images.
+
+    :param name: The plan ID.
+    :type name: str
+    :param publisher: The publisher ID.
+    :type publisher: str
+    :param product: The product ID.
+    :type product: str
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'publisher': {'key': 'publisher', 'type': 'str'},
+        'product': {'key': 'product', 'type': 'str'},
+    }
+
+    def __init__(self, *, name: str=None, publisher: str=None, product: str=None, **kwargs) -> None:
+        super(ImagePurchasePlan, self).__init__(**kwargs)
+        self.name = name
+        self.publisher = publisher
+        self.product = product
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/inner_error.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/inner_error.py
new file mode 100644
index 000000000000..6324249d7c19
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/inner_error.py
@@ -0,0 +1,32 @@
+# 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 InnerError(Model):
+    """Inner error details.
+
+    :param exceptiontype: The exception type.
+    :type exceptiontype: str
+    :param errordetail: The internal error message or exception dump.
+    :type errordetail: str
+    """
+
+    _attribute_map = {
+        'exceptiontype': {'key': 'exceptiontype', 'type': 'str'},
+        'errordetail': {'key': 'errordetail', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(InnerError, self).__init__(**kwargs)
+        self.exceptiontype = kwargs.get('exceptiontype', None)
+        self.errordetail = kwargs.get('errordetail', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/inner_error_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/inner_error_py3.py
new file mode 100644
index 000000000000..ccec30d7b53f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/inner_error_py3.py
@@ -0,0 +1,32 @@
+# 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 InnerError(Model):
+    """Inner error details.
+
+    :param exceptiontype: The exception type.
+    :type exceptiontype: str
+    :param errordetail: The internal error message or exception dump.
+    :type errordetail: str
+    """
+
+    _attribute_map = {
+        'exceptiontype': {'key': 'exceptiontype', 'type': 'str'},
+        'errordetail': {'key': 'errordetail', 'type': 'str'},
+    }
+
+    def __init__(self, *, exceptiontype: str=None, errordetail: str=None, **kwargs) -> None:
+        super(InnerError, self).__init__(**kwargs)
+        self.exceptiontype = exceptiontype
+        self.errordetail = errordetail
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
new file mode 100644
index 000000000000..75d0cf2708c0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/managed_artifact.py
@@ -0,0 +1,28 @@
+# 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 ManagedArtifact(Model):
+    """The managed artifact.
+
+    :param id: The managed artifact id.
+    :type id: str
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ManagedArtifact, self).__init__(**kwargs)
+        self.id = kwargs.get('id', None)
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
new file mode 100644
index 000000000000..2afb7d06ce6a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/managed_artifact_py3.py
@@ -0,0 +1,28 @@
+# 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 ManagedArtifact(Model):
+    """The managed artifact.
+
+    :param id: The managed artifact id.
+    :type id: str
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+    }
+
+    def __init__(self, *, id: str=None, **kwargs) -> None:
+        super(ManagedArtifact, self).__init__(**kwargs)
+        self.id = id
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response.py
new file mode 100644
index 000000000000..18065b7ec12f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response.py
@@ -0,0 +1,55 @@
+# 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 OperationStatusResponse(Model):
+    """Operation status response.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar name: Operation ID
+    :vartype name: str
+    :ivar status: Operation status
+    :vartype status: str
+    :ivar start_time: Start time of the operation
+    :vartype start_time: datetime
+    :ivar end_time: End time of the operation
+    :vartype end_time: datetime
+    :ivar error: Api error
+    :vartype error: ~azure.mgmt.compute.v2018_06_01.models.ApiError
+    """
+
+    _validation = {
+        'name': {'readonly': True},
+        'status': {'readonly': True},
+        'start_time': {'readonly': True},
+        'end_time': {'readonly': True},
+        'error': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'status': {'key': 'status', 'type': 'str'},
+        'start_time': {'key': 'startTime', 'type': 'iso-8601'},
+        'end_time': {'key': 'endTime', 'type': 'iso-8601'},
+        'error': {'key': 'error', 'type': 'ApiError'},
+    }
+
+    def __init__(self, **kwargs):
+        super(OperationStatusResponse, self).__init__(**kwargs)
+        self.name = None
+        self.status = None
+        self.start_time = None
+        self.end_time = None
+        self.error = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response_py3.py
new file mode 100644
index 000000000000..e36e5fb46916
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response_py3.py
@@ -0,0 +1,55 @@
+# 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 OperationStatusResponse(Model):
+    """Operation status response.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar name: Operation ID
+    :vartype name: str
+    :ivar status: Operation status
+    :vartype status: str
+    :ivar start_time: Start time of the operation
+    :vartype start_time: datetime
+    :ivar end_time: End time of the operation
+    :vartype end_time: datetime
+    :ivar error: Api error
+    :vartype error: ~azure.mgmt.compute.v2018_06_01.models.ApiError
+    """
+
+    _validation = {
+        'name': {'readonly': True},
+        'status': {'readonly': True},
+        'start_time': {'readonly': True},
+        'end_time': {'readonly': True},
+        'error': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'status': {'key': 'status', 'type': 'str'},
+        'start_time': {'key': 'startTime', 'type': 'iso-8601'},
+        'end_time': {'key': 'endTime', 'type': 'iso-8601'},
+        'error': {'key': 'error', 'type': 'ApiError'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(OperationStatusResponse, self).__init__(**kwargs)
+        self.name = None
+        self.status = None
+        self.start_time = None
+        self.end_time = None
+        self.error = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/recommended_machine_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/recommended_machine_configuration.py
new file mode 100644
index 000000000000..db452883a30c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/recommended_machine_configuration.py
@@ -0,0 +1,32 @@
+# 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 RecommendedMachineConfiguration(Model):
+    """Describes the recommended machine configuration.
+
+    :param v_cp_us:
+    :type v_cp_us: ~azure.mgmt.compute.v2018_06_01.models.ResourceRange
+    :param memory:
+    :type memory: ~azure.mgmt.compute.v2018_06_01.models.ResourceRange
+    """
+
+    _attribute_map = {
+        'v_cp_us': {'key': 'vCPUs', 'type': 'ResourceRange'},
+        'memory': {'key': 'memory', 'type': 'ResourceRange'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RecommendedMachineConfiguration, self).__init__(**kwargs)
+        self.v_cp_us = kwargs.get('v_cp_us', None)
+        self.memory = kwargs.get('memory', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/recommended_machine_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/recommended_machine_configuration_py3.py
new file mode 100644
index 000000000000..0473d92f01d5
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/recommended_machine_configuration_py3.py
@@ -0,0 +1,32 @@
+# 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 RecommendedMachineConfiguration(Model):
+    """Describes the recommended machine configuration.
+
+    :param v_cp_us:
+    :type v_cp_us: ~azure.mgmt.compute.v2018_06_01.models.ResourceRange
+    :param memory:
+    :type memory: ~azure.mgmt.compute.v2018_06_01.models.ResourceRange
+    """
+
+    _attribute_map = {
+        'v_cp_us': {'key': 'vCPUs', 'type': 'ResourceRange'},
+        'memory': {'key': 'memory', 'type': 'ResourceRange'},
+    }
+
+    def __init__(self, *, v_cp_us=None, memory=None, **kwargs) -> None:
+        super(RecommendedMachineConfiguration, self).__init__(**kwargs)
+        self.v_cp_us = v_cp_us
+        self.memory = memory
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status.py
new file mode 100644
index 000000000000..be74a7fdeb00
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status.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 RegionalReplicationStatus(Model):
+    """This is the regional replication status.
+
+    :param region: The region where the gallery image version is published to.
+    :type region: str
+    :param state: This is the regional replication state. Possible values
+     include: 'Unknown', 'Replicating', 'Completed', 'Failed'
+    :type state: str or
+     ~azure.mgmt.compute.v2018_06_01.models.ReplicationState
+    :param details: The details of the replication status.
+    :type details: str
+    :param progress: It indicates progress of the replication job.
+    :type progress: int
+    """
+
+    _attribute_map = {
+        'region': {'key': 'region', 'type': 'str'},
+        'state': {'key': 'state', 'type': 'ReplicationState'},
+        'details': {'key': 'details', 'type': 'str'},
+        'progress': {'key': 'progress', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RegionalReplicationStatus, self).__init__(**kwargs)
+        self.region = kwargs.get('region', None)
+        self.state = kwargs.get('state', None)
+        self.details = kwargs.get('details', None)
+        self.progress = kwargs.get('progress', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status_py3.py
new file mode 100644
index 000000000000..ad9e0e83c4d2
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status_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 RegionalReplicationStatus(Model):
+    """This is the regional replication status.
+
+    :param region: The region where the gallery image version is published to.
+    :type region: str
+    :param state: This is the regional replication state. Possible values
+     include: 'Unknown', 'Replicating', 'Completed', 'Failed'
+    :type state: str or
+     ~azure.mgmt.compute.v2018_06_01.models.ReplicationState
+    :param details: The details of the replication status.
+    :type details: str
+    :param progress: It indicates progress of the replication job.
+    :type progress: int
+    """
+
+    _attribute_map = {
+        'region': {'key': 'region', 'type': 'str'},
+        'state': {'key': 'state', 'type': 'ReplicationState'},
+        'details': {'key': 'details', 'type': 'str'},
+        'progress': {'key': 'progress', 'type': 'int'},
+    }
+
+    def __init__(self, *, region: str=None, state=None, details: str=None, progress: int=None, **kwargs) -> None:
+        super(RegionalReplicationStatus, self).__init__(**kwargs)
+        self.region = region
+        self.state = state
+        self.details = details
+        self.progress = progress
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status.py
new file mode 100644
index 000000000000..dca3310506b8
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status.py
@@ -0,0 +1,36 @@
+# 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 ReplicationStatus(Model):
+    """This is the replication status of the gallery image version.
+
+    :param aggregated_state: This is the aggregated replication status based
+     on the regional replication status. Possible values include: 'Unknown',
+     'InProgress', 'Completed', 'Failed'
+    :type aggregated_state: str or
+     ~azure.mgmt.compute.v2018_06_01.models.AggregatedReplicationState
+    :param summary: This is a summary of replication status for each region.
+    :type summary:
+     list[~azure.mgmt.compute.v2018_06_01.models.RegionalReplicationStatus]
+    """
+
+    _attribute_map = {
+        'aggregated_state': {'key': 'aggregatedState', 'type': 'AggregatedReplicationState'},
+        'summary': {'key': 'summary', 'type': '[RegionalReplicationStatus]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ReplicationStatus, self).__init__(**kwargs)
+        self.aggregated_state = kwargs.get('aggregated_state', None)
+        self.summary = kwargs.get('summary', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status_py3.py
new file mode 100644
index 000000000000..72bf40691d04
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status_py3.py
@@ -0,0 +1,36 @@
+# 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 ReplicationStatus(Model):
+    """This is the replication status of the gallery image version.
+
+    :param aggregated_state: This is the aggregated replication status based
+     on the regional replication status. Possible values include: 'Unknown',
+     'InProgress', 'Completed', 'Failed'
+    :type aggregated_state: str or
+     ~azure.mgmt.compute.v2018_06_01.models.AggregatedReplicationState
+    :param summary: This is a summary of replication status for each region.
+    :type summary:
+     list[~azure.mgmt.compute.v2018_06_01.models.RegionalReplicationStatus]
+    """
+
+    _attribute_map = {
+        'aggregated_state': {'key': 'aggregatedState', 'type': 'AggregatedReplicationState'},
+        'summary': {'key': 'summary', 'type': '[RegionalReplicationStatus]'},
+    }
+
+    def __init__(self, *, aggregated_state=None, summary=None, **kwargs) -> None:
+        super(ReplicationStatus, self).__init__(**kwargs)
+        self.aggregated_state = aggregated_state
+        self.summary = summary
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/resource.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/resource.py
new file mode 100644
index 000000000000..5dd7d481c685
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/resource.py
@@ -0,0 +1,56 @@
+# 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 Resource(Model):
+    """The Resource model definition.
+
+    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]
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': 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}'},
+    }
+
+    def __init__(self, **kwargs):
+        super(Resource, self).__init__(**kwargs)
+        self.id = None
+        self.name = None
+        self.type = None
+        self.location = kwargs.get('location', None)
+        self.tags = kwargs.get('tags', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/resource_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/resource_py3.py
new file mode 100644
index 000000000000..2f3702caf609
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/resource_py3.py
@@ -0,0 +1,56 @@
+# 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 Resource(Model):
+    """The Resource model definition.
+
+    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]
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': 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}'},
+    }
+
+    def __init__(self, *, location: str, tags=None, **kwargs) -> None:
+        super(Resource, self).__init__(**kwargs)
+        self.id = None
+        self.name = None
+        self.type = None
+        self.location = location
+        self.tags = tags
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/resource_range.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/resource_range.py
new file mode 100644
index 000000000000..6ebd52ac68d6
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/resource_range.py
@@ -0,0 +1,32 @@
+# 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 ResourceRange(Model):
+    """Describes the resource range.
+
+    :param min: The minimum number of the resource.
+    :type min: int
+    :param max: The maximum number of the resource.
+    :type max: int
+    """
+
+    _attribute_map = {
+        'min': {'key': 'min', 'type': 'int'},
+        'max': {'key': 'max', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ResourceRange, self).__init__(**kwargs)
+        self.min = kwargs.get('min', None)
+        self.max = kwargs.get('max', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/resource_range_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/resource_range_py3.py
new file mode 100644
index 000000000000..8ce42edfcc6d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/resource_range_py3.py
@@ -0,0 +1,32 @@
+# 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 ResourceRange(Model):
+    """Describes the resource range.
+
+    :param min: The minimum number of the resource.
+    :type min: int
+    :param max: The maximum number of the resource.
+    :type max: int
+    """
+
+    _attribute_map = {
+        'min': {'key': 'min', 'type': 'int'},
+        'max': {'key': 'max', 'type': 'int'},
+    }
+
+    def __init__(self, *, min: int=None, max: int=None, **kwargs) -> None:
+        super(ResourceRange, self).__init__(**kwargs)
+        self.min = min
+        self.max = max
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
new file mode 100644
index 000000000000..e058803d6884
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/__init__.py
@@ -0,0 +1,20 @@
+# 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 .galleries_operations import GalleriesOperations
+from .gallery_images_operations import GalleryImagesOperations
+from .gallery_image_versions_operations import GalleryImageVersionsOperations
+
+__all__ = [
+    'GalleriesOperations',
+    'GalleryImagesOperations',
+    'GalleryImageVersionsOperations',
+]
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/galleries_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/galleries_operations.py
new file mode 100644
index 000000000000..7d94dc409558
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/galleries_operations.py
@@ -0,0 +1,431 @@
+# 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 GalleriesOperations(object):
+    """GalleriesOperations 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, gallery_name, gallery, 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'),
+            'galleryName': self._serialize.url("gallery_name", gallery_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['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(gallery, 'Gallery')
+
+        # Construct and send request
+        request = self._client.put(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, stream=False, **operation_config)
+
+        if response.status_code not in [200, 201]:
+            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('Gallery', response)
+        if response.status_code == 201:
+            deserialized = self._deserialize('Gallery', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def create_or_update(
+            self, resource_group_name, gallery_name, gallery, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Create or update a gallery.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param gallery_name: The name of the gallery.
+        :type gallery_name: str
+        :param gallery: Parameters supplied to the create or update gallery
+         operation.
+        :type gallery: ~azure.mgmt.compute.v2018_06_01.models.Gallery
+        :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 Gallery or
+         ClientRawResponse<Gallery> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.Gallery]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.Gallery]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._create_or_update_initial(
+            resource_group_name=resource_group_name,
+            gallery_name=gallery_name,
+            gallery=gallery,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('Gallery', 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/galleries/{galleryName}'}
+
+    def get(
+            self, resource_group_name, gallery_name, custom_headers=None, raw=False, **operation_config):
+        """Retrieves information about a gallery.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param gallery_name: The name of the gallery.
+        :type gallery_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: Gallery or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_06_01.models.Gallery 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'),
+            'galleryName': self._serialize.url("gallery_name", gallery_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['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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('Gallery', 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/galleries/{galleryName}'}
+
+
+    def _delete_initial(
+            self, resource_group_name, gallery_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'),
+            'galleryName': self._serialize.url("gallery_name", gallery_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['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 and send request
+        request = self._client.delete(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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
+
+        deserialized = None
+
+        if response.status_code == 200:
+            deserialized = self._deserialize('OperationStatusResponse', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def delete(
+            self, resource_group_name, gallery_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Delete a gallery.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param gallery_name: The name of the gallery.
+        :type gallery_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 OperationStatusResponse
+         or ClientRawResponse<OperationStatusResponse> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.OperationStatusResponse]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.OperationStatusResponse]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._delete_initial(
+            resource_group_name=resource_group_name,
+            gallery_name=gallery_name,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('OperationStatusResponse', 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)
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/galleries/{galleryName}'}
+
+    def list_by_resource_group(
+            self, resource_group_name, custom_headers=None, raw=False, **operation_config):
+        """List galleries 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 Gallery
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.GalleryPaged[~azure.mgmt.compute.v2018_06_01.models.Gallery]
+        :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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.GalleryPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.GalleryPaged(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/galleries'}
+
+    def list_by_subscription(
+            self, custom_headers=None, raw=False, **operation_config):
+        """List galleries 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 Gallery
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.GalleryPaged[~azure.mgmt.compute.v2018_06_01.models.Gallery]
+        :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_subscription.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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.GalleryPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.GalleryPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/galleries'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_image_versions_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_image_versions_operations.py
new file mode 100644
index 000000000000..e0aa712f5c54
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_image_versions_operations.py
@@ -0,0 +1,404 @@
+# 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 GalleryImageVersionsOperations(object):
+    """GalleryImageVersionsOperations 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, gallery_name, gallery_image_name, gallery_image_version_name, gallery_image_version, 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'),
+            'galleryName': self._serialize.url("gallery_name", gallery_name, 'str'),
+            'galleryImageName': self._serialize.url("gallery_image_name", gallery_image_name, 'str'),
+            'galleryImageVersionName': self._serialize.url("gallery_image_version_name", gallery_image_version_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['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(gallery_image_version, 'GalleryImageVersion')
+
+        # Construct and send request
+        request = self._client.put(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, stream=False, **operation_config)
+
+        if response.status_code not in [200, 201]:
+            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('GalleryImageVersion', response)
+        if response.status_code == 201:
+            deserialized = self._deserialize('GalleryImageVersion', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def create_or_update(
+            self, resource_group_name, gallery_name, gallery_image_name, gallery_image_version_name, gallery_image_version, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Create or update a gallery image version.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param gallery_name: The name of the gallery.
+        :type gallery_name: str
+        :param gallery_image_name: The name of the gallery image.
+        :type gallery_image_name: str
+        :param gallery_image_version_name: The name of the gallery image
+         version.
+        :type gallery_image_version_name: str
+        :param gallery_image_version: Parameters supplied to the create or
+         update gallery image version operation.
+        :type gallery_image_version:
+         ~azure.mgmt.compute.v2018_06_01.models.GalleryImageVersion
+        :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 GalleryImageVersion or
+         ClientRawResponse<GalleryImageVersion> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.GalleryImageVersion]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.GalleryImageVersion]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._create_or_update_initial(
+            resource_group_name=resource_group_name,
+            gallery_name=gallery_name,
+            gallery_image_name=gallery_image_name,
+            gallery_image_version_name=gallery_image_version_name,
+            gallery_image_version=gallery_image_version,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('GalleryImageVersion', 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/galleries/{galleryName}/images/{galleryImageName}/versions/{galleryImageVersionName}'}
+
+    def get(
+            self, resource_group_name, gallery_name, gallery_image_name, gallery_image_version_name, expand=None, custom_headers=None, raw=False, **operation_config):
+        """Retrieves information about a gallery image version.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param gallery_name: The name of the gallery.
+        :type gallery_name: str
+        :param gallery_image_name: The name of the gallery image.
+        :type gallery_image_name: str
+        :param gallery_image_version_name: The name of the gallery image
+         version.
+        :type gallery_image_version_name: str
+        :param expand: The expand expression to apply on the operation.
+         Possible values include: 'ReplicationStatus'
+        :type expand: str or
+         ~azure.mgmt.compute.v2018_06_01.models.ReplicationStatusTypes
+        :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: GalleryImageVersion or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_06_01.models.GalleryImageVersion 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'),
+            'galleryName': self._serialize.url("gallery_name", gallery_name, 'str'),
+            'galleryImageName': self._serialize.url("gallery_image_name", gallery_image_name, 'str'),
+            'galleryImageVersionName': self._serialize.url("gallery_image_version_name", gallery_image_version_name, 'str')
+        }
+        url = self._client.format_url(url, **path_format_arguments)
+
+        # Construct parameters
+        query_parameters = {}
+        if expand is not None:
+            query_parameters['$expand'] = self._serialize.query("expand", expand, 'ReplicationStatusTypes')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('GalleryImageVersion', 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/galleries/{galleryName}/images/{galleryImageName}/versions/{galleryImageVersionName}'}
+
+
+    def _delete_initial(
+            self, resource_group_name, gallery_name, gallery_image_name, gallery_image_version_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'),
+            'galleryName': self._serialize.url("gallery_name", gallery_name, 'str'),
+            'galleryImageName': self._serialize.url("gallery_image_name", gallery_image_name, 'str'),
+            'galleryImageVersionName': self._serialize.url("gallery_image_version_name", gallery_image_version_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['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 and send request
+        request = self._client.delete(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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
+
+        deserialized = None
+
+        if response.status_code == 200:
+            deserialized = self._deserialize('OperationStatusResponse', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def delete(
+            self, resource_group_name, gallery_name, gallery_image_name, gallery_image_version_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Delete a gallery image version.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param gallery_name: The name of the gallery.
+        :type gallery_name: str
+        :param gallery_image_name: The name of the gallery image.
+        :type gallery_image_name: str
+        :param gallery_image_version_name: The name of the gallery image
+         version.
+        :type gallery_image_version_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 OperationStatusResponse
+         or ClientRawResponse<OperationStatusResponse> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.OperationStatusResponse]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.OperationStatusResponse]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._delete_initial(
+            resource_group_name=resource_group_name,
+            gallery_name=gallery_name,
+            gallery_image_name=gallery_image_name,
+            gallery_image_version_name=gallery_image_version_name,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('OperationStatusResponse', 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)
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/galleries/{galleryName}/images/{galleryImageName}/versions/{galleryImageVersionName}'}
+
+    def list_gallery_image_versions_by_gallery_image(
+            self, resource_group_name, gallery_name, gallery_image_name, custom_headers=None, raw=False, **operation_config):
+        """List gallery image versions under a gallery image.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param gallery_name: The name of the gallery.
+        :type gallery_name: str
+        :param gallery_image_name: The name of the gallery image.
+        :type gallery_image_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 GalleryImageVersion
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.GalleryImageVersionPaged[~azure.mgmt.compute.v2018_06_01.models.GalleryImageVersion]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        def internal_paging(next_link=None, raw=False):
+
+            if not next_link:
+                # Construct URL
+                url = self.list_gallery_image_versions_by_gallery_image.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'),
+                    'galleryName': self._serialize.url("gallery_name", gallery_name, 'str'),
+                    'galleryImageName': self._serialize.url("gallery_image_name", gallery_image_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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.GalleryImageVersionPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.GalleryImageVersionPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_gallery_image_versions_by_gallery_image.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/galleries/{galleryName}/images/{galleryImageName}/versions'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_images_operations.py
new file mode 100644
index 000000000000..e28d24dc1d58
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_images_operations.py
@@ -0,0 +1,381 @@
+# 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 GalleryImagesOperations(object):
+    """GalleryImagesOperations 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, gallery_name, gallery_image_name, gallery_image, 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'),
+            'galleryName': self._serialize.url("gallery_name", gallery_name, 'str'),
+            'galleryImageName': self._serialize.url("gallery_image_name", gallery_image_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['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(gallery_image, 'GalleryImage')
+
+        # Construct and send request
+        request = self._client.put(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, stream=False, **operation_config)
+
+        if response.status_code not in [200, 201]:
+            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('GalleryImage', response)
+        if response.status_code == 201:
+            deserialized = self._deserialize('GalleryImage', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def create_or_update(
+            self, resource_group_name, gallery_name, gallery_image_name, gallery_image, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Create or update a gallery image.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param gallery_name: The name of the gallery.
+        :type gallery_name: str
+        :param gallery_image_name: The name of the gallery image.
+        :type gallery_image_name: str
+        :param gallery_image: Parameters supplied to the create or update
+         gallery image operation.
+        :type gallery_image:
+         ~azure.mgmt.compute.v2018_06_01.models.GalleryImage
+        :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 GalleryImage or
+         ClientRawResponse<GalleryImage> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.GalleryImage]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.GalleryImage]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._create_or_update_initial(
+            resource_group_name=resource_group_name,
+            gallery_name=gallery_name,
+            gallery_image_name=gallery_image_name,
+            gallery_image=gallery_image,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('GalleryImage', 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/galleries/{galleryName}/images/{galleryImageName}'}
+
+    def get(
+            self, resource_group_name, gallery_name, gallery_image_name, custom_headers=None, raw=False, **operation_config):
+        """Retrieves information about a gallery image.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param gallery_name: The name of the gallery.
+        :type gallery_name: str
+        :param gallery_image_name: The name of the gallery image.
+        :type gallery_image_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: GalleryImage or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_06_01.models.GalleryImage 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'),
+            'galleryName': self._serialize.url("gallery_name", gallery_name, 'str'),
+            'galleryImageName': self._serialize.url("gallery_image_name", gallery_image_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['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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('GalleryImage', 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/galleries/{galleryName}/images/{galleryImageName}'}
+
+
+    def _delete_initial(
+            self, resource_group_name, gallery_name, gallery_image_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'),
+            'galleryName': self._serialize.url("gallery_name", gallery_name, 'str'),
+            'galleryImageName': self._serialize.url("gallery_image_name", gallery_image_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['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 and send request
+        request = self._client.delete(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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
+
+        deserialized = None
+
+        if response.status_code == 200:
+            deserialized = self._deserialize('OperationStatusResponse', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def delete(
+            self, resource_group_name, gallery_name, gallery_image_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Delete a gallery image.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param gallery_name: The name of the gallery.
+        :type gallery_name: str
+        :param gallery_image_name: The name of the gallery image.
+        :type gallery_image_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 OperationStatusResponse
+         or ClientRawResponse<OperationStatusResponse> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.OperationStatusResponse]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.OperationStatusResponse]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._delete_initial(
+            resource_group_name=resource_group_name,
+            gallery_name=gallery_name,
+            gallery_image_name=gallery_image_name,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('OperationStatusResponse', 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)
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/galleries/{galleryName}/images/{galleryImageName}'}
+
+    def list_gallery_images_by_gallery(
+            self, resource_group_name, gallery_name, custom_headers=None, raw=False, **operation_config):
+        """List gallery images under a gallery.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param gallery_name: The name of the gallery.
+        :type gallery_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 GalleryImage
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.GalleryImagePaged[~azure.mgmt.compute.v2018_06_01.models.GalleryImage]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        def internal_paging(next_link=None, raw=False):
+
+            if not next_link:
+                # Construct URL
+                url = self.list_gallery_images_by_gallery.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'),
+                    'galleryName': self._serialize.url("gallery_name", gallery_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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.GalleryImagePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.GalleryImagePaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_gallery_images_by_gallery.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/galleries/{galleryName}/images'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/version.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/version.py
new file mode 100644
index 000000000000..5f1af9fb17b6
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/version.py
@@ -0,0 +1,13 @@
+# 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.
+# --------------------------------------------------------------------------
+
+VERSION = "2018-06-01"
+

From 6d22b907d1c79c00cf3e6950732b94d58cf89282 Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Thu, 31 May 2018 08:57:07 -0700
Subject: [PATCH 07/29] Generated from 4abedb1c096796557fdd029401f3d317f99c7f61
 (#2664)

removing resourceUpdate, adding contents to disk and snapshot
---
 .../compute/v2018_04_01/models/__init__.py    |  3 --
 .../compute/v2018_04_01/models/disk_update.py | 18 ++++++-----
 .../v2018_04_01/models/disk_update_py3.py     | 22 +++++++------
 .../v2018_04_01/models/resource_update.py     | 32 -------------------
 .../v2018_04_01/models/resource_update_py3.py | 32 -------------------
 .../v2018_04_01/models/snapshot_update.py     | 18 ++++++-----
 .../v2018_04_01/models/snapshot_update_py3.py | 22 +++++++------
 7 files changed, 44 insertions(+), 103 deletions(-)
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/resource_update.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/resource_update_py3.py

diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/__init__.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/__init__.py
index a9b68bd118f4..e215874b54d3 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/__init__.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/__init__.py
@@ -12,7 +12,6 @@
 try:
     from .resource_py3 import Resource
     from .disk_sku_py3 import DiskSku
-    from .resource_update_py3 import ResourceUpdate
     from .image_disk_reference_py3 import ImageDiskReference
     from .creation_data_py3 import CreationData
     from .source_vault_py3 import SourceVault
@@ -29,7 +28,6 @@
 except (SyntaxError, ImportError):
     from .resource import Resource
     from .disk_sku import DiskSku
-    from .resource_update import ResourceUpdate
     from .image_disk_reference import ImageDiskReference
     from .creation_data import CreationData
     from .source_vault import SourceVault
@@ -56,7 +54,6 @@
 __all__ = [
     'Resource',
     'DiskSku',
-    'ResourceUpdate',
     'ImageDiskReference',
     'CreationData',
     'SourceVault',
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update.py
index 7364769892bf..3ca75fec3871 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update.py
@@ -9,16 +9,12 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource_update import ResourceUpdate
+from msrest.serialization import Model
 
 
-class DiskUpdate(ResourceUpdate):
+class DiskUpdate(Model):
     """Disk update resource.
 
-    :param tags: Resource tags
-    :type tags: dict[str, str]
-    :param sku:
-    :type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
     :param os_type: the Operating System type. Possible values include:
      'Windows', 'Linux'
     :type os_type: str or
@@ -32,14 +28,18 @@ class DiskUpdate(ResourceUpdate):
     :param encryption_settings: Encryption settings for disk or snapshot
     :type encryption_settings:
      ~azure.mgmt.compute.v2018_04_01.models.EncryptionSettings
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param sku:
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
     """
 
     _attribute_map = {
-        'tags': {'key': 'tags', 'type': '{str}'},
-        'sku': {'key': 'sku', 'type': 'DiskSku'},
         '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': 'DiskSku'},
     }
 
     def __init__(self, **kwargs):
@@ -47,3 +47,5 @@ def __init__(self, **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_04_01/models/disk_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update_py3.py
index b2445fda4cc9..407d553cff9e 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update_py3.py
@@ -9,16 +9,12 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource_update_py3 import ResourceUpdate
+from msrest.serialization import Model
 
 
-class DiskUpdate(ResourceUpdate):
+class DiskUpdate(Model):
     """Disk update resource.
 
-    :param tags: Resource tags
-    :type tags: dict[str, str]
-    :param sku:
-    :type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
     :param os_type: the Operating System type. Possible values include:
      'Windows', 'Linux'
     :type os_type: str or
@@ -32,18 +28,24 @@ class DiskUpdate(ResourceUpdate):
     :param encryption_settings: Encryption settings for disk or snapshot
     :type encryption_settings:
      ~azure.mgmt.compute.v2018_04_01.models.EncryptionSettings
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param sku:
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
     """
 
     _attribute_map = {
-        'tags': {'key': 'tags', 'type': '{str}'},
-        'sku': {'key': 'sku', 'type': 'DiskSku'},
         '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': 'DiskSku'},
     }
 
-    def __init__(self, *, tags=None, sku=None, os_type=None, disk_size_gb: int=None, encryption_settings=None, **kwargs) -> None:
-        super(DiskUpdate, self).__init__(tags=tags, sku=sku, **kwargs)
+    def __init__(self, *, os_type=None, disk_size_gb: int=None, encryption_settings=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.tags = tags
+        self.sku = sku
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/resource_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/resource_update.py
deleted file mode 100644
index 1ab6fb273f49..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/resource_update.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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 ResourceUpdate(Model):
-    """The Resource model definition.
-
-    :param tags: Resource tags
-    :type tags: dict[str, str]
-    :param sku:
-    :type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
-    """
-
-    _attribute_map = {
-        'tags': {'key': 'tags', 'type': '{str}'},
-        'sku': {'key': 'sku', 'type': 'DiskSku'},
-    }
-
-    def __init__(self, **kwargs):
-        super(ResourceUpdate, self).__init__(**kwargs)
-        self.tags = kwargs.get('tags', None)
-        self.sku = kwargs.get('sku', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/resource_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/resource_update_py3.py
deleted file mode 100644
index 1074982f9341..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/resource_update_py3.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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 ResourceUpdate(Model):
-    """The Resource model definition.
-
-    :param tags: Resource tags
-    :type tags: dict[str, str]
-    :param sku:
-    :type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
-    """
-
-    _attribute_map = {
-        'tags': {'key': 'tags', 'type': '{str}'},
-        'sku': {'key': 'sku', 'type': 'DiskSku'},
-    }
-
-    def __init__(self, *, tags=None, sku=None, **kwargs) -> None:
-        super(ResourceUpdate, self).__init__(**kwargs)
-        self.tags = tags
-        self.sku = sku
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update.py
index 6483ca6dd981..119c6f05bc49 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update.py
@@ -9,16 +9,12 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource_update import ResourceUpdate
+from msrest.serialization import Model
 
 
-class SnapshotUpdate(ResourceUpdate):
+class SnapshotUpdate(Model):
     """Snapshot update resource.
 
-    :param tags: Resource tags
-    :type tags: dict[str, str]
-    :param sku:
-    :type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
     :param os_type: the Operating System type. Possible values include:
      'Windows', 'Linux'
     :type os_type: str or
@@ -32,14 +28,18 @@ class SnapshotUpdate(ResourceUpdate):
     :param encryption_settings: Encryption settings for disk or snapshot
     :type encryption_settings:
      ~azure.mgmt.compute.v2018_04_01.models.EncryptionSettings
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param sku:
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.SnapshotSku
     """
 
     _attribute_map = {
-        'tags': {'key': 'tags', 'type': '{str}'},
-        'sku': {'key': 'sku', 'type': 'DiskSku'},
         '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):
@@ -47,3 +47,5 @@ def __init__(self, **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_04_01/models/snapshot_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update_py3.py
index c1a7cec5da8c..54e05426ce8e 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update_py3.py
@@ -9,16 +9,12 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource_update_py3 import ResourceUpdate
+from msrest.serialization import Model
 
 
-class SnapshotUpdate(ResourceUpdate):
+class SnapshotUpdate(Model):
     """Snapshot update resource.
 
-    :param tags: Resource tags
-    :type tags: dict[str, str]
-    :param sku:
-    :type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
     :param os_type: the Operating System type. Possible values include:
      'Windows', 'Linux'
     :type os_type: str or
@@ -32,18 +28,24 @@ class SnapshotUpdate(ResourceUpdate):
     :param encryption_settings: Encryption settings for disk or snapshot
     :type encryption_settings:
      ~azure.mgmt.compute.v2018_04_01.models.EncryptionSettings
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param sku:
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.SnapshotSku
     """
 
     _attribute_map = {
-        'tags': {'key': 'tags', 'type': '{str}'},
-        'sku': {'key': 'sku', 'type': 'DiskSku'},
         '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, *, tags=None, sku=None, os_type=None, disk_size_gb: int=None, encryption_settings=None, **kwargs) -> None:
-        super(SnapshotUpdate, self).__init__(tags=tags, sku=sku, **kwargs)
+    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

From e54191c5b4fe9ef3f314c47f52068d423b36f419 Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Thu, 31 May 2018 17:08:22 -0700
Subject: [PATCH 08/29] Generated from a2f275e122829ab63c18494dbaae5a1e9ef6e81c
 (#2673)

Compute Py conf
---
 .../mgmt/compute/compute_management_client.py |   45 +
 .../v2018_04_01/compute_management_client.py  |   75 +
 .../compute/v2018_04_01/models/__init__.py    |  444 ++++-
 .../models/additional_unattend_content.py     |   52 +
 .../models/additional_unattend_content_py3.py |   52 +
 .../models/api_entity_reference.py            |   29 +
 .../models/api_entity_reference_py3.py        |   29 +
 .../compute/v2018_04_01/models/api_error.py   |   44 +
 .../v2018_04_01/models/api_error_base.py      |   36 +
 .../v2018_04_01/models/api_error_base_py3.py  |   36 +
 .../v2018_04_01/models/api_error_py3.py       |   44 +
 .../models/auto_os_upgrade_policy.py          |   29 +
 .../models/auto_os_upgrade_policy_py3.py      |   29 +
 .../v2018_04_01/models/availability_set.py    |   85 +
 .../models/availability_set_paged.py          |   27 +
 .../models/availability_set_py3.py            |   85 +
 .../models/availability_set_update.py         |   58 +
 .../models/availability_set_update_py3.py     |   58 +
 .../v2018_04_01/models/boot_diagnostics.py    |   38 +
 .../models/boot_diagnostics_instance_view.py  |   32 +
 .../boot_diagnostics_instance_view_py3.py     |   32 +
 .../models/boot_diagnostics_py3.py            |   38 +
 .../models/compute_management_client_enums.py |  314 ++-
 .../models/compute_operation_value.py         |   60 +
 .../models/compute_operation_value_paged.py   |   27 +
 .../models/compute_operation_value_py3.py     |   60 +
 .../compute/v2018_04_01/models/data_disk.py   |   87 +
 .../v2018_04_01/models/data_disk_image.py     |   37 +
 .../v2018_04_01/models/data_disk_image_py3.py |   37 +
 .../v2018_04_01/models/data_disk_py3.py       |   87 +
 .../v2018_04_01/models/diagnostics_profile.py |   34 +
 .../models/diagnostics_profile_py3.py         |   34 +
 .../models/disk_encryption_settings.py        |   41 +
 .../models/disk_encryption_settings_py3.py    |   41 +
 .../v2018_04_01/models/disk_instance_view.py  |   39 +
 .../models/disk_instance_view_py3.py          |   39 +
 .../v2018_04_01/models/hardware_profile.py    |   85 +
 .../models/hardware_profile_py3.py            |   85 +
 .../mgmt/compute/v2018_04_01/models/image.py  |   70 +
 .../v2018_04_01/models/image_data_disk.py     |   68 +
 .../v2018_04_01/models/image_data_disk_py3.py |   68 +
 .../v2018_04_01/models/image_os_disk.py       |   77 +
 .../v2018_04_01/models/image_os_disk_py3.py   |   77 +
 .../compute/v2018_04_01/models/image_paged.py |   27 +
 .../compute/v2018_04_01/models/image_py3.py   |   70 +
 .../v2018_04_01/models/image_reference.py     |   54 +
 .../v2018_04_01/models/image_reference_py3.py |   54 +
 .../models/image_storage_profile.py           |   45 +
 .../models/image_storage_profile_py3.py       |   45 +
 .../v2018_04_01/models/image_update.py        |   50 +
 .../v2018_04_01/models/image_update_py3.py    |   50 +
 .../compute/v2018_04_01/models/inner_error.py |   32 +
 .../v2018_04_01/models/inner_error_py3.py     |   32 +
 .../models/instance_view_status.py            |   47 +
 .../models/instance_view_status_py3.py        |   47 +
 .../models/key_vault_key_reference.py         |   41 +
 .../models/key_vault_key_reference_py3.py     |   41 +
 .../models/key_vault_secret_reference.py      |   40 +
 .../models/key_vault_secret_reference_py3.py  |   40 +
 .../v2018_04_01/models/linux_configuration.py |   39 +
 .../models/linux_configuration_py3.py         |   39 +
 .../models/log_analytics_input_base.py        |   58 +
 .../models/log_analytics_input_base_py3.py    |   58 +
 .../models/log_analytics_operation_result.py  |   36 +
 .../log_analytics_operation_result_py3.py     |   36 +
 .../models/log_analytics_output.py            |   35 +
 .../models/log_analytics_output_py3.py        |   35 +
 .../models/maintenance_redeploy_status.py     |   60 +
 .../models/maintenance_redeploy_status_py3.py |   60 +
 .../models/managed_disk_parameters.py         |   34 +
 .../models/managed_disk_parameters_py3.py     |   34 +
 .../models/network_interface_reference.py     |   32 +
 .../models/network_interface_reference_py3.py |   32 +
 .../v2018_04_01/models/network_profile.py     |   30 +
 .../v2018_04_01/models/network_profile_py3.py |   30 +
 .../compute/v2018_04_01/models/os_disk.py     |   97 +
 .../v2018_04_01/models/os_disk_image.py       |   36 +
 .../v2018_04_01/models/os_disk_image_py3.py   |   36 +
 .../compute/v2018_04_01/models/os_disk_py3.py |   97 +
 .../compute/v2018_04_01/models/os_profile.py  |   99 +
 .../v2018_04_01/models/os_profile_py3.py      |   99 +
 .../mgmt/compute/v2018_04_01/models/plan.py   |   46 +
 .../compute/v2018_04_01/models/plan_py3.py    |   46 +
 .../v2018_04_01/models/purchase_plan.py       |   47 +
 .../v2018_04_01/models/purchase_plan_py3.py   |   47 +
 .../models/recovery_walk_response.py          |   41 +
 .../models/recovery_walk_response_py3.py      |   41 +
 .../models/request_rate_by_interval_input.py  |   60 +
 .../request_rate_by_interval_input_py3.py     |   60 +
 .../models/rollback_status_info.py            |   48 +
 .../models/rollback_status_info_py3.py        |   48 +
 .../models/rolling_upgrade_policy.py          |   63 +
 .../models/rolling_upgrade_policy_py3.py      |   63 +
 .../models/rolling_upgrade_progress_info.py   |   55 +
 .../rolling_upgrade_progress_info_py3.py      |   55 +
 .../models/rolling_upgrade_running_status.py  |   54 +
 .../rolling_upgrade_running_status_py3.py     |   54 +
 .../models/rolling_upgrade_status_info.py     |   76 +
 .../models/rolling_upgrade_status_info_py3.py |   76 +
 .../models/run_command_document.py            |   61 +
 .../models/run_command_document_base.py       |   56 +
 .../models/run_command_document_base_paged.py |   27 +
 .../models/run_command_document_base_py3.py   |   56 +
 .../models/run_command_document_py3.py        |   61 +
 .../v2018_04_01/models/run_command_input.py   |   44 +
 .../models/run_command_input_parameter.py     |   39 +
 .../models/run_command_input_parameter_py3.py |   39 +
 .../models/run_command_input_py3.py           |   44 +
 .../run_command_parameter_definition.py       |   48 +
 .../run_command_parameter_definition_py3.py   |   48 +
 .../v2018_04_01/models/run_command_result.py  |   28 +
 .../models/run_command_result_py3.py          |   28 +
 .../mgmt/compute/v2018_04_01/models/sku.py    |   38 +
 .../compute/v2018_04_01/models/sku_py3.py     |   38 +
 .../v2018_04_01/models/ssh_configuration.py   |   30 +
 .../models/ssh_configuration_py3.py           |   30 +
 .../v2018_04_01/models/ssh_public_key.py      |   39 +
 .../v2018_04_01/models/ssh_public_key_py3.py  |   39 +
 .../v2018_04_01/models/storage_profile.py     |   47 +
 .../v2018_04_01/models/storage_profile_py3.py |   47 +
 .../v2018_04_01/models/sub_resource.py        |   28 +
 .../v2018_04_01/models/sub_resource_py3.py    |   28 +
 .../models/sub_resource_read_only.py          |   35 +
 .../models/sub_resource_read_only_py3.py      |   35 +
 .../models/throttled_requests_input.py        |   52 +
 .../models/throttled_requests_input_py3.py    |   52 +
 .../v2018_04_01/models/update_resource.py     |   28 +
 .../v2018_04_01/models/update_resource_py3.py |   28 +
 ...pgrade_operation_historical_status_info.py |   47 +
 ..._operation_historical_status_info_paged.py |   27 +
 ...ation_historical_status_info_properties.py |   67 +
 ...n_historical_status_info_properties_py3.py |   67 +
 ...de_operation_historical_status_info_py3.py |   47 +
 .../upgrade_operation_history_status.py       |   46 +
 .../upgrade_operation_history_status_py3.py   |   46 +
 .../v2018_04_01/models/upgrade_policy.py      |   51 +
 .../v2018_04_01/models/upgrade_policy_py3.py  |   51 +
 .../mgmt/compute/v2018_04_01/models/usage.py  |   54 +
 .../compute/v2018_04_01/models/usage_name.py  |   32 +
 .../v2018_04_01/models/usage_name_py3.py      |   32 +
 .../compute/v2018_04_01/models/usage_paged.py |   27 +
 .../compute/v2018_04_01/models/usage_py3.py   |   54 +
 .../v2018_04_01/models/vault_certificate.py   |   46 +
 .../models/vault_certificate_py3.py           |   46 +
 .../v2018_04_01/models/vault_secret_group.py  |   35 +
 .../models/vault_secret_group_py3.py          |   35 +
 .../v2018_04_01/models/virtual_hard_disk.py   |   28 +
 .../models/virtual_hard_disk_py3.py           |   28 +
 .../v2018_04_01/models/virtual_machine.py     |  150 ++
 .../virtual_machine_agent_instance_view.py    |   39 +
 ...virtual_machine_agent_instance_view_py3.py |   39 +
 .../virtual_machine_capture_parameters.py     |   46 +
 .../virtual_machine_capture_parameters_py3.py |   46 +
 .../models/virtual_machine_capture_result.py  |   53 +
 .../virtual_machine_capture_result_py3.py     |   53 +
 .../models/virtual_machine_extension.py       |   97 +
 ...machine_extension_handler_instance_view.py |   37 +
 ...ine_extension_handler_instance_view_py3.py |   37 +
 .../models/virtual_machine_extension_image.py |   81 +
 .../virtual_machine_extension_image_py3.py    |   81 +
 ...virtual_machine_extension_instance_view.py |   47 +
 ...ual_machine_extension_instance_view_py3.py |   47 +
 .../models/virtual_machine_extension_py3.py   |   97 +
 .../virtual_machine_extension_update.py       |   62 +
 .../virtual_machine_extension_update_py3.py   |   62 +
 .../virtual_machine_extensions_list_result.py |   29 +
 ...tual_machine_extensions_list_result_py3.py |   29 +
 .../models/virtual_machine_health_status.py   |   35 +
 .../virtual_machine_health_status_py3.py      |   35 +
 .../models/virtual_machine_identity.py        |   58 +
 .../models/virtual_machine_identity_py3.py    |   58 +
 .../models/virtual_machine_image.py           |   59 +
 .../models/virtual_machine_image_py3.py       |   59 +
 .../models/virtual_machine_image_resource.py  |   49 +
 .../virtual_machine_image_resource_py3.py     |   49 +
 .../models/virtual_machine_instance_view.py   |   85 +
 .../virtual_machine_instance_view_py3.py      |   85 +
 .../models/virtual_machine_paged.py           |   27 +
 .../v2018_04_01/models/virtual_machine_py3.py |  150 ++
 .../models/virtual_machine_scale_set.py       |  116 ++
 .../virtual_machine_scale_set_data_disk.py    |   70 +
 ...virtual_machine_scale_set_data_disk_py3.py |   70 +
 .../virtual_machine_scale_set_extension.py    |   80 +
 ...rtual_machine_scale_set_extension_paged.py |   27 +
 ...ual_machine_scale_set_extension_profile.py |   30 +
 ...machine_scale_set_extension_profile_py3.py |   30 +
 ...virtual_machine_scale_set_extension_py3.py |   80 +
 .../virtual_machine_scale_set_identity.py     |   60 +
 .../virtual_machine_scale_set_identity_py3.py |   60 +
 ...virtual_machine_scale_set_instance_view.py |   48 +
 ...ual_machine_scale_set_instance_view_py3.py |   48 +
 ...cale_set_instance_view_statuses_summary.py |   37 +
 ..._set_instance_view_statuses_summary_py3.py |   37 +
 ...tual_machine_scale_set_ip_configuration.py |   83 +
 ..._machine_scale_set_ip_configuration_py3.py |   83 +
 ...chine_scale_set_managed_disk_parameters.py |   31 +
 ...e_scale_set_managed_disk_parameters_py3.py |   31 +
 ...machine_scale_set_network_configuration.py |   70 +
 ..._set_network_configuration_dns_settings.py |   29 +
 ..._network_configuration_dns_settings_py3.py |   29 +
 ...ine_scale_set_network_configuration_py3.py |   70 +
 ...rtual_machine_scale_set_network_profile.py |   38 +
 ...l_machine_scale_set_network_profile_py3.py |   38 +
 .../virtual_machine_scale_set_os_disk.py      |   80 +
 .../virtual_machine_scale_set_os_disk_py3.py  |   80 +
 .../virtual_machine_scale_set_os_profile.py   |   97 +
 ...irtual_machine_scale_set_os_profile_py3.py |   97 +
 .../models/virtual_machine_scale_set_paged.py |   27 +
 ...ale_set_public_ip_address_configuration.py |   45 +
 ...c_ip_address_configuration_dns_settings.py |   37 +
 ..._address_configuration_dns_settings_py3.py |   37 +
 ...set_public_ip_address_configuration_py3.py |   45 +
 .../models/virtual_machine_scale_set_py3.py   |  116 ++
 .../models/virtual_machine_scale_set_sku.py   |   46 +
 .../virtual_machine_scale_set_sku_capacity.py |   52 +
 ...tual_machine_scale_set_sku_capacity_py3.py |   52 +
 .../virtual_machine_scale_set_sku_paged.py    |   27 +
 .../virtual_machine_scale_set_sku_py3.py      |   46 +
 ...rtual_machine_scale_set_storage_profile.py |   49 +
 ...l_machine_scale_set_storage_profile_py3.py |   49 +
 .../virtual_machine_scale_set_update.py       |   61 +
 ...chine_scale_set_update_ip_configuration.py |   71 +
 ...e_scale_set_update_ip_configuration_py3.py |   71 +
 ..._scale_set_update_network_configuration.py |   61 +
 ...le_set_update_network_configuration_py3.py |   61 +
 ...achine_scale_set_update_network_profile.py |   30 +
 ...ne_scale_set_update_network_profile_py3.py |   30 +
 ...irtual_machine_scale_set_update_os_disk.py |   50 +
 ...al_machine_scale_set_update_os_disk_py3.py |   50 +
 ...ual_machine_scale_set_update_os_profile.py |   43 +
 ...machine_scale_set_update_os_profile_py3.py |   43 +
 ..._update_public_ip_address_configuration.py |   39 +
 ...ate_public_ip_address_configuration_py3.py |   39 +
 .../virtual_machine_scale_set_update_py3.py   |   61 +
 ...achine_scale_set_update_storage_profile.py |   39 +
 ...ne_scale_set_update_storage_profile_py3.py |   39 +
 ...ual_machine_scale_set_update_vm_profile.py |   55 +
 ...machine_scale_set_update_vm_profile_py3.py |   55 +
 .../models/virtual_machine_scale_set_vm.py    |  155 ++
 ...machine_scale_set_vm_extensions_summary.py |   41 +
 ...ine_scale_set_vm_extensions_summary_py3.py |   41 +
 ...rtual_machine_scale_set_vm_instance_ids.py |   30 +
 ...l_machine_scale_set_vm_instance_ids_py3.py |   30 +
 ...hine_scale_set_vm_instance_required_ids.py |   34 +
 ..._scale_set_vm_instance_required_ids_py3.py |   34 +
 ...tual_machine_scale_set_vm_instance_view.py |   87 +
 ..._machine_scale_set_vm_instance_view_py3.py |   87 +
 .../virtual_machine_scale_set_vm_paged.py     |   27 +
 .../virtual_machine_scale_set_vm_profile.py   |   80 +
 ...irtual_machine_scale_set_vm_profile_py3.py |   80 +
 .../virtual_machine_scale_set_vm_py3.py       |  155 ++
 .../models/virtual_machine_size.py            |   53 +
 .../models/virtual_machine_size_paged.py      |   27 +
 .../models/virtual_machine_size_py3.py        |   53 +
 .../virtual_machine_status_code_count.py      |   41 +
 .../virtual_machine_status_code_count_py3.py  |   41 +
 .../models/virtual_machine_update.py          |  126 ++
 .../models/virtual_machine_update_py3.py      |  126 ++
 .../models/win_rm_configuration.py            |   29 +
 .../models/win_rm_configuration_py3.py        |   29 +
 .../v2018_04_01/models/win_rm_listener.py     |   42 +
 .../v2018_04_01/models/win_rm_listener_py3.py |   42 +
 .../models/windows_configuration.py           |   54 +
 .../models/windows_configuration_py3.py       |   54 +
 .../v2018_04_01/operations/__init__.py        |   30 +
 .../availability_sets_operations.py           |  434 ++++
 .../operations/images_operations.py           |  525 +++++
 .../operations/log_analytics_operations.py    |  242 +++
 .../v2018_04_01/operations/operations.py      |   99 +
 .../operations/usage_operations.py            |  108 +
 ...ual_machine_extension_images_operations.py |  248 +++
 .../virtual_machine_extensions_operations.py  |  411 ++++
 .../virtual_machine_images_operations.py      |  383 ++++
 ...virtual_machine_run_commands_operations.py |  168 ++
 ...machine_scale_set_extensions_operations.py |  379 ++++
 ...e_scale_set_rolling_upgrades_operations.py |  267 +++
 ...irtual_machine_scale_set_vms_operations.py | 1131 +++++++++++
 .../virtual_machine_scale_sets_operations.py  | 1762 +++++++++++++++++
 .../virtual_machine_sizes_operations.py       |  108 +
 .../operations/virtual_machines_operations.py | 1563 +++++++++++++++
 280 files changed, 22217 insertions(+), 5 deletions(-)
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/additional_unattend_content.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/additional_unattend_content_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_entity_reference.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_entity_reference_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/auto_os_upgrade_policy.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/auto_os_upgrade_policy_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_update.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_update_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_instance_view.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_instance_view_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_image.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_image_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/diagnostics_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/diagnostics_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_encryption_settings.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_encryption_settings_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_instance_view.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_instance_view_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/hardware_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/hardware_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_reference.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_reference_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_storage_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_storage_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_update.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_update_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/instance_view_status.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/instance_view_status_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_key_reference.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_key_reference_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_secret_reference.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_secret_reference_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/linux_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/linux_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_input_base.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_input_base_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_operation_result.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_operation_result_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_output.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_output_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/maintenance_redeploy_status.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/maintenance_redeploy_status_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_interface_reference.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_interface_reference_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_image.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_image_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/plan.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/plan_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/purchase_plan.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/purchase_plan_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/recovery_walk_response.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/recovery_walk_response_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/request_rate_by_interval_input.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/request_rate_by_interval_input_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rollback_status_info.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rollback_status_info_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_policy.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_policy_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_progress_info.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_progress_info_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_running_status.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_running_status_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_status_info.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_status_info_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_parameter.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_parameter_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_parameter_definition.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_parameter_definition_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sku.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sku_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_public_key.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_public_key_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/storage_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/storage_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_read_only.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_read_only_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/throttled_requests_input.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/throttled_requests_input_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/update_resource.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/update_resource_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_properties.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_properties_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_history_status.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_history_status_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_policy.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_policy_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_name.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_name_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_certificate.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_certificate_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_secret_group.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_secret_group_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_hard_disk.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_hard_disk_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_agent_instance_view.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_agent_instance_view_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_parameters.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_parameters_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_result.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_result_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_handler_instance_view.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_handler_instance_view_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_image.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_image_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_instance_view.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_instance_view_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_update.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_update_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extensions_list_result.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extensions_list_result_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_health_status.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_health_status_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_identity.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_identity_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_resource.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_resource_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_instance_view.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_instance_view_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_data_disk.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_data_disk_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_identity.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_identity_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_statuses_summary.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_statuses_summary_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_dns_settings.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_dns_settings_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_disk.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_disk_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_capacity.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_capacity_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_storage_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_storage_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_ip_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_ip_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_disk.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_disk_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_public_ip_address_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_public_ip_address_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_storage_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_storage_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_vm_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_vm_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_extensions_summary.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_extensions_summary_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_ids.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_ids_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_required_ids.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_required_ids_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_view.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_view_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_status_code_count.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_status_code_count_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_update.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_update_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_listener.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_listener_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/windows_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/windows_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/images_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/log_analytics_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/usage_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extension_images_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extensions_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_images_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_run_commands_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_extensions_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_rolling_upgrades_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_vms_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_sets_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_sizes_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machines_operations.py

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 6c6f04ec9351..f12ba0766a1e 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py
@@ -158,6 +158,7 @@ def availability_sets(self):
            * 2016-04-30-preview: :class:`AvailabilitySetsOperations<azure.mgmt.compute.v2016_04_30_preview.operations.AvailabilitySetsOperations>`
            * 2017-03-30: :class:`AvailabilitySetsOperations<azure.mgmt.compute.v2017_03_30.operations.AvailabilitySetsOperations>`
            * 2017-12-01: :class:`AvailabilitySetsOperations<azure.mgmt.compute.v2017_12_01.operations.AvailabilitySetsOperations>`
+           * 2018-04-01: :class:`AvailabilitySetsOperations<azure.mgmt.compute.v2018_04_01.operations.AvailabilitySetsOperations>`
         """
         api_version = self._get_api_version('availability_sets')
         if api_version == '2015-06-15':
@@ -170,6 +171,8 @@ def availability_sets(self):
             from .v2017_03_30.operations import AvailabilitySetsOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import AvailabilitySetsOperations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import AvailabilitySetsOperations 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)))
@@ -239,6 +242,7 @@ def images(self):
            * 2016-04-30-preview: :class:`ImagesOperations<azure.mgmt.compute.v2016_04_30_preview.operations.ImagesOperations>`
            * 2017-03-30: :class:`ImagesOperations<azure.mgmt.compute.v2017_03_30.operations.ImagesOperations>`
            * 2017-12-01: :class:`ImagesOperations<azure.mgmt.compute.v2017_12_01.operations.ImagesOperations>`
+           * 2018-04-01: :class:`ImagesOperations<azure.mgmt.compute.v2018_04_01.operations.ImagesOperations>`
         """
         api_version = self._get_api_version('images')
         if api_version == '2016-04-30-preview':
@@ -247,6 +251,8 @@ def images(self):
             from .v2017_03_30.operations import ImagesOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import ImagesOperations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import ImagesOperations 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)))
@@ -256,10 +262,13 @@ def log_analytics(self):
         """Instance depends on the API version:
 
            * 2017-12-01: :class:`LogAnalyticsOperations<azure.mgmt.compute.v2017_12_01.operations.LogAnalyticsOperations>`
+           * 2018-04-01: :class:`LogAnalyticsOperations<azure.mgmt.compute.v2018_04_01.operations.LogAnalyticsOperations>`
         """
         api_version = self._get_api_version('log_analytics')
         if api_version == '2017-12-01':
             from .v2017_12_01.operations import LogAnalyticsOperations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import LogAnalyticsOperations 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)))
@@ -269,10 +278,13 @@ def operations(self):
         """Instance depends on the API version:
 
            * 2017-12-01: :class:`Operations<azure.mgmt.compute.v2017_12_01.operations.Operations>`
+           * 2018-04-01: :class:`Operations<azure.mgmt.compute.v2018_04_01.operations.Operations>`
         """
         api_version = self._get_api_version('operations')
         if api_version == '2017-12-01':
             from .v2017_12_01.operations import Operations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import Operations 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 +333,7 @@ def usage(self):
            * 2016-04-30-preview: :class:`UsageOperations<azure.mgmt.compute.v2016_04_30_preview.operations.UsageOperations>`
            * 2017-03-30: :class:`UsageOperations<azure.mgmt.compute.v2017_03_30.operations.UsageOperations>`
            * 2017-12-01: :class:`UsageOperations<azure.mgmt.compute.v2017_12_01.operations.UsageOperations>`
+           * 2018-04-01: :class:`UsageOperations<azure.mgmt.compute.v2018_04_01.operations.UsageOperations>`
         """
         api_version = self._get_api_version('usage')
         if api_version == '2015-06-15':
@@ -333,6 +346,8 @@ def usage(self):
             from .v2017_03_30.operations import UsageOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import UsageOperations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import UsageOperations 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)))
@@ -346,6 +361,7 @@ def virtual_machine_extension_images(self):
            * 2016-04-30-preview: :class:`VirtualMachineExtensionImagesOperations<azure.mgmt.compute.v2016_04_30_preview.operations.VirtualMachineExtensionImagesOperations>`
            * 2017-03-30: :class:`VirtualMachineExtensionImagesOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineExtensionImagesOperations>`
            * 2017-12-01: :class:`VirtualMachineExtensionImagesOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineExtensionImagesOperations>`
+           * 2018-04-01: :class:`VirtualMachineExtensionImagesOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineExtensionImagesOperations>`
         """
         api_version = self._get_api_version('virtual_machine_extension_images')
         if api_version == '2015-06-15':
@@ -358,6 +374,8 @@ def virtual_machine_extension_images(self):
             from .v2017_03_30.operations import VirtualMachineExtensionImagesOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachineExtensionImagesOperations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import VirtualMachineExtensionImagesOperations 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)))
@@ -371,6 +389,7 @@ def virtual_machine_extensions(self):
            * 2016-04-30-preview: :class:`VirtualMachineExtensionsOperations<azure.mgmt.compute.v2016_04_30_preview.operations.VirtualMachineExtensionsOperations>`
            * 2017-03-30: :class:`VirtualMachineExtensionsOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineExtensionsOperations>`
            * 2017-12-01: :class:`VirtualMachineExtensionsOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineExtensionsOperations>`
+           * 2018-04-01: :class:`VirtualMachineExtensionsOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineExtensionsOperations>`
         """
         api_version = self._get_api_version('virtual_machine_extensions')
         if api_version == '2015-06-15':
@@ -383,6 +402,8 @@ def virtual_machine_extensions(self):
             from .v2017_03_30.operations import VirtualMachineExtensionsOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachineExtensionsOperations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import VirtualMachineExtensionsOperations 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)))
@@ -396,6 +417,7 @@ def virtual_machine_images(self):
            * 2016-04-30-preview: :class:`VirtualMachineImagesOperations<azure.mgmt.compute.v2016_04_30_preview.operations.VirtualMachineImagesOperations>`
            * 2017-03-30: :class:`VirtualMachineImagesOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineImagesOperations>`
            * 2017-12-01: :class:`VirtualMachineImagesOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineImagesOperations>`
+           * 2018-04-01: :class:`VirtualMachineImagesOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineImagesOperations>`
         """
         api_version = self._get_api_version('virtual_machine_images')
         if api_version == '2015-06-15':
@@ -408,6 +430,8 @@ def virtual_machine_images(self):
             from .v2017_03_30.operations import VirtualMachineImagesOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachineImagesOperations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import VirtualMachineImagesOperations 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)))
@@ -418,12 +442,15 @@ def virtual_machine_run_commands(self):
 
            * 2017-03-30: :class:`VirtualMachineRunCommandsOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineRunCommandsOperations>`
            * 2017-12-01: :class:`VirtualMachineRunCommandsOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineRunCommandsOperations>`
+           * 2018-04-01: :class:`VirtualMachineRunCommandsOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineRunCommandsOperations>`
         """
         api_version = self._get_api_version('virtual_machine_run_commands')
         if api_version == '2017-03-30':
             from .v2017_03_30.operations import VirtualMachineRunCommandsOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachineRunCommandsOperations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import VirtualMachineRunCommandsOperations 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)))
@@ -434,12 +461,15 @@ def virtual_machine_scale_set_extensions(self):
 
            * 2017-03-30: :class:`VirtualMachineScaleSetExtensionsOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineScaleSetExtensionsOperations>`
            * 2017-12-01: :class:`VirtualMachineScaleSetExtensionsOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineScaleSetExtensionsOperations>`
+           * 2018-04-01: :class:`VirtualMachineScaleSetExtensionsOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineScaleSetExtensionsOperations>`
         """
         api_version = self._get_api_version('virtual_machine_scale_set_extensions')
         if api_version == '2017-03-30':
             from .v2017_03_30.operations import VirtualMachineScaleSetExtensionsOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachineScaleSetExtensionsOperations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import VirtualMachineScaleSetExtensionsOperations 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)))
@@ -450,12 +480,15 @@ def virtual_machine_scale_set_rolling_upgrades(self):
 
            * 2017-03-30: :class:`VirtualMachineScaleSetRollingUpgradesOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineScaleSetRollingUpgradesOperations>`
            * 2017-12-01: :class:`VirtualMachineScaleSetRollingUpgradesOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineScaleSetRollingUpgradesOperations>`
+           * 2018-04-01: :class:`VirtualMachineScaleSetRollingUpgradesOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineScaleSetRollingUpgradesOperations>`
         """
         api_version = self._get_api_version('virtual_machine_scale_set_rolling_upgrades')
         if api_version == '2017-03-30':
             from .v2017_03_30.operations import VirtualMachineScaleSetRollingUpgradesOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachineScaleSetRollingUpgradesOperations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import VirtualMachineScaleSetRollingUpgradesOperations 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)))
@@ -469,6 +502,7 @@ def virtual_machine_scale_set_vms(self):
            * 2016-04-30-preview: :class:`VirtualMachineScaleSetVMsOperations<azure.mgmt.compute.v2016_04_30_preview.operations.VirtualMachineScaleSetVMsOperations>`
            * 2017-03-30: :class:`VirtualMachineScaleSetVMsOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineScaleSetVMsOperations>`
            * 2017-12-01: :class:`VirtualMachineScaleSetVMsOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineScaleSetVMsOperations>`
+           * 2018-04-01: :class:`VirtualMachineScaleSetVMsOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineScaleSetVMsOperations>`
         """
         api_version = self._get_api_version('virtual_machine_scale_set_vms')
         if api_version == '2015-06-15':
@@ -481,6 +515,8 @@ def virtual_machine_scale_set_vms(self):
             from .v2017_03_30.operations import VirtualMachineScaleSetVMsOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachineScaleSetVMsOperations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import VirtualMachineScaleSetVMsOperations 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)))
@@ -494,6 +530,7 @@ def virtual_machine_scale_sets(self):
            * 2016-04-30-preview: :class:`VirtualMachineScaleSetsOperations<azure.mgmt.compute.v2016_04_30_preview.operations.VirtualMachineScaleSetsOperations>`
            * 2017-03-30: :class:`VirtualMachineScaleSetsOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineScaleSetsOperations>`
            * 2017-12-01: :class:`VirtualMachineScaleSetsOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineScaleSetsOperations>`
+           * 2018-04-01: :class:`VirtualMachineScaleSetsOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineScaleSetsOperations>`
         """
         api_version = self._get_api_version('virtual_machine_scale_sets')
         if api_version == '2015-06-15':
@@ -506,6 +543,8 @@ def virtual_machine_scale_sets(self):
             from .v2017_03_30.operations import VirtualMachineScaleSetsOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachineScaleSetsOperations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import VirtualMachineScaleSetsOperations 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)))
@@ -519,6 +558,7 @@ def virtual_machine_sizes(self):
            * 2016-04-30-preview: :class:`VirtualMachineSizesOperations<azure.mgmt.compute.v2016_04_30_preview.operations.VirtualMachineSizesOperations>`
            * 2017-03-30: :class:`VirtualMachineSizesOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineSizesOperations>`
            * 2017-12-01: :class:`VirtualMachineSizesOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineSizesOperations>`
+           * 2018-04-01: :class:`VirtualMachineSizesOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineSizesOperations>`
         """
         api_version = self._get_api_version('virtual_machine_sizes')
         if api_version == '2015-06-15':
@@ -531,6 +571,8 @@ def virtual_machine_sizes(self):
             from .v2017_03_30.operations import VirtualMachineSizesOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachineSizesOperations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import VirtualMachineSizesOperations 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)))
@@ -544,6 +586,7 @@ def virtual_machines(self):
            * 2016-04-30-preview: :class:`VirtualMachinesOperations<azure.mgmt.compute.v2016_04_30_preview.operations.VirtualMachinesOperations>`
            * 2017-03-30: :class:`VirtualMachinesOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachinesOperations>`
            * 2017-12-01: :class:`VirtualMachinesOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachinesOperations>`
+           * 2018-04-01: :class:`VirtualMachinesOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachinesOperations>`
         """
         api_version = self._get_api_version('virtual_machines')
         if api_version == '2015-06-15':
@@ -556,6 +599,8 @@ def virtual_machines(self):
             from .v2017_03_30.operations import VirtualMachinesOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachinesOperations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import VirtualMachinesOperations 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/v2018_04_01/compute_management_client.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/compute_management_client.py
index d815c08ac257..d56329fa3201 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/compute_management_client.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/compute_management_client.py
@@ -13,6 +13,21 @@
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
+from .operations.operations import Operations
+from .operations.availability_sets_operations import AvailabilitySetsOperations
+from .operations.virtual_machine_extension_images_operations import VirtualMachineExtensionImagesOperations
+from .operations.virtual_machine_extensions_operations import VirtualMachineExtensionsOperations
+from .operations.virtual_machines_operations import VirtualMachinesOperations
+from .operations.virtual_machine_images_operations import VirtualMachineImagesOperations
+from .operations.usage_operations import UsageOperations
+from .operations.virtual_machine_sizes_operations import VirtualMachineSizesOperations
+from .operations.images_operations import ImagesOperations
+from .operations.virtual_machine_scale_sets_operations import VirtualMachineScaleSetsOperations
+from .operations.virtual_machine_scale_set_extensions_operations import VirtualMachineScaleSetExtensionsOperations
+from .operations.virtual_machine_scale_set_rolling_upgrades_operations import VirtualMachineScaleSetRollingUpgradesOperations
+from .operations.virtual_machine_scale_set_vms_operations import VirtualMachineScaleSetVMsOperations
+from .operations.log_analytics_operations import LogAnalyticsOperations
+from .operations.virtual_machine_run_commands_operations import VirtualMachineRunCommandsOperations
 from .operations.disks_operations import DisksOperations
 from .operations.snapshots_operations import SnapshotsOperations
 from . import models
@@ -58,6 +73,36 @@ class ComputeManagementClient(SDKClient):
     :ivar config: Configuration for client.
     :vartype config: ComputeManagementClientConfiguration
 
+    :ivar operations: Operations operations
+    :vartype operations: azure.mgmt.compute.v2018_04_01.operations.Operations
+    :ivar availability_sets: AvailabilitySets operations
+    :vartype availability_sets: azure.mgmt.compute.v2018_04_01.operations.AvailabilitySetsOperations
+    :ivar virtual_machine_extension_images: VirtualMachineExtensionImages operations
+    :vartype virtual_machine_extension_images: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineExtensionImagesOperations
+    :ivar virtual_machine_extensions: VirtualMachineExtensions operations
+    :vartype virtual_machine_extensions: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineExtensionsOperations
+    :ivar virtual_machines: VirtualMachines operations
+    :vartype virtual_machines: azure.mgmt.compute.v2018_04_01.operations.VirtualMachinesOperations
+    :ivar virtual_machine_images: VirtualMachineImages operations
+    :vartype virtual_machine_images: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineImagesOperations
+    :ivar usage: Usage operations
+    :vartype usage: azure.mgmt.compute.v2018_04_01.operations.UsageOperations
+    :ivar virtual_machine_sizes: VirtualMachineSizes operations
+    :vartype virtual_machine_sizes: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineSizesOperations
+    :ivar images: Images operations
+    :vartype images: azure.mgmt.compute.v2018_04_01.operations.ImagesOperations
+    :ivar virtual_machine_scale_sets: VirtualMachineScaleSets operations
+    :vartype virtual_machine_scale_sets: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineScaleSetsOperations
+    :ivar virtual_machine_scale_set_extensions: VirtualMachineScaleSetExtensions operations
+    :vartype virtual_machine_scale_set_extensions: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineScaleSetExtensionsOperations
+    :ivar virtual_machine_scale_set_rolling_upgrades: VirtualMachineScaleSetRollingUpgrades operations
+    :vartype virtual_machine_scale_set_rolling_upgrades: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineScaleSetRollingUpgradesOperations
+    :ivar virtual_machine_scale_set_vms: VirtualMachineScaleSetVMs operations
+    :vartype virtual_machine_scale_set_vms: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineScaleSetVMsOperations
+    :ivar log_analytics: LogAnalytics operations
+    :vartype log_analytics: azure.mgmt.compute.v2018_04_01.operations.LogAnalyticsOperations
+    :ivar virtual_machine_run_commands: VirtualMachineRunCommands operations
+    :vartype virtual_machine_run_commands: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineRunCommandsOperations
     :ivar disks: Disks operations
     :vartype disks: azure.mgmt.compute.v2018_04_01.operations.DisksOperations
     :ivar snapshots: Snapshots operations
@@ -84,6 +129,36 @@ def __init__(
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
+        self.operations = Operations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.availability_sets = AvailabilitySetsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machine_extension_images = VirtualMachineExtensionImagesOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machine_extensions = VirtualMachineExtensionsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machines = VirtualMachinesOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machine_images = VirtualMachineImagesOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.usage = UsageOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machine_sizes = VirtualMachineSizesOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.images = ImagesOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machine_scale_sets = VirtualMachineScaleSetsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machine_scale_set_extensions = VirtualMachineScaleSetExtensionsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machine_scale_set_rolling_upgrades = VirtualMachineScaleSetRollingUpgradesOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machine_scale_set_vms = VirtualMachineScaleSetVMsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.log_analytics = LogAnalyticsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machine_run_commands = VirtualMachineRunCommandsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
         self.disks = DisksOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.snapshots = SnapshotsOperations(
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/__init__.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/__init__.py
index e215874b54d3..c186e402a241 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/__init__.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/__init__.py
@@ -10,7 +10,131 @@
 # --------------------------------------------------------------------------
 
 try:
+    from .compute_operation_value_py3 import ComputeOperationValue
+    from .instance_view_status_py3 import InstanceViewStatus
+    from .sub_resource_py3 import SubResource
+    from .sku_py3 import Sku
+    from .availability_set_py3 import AvailabilitySet
+    from .availability_set_update_py3 import AvailabilitySetUpdate
+    from .virtual_machine_size_py3 import VirtualMachineSize
+    from .virtual_machine_extension_image_py3 import VirtualMachineExtensionImage
+    from .virtual_machine_image_resource_py3 import VirtualMachineImageResource
+    from .virtual_machine_extension_instance_view_py3 import VirtualMachineExtensionInstanceView
+    from .virtual_machine_extension_py3 import VirtualMachineExtension
+    from .virtual_machine_extension_update_py3 import VirtualMachineExtensionUpdate
+    from .virtual_machine_extensions_list_result_py3 import VirtualMachineExtensionsListResult
+    from .purchase_plan_py3 import PurchasePlan
+    from .os_disk_image_py3 import OSDiskImage
+    from .data_disk_image_py3 import DataDiskImage
+    from .virtual_machine_image_py3 import VirtualMachineImage
+    from .usage_name_py3 import UsageName
+    from .usage_py3 import Usage
+    from .virtual_machine_capture_parameters_py3 import VirtualMachineCaptureParameters
+    from .virtual_machine_capture_result_py3 import VirtualMachineCaptureResult
+    from .plan_py3 import Plan
+    from .hardware_profile_py3 import HardwareProfile
+    from .image_reference_py3 import ImageReference
+    from .key_vault_secret_reference_py3 import KeyVaultSecretReference
+    from .key_vault_key_reference_py3 import KeyVaultKeyReference
+    from .disk_encryption_settings_py3 import DiskEncryptionSettings
+    from .virtual_hard_disk_py3 import VirtualHardDisk
+    from .managed_disk_parameters_py3 import ManagedDiskParameters
+    from .os_disk_py3 import OSDisk
+    from .data_disk_py3 import DataDisk
+    from .storage_profile_py3 import StorageProfile
+    from .additional_unattend_content_py3 import AdditionalUnattendContent
+    from .win_rm_listener_py3 import WinRMListener
+    from .win_rm_configuration_py3 import WinRMConfiguration
+    from .windows_configuration_py3 import WindowsConfiguration
+    from .ssh_public_key_py3 import SshPublicKey
+    from .ssh_configuration_py3 import SshConfiguration
+    from .linux_configuration_py3 import LinuxConfiguration
+    from .vault_certificate_py3 import VaultCertificate
+    from .vault_secret_group_py3 import VaultSecretGroup
+    from .os_profile_py3 import OSProfile
+    from .network_interface_reference_py3 import NetworkInterfaceReference
+    from .network_profile_py3 import NetworkProfile
+    from .boot_diagnostics_py3 import BootDiagnostics
+    from .diagnostics_profile_py3 import DiagnosticsProfile
+    from .virtual_machine_extension_handler_instance_view_py3 import VirtualMachineExtensionHandlerInstanceView
+    from .virtual_machine_agent_instance_view_py3 import VirtualMachineAgentInstanceView
+    from .disk_instance_view_py3 import DiskInstanceView
+    from .boot_diagnostics_instance_view_py3 import BootDiagnosticsInstanceView
+    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_py3 import VirtualMachine
+    from .virtual_machine_update_py3 import VirtualMachineUpdate
+    from .auto_os_upgrade_policy_py3 import AutoOSUpgradePolicy
+    from .rolling_upgrade_policy_py3 import RollingUpgradePolicy
+    from .upgrade_policy_py3 import UpgradePolicy
+    from .image_os_disk_py3 import ImageOSDisk
+    from .image_data_disk_py3 import ImageDataDisk
+    from .image_storage_profile_py3 import ImageStorageProfile
+    from .image_py3 import Image
+    from .image_update_py3 import ImageUpdate
+    from .virtual_machine_scale_set_identity_py3 import VirtualMachineScaleSetIdentity
+    from .virtual_machine_scale_set_os_profile_py3 import VirtualMachineScaleSetOSProfile
+    from .virtual_machine_scale_set_update_os_profile_py3 import VirtualMachineScaleSetUpdateOSProfile
+    from .virtual_machine_scale_set_managed_disk_parameters_py3 import VirtualMachineScaleSetManagedDiskParameters
+    from .virtual_machine_scale_set_os_disk_py3 import VirtualMachineScaleSetOSDisk
+    from .virtual_machine_scale_set_update_os_disk_py3 import VirtualMachineScaleSetUpdateOSDisk
+    from .virtual_machine_scale_set_data_disk_py3 import VirtualMachineScaleSetDataDisk
+    from .virtual_machine_scale_set_storage_profile_py3 import VirtualMachineScaleSetStorageProfile
+    from .virtual_machine_scale_set_update_storage_profile_py3 import VirtualMachineScaleSetUpdateStorageProfile
+    from .api_entity_reference_py3 import ApiEntityReference
+    from .virtual_machine_scale_set_public_ip_address_configuration_dns_settings_py3 import VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings
+    from .virtual_machine_scale_set_public_ip_address_configuration_py3 import VirtualMachineScaleSetPublicIPAddressConfiguration
+    from .virtual_machine_scale_set_update_public_ip_address_configuration_py3 import VirtualMachineScaleSetUpdatePublicIPAddressConfiguration
+    from .virtual_machine_scale_set_ip_configuration_py3 import VirtualMachineScaleSetIPConfiguration
+    from .virtual_machine_scale_set_update_ip_configuration_py3 import VirtualMachineScaleSetUpdateIPConfiguration
+    from .virtual_machine_scale_set_network_configuration_dns_settings_py3 import VirtualMachineScaleSetNetworkConfigurationDnsSettings
+    from .virtual_machine_scale_set_network_configuration_py3 import VirtualMachineScaleSetNetworkConfiguration
+    from .virtual_machine_scale_set_update_network_configuration_py3 import VirtualMachineScaleSetUpdateNetworkConfiguration
+    from .virtual_machine_scale_set_network_profile_py3 import VirtualMachineScaleSetNetworkProfile
+    from .virtual_machine_scale_set_update_network_profile_py3 import VirtualMachineScaleSetUpdateNetworkProfile
+    from .virtual_machine_scale_set_extension_py3 import VirtualMachineScaleSetExtension
+    from .virtual_machine_scale_set_extension_profile_py3 import VirtualMachineScaleSetExtensionProfile
+    from .virtual_machine_scale_set_vm_profile_py3 import VirtualMachineScaleSetVMProfile
+    from .virtual_machine_scale_set_update_vm_profile_py3 import VirtualMachineScaleSetUpdateVMProfile
+    from .virtual_machine_scale_set_py3 import VirtualMachineScaleSet
+    from .virtual_machine_scale_set_update_py3 import VirtualMachineScaleSetUpdate
+    from .virtual_machine_scale_set_vm_instance_ids_py3 import VirtualMachineScaleSetVMInstanceIDs
+    from .virtual_machine_scale_set_vm_instance_required_ids_py3 import VirtualMachineScaleSetVMInstanceRequiredIDs
+    from .virtual_machine_status_code_count_py3 import VirtualMachineStatusCodeCount
+    from .virtual_machine_scale_set_instance_view_statuses_summary_py3 import VirtualMachineScaleSetInstanceViewStatusesSummary
+    from .virtual_machine_scale_set_vm_extensions_summary_py3 import VirtualMachineScaleSetVMExtensionsSummary
+    from .virtual_machine_scale_set_instance_view_py3 import VirtualMachineScaleSetInstanceView
+    from .virtual_machine_scale_set_sku_capacity_py3 import VirtualMachineScaleSetSkuCapacity
+    from .virtual_machine_scale_set_sku_py3 import VirtualMachineScaleSetSku
+    from .api_error_base_py3 import ApiErrorBase
+    from .inner_error_py3 import InnerError
+    from .api_error_py3 import ApiError
+    from .rollback_status_info_py3 import RollbackStatusInfo
+    from .upgrade_operation_history_status_py3 import UpgradeOperationHistoryStatus
+    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_scale_set_vm_py3 import VirtualMachineScaleSetVM
+    from .virtual_machine_health_status_py3 import VirtualMachineHealthStatus
+    from .virtual_machine_scale_set_vm_instance_view_py3 import VirtualMachineScaleSetVMInstanceView
+    from .rolling_upgrade_running_status_py3 import RollingUpgradeRunningStatus
+    from .rolling_upgrade_status_info_py3 import RollingUpgradeStatusInfo
     from .resource_py3 import Resource
+    from .update_resource_py3 import UpdateResource
+    from .sub_resource_read_only_py3 import SubResourceReadOnly
+    from .recovery_walk_response_py3 import RecoveryWalkResponse
+    from .request_rate_by_interval_input_py3 import RequestRateByIntervalInput
+    from .throttled_requests_input_py3 import ThrottledRequestsInput
+    from .log_analytics_input_base_py3 import LogAnalyticsInputBase
+    from .log_analytics_output_py3 import LogAnalyticsOutput
+    from .log_analytics_operation_result_py3 import LogAnalyticsOperationResult
+    from .run_command_input_parameter_py3 import RunCommandInputParameter
+    from .run_command_input_py3 import RunCommandInput
+    from .run_command_parameter_definition_py3 import RunCommandParameterDefinition
+    from .run_command_document_base_py3 import RunCommandDocumentBase
+    from .run_command_document_py3 import RunCommandDocument
+    from .run_command_result_py3 import RunCommandResult
     from .disk_sku_py3 import DiskSku
     from .image_disk_reference_py3 import ImageDiskReference
     from .creation_data_py3 import CreationData
@@ -26,7 +150,131 @@
     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
+    from .sub_resource import SubResource
+    from .sku import Sku
+    from .availability_set import AvailabilitySet
+    from .availability_set_update import AvailabilitySetUpdate
+    from .virtual_machine_size import VirtualMachineSize
+    from .virtual_machine_extension_image import VirtualMachineExtensionImage
+    from .virtual_machine_image_resource import VirtualMachineImageResource
+    from .virtual_machine_extension_instance_view import VirtualMachineExtensionInstanceView
+    from .virtual_machine_extension import VirtualMachineExtension
+    from .virtual_machine_extension_update import VirtualMachineExtensionUpdate
+    from .virtual_machine_extensions_list_result import VirtualMachineExtensionsListResult
+    from .purchase_plan import PurchasePlan
+    from .os_disk_image import OSDiskImage
+    from .data_disk_image import DataDiskImage
+    from .virtual_machine_image import VirtualMachineImage
+    from .usage_name import UsageName
+    from .usage import Usage
+    from .virtual_machine_capture_parameters import VirtualMachineCaptureParameters
+    from .virtual_machine_capture_result import VirtualMachineCaptureResult
+    from .plan import Plan
+    from .hardware_profile import HardwareProfile
+    from .image_reference import ImageReference
+    from .key_vault_secret_reference import KeyVaultSecretReference
+    from .key_vault_key_reference import KeyVaultKeyReference
+    from .disk_encryption_settings import DiskEncryptionSettings
+    from .virtual_hard_disk import VirtualHardDisk
+    from .managed_disk_parameters import ManagedDiskParameters
+    from .os_disk import OSDisk
+    from .data_disk import DataDisk
+    from .storage_profile import StorageProfile
+    from .additional_unattend_content import AdditionalUnattendContent
+    from .win_rm_listener import WinRMListener
+    from .win_rm_configuration import WinRMConfiguration
+    from .windows_configuration import WindowsConfiguration
+    from .ssh_public_key import SshPublicKey
+    from .ssh_configuration import SshConfiguration
+    from .linux_configuration import LinuxConfiguration
+    from .vault_certificate import VaultCertificate
+    from .vault_secret_group import VaultSecretGroup
+    from .os_profile import OSProfile
+    from .network_interface_reference import NetworkInterfaceReference
+    from .network_profile import NetworkProfile
+    from .boot_diagnostics import BootDiagnostics
+    from .diagnostics_profile import DiagnosticsProfile
+    from .virtual_machine_extension_handler_instance_view import VirtualMachineExtensionHandlerInstanceView
+    from .virtual_machine_agent_instance_view import VirtualMachineAgentInstanceView
+    from .disk_instance_view import DiskInstanceView
+    from .boot_diagnostics_instance_view import BootDiagnosticsInstanceView
+    from .virtual_machine_identity import VirtualMachineIdentity
+    from .maintenance_redeploy_status import MaintenanceRedeployStatus
+    from .virtual_machine_instance_view import VirtualMachineInstanceView
+    from .virtual_machine import VirtualMachine
+    from .virtual_machine_update import VirtualMachineUpdate
+    from .auto_os_upgrade_policy import AutoOSUpgradePolicy
+    from .rolling_upgrade_policy import RollingUpgradePolicy
+    from .upgrade_policy import UpgradePolicy
+    from .image_os_disk import ImageOSDisk
+    from .image_data_disk import ImageDataDisk
+    from .image_storage_profile import ImageStorageProfile
+    from .image import Image
+    from .image_update import ImageUpdate
+    from .virtual_machine_scale_set_identity import VirtualMachineScaleSetIdentity
+    from .virtual_machine_scale_set_os_profile import VirtualMachineScaleSetOSProfile
+    from .virtual_machine_scale_set_update_os_profile import VirtualMachineScaleSetUpdateOSProfile
+    from .virtual_machine_scale_set_managed_disk_parameters import VirtualMachineScaleSetManagedDiskParameters
+    from .virtual_machine_scale_set_os_disk import VirtualMachineScaleSetOSDisk
+    from .virtual_machine_scale_set_update_os_disk import VirtualMachineScaleSetUpdateOSDisk
+    from .virtual_machine_scale_set_data_disk import VirtualMachineScaleSetDataDisk
+    from .virtual_machine_scale_set_storage_profile import VirtualMachineScaleSetStorageProfile
+    from .virtual_machine_scale_set_update_storage_profile import VirtualMachineScaleSetUpdateStorageProfile
+    from .api_entity_reference import ApiEntityReference
+    from .virtual_machine_scale_set_public_ip_address_configuration_dns_settings import VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings
+    from .virtual_machine_scale_set_public_ip_address_configuration import VirtualMachineScaleSetPublicIPAddressConfiguration
+    from .virtual_machine_scale_set_update_public_ip_address_configuration import VirtualMachineScaleSetUpdatePublicIPAddressConfiguration
+    from .virtual_machine_scale_set_ip_configuration import VirtualMachineScaleSetIPConfiguration
+    from .virtual_machine_scale_set_update_ip_configuration import VirtualMachineScaleSetUpdateIPConfiguration
+    from .virtual_machine_scale_set_network_configuration_dns_settings import VirtualMachineScaleSetNetworkConfigurationDnsSettings
+    from .virtual_machine_scale_set_network_configuration import VirtualMachineScaleSetNetworkConfiguration
+    from .virtual_machine_scale_set_update_network_configuration import VirtualMachineScaleSetUpdateNetworkConfiguration
+    from .virtual_machine_scale_set_network_profile import VirtualMachineScaleSetNetworkProfile
+    from .virtual_machine_scale_set_update_network_profile import VirtualMachineScaleSetUpdateNetworkProfile
+    from .virtual_machine_scale_set_extension import VirtualMachineScaleSetExtension
+    from .virtual_machine_scale_set_extension_profile import VirtualMachineScaleSetExtensionProfile
+    from .virtual_machine_scale_set_vm_profile import VirtualMachineScaleSetVMProfile
+    from .virtual_machine_scale_set_update_vm_profile import VirtualMachineScaleSetUpdateVMProfile
+    from .virtual_machine_scale_set import VirtualMachineScaleSet
+    from .virtual_machine_scale_set_update import VirtualMachineScaleSetUpdate
+    from .virtual_machine_scale_set_vm_instance_ids import VirtualMachineScaleSetVMInstanceIDs
+    from .virtual_machine_scale_set_vm_instance_required_ids import VirtualMachineScaleSetVMInstanceRequiredIDs
+    from .virtual_machine_status_code_count import VirtualMachineStatusCodeCount
+    from .virtual_machine_scale_set_instance_view_statuses_summary import VirtualMachineScaleSetInstanceViewStatusesSummary
+    from .virtual_machine_scale_set_vm_extensions_summary import VirtualMachineScaleSetVMExtensionsSummary
+    from .virtual_machine_scale_set_instance_view import VirtualMachineScaleSetInstanceView
+    from .virtual_machine_scale_set_sku_capacity import VirtualMachineScaleSetSkuCapacity
+    from .virtual_machine_scale_set_sku import VirtualMachineScaleSetSku
+    from .api_error_base import ApiErrorBase
+    from .inner_error import InnerError
+    from .api_error import ApiError
+    from .rollback_status_info import RollbackStatusInfo
+    from .upgrade_operation_history_status import UpgradeOperationHistoryStatus
+    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_scale_set_vm import VirtualMachineScaleSetVM
+    from .virtual_machine_health_status import VirtualMachineHealthStatus
+    from .virtual_machine_scale_set_vm_instance_view import VirtualMachineScaleSetVMInstanceView
+    from .rolling_upgrade_running_status import RollingUpgradeRunningStatus
+    from .rolling_upgrade_status_info import RollingUpgradeStatusInfo
     from .resource import Resource
+    from .update_resource import UpdateResource
+    from .sub_resource_read_only import SubResourceReadOnly
+    from .recovery_walk_response import RecoveryWalkResponse
+    from .request_rate_by_interval_input import RequestRateByIntervalInput
+    from .throttled_requests_input import ThrottledRequestsInput
+    from .log_analytics_input_base import LogAnalyticsInputBase
+    from .log_analytics_output import LogAnalyticsOutput
+    from .log_analytics_operation_result import LogAnalyticsOperationResult
+    from .run_command_input_parameter import RunCommandInputParameter
+    from .run_command_input import RunCommandInput
+    from .run_command_parameter_definition import RunCommandParameterDefinition
+    from .run_command_document_base import RunCommandDocumentBase
+    from .run_command_document import RunCommandDocument
+    from .run_command_result import RunCommandResult
     from .disk_sku import DiskSku
     from .image_disk_reference import ImageDiskReference
     from .creation_data import CreationData
@@ -41,18 +289,176 @@
     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
+from .virtual_machine_paged import VirtualMachinePaged
+from .usage_paged import UsagePaged
+from .image_paged import ImagePaged
+from .virtual_machine_scale_set_paged import VirtualMachineScaleSetPaged
+from .virtual_machine_scale_set_sku_paged import VirtualMachineScaleSetSkuPaged
+from .upgrade_operation_historical_status_info_paged import UpgradeOperationHistoricalStatusInfoPaged
+from .virtual_machine_scale_set_extension_paged import VirtualMachineScaleSetExtensionPaged
+from .virtual_machine_scale_set_vm_paged import VirtualMachineScaleSetVMPaged
+from .run_command_document_base_paged import RunCommandDocumentBasePaged
 from .disk_paged import DiskPaged
 from .snapshot_paged import SnapshotPaged
 from .compute_management_client_enums import (
-    StorageAccountTypes,
+    StatusLevelTypes,
     OperatingSystemTypes,
+    VirtualMachineSizeTypes,
+    CachingTypes,
+    DiskCreateOptionTypes,
+    StorageAccountTypes,
+    PassNames,
+    ComponentNames,
+    SettingNames,
+    ProtocolTypes,
+    ResourceIdentityType,
+    MaintenanceOperationResultCodeTypes,
+    UpgradeMode,
+    OperatingSystemStateTypes,
+    IPVersion,
+    VirtualMachinePriorityTypes,
+    VirtualMachineEvictionPolicyTypes,
+    VirtualMachineScaleSetSkuScaleType,
+    UpgradeState,
+    UpgradeOperationInvoker,
+    RollingUpgradeStatusCode,
+    RollingUpgradeActionType,
+    IntervalInMins,
     DiskCreateOption,
     SnapshotStorageAccountTypes,
     AccessLevel,
+    InstanceViewTypes,
 )
 
 __all__ = [
+    'ComputeOperationValue',
+    'InstanceViewStatus',
+    'SubResource',
+    'Sku',
+    'AvailabilitySet',
+    'AvailabilitySetUpdate',
+    'VirtualMachineSize',
+    'VirtualMachineExtensionImage',
+    'VirtualMachineImageResource',
+    'VirtualMachineExtensionInstanceView',
+    'VirtualMachineExtension',
+    'VirtualMachineExtensionUpdate',
+    'VirtualMachineExtensionsListResult',
+    'PurchasePlan',
+    'OSDiskImage',
+    'DataDiskImage',
+    'VirtualMachineImage',
+    'UsageName',
+    'Usage',
+    'VirtualMachineCaptureParameters',
+    'VirtualMachineCaptureResult',
+    'Plan',
+    'HardwareProfile',
+    'ImageReference',
+    'KeyVaultSecretReference',
+    'KeyVaultKeyReference',
+    'DiskEncryptionSettings',
+    'VirtualHardDisk',
+    'ManagedDiskParameters',
+    'OSDisk',
+    'DataDisk',
+    'StorageProfile',
+    'AdditionalUnattendContent',
+    'WinRMListener',
+    'WinRMConfiguration',
+    'WindowsConfiguration',
+    'SshPublicKey',
+    'SshConfiguration',
+    'LinuxConfiguration',
+    'VaultCertificate',
+    'VaultSecretGroup',
+    'OSProfile',
+    'NetworkInterfaceReference',
+    'NetworkProfile',
+    'BootDiagnostics',
+    'DiagnosticsProfile',
+    'VirtualMachineExtensionHandlerInstanceView',
+    'VirtualMachineAgentInstanceView',
+    'DiskInstanceView',
+    'BootDiagnosticsInstanceView',
+    'VirtualMachineIdentity',
+    'MaintenanceRedeployStatus',
+    'VirtualMachineInstanceView',
+    'VirtualMachine',
+    'VirtualMachineUpdate',
+    'AutoOSUpgradePolicy',
+    'RollingUpgradePolicy',
+    'UpgradePolicy',
+    'ImageOSDisk',
+    'ImageDataDisk',
+    'ImageStorageProfile',
+    'Image',
+    'ImageUpdate',
+    'VirtualMachineScaleSetIdentity',
+    'VirtualMachineScaleSetOSProfile',
+    'VirtualMachineScaleSetUpdateOSProfile',
+    'VirtualMachineScaleSetManagedDiskParameters',
+    'VirtualMachineScaleSetOSDisk',
+    'VirtualMachineScaleSetUpdateOSDisk',
+    'VirtualMachineScaleSetDataDisk',
+    'VirtualMachineScaleSetStorageProfile',
+    'VirtualMachineScaleSetUpdateStorageProfile',
+    'ApiEntityReference',
+    'VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings',
+    'VirtualMachineScaleSetPublicIPAddressConfiguration',
+    'VirtualMachineScaleSetUpdatePublicIPAddressConfiguration',
+    'VirtualMachineScaleSetIPConfiguration',
+    'VirtualMachineScaleSetUpdateIPConfiguration',
+    'VirtualMachineScaleSetNetworkConfigurationDnsSettings',
+    'VirtualMachineScaleSetNetworkConfiguration',
+    'VirtualMachineScaleSetUpdateNetworkConfiguration',
+    'VirtualMachineScaleSetNetworkProfile',
+    'VirtualMachineScaleSetUpdateNetworkProfile',
+    'VirtualMachineScaleSetExtension',
+    'VirtualMachineScaleSetExtensionProfile',
+    'VirtualMachineScaleSetVMProfile',
+    'VirtualMachineScaleSetUpdateVMProfile',
+    'VirtualMachineScaleSet',
+    'VirtualMachineScaleSetUpdate',
+    'VirtualMachineScaleSetVMInstanceIDs',
+    'VirtualMachineScaleSetVMInstanceRequiredIDs',
+    'VirtualMachineStatusCodeCount',
+    'VirtualMachineScaleSetInstanceViewStatusesSummary',
+    'VirtualMachineScaleSetVMExtensionsSummary',
+    'VirtualMachineScaleSetInstanceView',
+    'VirtualMachineScaleSetSkuCapacity',
+    'VirtualMachineScaleSetSku',
+    'ApiErrorBase',
+    'InnerError',
+    'ApiError',
+    'RollbackStatusInfo',
+    'UpgradeOperationHistoryStatus',
+    'RollingUpgradeProgressInfo',
+    'UpgradeOperationHistoricalStatusInfoProperties',
+    'UpgradeOperationHistoricalStatusInfo',
+    'VirtualMachineScaleSetVM',
+    'VirtualMachineHealthStatus',
+    'VirtualMachineScaleSetVMInstanceView',
+    'RollingUpgradeRunningStatus',
+    'RollingUpgradeStatusInfo',
     'Resource',
+    'UpdateResource',
+    'SubResourceReadOnly',
+    'RecoveryWalkResponse',
+    'RequestRateByIntervalInput',
+    'ThrottledRequestsInput',
+    'LogAnalyticsInputBase',
+    'LogAnalyticsOutput',
+    'LogAnalyticsOperationResult',
+    'RunCommandInputParameter',
+    'RunCommandInput',
+    'RunCommandParameterDefinition',
+    'RunCommandDocumentBase',
+    'RunCommandDocument',
+    'RunCommandResult',
     'DiskSku',
     'ImageDiskReference',
     'CreationData',
@@ -67,11 +473,45 @@
     'AccessUri',
     'Snapshot',
     'SnapshotUpdate',
+    'ComputeOperationValuePaged',
+    'AvailabilitySetPaged',
+    'VirtualMachineSizePaged',
+    'VirtualMachinePaged',
+    'UsagePaged',
+    'ImagePaged',
+    'VirtualMachineScaleSetPaged',
+    'VirtualMachineScaleSetSkuPaged',
+    'UpgradeOperationHistoricalStatusInfoPaged',
+    'VirtualMachineScaleSetExtensionPaged',
+    'VirtualMachineScaleSetVMPaged',
+    'RunCommandDocumentBasePaged',
     'DiskPaged',
     'SnapshotPaged',
-    'StorageAccountTypes',
+    'StatusLevelTypes',
     'OperatingSystemTypes',
+    'VirtualMachineSizeTypes',
+    'CachingTypes',
+    'DiskCreateOptionTypes',
+    'StorageAccountTypes',
+    'PassNames',
+    'ComponentNames',
+    'SettingNames',
+    'ProtocolTypes',
+    'ResourceIdentityType',
+    'MaintenanceOperationResultCodeTypes',
+    'UpgradeMode',
+    'OperatingSystemStateTypes',
+    'IPVersion',
+    'VirtualMachinePriorityTypes',
+    'VirtualMachineEvictionPolicyTypes',
+    'VirtualMachineScaleSetSkuScaleType',
+    'UpgradeState',
+    'UpgradeOperationInvoker',
+    'RollingUpgradeStatusCode',
+    'RollingUpgradeActionType',
+    'IntervalInMins',
     'DiskCreateOption',
     'SnapshotStorageAccountTypes',
     'AccessLevel',
+    'InstanceViewTypes',
 ]
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/additional_unattend_content.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/additional_unattend_content.py
new file mode 100644
index 000000000000..c8262b8dc95f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/additional_unattend_content.py
@@ -0,0 +1,52 @@
+# 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 AdditionalUnattendContent(Model):
+    """Specifies additional XML formatted information that can be included in the
+    Unattend.xml file, which is used by Windows Setup. Contents are defined by
+    setting name, component name, and the pass in which the content is applied.
+
+    :param pass_name: The pass name. Currently, the only allowable value is
+     OobeSystem. Possible values include: 'OobeSystem'
+    :type pass_name: str or ~azure.mgmt.compute.v2018_04_01.models.PassNames
+    :param component_name: The component name. Currently, the only allowable
+     value is Microsoft-Windows-Shell-Setup. Possible values include:
+     'Microsoft-Windows-Shell-Setup'
+    :type component_name: str or
+     ~azure.mgmt.compute.v2018_04_01.models.ComponentNames
+    :param setting_name: Specifies the name of the setting to which the
+     content applies. Possible values are: FirstLogonCommands and AutoLogon.
+     Possible values include: 'AutoLogon', 'FirstLogonCommands'
+    :type setting_name: str or
+     ~azure.mgmt.compute.v2018_04_01.models.SettingNames
+    :param content: Specifies the XML formatted content that is added to the
+     unattend.xml file for the specified path and component. The XML must be
+     less than 4KB and must include the root element for the setting or feature
+     that is being inserted.
+    :type content: str
+    """
+
+    _attribute_map = {
+        'pass_name': {'key': 'passName', 'type': 'PassNames'},
+        'component_name': {'key': 'componentName', 'type': 'ComponentNames'},
+        'setting_name': {'key': 'settingName', 'type': 'SettingNames'},
+        'content': {'key': 'content', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(AdditionalUnattendContent, self).__init__(**kwargs)
+        self.pass_name = kwargs.get('pass_name', None)
+        self.component_name = kwargs.get('component_name', None)
+        self.setting_name = kwargs.get('setting_name', None)
+        self.content = kwargs.get('content', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/additional_unattend_content_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/additional_unattend_content_py3.py
new file mode 100644
index 000000000000..17c0266fe4b0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/additional_unattend_content_py3.py
@@ -0,0 +1,52 @@
+# 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 AdditionalUnattendContent(Model):
+    """Specifies additional XML formatted information that can be included in the
+    Unattend.xml file, which is used by Windows Setup. Contents are defined by
+    setting name, component name, and the pass in which the content is applied.
+
+    :param pass_name: The pass name. Currently, the only allowable value is
+     OobeSystem. Possible values include: 'OobeSystem'
+    :type pass_name: str or ~azure.mgmt.compute.v2018_04_01.models.PassNames
+    :param component_name: The component name. Currently, the only allowable
+     value is Microsoft-Windows-Shell-Setup. Possible values include:
+     'Microsoft-Windows-Shell-Setup'
+    :type component_name: str or
+     ~azure.mgmt.compute.v2018_04_01.models.ComponentNames
+    :param setting_name: Specifies the name of the setting to which the
+     content applies. Possible values are: FirstLogonCommands and AutoLogon.
+     Possible values include: 'AutoLogon', 'FirstLogonCommands'
+    :type setting_name: str or
+     ~azure.mgmt.compute.v2018_04_01.models.SettingNames
+    :param content: Specifies the XML formatted content that is added to the
+     unattend.xml file for the specified path and component. The XML must be
+     less than 4KB and must include the root element for the setting or feature
+     that is being inserted.
+    :type content: str
+    """
+
+    _attribute_map = {
+        'pass_name': {'key': 'passName', 'type': 'PassNames'},
+        'component_name': {'key': 'componentName', 'type': 'ComponentNames'},
+        'setting_name': {'key': 'settingName', 'type': 'SettingNames'},
+        'content': {'key': 'content', 'type': 'str'},
+    }
+
+    def __init__(self, *, pass_name=None, component_name=None, setting_name=None, content: str=None, **kwargs) -> None:
+        super(AdditionalUnattendContent, self).__init__(**kwargs)
+        self.pass_name = pass_name
+        self.component_name = component_name
+        self.setting_name = setting_name
+        self.content = content
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_entity_reference.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_entity_reference.py
new file mode 100644
index 000000000000..d1bf572e916d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_entity_reference.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 ApiEntityReference(Model):
+    """The API entity reference.
+
+    :param id: The ARM resource id in the form of
+     /subscriptions/{SubcriptionId}/resourceGroups/{ResourceGroupName}/...
+    :type id: str
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ApiEntityReference, self).__init__(**kwargs)
+        self.id = kwargs.get('id', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_entity_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_entity_reference_py3.py
new file mode 100644
index 000000000000..da3e07082381
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_entity_reference_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 ApiEntityReference(Model):
+    """The API entity reference.
+
+    :param id: The ARM resource id in the form of
+     /subscriptions/{SubcriptionId}/resourceGroups/{ResourceGroupName}/...
+    :type id: str
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+    }
+
+    def __init__(self, *, id: str=None, **kwargs) -> None:
+        super(ApiEntityReference, self).__init__(**kwargs)
+        self.id = id
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error.py
new file mode 100644
index 000000000000..6c3ce23571f7
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error.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 ApiError(Model):
+    """Api error.
+
+    :param details: The Api error details
+    :type details: list[~azure.mgmt.compute.v2018_04_01.models.ApiErrorBase]
+    :param innererror: The Api inner error
+    :type innererror: ~azure.mgmt.compute.v2018_04_01.models.InnerError
+    :param code: The error code.
+    :type code: str
+    :param target: The target of the particular error.
+    :type target: str
+    :param message: The error message.
+    :type message: str
+    """
+
+    _attribute_map = {
+        'details': {'key': 'details', 'type': '[ApiErrorBase]'},
+        'innererror': {'key': 'innererror', 'type': 'InnerError'},
+        'code': {'key': 'code', 'type': 'str'},
+        'target': {'key': 'target', 'type': 'str'},
+        'message': {'key': 'message', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ApiError, self).__init__(**kwargs)
+        self.details = kwargs.get('details', None)
+        self.innererror = kwargs.get('innererror', None)
+        self.code = kwargs.get('code', None)
+        self.target = kwargs.get('target', None)
+        self.message = kwargs.get('message', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base.py
new file mode 100644
index 000000000000..655c08638905
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base.py
@@ -0,0 +1,36 @@
+# 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 ApiErrorBase(Model):
+    """Api error base.
+
+    :param code: The error code.
+    :type code: str
+    :param target: The target of the particular error.
+    :type target: str
+    :param message: The error message.
+    :type message: str
+    """
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'str'},
+        'target': {'key': 'target', 'type': 'str'},
+        'message': {'key': 'message', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ApiErrorBase, self).__init__(**kwargs)
+        self.code = kwargs.get('code', None)
+        self.target = kwargs.get('target', None)
+        self.message = kwargs.get('message', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base_py3.py
new file mode 100644
index 000000000000..5ba95aa0283e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base_py3.py
@@ -0,0 +1,36 @@
+# 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 ApiErrorBase(Model):
+    """Api error base.
+
+    :param code: The error code.
+    :type code: str
+    :param target: The target of the particular error.
+    :type target: str
+    :param message: The error message.
+    :type message: str
+    """
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'str'},
+        'target': {'key': 'target', 'type': 'str'},
+        'message': {'key': 'message', 'type': 'str'},
+    }
+
+    def __init__(self, *, code: str=None, target: str=None, message: str=None, **kwargs) -> None:
+        super(ApiErrorBase, self).__init__(**kwargs)
+        self.code = code
+        self.target = target
+        self.message = message
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_py3.py
new file mode 100644
index 000000000000..ad665ba38599
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_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 ApiError(Model):
+    """Api error.
+
+    :param details: The Api error details
+    :type details: list[~azure.mgmt.compute.v2018_04_01.models.ApiErrorBase]
+    :param innererror: The Api inner error
+    :type innererror: ~azure.mgmt.compute.v2018_04_01.models.InnerError
+    :param code: The error code.
+    :type code: str
+    :param target: The target of the particular error.
+    :type target: str
+    :param message: The error message.
+    :type message: str
+    """
+
+    _attribute_map = {
+        'details': {'key': 'details', 'type': '[ApiErrorBase]'},
+        'innererror': {'key': 'innererror', 'type': 'InnerError'},
+        'code': {'key': 'code', 'type': 'str'},
+        'target': {'key': 'target', 'type': 'str'},
+        'message': {'key': 'message', 'type': 'str'},
+    }
+
+    def __init__(self, *, details=None, innererror=None, code: str=None, target: str=None, message: str=None, **kwargs) -> None:
+        super(ApiError, self).__init__(**kwargs)
+        self.details = details
+        self.innererror = innererror
+        self.code = code
+        self.target = target
+        self.message = message
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/auto_os_upgrade_policy.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/auto_os_upgrade_policy.py
new file mode 100644
index 000000000000..2c74af408892
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/auto_os_upgrade_policy.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 AutoOSUpgradePolicy(Model):
+    """The configuration parameters used for performing automatic OS upgrade.
+
+    :param disable_auto_rollback: Whether OS image rollback feature should be
+     disabled. Default value is false.
+    :type disable_auto_rollback: bool
+    """
+
+    _attribute_map = {
+        'disable_auto_rollback': {'key': 'disableAutoRollback', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(AutoOSUpgradePolicy, self).__init__(**kwargs)
+        self.disable_auto_rollback = kwargs.get('disable_auto_rollback', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/auto_os_upgrade_policy_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/auto_os_upgrade_policy_py3.py
new file mode 100644
index 000000000000..3e3e751838a8
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/auto_os_upgrade_policy_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 AutoOSUpgradePolicy(Model):
+    """The configuration parameters used for performing automatic OS upgrade.
+
+    :param disable_auto_rollback: Whether OS image rollback feature should be
+     disabled. Default value is false.
+    :type disable_auto_rollback: bool
+    """
+
+    _attribute_map = {
+        'disable_auto_rollback': {'key': 'disableAutoRollback', 'type': 'bool'},
+    }
+
+    def __init__(self, *, disable_auto_rollback: bool=None, **kwargs) -> None:
+        super(AutoOSUpgradePolicy, self).__init__(**kwargs)
+        self.disable_auto_rollback = disable_auto_rollback
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set.py
new file mode 100644
index 000000000000..9221a6ce1278
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set.py
@@ -0,0 +1,85 @@
+# 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 AvailabilitySet(Resource):
+    """Specifies information about the availability set that the virtual machine
+    should be assigned to. Virtual machines specified in the same availability
+    set are allocated to different nodes to maximize availability. For more
+    information about availability sets, see [Manage the availability of
+    virtual
+    machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    <br><br> For more information on Azure planned maintainance, see [Planned
+    maintenance for virtual machines in
+    Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+    <br><br> Currently, a VM can only be added to availability set at creation
+    time. An existing VM cannot be added to an availability set.
+
+    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]
+    :param platform_update_domain_count: Update Domain count.
+    :type platform_update_domain_count: int
+    :param platform_fault_domain_count: Fault Domain count.
+    :type platform_fault_domain_count: int
+    :param virtual_machines: A list of references to all virtual machines in
+     the availability set.
+    :type virtual_machines:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    :ivar statuses: The resource status information.
+    :vartype statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    :param sku: Sku of the availability set
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'statuses': {'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}'},
+        'platform_update_domain_count': {'key': 'properties.platformUpdateDomainCount', 'type': 'int'},
+        'platform_fault_domain_count': {'key': 'properties.platformFaultDomainCount', 'type': 'int'},
+        'virtual_machines': {'key': 'properties.virtualMachines', 'type': '[SubResource]'},
+        'statuses': {'key': 'properties.statuses', 'type': '[InstanceViewStatus]'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+    }
+
+    def __init__(self, **kwargs):
+        super(AvailabilitySet, self).__init__(**kwargs)
+        self.platform_update_domain_count = kwargs.get('platform_update_domain_count', None)
+        self.platform_fault_domain_count = kwargs.get('platform_fault_domain_count', None)
+        self.virtual_machines = kwargs.get('virtual_machines', None)
+        self.statuses = None
+        self.sku = kwargs.get('sku', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_paged.py
new file mode 100644
index 000000000000..d3f242bb4d7d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_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 AvailabilitySetPaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`AvailabilitySet <azure.mgmt.compute.v2018_04_01.models.AvailabilitySet>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[AvailabilitySet]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(AvailabilitySetPaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_py3.py
new file mode 100644
index 000000000000..65c743257697
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_py3.py
@@ -0,0 +1,85 @@
+# 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 AvailabilitySet(Resource):
+    """Specifies information about the availability set that the virtual machine
+    should be assigned to. Virtual machines specified in the same availability
+    set are allocated to different nodes to maximize availability. For more
+    information about availability sets, see [Manage the availability of
+    virtual
+    machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    <br><br> For more information on Azure planned maintainance, see [Planned
+    maintenance for virtual machines in
+    Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+    <br><br> Currently, a VM can only be added to availability set at creation
+    time. An existing VM cannot be added to an availability set.
+
+    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]
+    :param platform_update_domain_count: Update Domain count.
+    :type platform_update_domain_count: int
+    :param platform_fault_domain_count: Fault Domain count.
+    :type platform_fault_domain_count: int
+    :param virtual_machines: A list of references to all virtual machines in
+     the availability set.
+    :type virtual_machines:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    :ivar statuses: The resource status information.
+    :vartype statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    :param sku: Sku of the availability set
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'statuses': {'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}'},
+        'platform_update_domain_count': {'key': 'properties.platformUpdateDomainCount', 'type': 'int'},
+        'platform_fault_domain_count': {'key': 'properties.platformFaultDomainCount', 'type': 'int'},
+        'virtual_machines': {'key': 'properties.virtualMachines', 'type': '[SubResource]'},
+        'statuses': {'key': 'properties.statuses', 'type': '[InstanceViewStatus]'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+    }
+
+    def __init__(self, *, location: str, tags=None, platform_update_domain_count: int=None, platform_fault_domain_count: int=None, virtual_machines=None, sku=None, **kwargs) -> None:
+        super(AvailabilitySet, self).__init__(location=location, tags=tags, **kwargs)
+        self.platform_update_domain_count = platform_update_domain_count
+        self.platform_fault_domain_count = platform_fault_domain_count
+        self.virtual_machines = virtual_machines
+        self.statuses = None
+        self.sku = sku
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_update.py
new file mode 100644
index 000000000000..749c2d03a3e1
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_update.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 .update_resource import UpdateResource
+
+
+class AvailabilitySetUpdate(UpdateResource):
+    """Specifies information about the availability set that the virtual machine
+    should be assigned to. Only tags may be updated.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param platform_update_domain_count: Update Domain count.
+    :type platform_update_domain_count: int
+    :param platform_fault_domain_count: Fault Domain count.
+    :type platform_fault_domain_count: int
+    :param virtual_machines: A list of references to all virtual machines in
+     the availability set.
+    :type virtual_machines:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    :ivar statuses: The resource status information.
+    :vartype statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    :param sku: Sku of the availability set
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
+    """
+
+    _validation = {
+        'statuses': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'platform_update_domain_count': {'key': 'properties.platformUpdateDomainCount', 'type': 'int'},
+        'platform_fault_domain_count': {'key': 'properties.platformFaultDomainCount', 'type': 'int'},
+        'virtual_machines': {'key': 'properties.virtualMachines', 'type': '[SubResource]'},
+        'statuses': {'key': 'properties.statuses', 'type': '[InstanceViewStatus]'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+    }
+
+    def __init__(self, **kwargs):
+        super(AvailabilitySetUpdate, self).__init__(**kwargs)
+        self.platform_update_domain_count = kwargs.get('platform_update_domain_count', None)
+        self.platform_fault_domain_count = kwargs.get('platform_fault_domain_count', None)
+        self.virtual_machines = kwargs.get('virtual_machines', None)
+        self.statuses = None
+        self.sku = kwargs.get('sku', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_update_py3.py
new file mode 100644
index 000000000000..099479e29c04
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_update_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 .update_resource_py3 import UpdateResource
+
+
+class AvailabilitySetUpdate(UpdateResource):
+    """Specifies information about the availability set that the virtual machine
+    should be assigned to. Only tags may be updated.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param platform_update_domain_count: Update Domain count.
+    :type platform_update_domain_count: int
+    :param platform_fault_domain_count: Fault Domain count.
+    :type platform_fault_domain_count: int
+    :param virtual_machines: A list of references to all virtual machines in
+     the availability set.
+    :type virtual_machines:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    :ivar statuses: The resource status information.
+    :vartype statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    :param sku: Sku of the availability set
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
+    """
+
+    _validation = {
+        'statuses': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'platform_update_domain_count': {'key': 'properties.platformUpdateDomainCount', 'type': 'int'},
+        'platform_fault_domain_count': {'key': 'properties.platformFaultDomainCount', 'type': 'int'},
+        'virtual_machines': {'key': 'properties.virtualMachines', 'type': '[SubResource]'},
+        'statuses': {'key': 'properties.statuses', 'type': '[InstanceViewStatus]'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+    }
+
+    def __init__(self, *, tags=None, platform_update_domain_count: int=None, platform_fault_domain_count: int=None, virtual_machines=None, sku=None, **kwargs) -> None:
+        super(AvailabilitySetUpdate, self).__init__(tags=tags, **kwargs)
+        self.platform_update_domain_count = platform_update_domain_count
+        self.platform_fault_domain_count = platform_fault_domain_count
+        self.virtual_machines = virtual_machines
+        self.statuses = None
+        self.sku = sku
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics.py
new file mode 100644
index 000000000000..ca3dbdd4f23c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics.py
@@ -0,0 +1,38 @@
+# 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 BootDiagnostics(Model):
+    """Boot Diagnostics is a debugging feature which allows you to view Console
+    Output and Screenshot to diagnose VM status. <br><br> For Linux Virtual
+    Machines, you can easily view the output of your console log. <br><br> For
+    both Windows and Linux virtual machines, Azure also enables you to see a
+    screenshot of the VM from the hypervisor.
+
+    :param enabled: Whether boot diagnostics should be enabled on the Virtual
+     Machine.
+    :type enabled: bool
+    :param storage_uri: Uri of the storage account to use for placing the
+     console output and screenshot.
+    :type storage_uri: str
+    """
+
+    _attribute_map = {
+        'enabled': {'key': 'enabled', 'type': 'bool'},
+        'storage_uri': {'key': 'storageUri', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(BootDiagnostics, self).__init__(**kwargs)
+        self.enabled = kwargs.get('enabled', None)
+        self.storage_uri = kwargs.get('storage_uri', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_instance_view.py
new file mode 100644
index 000000000000..6fe1f84a3910
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_instance_view.py
@@ -0,0 +1,32 @@
+# 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 BootDiagnosticsInstanceView(Model):
+    """The instance view of a virtual machine boot diagnostics.
+
+    :param console_screenshot_blob_uri: The console screenshot blob URI.
+    :type console_screenshot_blob_uri: str
+    :param serial_console_log_blob_uri: The Linux serial console log blob Uri.
+    :type serial_console_log_blob_uri: str
+    """
+
+    _attribute_map = {
+        'console_screenshot_blob_uri': {'key': 'consoleScreenshotBlobUri', 'type': 'str'},
+        'serial_console_log_blob_uri': {'key': 'serialConsoleLogBlobUri', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(BootDiagnosticsInstanceView, self).__init__(**kwargs)
+        self.console_screenshot_blob_uri = kwargs.get('console_screenshot_blob_uri', None)
+        self.serial_console_log_blob_uri = kwargs.get('serial_console_log_blob_uri', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_instance_view_py3.py
new file mode 100644
index 000000000000..d85b51981ab9
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_instance_view_py3.py
@@ -0,0 +1,32 @@
+# 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 BootDiagnosticsInstanceView(Model):
+    """The instance view of a virtual machine boot diagnostics.
+
+    :param console_screenshot_blob_uri: The console screenshot blob URI.
+    :type console_screenshot_blob_uri: str
+    :param serial_console_log_blob_uri: The Linux serial console log blob Uri.
+    :type serial_console_log_blob_uri: str
+    """
+
+    _attribute_map = {
+        'console_screenshot_blob_uri': {'key': 'consoleScreenshotBlobUri', 'type': 'str'},
+        'serial_console_log_blob_uri': {'key': 'serialConsoleLogBlobUri', 'type': 'str'},
+    }
+
+    def __init__(self, *, console_screenshot_blob_uri: str=None, serial_console_log_blob_uri: str=None, **kwargs) -> None:
+        super(BootDiagnosticsInstanceView, self).__init__(**kwargs)
+        self.console_screenshot_blob_uri = console_screenshot_blob_uri
+        self.serial_console_log_blob_uri = serial_console_log_blob_uri
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_py3.py
new file mode 100644
index 000000000000..b0a756ea4fa0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_py3.py
@@ -0,0 +1,38 @@
+# 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 BootDiagnostics(Model):
+    """Boot Diagnostics is a debugging feature which allows you to view Console
+    Output and Screenshot to diagnose VM status. <br><br> For Linux Virtual
+    Machines, you can easily view the output of your console log. <br><br> For
+    both Windows and Linux virtual machines, Azure also enables you to see a
+    screenshot of the VM from the hypervisor.
+
+    :param enabled: Whether boot diagnostics should be enabled on the Virtual
+     Machine.
+    :type enabled: bool
+    :param storage_uri: Uri of the storage account to use for placing the
+     console output and screenshot.
+    :type storage_uri: str
+    """
+
+    _attribute_map = {
+        'enabled': {'key': 'enabled', 'type': 'bool'},
+        'storage_uri': {'key': 'storageUri', 'type': 'str'},
+    }
+
+    def __init__(self, *, enabled: bool=None, storage_uri: str=None, **kwargs) -> None:
+        super(BootDiagnostics, self).__init__(**kwargs)
+        self.enabled = enabled
+        self.storage_uri = storage_uri
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py
index 94796a92c793..b66be29c4cf4 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py
@@ -12,10 +12,11 @@
 from enum import Enum
 
 
-class StorageAccountTypes(str, Enum):
+class StatusLevelTypes(str, Enum):
 
-    standard_lrs = "Standard_LRS"
-    premium_lrs = "Premium_LRS"
+    info = "Info"
+    warning = "Warning"
+    error = "Error"
 
 
 class OperatingSystemTypes(str, Enum):
@@ -24,6 +25,308 @@ class OperatingSystemTypes(str, Enum):
     linux = "Linux"
 
 
+class VirtualMachineSizeTypes(str, Enum):
+
+    basic_a0 = "Basic_A0"
+    basic_a1 = "Basic_A1"
+    basic_a2 = "Basic_A2"
+    basic_a3 = "Basic_A3"
+    basic_a4 = "Basic_A4"
+    standard_a0 = "Standard_A0"
+    standard_a1 = "Standard_A1"
+    standard_a2 = "Standard_A2"
+    standard_a3 = "Standard_A3"
+    standard_a4 = "Standard_A4"
+    standard_a5 = "Standard_A5"
+    standard_a6 = "Standard_A6"
+    standard_a7 = "Standard_A7"
+    standard_a8 = "Standard_A8"
+    standard_a9 = "Standard_A9"
+    standard_a10 = "Standard_A10"
+    standard_a11 = "Standard_A11"
+    standard_a1_v2 = "Standard_A1_v2"
+    standard_a2_v2 = "Standard_A2_v2"
+    standard_a4_v2 = "Standard_A4_v2"
+    standard_a8_v2 = "Standard_A8_v2"
+    standard_a2m_v2 = "Standard_A2m_v2"
+    standard_a4m_v2 = "Standard_A4m_v2"
+    standard_a8m_v2 = "Standard_A8m_v2"
+    standard_b1s = "Standard_B1s"
+    standard_b1ms = "Standard_B1ms"
+    standard_b2s = "Standard_B2s"
+    standard_b2ms = "Standard_B2ms"
+    standard_b4ms = "Standard_B4ms"
+    standard_b8ms = "Standard_B8ms"
+    standard_d1 = "Standard_D1"
+    standard_d2 = "Standard_D2"
+    standard_d3 = "Standard_D3"
+    standard_d4 = "Standard_D4"
+    standard_d11 = "Standard_D11"
+    standard_d12 = "Standard_D12"
+    standard_d13 = "Standard_D13"
+    standard_d14 = "Standard_D14"
+    standard_d1_v2 = "Standard_D1_v2"
+    standard_d2_v2 = "Standard_D2_v2"
+    standard_d3_v2 = "Standard_D3_v2"
+    standard_d4_v2 = "Standard_D4_v2"
+    standard_d5_v2 = "Standard_D5_v2"
+    standard_d2_v3 = "Standard_D2_v3"
+    standard_d4_v3 = "Standard_D4_v3"
+    standard_d8_v3 = "Standard_D8_v3"
+    standard_d16_v3 = "Standard_D16_v3"
+    standard_d32_v3 = "Standard_D32_v3"
+    standard_d64_v3 = "Standard_D64_v3"
+    standard_d2s_v3 = "Standard_D2s_v3"
+    standard_d4s_v3 = "Standard_D4s_v3"
+    standard_d8s_v3 = "Standard_D8s_v3"
+    standard_d16s_v3 = "Standard_D16s_v3"
+    standard_d32s_v3 = "Standard_D32s_v3"
+    standard_d64s_v3 = "Standard_D64s_v3"
+    standard_d11_v2 = "Standard_D11_v2"
+    standard_d12_v2 = "Standard_D12_v2"
+    standard_d13_v2 = "Standard_D13_v2"
+    standard_d14_v2 = "Standard_D14_v2"
+    standard_d15_v2 = "Standard_D15_v2"
+    standard_ds1 = "Standard_DS1"
+    standard_ds2 = "Standard_DS2"
+    standard_ds3 = "Standard_DS3"
+    standard_ds4 = "Standard_DS4"
+    standard_ds11 = "Standard_DS11"
+    standard_ds12 = "Standard_DS12"
+    standard_ds13 = "Standard_DS13"
+    standard_ds14 = "Standard_DS14"
+    standard_ds1_v2 = "Standard_DS1_v2"
+    standard_ds2_v2 = "Standard_DS2_v2"
+    standard_ds3_v2 = "Standard_DS3_v2"
+    standard_ds4_v2 = "Standard_DS4_v2"
+    standard_ds5_v2 = "Standard_DS5_v2"
+    standard_ds11_v2 = "Standard_DS11_v2"
+    standard_ds12_v2 = "Standard_DS12_v2"
+    standard_ds13_v2 = "Standard_DS13_v2"
+    standard_ds14_v2 = "Standard_DS14_v2"
+    standard_ds15_v2 = "Standard_DS15_v2"
+    standard_ds13_4_v2 = "Standard_DS13-4_v2"
+    standard_ds13_2_v2 = "Standard_DS13-2_v2"
+    standard_ds14_8_v2 = "Standard_DS14-8_v2"
+    standard_ds14_4_v2 = "Standard_DS14-4_v2"
+    standard_e2_v3 = "Standard_E2_v3"
+    standard_e4_v3 = "Standard_E4_v3"
+    standard_e8_v3 = "Standard_E8_v3"
+    standard_e16_v3 = "Standard_E16_v3"
+    standard_e32_v3 = "Standard_E32_v3"
+    standard_e64_v3 = "Standard_E64_v3"
+    standard_e2s_v3 = "Standard_E2s_v3"
+    standard_e4s_v3 = "Standard_E4s_v3"
+    standard_e8s_v3 = "Standard_E8s_v3"
+    standard_e16s_v3 = "Standard_E16s_v3"
+    standard_e32s_v3 = "Standard_E32s_v3"
+    standard_e64s_v3 = "Standard_E64s_v3"
+    standard_e32_16_v3 = "Standard_E32-16_v3"
+    standard_e32_8s_v3 = "Standard_E32-8s_v3"
+    standard_e64_32s_v3 = "Standard_E64-32s_v3"
+    standard_e64_16s_v3 = "Standard_E64-16s_v3"
+    standard_f1 = "Standard_F1"
+    standard_f2 = "Standard_F2"
+    standard_f4 = "Standard_F4"
+    standard_f8 = "Standard_F8"
+    standard_f16 = "Standard_F16"
+    standard_f1s = "Standard_F1s"
+    standard_f2s = "Standard_F2s"
+    standard_f4s = "Standard_F4s"
+    standard_f8s = "Standard_F8s"
+    standard_f16s = "Standard_F16s"
+    standard_f2s_v2 = "Standard_F2s_v2"
+    standard_f4s_v2 = "Standard_F4s_v2"
+    standard_f8s_v2 = "Standard_F8s_v2"
+    standard_f16s_v2 = "Standard_F16s_v2"
+    standard_f32s_v2 = "Standard_F32s_v2"
+    standard_f64s_v2 = "Standard_F64s_v2"
+    standard_f72s_v2 = "Standard_F72s_v2"
+    standard_g1 = "Standard_G1"
+    standard_g2 = "Standard_G2"
+    standard_g3 = "Standard_G3"
+    standard_g4 = "Standard_G4"
+    standard_g5 = "Standard_G5"
+    standard_gs1 = "Standard_GS1"
+    standard_gs2 = "Standard_GS2"
+    standard_gs3 = "Standard_GS3"
+    standard_gs4 = "Standard_GS4"
+    standard_gs5 = "Standard_GS5"
+    standard_gs4_8 = "Standard_GS4-8"
+    standard_gs4_4 = "Standard_GS4-4"
+    standard_gs5_16 = "Standard_GS5-16"
+    standard_gs5_8 = "Standard_GS5-8"
+    standard_h8 = "Standard_H8"
+    standard_h16 = "Standard_H16"
+    standard_h8m = "Standard_H8m"
+    standard_h16m = "Standard_H16m"
+    standard_h16r = "Standard_H16r"
+    standard_h16mr = "Standard_H16mr"
+    standard_l4s = "Standard_L4s"
+    standard_l8s = "Standard_L8s"
+    standard_l16s = "Standard_L16s"
+    standard_l32s = "Standard_L32s"
+    standard_m64s = "Standard_M64s"
+    standard_m64ms = "Standard_M64ms"
+    standard_m128s = "Standard_M128s"
+    standard_m128ms = "Standard_M128ms"
+    standard_m64_32ms = "Standard_M64-32ms"
+    standard_m64_16ms = "Standard_M64-16ms"
+    standard_m128_64ms = "Standard_M128-64ms"
+    standard_m128_32ms = "Standard_M128-32ms"
+    standard_nc6 = "Standard_NC6"
+    standard_nc12 = "Standard_NC12"
+    standard_nc24 = "Standard_NC24"
+    standard_nc24r = "Standard_NC24r"
+    standard_nc6s_v2 = "Standard_NC6s_v2"
+    standard_nc12s_v2 = "Standard_NC12s_v2"
+    standard_nc24s_v2 = "Standard_NC24s_v2"
+    standard_nc24rs_v2 = "Standard_NC24rs_v2"
+    standard_nc6s_v3 = "Standard_NC6s_v3"
+    standard_nc12s_v3 = "Standard_NC12s_v3"
+    standard_nc24s_v3 = "Standard_NC24s_v3"
+    standard_nc24rs_v3 = "Standard_NC24rs_v3"
+    standard_nd6s = "Standard_ND6s"
+    standard_nd12s = "Standard_ND12s"
+    standard_nd24s = "Standard_ND24s"
+    standard_nd24rs = "Standard_ND24rs"
+    standard_nv6 = "Standard_NV6"
+    standard_nv12 = "Standard_NV12"
+    standard_nv24 = "Standard_NV24"
+
+
+class CachingTypes(str, Enum):
+
+    none = "None"
+    read_only = "ReadOnly"
+    read_write = "ReadWrite"
+
+
+class DiskCreateOptionTypes(str, Enum):
+
+    from_image = "FromImage"
+    empty = "Empty"
+    attach = "Attach"
+
+
+class StorageAccountTypes(str, Enum):
+
+    standard_lrs = "Standard_LRS"
+    premium_lrs = "Premium_LRS"
+
+
+class PassNames(str, Enum):
+
+    oobe_system = "OobeSystem"
+
+
+class ComponentNames(str, Enum):
+
+    microsoft_windows_shell_setup = "Microsoft-Windows-Shell-Setup"
+
+
+class SettingNames(str, Enum):
+
+    auto_logon = "AutoLogon"
+    first_logon_commands = "FirstLogonCommands"
+
+
+class ProtocolTypes(str, Enum):
+
+    http = "Http"
+    https = "Https"
+
+
+class ResourceIdentityType(str, Enum):
+
+    system_assigned = "SystemAssigned"
+    user_assigned = "UserAssigned"
+    system_assigned_user_assigned = "SystemAssigned, UserAssigned"
+    none = "None"
+
+
+class MaintenanceOperationResultCodeTypes(str, Enum):
+
+    none = "None"
+    retry_later = "RetryLater"
+    maintenance_aborted = "MaintenanceAborted"
+    maintenance_completed = "MaintenanceCompleted"
+
+
+class UpgradeMode(str, Enum):
+
+    automatic = "Automatic"
+    manual = "Manual"
+    rolling = "Rolling"
+
+
+class OperatingSystemStateTypes(str, Enum):
+
+    generalized = "Generalized"
+    specialized = "Specialized"
+
+
+class IPVersion(str, Enum):
+
+    ipv4 = "IPv4"
+    ipv6 = "IPv6"
+
+
+class VirtualMachinePriorityTypes(str, Enum):
+
+    regular = "Regular"
+    low = "Low"
+
+
+class VirtualMachineEvictionPolicyTypes(str, Enum):
+
+    deallocate = "Deallocate"
+    delete = "Delete"
+
+
+class VirtualMachineScaleSetSkuScaleType(str, Enum):
+
+    automatic = "Automatic"
+    none = "None"
+
+
+class UpgradeState(str, Enum):
+
+    rolling_forward = "RollingForward"
+    cancelled = "Cancelled"
+    completed = "Completed"
+    faulted = "Faulted"
+
+
+class UpgradeOperationInvoker(str, Enum):
+
+    unknown = "Unknown"
+    user = "User"
+    platform = "Platform"
+
+
+class RollingUpgradeStatusCode(str, Enum):
+
+    rolling_forward = "RollingForward"
+    cancelled = "Cancelled"
+    completed = "Completed"
+    faulted = "Faulted"
+
+
+class RollingUpgradeActionType(str, Enum):
+
+    start = "Start"
+    cancel = "Cancel"
+
+
+class IntervalInMins(str, Enum):
+
+    three_mins = "ThreeMins"
+    five_mins = "FiveMins"
+    thirty_mins = "ThirtyMins"
+    sixty_mins = "SixtyMins"
+
+
 class DiskCreateOption(str, Enum):
 
     empty = "Empty"
@@ -45,3 +348,8 @@ 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_04_01/models/compute_operation_value.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value.py
new file mode 100644
index 000000000000..525ef3bbb69a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value.py
@@ -0,0 +1,60 @@
+# 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 ComputeOperationValue(Model):
+    """Describes the properties of a Compute Operation value.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar origin: The origin of the compute operation.
+    :vartype origin: str
+    :ivar name: The name of the compute operation.
+    :vartype name: str
+    :ivar operation: The display name of the compute operation.
+    :vartype operation: str
+    :ivar resource: The display name of the resource the operation applies to.
+    :vartype resource: str
+    :ivar description: The description of the operation.
+    :vartype description: str
+    :ivar provider: The resource provider for the operation.
+    :vartype provider: str
+    """
+
+    _validation = {
+        'origin': {'readonly': True},
+        'name': {'readonly': True},
+        'operation': {'readonly': True},
+        'resource': {'readonly': True},
+        'description': {'readonly': True},
+        'provider': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'origin': {'key': 'origin', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'operation': {'key': 'display.operation', 'type': 'str'},
+        'resource': {'key': 'display.resource', 'type': 'str'},
+        'description': {'key': 'display.description', 'type': 'str'},
+        'provider': {'key': 'display.provider', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ComputeOperationValue, self).__init__(**kwargs)
+        self.origin = None
+        self.name = None
+        self.operation = None
+        self.resource = None
+        self.description = None
+        self.provider = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value_paged.py
new file mode 100644
index 000000000000..0735c0107487
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value_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 ComputeOperationValuePaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`ComputeOperationValue <azure.mgmt.compute.v2018_04_01.models.ComputeOperationValue>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[ComputeOperationValue]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(ComputeOperationValuePaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value_py3.py
new file mode 100644
index 000000000000..3c4388f312b9
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value_py3.py
@@ -0,0 +1,60 @@
+# 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 ComputeOperationValue(Model):
+    """Describes the properties of a Compute Operation value.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar origin: The origin of the compute operation.
+    :vartype origin: str
+    :ivar name: The name of the compute operation.
+    :vartype name: str
+    :ivar operation: The display name of the compute operation.
+    :vartype operation: str
+    :ivar resource: The display name of the resource the operation applies to.
+    :vartype resource: str
+    :ivar description: The description of the operation.
+    :vartype description: str
+    :ivar provider: The resource provider for the operation.
+    :vartype provider: str
+    """
+
+    _validation = {
+        'origin': {'readonly': True},
+        'name': {'readonly': True},
+        'operation': {'readonly': True},
+        'resource': {'readonly': True},
+        'description': {'readonly': True},
+        'provider': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'origin': {'key': 'origin', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'operation': {'key': 'display.operation', 'type': 'str'},
+        'resource': {'key': 'display.resource', 'type': 'str'},
+        'description': {'key': 'display.description', 'type': 'str'},
+        'provider': {'key': 'display.provider', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(ComputeOperationValue, self).__init__(**kwargs)
+        self.origin = None
+        self.name = None
+        self.operation = None
+        self.resource = None
+        self.description = None
+        self.provider = 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
new file mode 100644
index 000000000000..b72af03bf155
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk.py
@@ -0,0 +1,87 @@
+# 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 DataDisk(Model):
+    """Describes a data disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param lun: Required. Specifies the logical unit number of the data disk.
+     This value is used to identify data disks within the VM and therefore must
+     be unique for each data disk attached to a VM.
+    :type lun: int
+    :param name: The disk name.
+    :type name: str
+    :param vhd: The virtual hard disk.
+    :type vhd: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
+    :param image: The source user image virtual hard disk. The virtual hard
+     disk will be copied before being attached to the virtual machine. If
+     SourceImage is provided, the destination virtual hard drive must not
+     exist.
+    :type image: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :param create_option: Required. Specifies how the virtual machine should
+     be created.<br><br> Possible values are:<br><br> **Attach** \\u2013 This
+     value is used when you are using a specialized disk to create the virtual
+     machine.<br><br> **FromImage** \\u2013 This value is used when you are
+     using an image to create the virtual machine. If you are using a platform
+     image, you also use the imageReference element described above. If you are
+     using a marketplace image, you  also use the plan element previously
+     described. Possible values include: 'FromImage', 'Empty', 'Attach'
+    :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
+     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.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_04_01.models.ManagedDiskParameters
+    """
+
+    _validation = {
+        'lun': {'required': True},
+        'create_option': {'required': True},
+    }
+
+    _attribute_map = {
+        'lun': {'key': 'lun', 'type': 'int'},
+        'name': {'key': 'name', 'type': 'str'},
+        'vhd': {'key': 'vhd', 'type': 'VirtualHardDisk'},
+        'image': {'key': 'image', 'type': 'VirtualHardDisk'},
+        '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'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'ManagedDiskParameters'},
+    }
+
+    def __init__(self, **kwargs):
+        super(DataDisk, self).__init__(**kwargs)
+        self.lun = kwargs.get('lun', None)
+        self.name = kwargs.get('name', None)
+        self.vhd = kwargs.get('vhd', None)
+        self.image = kwargs.get('image', None)
+        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.managed_disk = kwargs.get('managed_disk', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_image.py
new file mode 100644
index 000000000000..b5dbfcefb472
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_image.py
@@ -0,0 +1,37 @@
+# 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 DataDiskImage(Model):
+    """Contains the data disk images information.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar lun: Specifies the logical unit number of the data disk. This value
+     is used to identify data disks within the VM and therefore must be unique
+     for each data disk attached to a VM.
+    :vartype lun: int
+    """
+
+    _validation = {
+        'lun': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'lun': {'key': 'lun', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs):
+        super(DataDiskImage, self).__init__(**kwargs)
+        self.lun = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_image_py3.py
new file mode 100644
index 000000000000..8431a3988502
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_image_py3.py
@@ -0,0 +1,37 @@
+# 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 DataDiskImage(Model):
+    """Contains the data disk images information.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar lun: Specifies the logical unit number of the data disk. This value
+     is used to identify data disks within the VM and therefore must be unique
+     for each data disk attached to a VM.
+    :vartype lun: int
+    """
+
+    _validation = {
+        'lun': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'lun': {'key': 'lun', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(DataDiskImage, self).__init__(**kwargs)
+        self.lun = None
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
new file mode 100644
index 000000000000..9a75b455ed11
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_py3.py
@@ -0,0 +1,87 @@
+# 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 DataDisk(Model):
+    """Describes a data disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param lun: Required. Specifies the logical unit number of the data disk.
+     This value is used to identify data disks within the VM and therefore must
+     be unique for each data disk attached to a VM.
+    :type lun: int
+    :param name: The disk name.
+    :type name: str
+    :param vhd: The virtual hard disk.
+    :type vhd: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
+    :param image: The source user image virtual hard disk. The virtual hard
+     disk will be copied before being attached to the virtual machine. If
+     SourceImage is provided, the destination virtual hard drive must not
+     exist.
+    :type image: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :param create_option: Required. Specifies how the virtual machine should
+     be created.<br><br> Possible values are:<br><br> **Attach** \\u2013 This
+     value is used when you are using a specialized disk to create the virtual
+     machine.<br><br> **FromImage** \\u2013 This value is used when you are
+     using an image to create the virtual machine. If you are using a platform
+     image, you also use the imageReference element described above. If you are
+     using a marketplace image, you  also use the plan element previously
+     described. Possible values include: 'FromImage', 'Empty', 'Attach'
+    :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
+     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.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_04_01.models.ManagedDiskParameters
+    """
+
+    _validation = {
+        'lun': {'required': True},
+        'create_option': {'required': True},
+    }
+
+    _attribute_map = {
+        'lun': {'key': 'lun', 'type': 'int'},
+        'name': {'key': 'name', 'type': 'str'},
+        'vhd': {'key': 'vhd', 'type': 'VirtualHardDisk'},
+        'image': {'key': 'image', 'type': 'VirtualHardDisk'},
+        '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'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'ManagedDiskParameters'},
+    }
+
+    def __init__(self, *, lun: int, create_option, name: str=None, vhd=None, image=None, caching=None, write_accelerator_enabled: bool=None, disk_size_gb: int=None, managed_disk=None, **kwargs) -> None:
+        super(DataDisk, self).__init__(**kwargs)
+        self.lun = lun
+        self.name = name
+        self.vhd = vhd
+        self.image = image
+        self.caching = caching
+        self.write_accelerator_enabled = write_accelerator_enabled
+        self.create_option = create_option
+        self.disk_size_gb = disk_size_gb
+        self.managed_disk = managed_disk
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/diagnostics_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/diagnostics_profile.py
new file mode 100644
index 000000000000..c809544d655e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/diagnostics_profile.py
@@ -0,0 +1,34 @@
+# 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 DiagnosticsProfile(Model):
+    """Specifies the boot diagnostic settings state. <br><br>Minimum api-version:
+    2015-06-15.
+
+    :param boot_diagnostics: Boot Diagnostics is a debugging feature which
+     allows you to view Console Output and Screenshot to diagnose VM status.
+     <br><br> For Linux Virtual Machines, you can easily view the output of
+     your console log. <br><br> For both Windows and Linux virtual machines,
+     Azure also enables you to see a screenshot of the VM from the hypervisor.
+    :type boot_diagnostics:
+     ~azure.mgmt.compute.v2018_04_01.models.BootDiagnostics
+    """
+
+    _attribute_map = {
+        'boot_diagnostics': {'key': 'bootDiagnostics', 'type': 'BootDiagnostics'},
+    }
+
+    def __init__(self, **kwargs):
+        super(DiagnosticsProfile, self).__init__(**kwargs)
+        self.boot_diagnostics = kwargs.get('boot_diagnostics', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/diagnostics_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/diagnostics_profile_py3.py
new file mode 100644
index 000000000000..0193402fe61f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/diagnostics_profile_py3.py
@@ -0,0 +1,34 @@
+# 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 DiagnosticsProfile(Model):
+    """Specifies the boot diagnostic settings state. <br><br>Minimum api-version:
+    2015-06-15.
+
+    :param boot_diagnostics: Boot Diagnostics is a debugging feature which
+     allows you to view Console Output and Screenshot to diagnose VM status.
+     <br><br> For Linux Virtual Machines, you can easily view the output of
+     your console log. <br><br> For both Windows and Linux virtual machines,
+     Azure also enables you to see a screenshot of the VM from the hypervisor.
+    :type boot_diagnostics:
+     ~azure.mgmt.compute.v2018_04_01.models.BootDiagnostics
+    """
+
+    _attribute_map = {
+        'boot_diagnostics': {'key': 'bootDiagnostics', 'type': 'BootDiagnostics'},
+    }
+
+    def __init__(self, *, boot_diagnostics=None, **kwargs) -> None:
+        super(DiagnosticsProfile, self).__init__(**kwargs)
+        self.boot_diagnostics = boot_diagnostics
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_encryption_settings.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_encryption_settings.py
new file mode 100644
index 000000000000..7fd550357d75
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_encryption_settings.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 DiskEncryptionSettings(Model):
+    """Describes a Encryption Settings for a Disk.
+
+    :param disk_encryption_key: Specifies the location of the disk encryption
+     key, which is a Key Vault Secret.
+    :type disk_encryption_key:
+     ~azure.mgmt.compute.v2018_04_01.models.KeyVaultSecretReference
+    :param key_encryption_key: Specifies the location of the key encryption
+     key in Key Vault.
+    :type key_encryption_key:
+     ~azure.mgmt.compute.v2018_04_01.models.KeyVaultKeyReference
+    :param enabled: Specifies whether disk encryption should be enabled on the
+     virtual machine.
+    :type enabled: bool
+    """
+
+    _attribute_map = {
+        'disk_encryption_key': {'key': 'diskEncryptionKey', 'type': 'KeyVaultSecretReference'},
+        'key_encryption_key': {'key': 'keyEncryptionKey', 'type': 'KeyVaultKeyReference'},
+        'enabled': {'key': 'enabled', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(DiskEncryptionSettings, self).__init__(**kwargs)
+        self.disk_encryption_key = kwargs.get('disk_encryption_key', None)
+        self.key_encryption_key = kwargs.get('key_encryption_key', None)
+        self.enabled = kwargs.get('enabled', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_encryption_settings_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_encryption_settings_py3.py
new file mode 100644
index 000000000000..380a0b7f1176
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_encryption_settings_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 DiskEncryptionSettings(Model):
+    """Describes a Encryption Settings for a Disk.
+
+    :param disk_encryption_key: Specifies the location of the disk encryption
+     key, which is a Key Vault Secret.
+    :type disk_encryption_key:
+     ~azure.mgmt.compute.v2018_04_01.models.KeyVaultSecretReference
+    :param key_encryption_key: Specifies the location of the key encryption
+     key in Key Vault.
+    :type key_encryption_key:
+     ~azure.mgmt.compute.v2018_04_01.models.KeyVaultKeyReference
+    :param enabled: Specifies whether disk encryption should be enabled on the
+     virtual machine.
+    :type enabled: bool
+    """
+
+    _attribute_map = {
+        'disk_encryption_key': {'key': 'diskEncryptionKey', 'type': 'KeyVaultSecretReference'},
+        'key_encryption_key': {'key': 'keyEncryptionKey', 'type': 'KeyVaultKeyReference'},
+        'enabled': {'key': 'enabled', 'type': 'bool'},
+    }
+
+    def __init__(self, *, disk_encryption_key=None, key_encryption_key=None, enabled: bool=None, **kwargs) -> None:
+        super(DiskEncryptionSettings, self).__init__(**kwargs)
+        self.disk_encryption_key = disk_encryption_key
+        self.key_encryption_key = key_encryption_key
+        self.enabled = enabled
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_instance_view.py
new file mode 100644
index 000000000000..9a040fd5739b
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_instance_view.py
@@ -0,0 +1,39 @@
+# 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 DiskInstanceView(Model):
+    """The instance view of the disk.
+
+    :param name: The disk name.
+    :type name: str
+    :param encryption_settings: Specifies the encryption settings for the OS
+     Disk. <br><br> Minimum api-version: 2015-06-15
+    :type encryption_settings:
+     list[~azure.mgmt.compute.v2018_04_01.models.DiskEncryptionSettings]
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'encryption_settings': {'key': 'encryptionSettings', 'type': '[DiskEncryptionSettings]'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(DiskInstanceView, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.encryption_settings = kwargs.get('encryption_settings', None)
+        self.statuses = kwargs.get('statuses', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_instance_view_py3.py
new file mode 100644
index 000000000000..b9583371ba8b
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_instance_view_py3.py
@@ -0,0 +1,39 @@
+# 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 DiskInstanceView(Model):
+    """The instance view of the disk.
+
+    :param name: The disk name.
+    :type name: str
+    :param encryption_settings: Specifies the encryption settings for the OS
+     Disk. <br><br> Minimum api-version: 2015-06-15
+    :type encryption_settings:
+     list[~azure.mgmt.compute.v2018_04_01.models.DiskEncryptionSettings]
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'encryption_settings': {'key': 'encryptionSettings', 'type': '[DiskEncryptionSettings]'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, *, name: str=None, encryption_settings=None, statuses=None, **kwargs) -> None:
+        super(DiskInstanceView, self).__init__(**kwargs)
+        self.name = name
+        self.encryption_settings = encryption_settings
+        self.statuses = statuses
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/hardware_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/hardware_profile.py
new file mode 100644
index 000000000000..c9f1db70f257
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/hardware_profile.py
@@ -0,0 +1,85 @@
+# 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 HardwareProfile(Model):
+    """Specifies the hardware settings for the virtual machine.
+
+    :param vm_size: Specifies the size of the virtual machine. For more
+     information about virtual machine sizes, see [Sizes for virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-sizes?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+     <br><br> The available VM sizes depend on region and availability set. For
+     a list of available sizes use these APIs:  <br><br> [List all available
+     virtual machine sizes in an availability
+     set](https://docs.microsoft.com/rest/api/compute/availabilitysets/listavailablesizes)
+     <br><br> [List all available virtual machine sizes in a
+     region](https://docs.microsoft.com/rest/api/compute/virtualmachinesizes/list)
+     <br><br> [List all available virtual machine sizes for
+     resizing](https://docs.microsoft.com/rest/api/compute/virtualmachines/listavailablesizes).
+     Possible values include: 'Basic_A0', 'Basic_A1', 'Basic_A2', 'Basic_A3',
+     'Basic_A4', 'Standard_A0', 'Standard_A1', 'Standard_A2', 'Standard_A3',
+     'Standard_A4', 'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8',
+     'Standard_A9', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2',
+     'Standard_A2_v2', 'Standard_A4_v2', 'Standard_A8_v2', 'Standard_A2m_v2',
+     'Standard_A4m_v2', 'Standard_A8m_v2', 'Standard_B1s', 'Standard_B1ms',
+     'Standard_B2s', 'Standard_B2ms', 'Standard_B4ms', 'Standard_B8ms',
+     'Standard_D1', 'Standard_D2', 'Standard_D3', 'Standard_D4',
+     'Standard_D11', 'Standard_D12', 'Standard_D13', 'Standard_D14',
+     'Standard_D1_v2', 'Standard_D2_v2', 'Standard_D3_v2', 'Standard_D4_v2',
+     'Standard_D5_v2', 'Standard_D2_v3', 'Standard_D4_v3', 'Standard_D8_v3',
+     'Standard_D16_v3', 'Standard_D32_v3', 'Standard_D64_v3',
+     'Standard_D2s_v3', 'Standard_D4s_v3', 'Standard_D8s_v3',
+     'Standard_D16s_v3', 'Standard_D32s_v3', 'Standard_D64s_v3',
+     'Standard_D11_v2', 'Standard_D12_v2', 'Standard_D13_v2',
+     'Standard_D14_v2', 'Standard_D15_v2', 'Standard_DS1', 'Standard_DS2',
+     'Standard_DS3', 'Standard_DS4', 'Standard_DS11', 'Standard_DS12',
+     'Standard_DS13', 'Standard_DS14', 'Standard_DS1_v2', 'Standard_DS2_v2',
+     'Standard_DS3_v2', 'Standard_DS4_v2', 'Standard_DS5_v2',
+     'Standard_DS11_v2', 'Standard_DS12_v2', 'Standard_DS13_v2',
+     'Standard_DS14_v2', 'Standard_DS15_v2', 'Standard_DS13-4_v2',
+     'Standard_DS13-2_v2', 'Standard_DS14-8_v2', 'Standard_DS14-4_v2',
+     'Standard_E2_v3', 'Standard_E4_v3', 'Standard_E8_v3', 'Standard_E16_v3',
+     'Standard_E32_v3', 'Standard_E64_v3', 'Standard_E2s_v3',
+     'Standard_E4s_v3', 'Standard_E8s_v3', 'Standard_E16s_v3',
+     'Standard_E32s_v3', 'Standard_E64s_v3', 'Standard_E32-16_v3',
+     'Standard_E32-8s_v3', 'Standard_E64-32s_v3', 'Standard_E64-16s_v3',
+     'Standard_F1', 'Standard_F2', 'Standard_F4', 'Standard_F8',
+     'Standard_F16', 'Standard_F1s', 'Standard_F2s', 'Standard_F4s',
+     'Standard_F8s', 'Standard_F16s', 'Standard_F2s_v2', 'Standard_F4s_v2',
+     'Standard_F8s_v2', 'Standard_F16s_v2', 'Standard_F32s_v2',
+     'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_G1', 'Standard_G2',
+     'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1',
+     'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS5',
+     'Standard_GS4-8', 'Standard_GS4-4', 'Standard_GS5-16', 'Standard_GS5-8',
+     'Standard_H8', 'Standard_H16', 'Standard_H8m', 'Standard_H16m',
+     'Standard_H16r', 'Standard_H16mr', 'Standard_L4s', 'Standard_L8s',
+     'Standard_L16s', 'Standard_L32s', 'Standard_M64s', 'Standard_M64ms',
+     'Standard_M128s', 'Standard_M128ms', 'Standard_M64-32ms',
+     'Standard_M64-16ms', 'Standard_M128-64ms', 'Standard_M128-32ms',
+     'Standard_NC6', 'Standard_NC12', 'Standard_NC24', 'Standard_NC24r',
+     'Standard_NC6s_v2', 'Standard_NC12s_v2', 'Standard_NC24s_v2',
+     'Standard_NC24rs_v2', 'Standard_NC6s_v3', 'Standard_NC12s_v3',
+     'Standard_NC24s_v3', 'Standard_NC24rs_v3', 'Standard_ND6s',
+     'Standard_ND12s', 'Standard_ND24s', 'Standard_ND24rs', 'Standard_NV6',
+     'Standard_NV12', 'Standard_NV24'
+    :type vm_size: str or
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineSizeTypes
+    """
+
+    _attribute_map = {
+        'vm_size': {'key': 'vmSize', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(HardwareProfile, self).__init__(**kwargs)
+        self.vm_size = kwargs.get('vm_size', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/hardware_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/hardware_profile_py3.py
new file mode 100644
index 000000000000..a9f8ba14df0e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/hardware_profile_py3.py
@@ -0,0 +1,85 @@
+# 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 HardwareProfile(Model):
+    """Specifies the hardware settings for the virtual machine.
+
+    :param vm_size: Specifies the size of the virtual machine. For more
+     information about virtual machine sizes, see [Sizes for virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-sizes?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+     <br><br> The available VM sizes depend on region and availability set. For
+     a list of available sizes use these APIs:  <br><br> [List all available
+     virtual machine sizes in an availability
+     set](https://docs.microsoft.com/rest/api/compute/availabilitysets/listavailablesizes)
+     <br><br> [List all available virtual machine sizes in a
+     region](https://docs.microsoft.com/rest/api/compute/virtualmachinesizes/list)
+     <br><br> [List all available virtual machine sizes for
+     resizing](https://docs.microsoft.com/rest/api/compute/virtualmachines/listavailablesizes).
+     Possible values include: 'Basic_A0', 'Basic_A1', 'Basic_A2', 'Basic_A3',
+     'Basic_A4', 'Standard_A0', 'Standard_A1', 'Standard_A2', 'Standard_A3',
+     'Standard_A4', 'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8',
+     'Standard_A9', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2',
+     'Standard_A2_v2', 'Standard_A4_v2', 'Standard_A8_v2', 'Standard_A2m_v2',
+     'Standard_A4m_v2', 'Standard_A8m_v2', 'Standard_B1s', 'Standard_B1ms',
+     'Standard_B2s', 'Standard_B2ms', 'Standard_B4ms', 'Standard_B8ms',
+     'Standard_D1', 'Standard_D2', 'Standard_D3', 'Standard_D4',
+     'Standard_D11', 'Standard_D12', 'Standard_D13', 'Standard_D14',
+     'Standard_D1_v2', 'Standard_D2_v2', 'Standard_D3_v2', 'Standard_D4_v2',
+     'Standard_D5_v2', 'Standard_D2_v3', 'Standard_D4_v3', 'Standard_D8_v3',
+     'Standard_D16_v3', 'Standard_D32_v3', 'Standard_D64_v3',
+     'Standard_D2s_v3', 'Standard_D4s_v3', 'Standard_D8s_v3',
+     'Standard_D16s_v3', 'Standard_D32s_v3', 'Standard_D64s_v3',
+     'Standard_D11_v2', 'Standard_D12_v2', 'Standard_D13_v2',
+     'Standard_D14_v2', 'Standard_D15_v2', 'Standard_DS1', 'Standard_DS2',
+     'Standard_DS3', 'Standard_DS4', 'Standard_DS11', 'Standard_DS12',
+     'Standard_DS13', 'Standard_DS14', 'Standard_DS1_v2', 'Standard_DS2_v2',
+     'Standard_DS3_v2', 'Standard_DS4_v2', 'Standard_DS5_v2',
+     'Standard_DS11_v2', 'Standard_DS12_v2', 'Standard_DS13_v2',
+     'Standard_DS14_v2', 'Standard_DS15_v2', 'Standard_DS13-4_v2',
+     'Standard_DS13-2_v2', 'Standard_DS14-8_v2', 'Standard_DS14-4_v2',
+     'Standard_E2_v3', 'Standard_E4_v3', 'Standard_E8_v3', 'Standard_E16_v3',
+     'Standard_E32_v3', 'Standard_E64_v3', 'Standard_E2s_v3',
+     'Standard_E4s_v3', 'Standard_E8s_v3', 'Standard_E16s_v3',
+     'Standard_E32s_v3', 'Standard_E64s_v3', 'Standard_E32-16_v3',
+     'Standard_E32-8s_v3', 'Standard_E64-32s_v3', 'Standard_E64-16s_v3',
+     'Standard_F1', 'Standard_F2', 'Standard_F4', 'Standard_F8',
+     'Standard_F16', 'Standard_F1s', 'Standard_F2s', 'Standard_F4s',
+     'Standard_F8s', 'Standard_F16s', 'Standard_F2s_v2', 'Standard_F4s_v2',
+     'Standard_F8s_v2', 'Standard_F16s_v2', 'Standard_F32s_v2',
+     'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_G1', 'Standard_G2',
+     'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1',
+     'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS5',
+     'Standard_GS4-8', 'Standard_GS4-4', 'Standard_GS5-16', 'Standard_GS5-8',
+     'Standard_H8', 'Standard_H16', 'Standard_H8m', 'Standard_H16m',
+     'Standard_H16r', 'Standard_H16mr', 'Standard_L4s', 'Standard_L8s',
+     'Standard_L16s', 'Standard_L32s', 'Standard_M64s', 'Standard_M64ms',
+     'Standard_M128s', 'Standard_M128ms', 'Standard_M64-32ms',
+     'Standard_M64-16ms', 'Standard_M128-64ms', 'Standard_M128-32ms',
+     'Standard_NC6', 'Standard_NC12', 'Standard_NC24', 'Standard_NC24r',
+     'Standard_NC6s_v2', 'Standard_NC12s_v2', 'Standard_NC24s_v2',
+     'Standard_NC24rs_v2', 'Standard_NC6s_v3', 'Standard_NC12s_v3',
+     'Standard_NC24s_v3', 'Standard_NC24rs_v3', 'Standard_ND6s',
+     'Standard_ND12s', 'Standard_ND24s', 'Standard_ND24rs', 'Standard_NV6',
+     'Standard_NV12', 'Standard_NV24'
+    :type vm_size: str or
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineSizeTypes
+    """
+
+    _attribute_map = {
+        'vm_size': {'key': 'vmSize', 'type': 'str'},
+    }
+
+    def __init__(self, *, vm_size=None, **kwargs) -> None:
+        super(HardwareProfile, self).__init__(**kwargs)
+        self.vm_size = vm_size
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image.py
new file mode 100644
index 000000000000..d3a1f84f255c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image.py
@@ -0,0 +1,70 @@
+# 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 Image(Resource):
+    """The source user image virtual hard disk. The virtual hard disk will be
+    copied before being attached to the virtual machine. If SourceImage is
+    provided, the destination virtual hard drive must not exist.
+
+    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]
+    :param source_virtual_machine: The source virtual machine from which Image
+     is created.
+    :type source_virtual_machine:
+     ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.ImageStorageProfile
+    :ivar provisioning_state: The provisioning state.
+    :vartype provisioning_state: str
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'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}'},
+        'source_virtual_machine': {'key': 'properties.sourceVirtualMachine', 'type': 'SubResource'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'ImageStorageProfile'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(Image, self).__init__(**kwargs)
+        self.source_virtual_machine = kwargs.get('source_virtual_machine', None)
+        self.storage_profile = kwargs.get('storage_profile', None)
+        self.provisioning_state = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py
new file mode 100644
index 000000000000..ae905adba8c4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py
@@ -0,0 +1,68 @@
+# 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 ImageDataDisk(Model):
+    """Describes a data disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param lun: Required. Specifies the logical unit number of the data disk.
+     This value is used to identify data disks within the VM and therefore must
+     be unique for each data disk attached to a VM.
+    :type lun: int
+    :param snapshot: The snapshot.
+    :type snapshot: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param managed_disk: The managedDisk.
+    :type managed_disk: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param blob_uri: The Virtual Hard Disk.
+    :type blob_uri: str
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
+    :param disk_size_gb: Specifies the size of empty data disks in gigabytes.
+     This element can be used to overwrite the name of the disk in a virtual
+     machine image. <br><br> This value cannot be larger than 1023 GB
+    :type disk_size_gb: int
+    :param storage_account_type: Specifies the storage account type for the
+     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
+    :type storage_account_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
+    """
+
+    _validation = {
+        'lun': {'required': True},
+    }
+
+    _attribute_map = {
+        'lun': {'key': 'lun', 'type': 'int'},
+        'snapshot': {'key': 'snapshot', 'type': 'SubResource'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'SubResource'},
+        'blob_uri': {'key': 'blobUri', 'type': 'str'},
+        'caching': {'key': 'caching', 'type': 'CachingTypes'},
+        'disk_size_gb': {'key': 'diskSizeGB', 'type': 'int'},
+        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ImageDataDisk, self).__init__(**kwargs)
+        self.lun = kwargs.get('lun', None)
+        self.snapshot = kwargs.get('snapshot', None)
+        self.managed_disk = kwargs.get('managed_disk', None)
+        self.blob_uri = kwargs.get('blob_uri', None)
+        self.caching = kwargs.get('caching', None)
+        self.disk_size_gb = kwargs.get('disk_size_gb', None)
+        self.storage_account_type = kwargs.get('storage_account_type', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py
new file mode 100644
index 000000000000..7112f92f78c0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py
@@ -0,0 +1,68 @@
+# 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 ImageDataDisk(Model):
+    """Describes a data disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param lun: Required. Specifies the logical unit number of the data disk.
+     This value is used to identify data disks within the VM and therefore must
+     be unique for each data disk attached to a VM.
+    :type lun: int
+    :param snapshot: The snapshot.
+    :type snapshot: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param managed_disk: The managedDisk.
+    :type managed_disk: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param blob_uri: The Virtual Hard Disk.
+    :type blob_uri: str
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
+    :param disk_size_gb: Specifies the size of empty data disks in gigabytes.
+     This element can be used to overwrite the name of the disk in a virtual
+     machine image. <br><br> This value cannot be larger than 1023 GB
+    :type disk_size_gb: int
+    :param storage_account_type: Specifies the storage account type for the
+     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
+    :type storage_account_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
+    """
+
+    _validation = {
+        'lun': {'required': True},
+    }
+
+    _attribute_map = {
+        'lun': {'key': 'lun', 'type': 'int'},
+        'snapshot': {'key': 'snapshot', 'type': 'SubResource'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'SubResource'},
+        'blob_uri': {'key': 'blobUri', 'type': 'str'},
+        'caching': {'key': 'caching', 'type': 'CachingTypes'},
+        'disk_size_gb': {'key': 'diskSizeGB', 'type': 'int'},
+        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
+    }
+
+    def __init__(self, *, lun: int, snapshot=None, managed_disk=None, blob_uri: str=None, caching=None, disk_size_gb: int=None, storage_account_type=None, **kwargs) -> None:
+        super(ImageDataDisk, self).__init__(**kwargs)
+        self.lun = lun
+        self.snapshot = snapshot
+        self.managed_disk = managed_disk
+        self.blob_uri = blob_uri
+        self.caching = caching
+        self.disk_size_gb = disk_size_gb
+        self.storage_account_type = storage_account_type
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py
new file mode 100644
index 000000000000..3ef3a0cd4414
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py
@@ -0,0 +1,77 @@
+# 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 ImageOSDisk(Model):
+    """Describes an Operating System disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :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 a custom image.
+     <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_04_01.models.OperatingSystemTypes
+    :param os_state: Required. The OS State. Possible values include:
+     'Generalized', 'Specialized'
+    :type os_state: str or
+     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemStateTypes
+    :param snapshot: The snapshot.
+    :type snapshot: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param managed_disk: The managedDisk.
+    :type managed_disk: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param blob_uri: The Virtual Hard Disk.
+    :type blob_uri: str
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
+    :param disk_size_gb: Specifies the size of empty data disks in gigabytes.
+     This element can be used to overwrite the name of the disk in a virtual
+     machine image. <br><br> This value cannot be larger than 1023 GB
+    :type disk_size_gb: int
+    :param storage_account_type: Specifies the storage account type for the
+     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
+    :type storage_account_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
+    """
+
+    _validation = {
+        'os_type': {'required': True},
+        'os_state': {'required': True},
+    }
+
+    _attribute_map = {
+        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
+        'os_state': {'key': 'osState', 'type': 'OperatingSystemStateTypes'},
+        'snapshot': {'key': 'snapshot', 'type': 'SubResource'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'SubResource'},
+        'blob_uri': {'key': 'blobUri', 'type': 'str'},
+        'caching': {'key': 'caching', 'type': 'CachingTypes'},
+        'disk_size_gb': {'key': 'diskSizeGB', 'type': 'int'},
+        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ImageOSDisk, self).__init__(**kwargs)
+        self.os_type = kwargs.get('os_type', None)
+        self.os_state = kwargs.get('os_state', None)
+        self.snapshot = kwargs.get('snapshot', None)
+        self.managed_disk = kwargs.get('managed_disk', None)
+        self.blob_uri = kwargs.get('blob_uri', None)
+        self.caching = kwargs.get('caching', None)
+        self.disk_size_gb = kwargs.get('disk_size_gb', None)
+        self.storage_account_type = kwargs.get('storage_account_type', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py
new file mode 100644
index 000000000000..59c61abd3f0f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py
@@ -0,0 +1,77 @@
+# 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 ImageOSDisk(Model):
+    """Describes an Operating System disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :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 a custom image.
+     <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_04_01.models.OperatingSystemTypes
+    :param os_state: Required. The OS State. Possible values include:
+     'Generalized', 'Specialized'
+    :type os_state: str or
+     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemStateTypes
+    :param snapshot: The snapshot.
+    :type snapshot: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param managed_disk: The managedDisk.
+    :type managed_disk: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param blob_uri: The Virtual Hard Disk.
+    :type blob_uri: str
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
+    :param disk_size_gb: Specifies the size of empty data disks in gigabytes.
+     This element can be used to overwrite the name of the disk in a virtual
+     machine image. <br><br> This value cannot be larger than 1023 GB
+    :type disk_size_gb: int
+    :param storage_account_type: Specifies the storage account type for the
+     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
+    :type storage_account_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
+    """
+
+    _validation = {
+        'os_type': {'required': True},
+        'os_state': {'required': True},
+    }
+
+    _attribute_map = {
+        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
+        'os_state': {'key': 'osState', 'type': 'OperatingSystemStateTypes'},
+        'snapshot': {'key': 'snapshot', 'type': 'SubResource'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'SubResource'},
+        'blob_uri': {'key': 'blobUri', 'type': 'str'},
+        'caching': {'key': 'caching', 'type': 'CachingTypes'},
+        'disk_size_gb': {'key': 'diskSizeGB', 'type': 'int'},
+        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
+    }
+
+    def __init__(self, *, os_type, os_state, snapshot=None, managed_disk=None, blob_uri: str=None, caching=None, disk_size_gb: int=None, storage_account_type=None, **kwargs) -> None:
+        super(ImageOSDisk, self).__init__(**kwargs)
+        self.os_type = os_type
+        self.os_state = os_state
+        self.snapshot = snapshot
+        self.managed_disk = managed_disk
+        self.blob_uri = blob_uri
+        self.caching = caching
+        self.disk_size_gb = disk_size_gb
+        self.storage_account_type = storage_account_type
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_paged.py
new file mode 100644
index 000000000000..de04f8efc49c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_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 ImagePaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`Image <azure.mgmt.compute.v2018_04_01.models.Image>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[Image]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(ImagePaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_py3.py
new file mode 100644
index 000000000000..916f2df5e511
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_py3.py
@@ -0,0 +1,70 @@
+# 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 Image(Resource):
+    """The source user image virtual hard disk. The virtual hard disk will be
+    copied before being attached to the virtual machine. If SourceImage is
+    provided, the destination virtual hard drive must not exist.
+
+    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]
+    :param source_virtual_machine: The source virtual machine from which Image
+     is created.
+    :type source_virtual_machine:
+     ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.ImageStorageProfile
+    :ivar provisioning_state: The provisioning state.
+    :vartype provisioning_state: str
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'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}'},
+        'source_virtual_machine': {'key': 'properties.sourceVirtualMachine', 'type': 'SubResource'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'ImageStorageProfile'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+    }
+
+    def __init__(self, *, location: str, tags=None, source_virtual_machine=None, storage_profile=None, **kwargs) -> None:
+        super(Image, self).__init__(location=location, tags=tags, **kwargs)
+        self.source_virtual_machine = source_virtual_machine
+        self.storage_profile = storage_profile
+        self.provisioning_state = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_reference.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_reference.py
new file mode 100644
index 000000000000..b8f929f4ad70
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_reference.py
@@ -0,0 +1,54 @@
+# 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 .sub_resource import SubResource
+
+
+class ImageReference(SubResource):
+    """Specifies information about the image to use. You can specify information
+    about platform images, marketplace images, or virtual machine images. This
+    element is required when you want to use a platform image, marketplace
+    image, or virtual machine image, but is not used in other creation
+    operations.
+
+    :param id: Resource Id
+    :type id: str
+    :param publisher: The image publisher.
+    :type publisher: str
+    :param offer: Specifies the offer of the platform image or marketplace
+     image used to create the virtual machine.
+    :type offer: str
+    :param sku: The image SKU.
+    :type sku: str
+    :param version: Specifies the version of the platform image or marketplace
+     image used to create the virtual machine. The allowed formats are
+     Major.Minor.Build or 'latest'. Major, Minor, and Build are decimal
+     numbers. Specify 'latest' to use the latest version of an image available
+     at deploy time. Even if you use 'latest', the VM image will not
+     automatically update after deploy time even if a new version becomes
+     available.
+    :type version: str
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'publisher': {'key': 'publisher', 'type': 'str'},
+        'offer': {'key': 'offer', 'type': 'str'},
+        'sku': {'key': 'sku', 'type': 'str'},
+        'version': {'key': 'version', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ImageReference, self).__init__(**kwargs)
+        self.publisher = kwargs.get('publisher', None)
+        self.offer = kwargs.get('offer', None)
+        self.sku = kwargs.get('sku', None)
+        self.version = kwargs.get('version', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_reference_py3.py
new file mode 100644
index 000000000000..1d7eefe5ac65
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_reference_py3.py
@@ -0,0 +1,54 @@
+# 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 .sub_resource_py3 import SubResource
+
+
+class ImageReference(SubResource):
+    """Specifies information about the image to use. You can specify information
+    about platform images, marketplace images, or virtual machine images. This
+    element is required when you want to use a platform image, marketplace
+    image, or virtual machine image, but is not used in other creation
+    operations.
+
+    :param id: Resource Id
+    :type id: str
+    :param publisher: The image publisher.
+    :type publisher: str
+    :param offer: Specifies the offer of the platform image or marketplace
+     image used to create the virtual machine.
+    :type offer: str
+    :param sku: The image SKU.
+    :type sku: str
+    :param version: Specifies the version of the platform image or marketplace
+     image used to create the virtual machine. The allowed formats are
+     Major.Minor.Build or 'latest'. Major, Minor, and Build are decimal
+     numbers. Specify 'latest' to use the latest version of an image available
+     at deploy time. Even if you use 'latest', the VM image will not
+     automatically update after deploy time even if a new version becomes
+     available.
+    :type version: str
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'publisher': {'key': 'publisher', 'type': 'str'},
+        'offer': {'key': 'offer', 'type': 'str'},
+        'sku': {'key': 'sku', 'type': 'str'},
+        'version': {'key': 'version', 'type': 'str'},
+    }
+
+    def __init__(self, *, id: str=None, publisher: str=None, offer: str=None, sku: str=None, version: str=None, **kwargs) -> None:
+        super(ImageReference, self).__init__(id=id, **kwargs)
+        self.publisher = publisher
+        self.offer = offer
+        self.sku = sku
+        self.version = version
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_storage_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_storage_profile.py
new file mode 100644
index 000000000000..2cd188cf28f9
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_storage_profile.py
@@ -0,0 +1,45 @@
+# 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 ImageStorageProfile(Model):
+    """Describes a storage profile.
+
+    :param os_disk: Specifies information about the operating system disk used
+     by the virtual machine. <br><br> For more information about disks, see
+     [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type os_disk: ~azure.mgmt.compute.v2018_04_01.models.ImageOSDisk
+    :param data_disks: Specifies the parameters that are used to add a data
+     disk to a virtual machine. <br><br> For more information about disks, see
+     [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type data_disks:
+     list[~azure.mgmt.compute.v2018_04_01.models.ImageDataDisk]
+    :param zone_resilient: Specifies whether an image is zone resilient or
+     not. Default is false. Zone resilient images can be created only in
+     regions that provide Zone Redundant Storage (ZRS).
+    :type zone_resilient: bool
+    """
+
+    _attribute_map = {
+        'os_disk': {'key': 'osDisk', 'type': 'ImageOSDisk'},
+        'data_disks': {'key': 'dataDisks', 'type': '[ImageDataDisk]'},
+        'zone_resilient': {'key': 'zoneResilient', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ImageStorageProfile, self).__init__(**kwargs)
+        self.os_disk = kwargs.get('os_disk', None)
+        self.data_disks = kwargs.get('data_disks', None)
+        self.zone_resilient = kwargs.get('zone_resilient', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_storage_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_storage_profile_py3.py
new file mode 100644
index 000000000000..359c87789cc3
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_storage_profile_py3.py
@@ -0,0 +1,45 @@
+# 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 ImageStorageProfile(Model):
+    """Describes a storage profile.
+
+    :param os_disk: Specifies information about the operating system disk used
+     by the virtual machine. <br><br> For more information about disks, see
+     [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type os_disk: ~azure.mgmt.compute.v2018_04_01.models.ImageOSDisk
+    :param data_disks: Specifies the parameters that are used to add a data
+     disk to a virtual machine. <br><br> For more information about disks, see
+     [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type data_disks:
+     list[~azure.mgmt.compute.v2018_04_01.models.ImageDataDisk]
+    :param zone_resilient: Specifies whether an image is zone resilient or
+     not. Default is false. Zone resilient images can be created only in
+     regions that provide Zone Redundant Storage (ZRS).
+    :type zone_resilient: bool
+    """
+
+    _attribute_map = {
+        'os_disk': {'key': 'osDisk', 'type': 'ImageOSDisk'},
+        'data_disks': {'key': 'dataDisks', 'type': '[ImageDataDisk]'},
+        'zone_resilient': {'key': 'zoneResilient', 'type': 'bool'},
+    }
+
+    def __init__(self, *, os_disk=None, data_disks=None, zone_resilient: bool=None, **kwargs) -> None:
+        super(ImageStorageProfile, self).__init__(**kwargs)
+        self.os_disk = os_disk
+        self.data_disks = data_disks
+        self.zone_resilient = zone_resilient
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_update.py
new file mode 100644
index 000000000000..56f1f29d62d6
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_update.py
@@ -0,0 +1,50 @@
+# 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 .update_resource import UpdateResource
+
+
+class ImageUpdate(UpdateResource):
+    """The source user image virtual hard disk. Only tags may be updated.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param source_virtual_machine: The source virtual machine from which Image
+     is created.
+    :type source_virtual_machine:
+     ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.ImageStorageProfile
+    :ivar provisioning_state: The provisioning state.
+    :vartype provisioning_state: str
+    """
+
+    _validation = {
+        'provisioning_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'source_virtual_machine': {'key': 'properties.sourceVirtualMachine', 'type': 'SubResource'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'ImageStorageProfile'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ImageUpdate, self).__init__(**kwargs)
+        self.source_virtual_machine = kwargs.get('source_virtual_machine', None)
+        self.storage_profile = kwargs.get('storage_profile', None)
+        self.provisioning_state = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_update_py3.py
new file mode 100644
index 000000000000..47658e7217f1
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_update_py3.py
@@ -0,0 +1,50 @@
+# 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 .update_resource_py3 import UpdateResource
+
+
+class ImageUpdate(UpdateResource):
+    """The source user image virtual hard disk. Only tags may be updated.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param source_virtual_machine: The source virtual machine from which Image
+     is created.
+    :type source_virtual_machine:
+     ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.ImageStorageProfile
+    :ivar provisioning_state: The provisioning state.
+    :vartype provisioning_state: str
+    """
+
+    _validation = {
+        'provisioning_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'source_virtual_machine': {'key': 'properties.sourceVirtualMachine', 'type': 'SubResource'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'ImageStorageProfile'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+    }
+
+    def __init__(self, *, tags=None, source_virtual_machine=None, storage_profile=None, **kwargs) -> None:
+        super(ImageUpdate, self).__init__(tags=tags, **kwargs)
+        self.source_virtual_machine = source_virtual_machine
+        self.storage_profile = storage_profile
+        self.provisioning_state = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error.py
new file mode 100644
index 000000000000..6324249d7c19
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error.py
@@ -0,0 +1,32 @@
+# 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 InnerError(Model):
+    """Inner error details.
+
+    :param exceptiontype: The exception type.
+    :type exceptiontype: str
+    :param errordetail: The internal error message or exception dump.
+    :type errordetail: str
+    """
+
+    _attribute_map = {
+        'exceptiontype': {'key': 'exceptiontype', 'type': 'str'},
+        'errordetail': {'key': 'errordetail', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(InnerError, self).__init__(**kwargs)
+        self.exceptiontype = kwargs.get('exceptiontype', None)
+        self.errordetail = kwargs.get('errordetail', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error_py3.py
new file mode 100644
index 000000000000..ccec30d7b53f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error_py3.py
@@ -0,0 +1,32 @@
+# 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 InnerError(Model):
+    """Inner error details.
+
+    :param exceptiontype: The exception type.
+    :type exceptiontype: str
+    :param errordetail: The internal error message or exception dump.
+    :type errordetail: str
+    """
+
+    _attribute_map = {
+        'exceptiontype': {'key': 'exceptiontype', 'type': 'str'},
+        'errordetail': {'key': 'errordetail', 'type': 'str'},
+    }
+
+    def __init__(self, *, exceptiontype: str=None, errordetail: str=None, **kwargs) -> None:
+        super(InnerError, self).__init__(**kwargs)
+        self.exceptiontype = exceptiontype
+        self.errordetail = errordetail
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/instance_view_status.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/instance_view_status.py
new file mode 100644
index 000000000000..fb7e1d99269e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/instance_view_status.py
@@ -0,0 +1,47 @@
+# 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 InstanceViewStatus(Model):
+    """Instance view status.
+
+    :param code: The status code.
+    :type code: str
+    :param level: The level code. Possible values include: 'Info', 'Warning',
+     'Error'
+    :type level: str or
+     ~azure.mgmt.compute.v2018_04_01.models.StatusLevelTypes
+    :param display_status: The short localizable label for the status.
+    :type display_status: str
+    :param message: The detailed status message, including for alerts and
+     error messages.
+    :type message: str
+    :param time: The time of the status.
+    :type time: datetime
+    """
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'str'},
+        'level': {'key': 'level', 'type': 'StatusLevelTypes'},
+        'display_status': {'key': 'displayStatus', 'type': 'str'},
+        'message': {'key': 'message', 'type': 'str'},
+        'time': {'key': 'time', 'type': 'iso-8601'},
+    }
+
+    def __init__(self, **kwargs):
+        super(InstanceViewStatus, self).__init__(**kwargs)
+        self.code = kwargs.get('code', None)
+        self.level = kwargs.get('level', None)
+        self.display_status = kwargs.get('display_status', None)
+        self.message = kwargs.get('message', None)
+        self.time = kwargs.get('time', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/instance_view_status_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/instance_view_status_py3.py
new file mode 100644
index 000000000000..b3cf969f8cae
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/instance_view_status_py3.py
@@ -0,0 +1,47 @@
+# 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 InstanceViewStatus(Model):
+    """Instance view status.
+
+    :param code: The status code.
+    :type code: str
+    :param level: The level code. Possible values include: 'Info', 'Warning',
+     'Error'
+    :type level: str or
+     ~azure.mgmt.compute.v2018_04_01.models.StatusLevelTypes
+    :param display_status: The short localizable label for the status.
+    :type display_status: str
+    :param message: The detailed status message, including for alerts and
+     error messages.
+    :type message: str
+    :param time: The time of the status.
+    :type time: datetime
+    """
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'str'},
+        'level': {'key': 'level', 'type': 'StatusLevelTypes'},
+        'display_status': {'key': 'displayStatus', 'type': 'str'},
+        'message': {'key': 'message', 'type': 'str'},
+        'time': {'key': 'time', 'type': 'iso-8601'},
+    }
+
+    def __init__(self, *, code: str=None, level=None, display_status: str=None, message: str=None, time=None, **kwargs) -> None:
+        super(InstanceViewStatus, self).__init__(**kwargs)
+        self.code = code
+        self.level = level
+        self.display_status = display_status
+        self.message = message
+        self.time = time
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_key_reference.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_key_reference.py
new file mode 100644
index 000000000000..f1eb6d6c120a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_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 KeyVaultKeyReference(Model):
+    """Describes a reference to Key Vault Key.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param key_url: Required. The URL referencing a key encryption key in Key
+     Vault.
+    :type key_url: str
+    :param source_vault: Required. The relative URL of the Key Vault
+     containing the key.
+    :type source_vault: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    """
+
+    _validation = {
+        'key_url': {'required': True},
+        'source_vault': {'required': True},
+    }
+
+    _attribute_map = {
+        'key_url': {'key': 'keyUrl', 'type': 'str'},
+        'source_vault': {'key': 'sourceVault', 'type': 'SubResource'},
+    }
+
+    def __init__(self, **kwargs):
+        super(KeyVaultKeyReference, self).__init__(**kwargs)
+        self.key_url = kwargs.get('key_url', None)
+        self.source_vault = kwargs.get('source_vault', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_key_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_key_reference_py3.py
new file mode 100644
index 000000000000..378de235d684
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_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 KeyVaultKeyReference(Model):
+    """Describes a reference to Key Vault Key.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param key_url: Required. The URL referencing a key encryption key in Key
+     Vault.
+    :type key_url: str
+    :param source_vault: Required. The relative URL of the Key Vault
+     containing the key.
+    :type source_vault: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    """
+
+    _validation = {
+        'key_url': {'required': True},
+        'source_vault': {'required': True},
+    }
+
+    _attribute_map = {
+        'key_url': {'key': 'keyUrl', 'type': 'str'},
+        'source_vault': {'key': 'sourceVault', 'type': 'SubResource'},
+    }
+
+    def __init__(self, *, key_url: str, source_vault, **kwargs) -> None:
+        super(KeyVaultKeyReference, self).__init__(**kwargs)
+        self.key_url = key_url
+        self.source_vault = source_vault
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_secret_reference.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_secret_reference.py
new file mode 100644
index 000000000000..082199bce901
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_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 KeyVaultSecretReference(Model):
+    """Describes a reference to Key Vault Secret.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param secret_url: Required. The URL referencing a secret in a Key Vault.
+    :type secret_url: str
+    :param source_vault: Required. The relative URL of the Key Vault
+     containing the secret.
+    :type source_vault: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    """
+
+    _validation = {
+        'secret_url': {'required': True},
+        'source_vault': {'required': True},
+    }
+
+    _attribute_map = {
+        'secret_url': {'key': 'secretUrl', 'type': 'str'},
+        'source_vault': {'key': 'sourceVault', 'type': 'SubResource'},
+    }
+
+    def __init__(self, **kwargs):
+        super(KeyVaultSecretReference, self).__init__(**kwargs)
+        self.secret_url = kwargs.get('secret_url', None)
+        self.source_vault = kwargs.get('source_vault', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_secret_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_secret_reference_py3.py
new file mode 100644
index 000000000000..8d938cbf5e89
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_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 KeyVaultSecretReference(Model):
+    """Describes a reference to Key Vault Secret.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param secret_url: Required. The URL referencing a secret in a Key Vault.
+    :type secret_url: str
+    :param source_vault: Required. The relative URL of the Key Vault
+     containing the secret.
+    :type source_vault: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    """
+
+    _validation = {
+        'secret_url': {'required': True},
+        'source_vault': {'required': True},
+    }
+
+    _attribute_map = {
+        'secret_url': {'key': 'secretUrl', 'type': 'str'},
+        'source_vault': {'key': 'sourceVault', 'type': 'SubResource'},
+    }
+
+    def __init__(self, *, secret_url: str, source_vault, **kwargs) -> None:
+        super(KeyVaultSecretReference, self).__init__(**kwargs)
+        self.secret_url = secret_url
+        self.source_vault = source_vault
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/linux_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/linux_configuration.py
new file mode 100644
index 000000000000..3dc5246c35d7
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/linux_configuration.py
@@ -0,0 +1,39 @@
+# 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 LinuxConfiguration(Model):
+    """Specifies the Linux operating system settings on the virtual machine.
+    <br><br>For a list of supported Linux distributions, see [Linux on
+    Azure-Endorsed
+    Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    <br><br> For running non-endorsed distributions, see [Information for
+    Non-Endorsed
+    Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
+
+    :param disable_password_authentication: Specifies whether password
+     authentication should be disabled.
+    :type disable_password_authentication: bool
+    :param ssh: Specifies the ssh key configuration for a Linux OS.
+    :type ssh: ~azure.mgmt.compute.v2018_04_01.models.SshConfiguration
+    """
+
+    _attribute_map = {
+        'disable_password_authentication': {'key': 'disablePasswordAuthentication', 'type': 'bool'},
+        'ssh': {'key': 'ssh', 'type': 'SshConfiguration'},
+    }
+
+    def __init__(self, **kwargs):
+        super(LinuxConfiguration, self).__init__(**kwargs)
+        self.disable_password_authentication = kwargs.get('disable_password_authentication', None)
+        self.ssh = kwargs.get('ssh', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/linux_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/linux_configuration_py3.py
new file mode 100644
index 000000000000..45614597db33
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/linux_configuration_py3.py
@@ -0,0 +1,39 @@
+# 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 LinuxConfiguration(Model):
+    """Specifies the Linux operating system settings on the virtual machine.
+    <br><br>For a list of supported Linux distributions, see [Linux on
+    Azure-Endorsed
+    Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    <br><br> For running non-endorsed distributions, see [Information for
+    Non-Endorsed
+    Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
+
+    :param disable_password_authentication: Specifies whether password
+     authentication should be disabled.
+    :type disable_password_authentication: bool
+    :param ssh: Specifies the ssh key configuration for a Linux OS.
+    :type ssh: ~azure.mgmt.compute.v2018_04_01.models.SshConfiguration
+    """
+
+    _attribute_map = {
+        'disable_password_authentication': {'key': 'disablePasswordAuthentication', 'type': 'bool'},
+        'ssh': {'key': 'ssh', 'type': 'SshConfiguration'},
+    }
+
+    def __init__(self, *, disable_password_authentication: bool=None, ssh=None, **kwargs) -> None:
+        super(LinuxConfiguration, self).__init__(**kwargs)
+        self.disable_password_authentication = disable_password_authentication
+        self.ssh = ssh
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_input_base.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_input_base.py
new file mode 100644
index 000000000000..843b739a0328
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_input_base.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 LogAnalyticsInputBase(Model):
+    """Api input base class for LogAnalytics Api.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param blob_container_sas_uri: Required. SAS Uri of the logging blob
+     container to which LogAnalytics Api writes output logs to.
+    :type blob_container_sas_uri: str
+    :param from_time: Required. From time of the query
+    :type from_time: datetime
+    :param to_time: Required. To time of the query
+    :type to_time: datetime
+    :param group_by_throttle_policy: Group query result by Throttle Policy
+     applied.
+    :type group_by_throttle_policy: bool
+    :param group_by_operation_name: Group query result by  by Operation Name.
+    :type group_by_operation_name: bool
+    :param group_by_resource_name: Group query result by Resource Name.
+    :type group_by_resource_name: bool
+    """
+
+    _validation = {
+        'blob_container_sas_uri': {'required': True},
+        'from_time': {'required': True},
+        'to_time': {'required': True},
+    }
+
+    _attribute_map = {
+        'blob_container_sas_uri': {'key': 'blobContainerSasUri', 'type': 'str'},
+        'from_time': {'key': 'fromTime', 'type': 'iso-8601'},
+        'to_time': {'key': 'toTime', 'type': 'iso-8601'},
+        'group_by_throttle_policy': {'key': 'groupByThrottlePolicy', 'type': 'bool'},
+        'group_by_operation_name': {'key': 'groupByOperationName', 'type': 'bool'},
+        'group_by_resource_name': {'key': 'groupByResourceName', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(LogAnalyticsInputBase, self).__init__(**kwargs)
+        self.blob_container_sas_uri = kwargs.get('blob_container_sas_uri', None)
+        self.from_time = kwargs.get('from_time', None)
+        self.to_time = kwargs.get('to_time', None)
+        self.group_by_throttle_policy = kwargs.get('group_by_throttle_policy', None)
+        self.group_by_operation_name = kwargs.get('group_by_operation_name', None)
+        self.group_by_resource_name = kwargs.get('group_by_resource_name', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_input_base_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_input_base_py3.py
new file mode 100644
index 000000000000..b9420117a8ca
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_input_base_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 LogAnalyticsInputBase(Model):
+    """Api input base class for LogAnalytics Api.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param blob_container_sas_uri: Required. SAS Uri of the logging blob
+     container to which LogAnalytics Api writes output logs to.
+    :type blob_container_sas_uri: str
+    :param from_time: Required. From time of the query
+    :type from_time: datetime
+    :param to_time: Required. To time of the query
+    :type to_time: datetime
+    :param group_by_throttle_policy: Group query result by Throttle Policy
+     applied.
+    :type group_by_throttle_policy: bool
+    :param group_by_operation_name: Group query result by  by Operation Name.
+    :type group_by_operation_name: bool
+    :param group_by_resource_name: Group query result by Resource Name.
+    :type group_by_resource_name: bool
+    """
+
+    _validation = {
+        'blob_container_sas_uri': {'required': True},
+        'from_time': {'required': True},
+        'to_time': {'required': True},
+    }
+
+    _attribute_map = {
+        'blob_container_sas_uri': {'key': 'blobContainerSasUri', 'type': 'str'},
+        'from_time': {'key': 'fromTime', 'type': 'iso-8601'},
+        'to_time': {'key': 'toTime', 'type': 'iso-8601'},
+        'group_by_throttle_policy': {'key': 'groupByThrottlePolicy', 'type': 'bool'},
+        'group_by_operation_name': {'key': 'groupByOperationName', 'type': 'bool'},
+        'group_by_resource_name': {'key': 'groupByResourceName', 'type': 'bool'},
+    }
+
+    def __init__(self, *, blob_container_sas_uri: str, from_time, to_time, group_by_throttle_policy: bool=None, group_by_operation_name: bool=None, group_by_resource_name: bool=None, **kwargs) -> None:
+        super(LogAnalyticsInputBase, self).__init__(**kwargs)
+        self.blob_container_sas_uri = blob_container_sas_uri
+        self.from_time = from_time
+        self.to_time = to_time
+        self.group_by_throttle_policy = group_by_throttle_policy
+        self.group_by_operation_name = group_by_operation_name
+        self.group_by_resource_name = group_by_resource_name
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_operation_result.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_operation_result.py
new file mode 100644
index 000000000000..ebb7a1177049
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_operation_result.py
@@ -0,0 +1,36 @@
+# 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 LogAnalyticsOperationResult(Model):
+    """LogAnalytics operation status response.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar properties: LogAnalyticsOutput
+    :vartype properties:
+     ~azure.mgmt.compute.v2018_04_01.models.LogAnalyticsOutput
+    """
+
+    _validation = {
+        'properties': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'properties': {'key': 'properties', 'type': 'LogAnalyticsOutput'},
+    }
+
+    def __init__(self, **kwargs):
+        super(LogAnalyticsOperationResult, self).__init__(**kwargs)
+        self.properties = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_operation_result_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_operation_result_py3.py
new file mode 100644
index 000000000000..dfeceeb58cf4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_operation_result_py3.py
@@ -0,0 +1,36 @@
+# 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 LogAnalyticsOperationResult(Model):
+    """LogAnalytics operation status response.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar properties: LogAnalyticsOutput
+    :vartype properties:
+     ~azure.mgmt.compute.v2018_04_01.models.LogAnalyticsOutput
+    """
+
+    _validation = {
+        'properties': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'properties': {'key': 'properties', 'type': 'LogAnalyticsOutput'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(LogAnalyticsOperationResult, self).__init__(**kwargs)
+        self.properties = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_output.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_output.py
new file mode 100644
index 000000000000..5ea1615011c3
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_output.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 LogAnalyticsOutput(Model):
+    """LogAnalytics output properties.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar output: Output file Uri path to blob container.
+    :vartype output: str
+    """
+
+    _validation = {
+        'output': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'output': {'key': 'output', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(LogAnalyticsOutput, self).__init__(**kwargs)
+        self.output = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_output_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_output_py3.py
new file mode 100644
index 000000000000..71a428a8e49a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_output_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 LogAnalyticsOutput(Model):
+    """LogAnalytics output properties.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar output: Output file Uri path to blob container.
+    :vartype output: str
+    """
+
+    _validation = {
+        'output': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'output': {'key': 'output', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(LogAnalyticsOutput, self).__init__(**kwargs)
+        self.output = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/maintenance_redeploy_status.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/maintenance_redeploy_status.py
new file mode 100644
index 000000000000..6c22c904d185
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/maintenance_redeploy_status.py
@@ -0,0 +1,60 @@
+# 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 MaintenanceRedeployStatus(Model):
+    """Maintenance Operation Status.
+
+    :param is_customer_initiated_maintenance_allowed: True, if customer is
+     allowed to perform Maintenance.
+    :type is_customer_initiated_maintenance_allowed: bool
+    :param pre_maintenance_window_start_time: Start Time for the Pre
+     Maintenance Window.
+    :type pre_maintenance_window_start_time: datetime
+    :param pre_maintenance_window_end_time: End Time for the Pre Maintenance
+     Window.
+    :type pre_maintenance_window_end_time: datetime
+    :param maintenance_window_start_time: Start Time for the Maintenance
+     Window.
+    :type maintenance_window_start_time: datetime
+    :param maintenance_window_end_time: End Time for the Maintenance Window.
+    :type maintenance_window_end_time: datetime
+    :param last_operation_result_code: The Last Maintenance Operation Result
+     Code. Possible values include: 'None', 'RetryLater', 'MaintenanceAborted',
+     'MaintenanceCompleted'
+    :type last_operation_result_code: str or
+     ~azure.mgmt.compute.v2018_04_01.models.MaintenanceOperationResultCodeTypes
+    :param last_operation_message: Message returned for the last Maintenance
+     Operation.
+    :type last_operation_message: str
+    """
+
+    _attribute_map = {
+        'is_customer_initiated_maintenance_allowed': {'key': 'isCustomerInitiatedMaintenanceAllowed', 'type': 'bool'},
+        'pre_maintenance_window_start_time': {'key': 'preMaintenanceWindowStartTime', 'type': 'iso-8601'},
+        'pre_maintenance_window_end_time': {'key': 'preMaintenanceWindowEndTime', 'type': 'iso-8601'},
+        'maintenance_window_start_time': {'key': 'maintenanceWindowStartTime', 'type': 'iso-8601'},
+        'maintenance_window_end_time': {'key': 'maintenanceWindowEndTime', 'type': 'iso-8601'},
+        'last_operation_result_code': {'key': 'lastOperationResultCode', 'type': 'MaintenanceOperationResultCodeTypes'},
+        'last_operation_message': {'key': 'lastOperationMessage', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MaintenanceRedeployStatus, self).__init__(**kwargs)
+        self.is_customer_initiated_maintenance_allowed = kwargs.get('is_customer_initiated_maintenance_allowed', None)
+        self.pre_maintenance_window_start_time = kwargs.get('pre_maintenance_window_start_time', None)
+        self.pre_maintenance_window_end_time = kwargs.get('pre_maintenance_window_end_time', None)
+        self.maintenance_window_start_time = kwargs.get('maintenance_window_start_time', None)
+        self.maintenance_window_end_time = kwargs.get('maintenance_window_end_time', None)
+        self.last_operation_result_code = kwargs.get('last_operation_result_code', None)
+        self.last_operation_message = kwargs.get('last_operation_message', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/maintenance_redeploy_status_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/maintenance_redeploy_status_py3.py
new file mode 100644
index 000000000000..f2e8bbf807df
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/maintenance_redeploy_status_py3.py
@@ -0,0 +1,60 @@
+# 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 MaintenanceRedeployStatus(Model):
+    """Maintenance Operation Status.
+
+    :param is_customer_initiated_maintenance_allowed: True, if customer is
+     allowed to perform Maintenance.
+    :type is_customer_initiated_maintenance_allowed: bool
+    :param pre_maintenance_window_start_time: Start Time for the Pre
+     Maintenance Window.
+    :type pre_maintenance_window_start_time: datetime
+    :param pre_maintenance_window_end_time: End Time for the Pre Maintenance
+     Window.
+    :type pre_maintenance_window_end_time: datetime
+    :param maintenance_window_start_time: Start Time for the Maintenance
+     Window.
+    :type maintenance_window_start_time: datetime
+    :param maintenance_window_end_time: End Time for the Maintenance Window.
+    :type maintenance_window_end_time: datetime
+    :param last_operation_result_code: The Last Maintenance Operation Result
+     Code. Possible values include: 'None', 'RetryLater', 'MaintenanceAborted',
+     'MaintenanceCompleted'
+    :type last_operation_result_code: str or
+     ~azure.mgmt.compute.v2018_04_01.models.MaintenanceOperationResultCodeTypes
+    :param last_operation_message: Message returned for the last Maintenance
+     Operation.
+    :type last_operation_message: str
+    """
+
+    _attribute_map = {
+        'is_customer_initiated_maintenance_allowed': {'key': 'isCustomerInitiatedMaintenanceAllowed', 'type': 'bool'},
+        'pre_maintenance_window_start_time': {'key': 'preMaintenanceWindowStartTime', 'type': 'iso-8601'},
+        'pre_maintenance_window_end_time': {'key': 'preMaintenanceWindowEndTime', 'type': 'iso-8601'},
+        'maintenance_window_start_time': {'key': 'maintenanceWindowStartTime', 'type': 'iso-8601'},
+        'maintenance_window_end_time': {'key': 'maintenanceWindowEndTime', 'type': 'iso-8601'},
+        'last_operation_result_code': {'key': 'lastOperationResultCode', 'type': 'MaintenanceOperationResultCodeTypes'},
+        'last_operation_message': {'key': 'lastOperationMessage', 'type': 'str'},
+    }
+
+    def __init__(self, *, is_customer_initiated_maintenance_allowed: bool=None, pre_maintenance_window_start_time=None, pre_maintenance_window_end_time=None, maintenance_window_start_time=None, maintenance_window_end_time=None, last_operation_result_code=None, last_operation_message: str=None, **kwargs) -> None:
+        super(MaintenanceRedeployStatus, self).__init__(**kwargs)
+        self.is_customer_initiated_maintenance_allowed = is_customer_initiated_maintenance_allowed
+        self.pre_maintenance_window_start_time = pre_maintenance_window_start_time
+        self.pre_maintenance_window_end_time = pre_maintenance_window_end_time
+        self.maintenance_window_start_time = maintenance_window_start_time
+        self.maintenance_window_end_time = maintenance_window_end_time
+        self.last_operation_result_code = last_operation_result_code
+        self.last_operation_message = last_operation_message
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py
new file mode 100644
index 000000000000..a16aed3bbcbf
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py
@@ -0,0 +1,34 @@
+# 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 .sub_resource import SubResource
+
+
+class ManagedDiskParameters(SubResource):
+    """The parameters of a managed disk.
+
+    :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 or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
+    :type storage_account_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ManagedDiskParameters, self).__init__(**kwargs)
+        self.storage_account_type = kwargs.get('storage_account_type', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py
new file mode 100644
index 000000000000..50b8a76181d6
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py
@@ -0,0 +1,34 @@
+# 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 .sub_resource_py3 import SubResource
+
+
+class ManagedDiskParameters(SubResource):
+    """The parameters of a managed disk.
+
+    :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 or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
+    :type storage_account_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
+    }
+
+    def __init__(self, *, id: str=None, storage_account_type=None, **kwargs) -> None:
+        super(ManagedDiskParameters, self).__init__(id=id, **kwargs)
+        self.storage_account_type = storage_account_type
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_interface_reference.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_interface_reference.py
new file mode 100644
index 000000000000..b86e305e3f74
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_interface_reference.py
@@ -0,0 +1,32 @@
+# 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 .sub_resource import SubResource
+
+
+class NetworkInterfaceReference(SubResource):
+    """Describes a network interface reference.
+
+    :param id: Resource Id
+    :type id: str
+    :param primary: Specifies the primary network interface in case the
+     virtual machine has more than 1 network interface.
+    :type primary: bool
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(NetworkInterfaceReference, self).__init__(**kwargs)
+        self.primary = kwargs.get('primary', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_interface_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_interface_reference_py3.py
new file mode 100644
index 000000000000..47da29278832
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_interface_reference_py3.py
@@ -0,0 +1,32 @@
+# 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 .sub_resource_py3 import SubResource
+
+
+class NetworkInterfaceReference(SubResource):
+    """Describes a network interface reference.
+
+    :param id: Resource Id
+    :type id: str
+    :param primary: Specifies the primary network interface in case the
+     virtual machine has more than 1 network interface.
+    :type primary: bool
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+    }
+
+    def __init__(self, *, id: str=None, primary: bool=None, **kwargs) -> None:
+        super(NetworkInterfaceReference, self).__init__(id=id, **kwargs)
+        self.primary = primary
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_profile.py
new file mode 100644
index 000000000000..b547518c8397
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_profile.py
@@ -0,0 +1,30 @@
+# 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 NetworkProfile(Model):
+    """Specifies the network interfaces of the virtual machine.
+
+    :param network_interfaces: Specifies the list of resource Ids for the
+     network interfaces associated with the virtual machine.
+    :type network_interfaces:
+     list[~azure.mgmt.compute.v2018_04_01.models.NetworkInterfaceReference]
+    """
+
+    _attribute_map = {
+        'network_interfaces': {'key': 'networkInterfaces', 'type': '[NetworkInterfaceReference]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(NetworkProfile, self).__init__(**kwargs)
+        self.network_interfaces = kwargs.get('network_interfaces', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_profile_py3.py
new file mode 100644
index 000000000000..63e37d139e29
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_profile_py3.py
@@ -0,0 +1,30 @@
+# 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 NetworkProfile(Model):
+    """Specifies the network interfaces of the virtual machine.
+
+    :param network_interfaces: Specifies the list of resource Ids for the
+     network interfaces associated with the virtual machine.
+    :type network_interfaces:
+     list[~azure.mgmt.compute.v2018_04_01.models.NetworkInterfaceReference]
+    """
+
+    _attribute_map = {
+        'network_interfaces': {'key': 'networkInterfaces', 'type': '[NetworkInterfaceReference]'},
+    }
+
+    def __init__(self, *, network_interfaces=None, **kwargs) -> None:
+        super(NetworkProfile, self).__init__(**kwargs)
+        self.network_interfaces = network_interfaces
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
new file mode 100644
index 000000000000..e82f77c2447c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk.py
@@ -0,0 +1,97 @@
+# 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 OSDisk(Model):
+    """Specifies information about the operating system disk used by the virtual
+    machine. <br><br> For more information about disks, see [About disks and
+    VHDs for Azure virtual
+    machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+
+    All required parameters must be populated in order to send to Azure.
+
+    :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**
+     <br><br> **Linux**. Possible values include: 'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
+    :param encryption_settings: Specifies the encryption settings for the OS
+     Disk. <br><br> Minimum api-version: 2015-06-15
+    :type encryption_settings:
+     ~azure.mgmt.compute.v2018_04_01.models.DiskEncryptionSettings
+    :param name: The disk name.
+    :type name: str
+    :param vhd: The virtual hard disk.
+    :type vhd: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
+    :param image: The source user image virtual hard disk. The virtual hard
+     disk will be copied before being attached to the virtual machine. If
+     SourceImage is provided, the destination virtual hard drive must not
+     exist.
+    :type image: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :param create_option: Required. Specifies how the virtual machine should
+     be created.<br><br> Possible values are:<br><br> **Attach** \\u2013 This
+     value is used when you are using a specialized disk to create the virtual
+     machine.<br><br> **FromImage** \\u2013 This value is used when you are
+     using an image to create the virtual machine. If you are using a platform
+     image, you also use the imageReference element described above. If you are
+     using a marketplace image, you  also use the plan element previously
+     described. Possible values include: 'FromImage', 'Empty', 'Attach'
+    :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
+     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.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_04_01.models.ManagedDiskParameters
+    """
+
+    _validation = {
+        'create_option': {'required': True},
+    }
+
+    _attribute_map = {
+        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
+        'encryption_settings': {'key': 'encryptionSettings', 'type': 'DiskEncryptionSettings'},
+        'name': {'key': 'name', 'type': 'str'},
+        'vhd': {'key': 'vhd', 'type': 'VirtualHardDisk'},
+        'image': {'key': 'image', 'type': 'VirtualHardDisk'},
+        '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'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'ManagedDiskParameters'},
+    }
+
+    def __init__(self, **kwargs):
+        super(OSDisk, self).__init__(**kwargs)
+        self.os_type = kwargs.get('os_type', None)
+        self.encryption_settings = kwargs.get('encryption_settings', None)
+        self.name = kwargs.get('name', None)
+        self.vhd = kwargs.get('vhd', None)
+        self.image = kwargs.get('image', None)
+        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.managed_disk = kwargs.get('managed_disk', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_image.py
new file mode 100644
index 000000000000..ad439c7ab470
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_image.py
@@ -0,0 +1,36 @@
+# 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 OSDiskImage(Model):
+    """Contains the os disk image information.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param operating_system: Required. The operating system of the
+     osDiskImage. Possible values include: 'Windows', 'Linux'
+    :type operating_system: str or
+     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
+    """
+
+    _validation = {
+        'operating_system': {'required': True},
+    }
+
+    _attribute_map = {
+        'operating_system': {'key': 'operatingSystem', 'type': 'OperatingSystemTypes'},
+    }
+
+    def __init__(self, **kwargs):
+        super(OSDiskImage, self).__init__(**kwargs)
+        self.operating_system = kwargs.get('operating_system', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_image_py3.py
new file mode 100644
index 000000000000..1d9c6e45d677
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_image_py3.py
@@ -0,0 +1,36 @@
+# 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 OSDiskImage(Model):
+    """Contains the os disk image information.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param operating_system: Required. The operating system of the
+     osDiskImage. Possible values include: 'Windows', 'Linux'
+    :type operating_system: str or
+     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
+    """
+
+    _validation = {
+        'operating_system': {'required': True},
+    }
+
+    _attribute_map = {
+        'operating_system': {'key': 'operatingSystem', 'type': 'OperatingSystemTypes'},
+    }
+
+    def __init__(self, *, operating_system, **kwargs) -> None:
+        super(OSDiskImage, self).__init__(**kwargs)
+        self.operating_system = operating_system
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
new file mode 100644
index 000000000000..e45324c5df9c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_py3.py
@@ -0,0 +1,97 @@
+# 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 OSDisk(Model):
+    """Specifies information about the operating system disk used by the virtual
+    machine. <br><br> For more information about disks, see [About disks and
+    VHDs for Azure virtual
+    machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+
+    All required parameters must be populated in order to send to Azure.
+
+    :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**
+     <br><br> **Linux**. Possible values include: 'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
+    :param encryption_settings: Specifies the encryption settings for the OS
+     Disk. <br><br> Minimum api-version: 2015-06-15
+    :type encryption_settings:
+     ~azure.mgmt.compute.v2018_04_01.models.DiskEncryptionSettings
+    :param name: The disk name.
+    :type name: str
+    :param vhd: The virtual hard disk.
+    :type vhd: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
+    :param image: The source user image virtual hard disk. The virtual hard
+     disk will be copied before being attached to the virtual machine. If
+     SourceImage is provided, the destination virtual hard drive must not
+     exist.
+    :type image: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :param create_option: Required. Specifies how the virtual machine should
+     be created.<br><br> Possible values are:<br><br> **Attach** \\u2013 This
+     value is used when you are using a specialized disk to create the virtual
+     machine.<br><br> **FromImage** \\u2013 This value is used when you are
+     using an image to create the virtual machine. If you are using a platform
+     image, you also use the imageReference element described above. If you are
+     using a marketplace image, you  also use the plan element previously
+     described. Possible values include: 'FromImage', 'Empty', 'Attach'
+    :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
+     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.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_04_01.models.ManagedDiskParameters
+    """
+
+    _validation = {
+        'create_option': {'required': True},
+    }
+
+    _attribute_map = {
+        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
+        'encryption_settings': {'key': 'encryptionSettings', 'type': 'DiskEncryptionSettings'},
+        'name': {'key': 'name', 'type': 'str'},
+        'vhd': {'key': 'vhd', 'type': 'VirtualHardDisk'},
+        'image': {'key': 'image', 'type': 'VirtualHardDisk'},
+        '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'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'ManagedDiskParameters'},
+    }
+
+    def __init__(self, *, create_option, os_type=None, encryption_settings=None, name: str=None, vhd=None, image=None, caching=None, write_accelerator_enabled: bool=None, disk_size_gb: int=None, managed_disk=None, **kwargs) -> None:
+        super(OSDisk, self).__init__(**kwargs)
+        self.os_type = os_type
+        self.encryption_settings = encryption_settings
+        self.name = name
+        self.vhd = vhd
+        self.image = image
+        self.caching = caching
+        self.write_accelerator_enabled = write_accelerator_enabled
+        self.create_option = create_option
+        self.disk_size_gb = disk_size_gb
+        self.managed_disk = managed_disk
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_profile.py
new file mode 100644
index 000000000000..3197bdb4b81f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_profile.py
@@ -0,0 +1,99 @@
+# 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 OSProfile(Model):
+    """Specifies the operating system settings for the virtual machine.
+
+    :param computer_name: Specifies the host OS name of the virtual machine.
+     <br><br> **Max-length (Windows):** 15 characters <br><br> **Max-length
+     (Linux):** 64 characters. <br><br> For naming conventions and restrictions
+     see [Azure infrastructure services implementation
+     guidelines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-infrastructure-subscription-accounts-guidelines?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#1-naming-conventions).
+    :type computer_name: str
+    :param admin_username: Specifies the name of the administrator account.
+     <br><br> **Windows-only restriction:** Cannot end in "." <br><br>
+     **Disallowed values:** "administrator", "admin", "user", "user1", "test",
+     "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm",
+     "admin2", "aspnet", "backup", "console", "david", "guest", "john",
+     "owner", "root", "server", "sql", "support", "support_388945a0", "sys",
+     "test2", "test3", "user4", "user5". <br><br> **Minimum-length (Linux):** 1
+     character <br><br> **Max-length (Linux):** 64 characters <br><br>
+     **Max-length (Windows):** 20 characters  <br><br><li> For root access to
+     the Linux VM, see [Using root privileges on Linux virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-use-root-privileges?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)<br><li>
+     For a list of built-in system users on Linux that should not be used in
+     this field, see [Selecting User Names for Linux on
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-usernames?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    :type admin_username: str
+    :param admin_password: Specifies the password of the administrator
+     account. <br><br> **Minimum-length (Windows):** 8 characters <br><br>
+     **Minimum-length (Linux):** 6 characters <br><br> **Max-length
+     (Windows):** 123 characters <br><br> **Max-length (Linux):** 72 characters
+     <br><br> **Complexity requirements:** 3 out of 4 conditions below need to
+     be fulfilled <br> Has lower characters <br>Has upper characters <br> Has a
+     digit <br> Has a special character (Regex match [\\W_]) <br><br>
+     **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123",
+     "Pa$$word", "pass@word1", "Password!", "Password1", "Password22",
+     "iloveyou!" <br><br> For resetting the password, see [How to reset the
+     Remote Desktop service or its login password in a Windows
+     VM](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-reset-rdp?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> For resetting root password, see [Manage users, SSH, and check or
+     repair disks on Azure Linux VMs using the VMAccess
+     Extension](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-vmaccess-extension?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#reset-root-password)
+    :type admin_password: str
+    :param custom_data: Specifies a base-64 encoded string of custom data. The
+     base-64 encoded string is decoded to a binary array that is saved as a
+     file on the Virtual Machine. The maximum length of the binary array is
+     65535 bytes. <br><br> For using cloud-init for your VM, see [Using
+     cloud-init to customize a Linux VM during
+     creation](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-cloud-init?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    :type custom_data: str
+    :param windows_configuration: Specifies Windows operating system settings
+     on the virtual machine.
+    :type windows_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.WindowsConfiguration
+    :param linux_configuration: Specifies the Linux operating system settings
+     on the virtual machine. <br><br>For a list of supported Linux
+     distributions, see [Linux on Azure-Endorsed
+     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+     <br><br> For running non-endorsed distributions, see [Information for
+     Non-Endorsed
+     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
+    :type linux_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.LinuxConfiguration
+    :param secrets: Specifies set of certificates that should be installed
+     onto the virtual machine.
+    :type secrets:
+     list[~azure.mgmt.compute.v2018_04_01.models.VaultSecretGroup]
+    """
+
+    _attribute_map = {
+        'computer_name': {'key': 'computerName', 'type': 'str'},
+        'admin_username': {'key': 'adminUsername', 'type': 'str'},
+        'admin_password': {'key': 'adminPassword', 'type': 'str'},
+        'custom_data': {'key': 'customData', 'type': 'str'},
+        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'WindowsConfiguration'},
+        'linux_configuration': {'key': 'linuxConfiguration', 'type': 'LinuxConfiguration'},
+        'secrets': {'key': 'secrets', 'type': '[VaultSecretGroup]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(OSProfile, self).__init__(**kwargs)
+        self.computer_name = kwargs.get('computer_name', None)
+        self.admin_username = kwargs.get('admin_username', None)
+        self.admin_password = kwargs.get('admin_password', None)
+        self.custom_data = kwargs.get('custom_data', None)
+        self.windows_configuration = kwargs.get('windows_configuration', None)
+        self.linux_configuration = kwargs.get('linux_configuration', None)
+        self.secrets = kwargs.get('secrets', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_profile_py3.py
new file mode 100644
index 000000000000..eaef9a9ff6a0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_profile_py3.py
@@ -0,0 +1,99 @@
+# 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 OSProfile(Model):
+    """Specifies the operating system settings for the virtual machine.
+
+    :param computer_name: Specifies the host OS name of the virtual machine.
+     <br><br> **Max-length (Windows):** 15 characters <br><br> **Max-length
+     (Linux):** 64 characters. <br><br> For naming conventions and restrictions
+     see [Azure infrastructure services implementation
+     guidelines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-infrastructure-subscription-accounts-guidelines?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#1-naming-conventions).
+    :type computer_name: str
+    :param admin_username: Specifies the name of the administrator account.
+     <br><br> **Windows-only restriction:** Cannot end in "." <br><br>
+     **Disallowed values:** "administrator", "admin", "user", "user1", "test",
+     "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm",
+     "admin2", "aspnet", "backup", "console", "david", "guest", "john",
+     "owner", "root", "server", "sql", "support", "support_388945a0", "sys",
+     "test2", "test3", "user4", "user5". <br><br> **Minimum-length (Linux):** 1
+     character <br><br> **Max-length (Linux):** 64 characters <br><br>
+     **Max-length (Windows):** 20 characters  <br><br><li> For root access to
+     the Linux VM, see [Using root privileges on Linux virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-use-root-privileges?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)<br><li>
+     For a list of built-in system users on Linux that should not be used in
+     this field, see [Selecting User Names for Linux on
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-usernames?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    :type admin_username: str
+    :param admin_password: Specifies the password of the administrator
+     account. <br><br> **Minimum-length (Windows):** 8 characters <br><br>
+     **Minimum-length (Linux):** 6 characters <br><br> **Max-length
+     (Windows):** 123 characters <br><br> **Max-length (Linux):** 72 characters
+     <br><br> **Complexity requirements:** 3 out of 4 conditions below need to
+     be fulfilled <br> Has lower characters <br>Has upper characters <br> Has a
+     digit <br> Has a special character (Regex match [\\W_]) <br><br>
+     **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123",
+     "Pa$$word", "pass@word1", "Password!", "Password1", "Password22",
+     "iloveyou!" <br><br> For resetting the password, see [How to reset the
+     Remote Desktop service or its login password in a Windows
+     VM](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-reset-rdp?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> For resetting root password, see [Manage users, SSH, and check or
+     repair disks on Azure Linux VMs using the VMAccess
+     Extension](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-vmaccess-extension?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#reset-root-password)
+    :type admin_password: str
+    :param custom_data: Specifies a base-64 encoded string of custom data. The
+     base-64 encoded string is decoded to a binary array that is saved as a
+     file on the Virtual Machine. The maximum length of the binary array is
+     65535 bytes. <br><br> For using cloud-init for your VM, see [Using
+     cloud-init to customize a Linux VM during
+     creation](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-cloud-init?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    :type custom_data: str
+    :param windows_configuration: Specifies Windows operating system settings
+     on the virtual machine.
+    :type windows_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.WindowsConfiguration
+    :param linux_configuration: Specifies the Linux operating system settings
+     on the virtual machine. <br><br>For a list of supported Linux
+     distributions, see [Linux on Azure-Endorsed
+     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+     <br><br> For running non-endorsed distributions, see [Information for
+     Non-Endorsed
+     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
+    :type linux_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.LinuxConfiguration
+    :param secrets: Specifies set of certificates that should be installed
+     onto the virtual machine.
+    :type secrets:
+     list[~azure.mgmt.compute.v2018_04_01.models.VaultSecretGroup]
+    """
+
+    _attribute_map = {
+        'computer_name': {'key': 'computerName', 'type': 'str'},
+        'admin_username': {'key': 'adminUsername', 'type': 'str'},
+        'admin_password': {'key': 'adminPassword', 'type': 'str'},
+        'custom_data': {'key': 'customData', 'type': 'str'},
+        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'WindowsConfiguration'},
+        'linux_configuration': {'key': 'linuxConfiguration', 'type': 'LinuxConfiguration'},
+        'secrets': {'key': 'secrets', 'type': '[VaultSecretGroup]'},
+    }
+
+    def __init__(self, *, computer_name: str=None, admin_username: str=None, admin_password: str=None, custom_data: str=None, windows_configuration=None, linux_configuration=None, secrets=None, **kwargs) -> None:
+        super(OSProfile, self).__init__(**kwargs)
+        self.computer_name = computer_name
+        self.admin_username = admin_username
+        self.admin_password = admin_password
+        self.custom_data = custom_data
+        self.windows_configuration = windows_configuration
+        self.linux_configuration = linux_configuration
+        self.secrets = secrets
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/plan.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/plan.py
new file mode 100644
index 000000000000..d42b6b32cfac
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/plan.py
@@ -0,0 +1,46 @@
+# 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 Plan(Model):
+    """Specifies information about the marketplace image used to create the
+    virtual machine. This element is only used for marketplace images. Before
+    you can use a marketplace image from an API, you must enable the image for
+    programmatic use.  In the Azure portal, find the marketplace image that you
+    want to use and then click **Want to deploy programmatically, Get Started
+    ->**. Enter any required information and then click **Save**.
+
+    :param name: The plan ID.
+    :type name: str
+    :param publisher: The publisher ID.
+    :type publisher: str
+    :param product: Specifies the product of the image from the marketplace.
+     This is the same value as Offer under the imageReference element.
+    :type product: str
+    :param promotion_code: The promotion code.
+    :type promotion_code: str
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'publisher': {'key': 'publisher', 'type': 'str'},
+        'product': {'key': 'product', 'type': 'str'},
+        'promotion_code': {'key': 'promotionCode', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(Plan, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.publisher = kwargs.get('publisher', None)
+        self.product = kwargs.get('product', None)
+        self.promotion_code = kwargs.get('promotion_code', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/plan_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/plan_py3.py
new file mode 100644
index 000000000000..9cca2c78a123
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/plan_py3.py
@@ -0,0 +1,46 @@
+# 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 Plan(Model):
+    """Specifies information about the marketplace image used to create the
+    virtual machine. This element is only used for marketplace images. Before
+    you can use a marketplace image from an API, you must enable the image for
+    programmatic use.  In the Azure portal, find the marketplace image that you
+    want to use and then click **Want to deploy programmatically, Get Started
+    ->**. Enter any required information and then click **Save**.
+
+    :param name: The plan ID.
+    :type name: str
+    :param publisher: The publisher ID.
+    :type publisher: str
+    :param product: Specifies the product of the image from the marketplace.
+     This is the same value as Offer under the imageReference element.
+    :type product: str
+    :param promotion_code: The promotion code.
+    :type promotion_code: str
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'publisher': {'key': 'publisher', 'type': 'str'},
+        'product': {'key': 'product', 'type': 'str'},
+        'promotion_code': {'key': 'promotionCode', 'type': 'str'},
+    }
+
+    def __init__(self, *, name: str=None, publisher: str=None, product: str=None, promotion_code: str=None, **kwargs) -> None:
+        super(Plan, self).__init__(**kwargs)
+        self.name = name
+        self.publisher = publisher
+        self.product = product
+        self.promotion_code = promotion_code
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/purchase_plan.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/purchase_plan.py
new file mode 100644
index 000000000000..2e1509addca6
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/purchase_plan.py
@@ -0,0 +1,47 @@
+# 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 PurchasePlan(Model):
+    """Used for establishing the purchase context of any 3rd Party artifact
+    through MarketPlace.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param publisher: Required. The publisher ID.
+    :type publisher: str
+    :param name: Required. The plan ID.
+    :type name: str
+    :param product: Required. Specifies the product of the image from the
+     marketplace. This is the same value as Offer under the imageReference
+     element.
+    :type product: str
+    """
+
+    _validation = {
+        'publisher': {'required': True},
+        'name': {'required': True},
+        'product': {'required': True},
+    }
+
+    _attribute_map = {
+        'publisher': {'key': 'publisher', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'product': {'key': 'product', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(PurchasePlan, self).__init__(**kwargs)
+        self.publisher = kwargs.get('publisher', None)
+        self.name = kwargs.get('name', None)
+        self.product = kwargs.get('product', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/purchase_plan_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/purchase_plan_py3.py
new file mode 100644
index 000000000000..26f7996f1633
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/purchase_plan_py3.py
@@ -0,0 +1,47 @@
+# 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 PurchasePlan(Model):
+    """Used for establishing the purchase context of any 3rd Party artifact
+    through MarketPlace.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param publisher: Required. The publisher ID.
+    :type publisher: str
+    :param name: Required. The plan ID.
+    :type name: str
+    :param product: Required. Specifies the product of the image from the
+     marketplace. This is the same value as Offer under the imageReference
+     element.
+    :type product: str
+    """
+
+    _validation = {
+        'publisher': {'required': True},
+        'name': {'required': True},
+        'product': {'required': True},
+    }
+
+    _attribute_map = {
+        'publisher': {'key': 'publisher', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'product': {'key': 'product', 'type': 'str'},
+    }
+
+    def __init__(self, *, publisher: str, name: str, product: str, **kwargs) -> None:
+        super(PurchasePlan, self).__init__(**kwargs)
+        self.publisher = publisher
+        self.name = name
+        self.product = product
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/recovery_walk_response.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/recovery_walk_response.py
new file mode 100644
index 000000000000..8dcbca604c7e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/recovery_walk_response.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 RecoveryWalkResponse(Model):
+    """Response after calling a manual recovery walk.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar walk_performed: Whether the recovery walk was performed
+    :vartype walk_performed: bool
+    :ivar next_platform_update_domain: The next update domain that needs to be
+     walked. Null means walk spanning all update domains has been completed
+    :vartype next_platform_update_domain: int
+    """
+
+    _validation = {
+        'walk_performed': {'readonly': True},
+        'next_platform_update_domain': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'walk_performed': {'key': 'walkPerformed', 'type': 'bool'},
+        'next_platform_update_domain': {'key': 'nextPlatformUpdateDomain', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RecoveryWalkResponse, self).__init__(**kwargs)
+        self.walk_performed = None
+        self.next_platform_update_domain = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/recovery_walk_response_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/recovery_walk_response_py3.py
new file mode 100644
index 000000000000..5b24a0ed9b7a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/recovery_walk_response_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 RecoveryWalkResponse(Model):
+    """Response after calling a manual recovery walk.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar walk_performed: Whether the recovery walk was performed
+    :vartype walk_performed: bool
+    :ivar next_platform_update_domain: The next update domain that needs to be
+     walked. Null means walk spanning all update domains has been completed
+    :vartype next_platform_update_domain: int
+    """
+
+    _validation = {
+        'walk_performed': {'readonly': True},
+        'next_platform_update_domain': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'walk_performed': {'key': 'walkPerformed', 'type': 'bool'},
+        'next_platform_update_domain': {'key': 'nextPlatformUpdateDomain', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(RecoveryWalkResponse, self).__init__(**kwargs)
+        self.walk_performed = None
+        self.next_platform_update_domain = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/request_rate_by_interval_input.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/request_rate_by_interval_input.py
new file mode 100644
index 000000000000..8712882e54db
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/request_rate_by_interval_input.py
@@ -0,0 +1,60 @@
+# 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 .log_analytics_input_base import LogAnalyticsInputBase
+
+
+class RequestRateByIntervalInput(LogAnalyticsInputBase):
+    """Api request input for LogAnalytics getRequestRateByInterval Api.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param blob_container_sas_uri: Required. SAS Uri of the logging blob
+     container to which LogAnalytics Api writes output logs to.
+    :type blob_container_sas_uri: str
+    :param from_time: Required. From time of the query
+    :type from_time: datetime
+    :param to_time: Required. To time of the query
+    :type to_time: datetime
+    :param group_by_throttle_policy: Group query result by Throttle Policy
+     applied.
+    :type group_by_throttle_policy: bool
+    :param group_by_operation_name: Group query result by  by Operation Name.
+    :type group_by_operation_name: bool
+    :param group_by_resource_name: Group query result by Resource Name.
+    :type group_by_resource_name: bool
+    :param interval_length: Required. Interval value in minutes used to create
+     LogAnalytics call rate logs. Possible values include: 'ThreeMins',
+     'FiveMins', 'ThirtyMins', 'SixtyMins'
+    :type interval_length: str or
+     ~azure.mgmt.compute.v2018_04_01.models.IntervalInMins
+    """
+
+    _validation = {
+        'blob_container_sas_uri': {'required': True},
+        'from_time': {'required': True},
+        'to_time': {'required': True},
+        'interval_length': {'required': True},
+    }
+
+    _attribute_map = {
+        'blob_container_sas_uri': {'key': 'blobContainerSasUri', 'type': 'str'},
+        'from_time': {'key': 'fromTime', 'type': 'iso-8601'},
+        'to_time': {'key': 'toTime', 'type': 'iso-8601'},
+        'group_by_throttle_policy': {'key': 'groupByThrottlePolicy', 'type': 'bool'},
+        'group_by_operation_name': {'key': 'groupByOperationName', 'type': 'bool'},
+        'group_by_resource_name': {'key': 'groupByResourceName', 'type': 'bool'},
+        'interval_length': {'key': 'intervalLength', 'type': 'IntervalInMins'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RequestRateByIntervalInput, self).__init__(**kwargs)
+        self.interval_length = kwargs.get('interval_length', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/request_rate_by_interval_input_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/request_rate_by_interval_input_py3.py
new file mode 100644
index 000000000000..c073513f5d59
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/request_rate_by_interval_input_py3.py
@@ -0,0 +1,60 @@
+# 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 .log_analytics_input_base_py3 import LogAnalyticsInputBase
+
+
+class RequestRateByIntervalInput(LogAnalyticsInputBase):
+    """Api request input for LogAnalytics getRequestRateByInterval Api.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param blob_container_sas_uri: Required. SAS Uri of the logging blob
+     container to which LogAnalytics Api writes output logs to.
+    :type blob_container_sas_uri: str
+    :param from_time: Required. From time of the query
+    :type from_time: datetime
+    :param to_time: Required. To time of the query
+    :type to_time: datetime
+    :param group_by_throttle_policy: Group query result by Throttle Policy
+     applied.
+    :type group_by_throttle_policy: bool
+    :param group_by_operation_name: Group query result by  by Operation Name.
+    :type group_by_operation_name: bool
+    :param group_by_resource_name: Group query result by Resource Name.
+    :type group_by_resource_name: bool
+    :param interval_length: Required. Interval value in minutes used to create
+     LogAnalytics call rate logs. Possible values include: 'ThreeMins',
+     'FiveMins', 'ThirtyMins', 'SixtyMins'
+    :type interval_length: str or
+     ~azure.mgmt.compute.v2018_04_01.models.IntervalInMins
+    """
+
+    _validation = {
+        'blob_container_sas_uri': {'required': True},
+        'from_time': {'required': True},
+        'to_time': {'required': True},
+        'interval_length': {'required': True},
+    }
+
+    _attribute_map = {
+        'blob_container_sas_uri': {'key': 'blobContainerSasUri', 'type': 'str'},
+        'from_time': {'key': 'fromTime', 'type': 'iso-8601'},
+        'to_time': {'key': 'toTime', 'type': 'iso-8601'},
+        'group_by_throttle_policy': {'key': 'groupByThrottlePolicy', 'type': 'bool'},
+        'group_by_operation_name': {'key': 'groupByOperationName', 'type': 'bool'},
+        'group_by_resource_name': {'key': 'groupByResourceName', 'type': 'bool'},
+        'interval_length': {'key': 'intervalLength', 'type': 'IntervalInMins'},
+    }
+
+    def __init__(self, *, blob_container_sas_uri: str, from_time, to_time, interval_length, group_by_throttle_policy: bool=None, group_by_operation_name: bool=None, group_by_resource_name: bool=None, **kwargs) -> None:
+        super(RequestRateByIntervalInput, self).__init__(blob_container_sas_uri=blob_container_sas_uri, from_time=from_time, to_time=to_time, group_by_throttle_policy=group_by_throttle_policy, group_by_operation_name=group_by_operation_name, group_by_resource_name=group_by_resource_name, **kwargs)
+        self.interval_length = interval_length
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rollback_status_info.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rollback_status_info.py
new file mode 100644
index 000000000000..db43528801fa
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rollback_status_info.py
@@ -0,0 +1,48 @@
+# 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 RollbackStatusInfo(Model):
+    """Information about rollback on failed VM instances after a OS Upgrade
+    operation.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar successfully_rolledback_instance_count: The number of instances
+     which have been successfully rolled back.
+    :vartype successfully_rolledback_instance_count: int
+    :ivar failed_rolledback_instance_count: The number of instances which
+     failed to rollback.
+    :vartype failed_rolledback_instance_count: int
+    :ivar rollback_error: Error Details if OS rollback failed.
+    :vartype rollback_error: ~azure.mgmt.compute.v2018_04_01.models.ApiError
+    """
+
+    _validation = {
+        'successfully_rolledback_instance_count': {'readonly': True},
+        'failed_rolledback_instance_count': {'readonly': True},
+        'rollback_error': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'successfully_rolledback_instance_count': {'key': 'successfullyRolledbackInstanceCount', 'type': 'int'},
+        'failed_rolledback_instance_count': {'key': 'failedRolledbackInstanceCount', 'type': 'int'},
+        'rollback_error': {'key': 'rollbackError', 'type': 'ApiError'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RollbackStatusInfo, self).__init__(**kwargs)
+        self.successfully_rolledback_instance_count = None
+        self.failed_rolledback_instance_count = None
+        self.rollback_error = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rollback_status_info_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rollback_status_info_py3.py
new file mode 100644
index 000000000000..37ebb8516470
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rollback_status_info_py3.py
@@ -0,0 +1,48 @@
+# 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 RollbackStatusInfo(Model):
+    """Information about rollback on failed VM instances after a OS Upgrade
+    operation.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar successfully_rolledback_instance_count: The number of instances
+     which have been successfully rolled back.
+    :vartype successfully_rolledback_instance_count: int
+    :ivar failed_rolledback_instance_count: The number of instances which
+     failed to rollback.
+    :vartype failed_rolledback_instance_count: int
+    :ivar rollback_error: Error Details if OS rollback failed.
+    :vartype rollback_error: ~azure.mgmt.compute.v2018_04_01.models.ApiError
+    """
+
+    _validation = {
+        'successfully_rolledback_instance_count': {'readonly': True},
+        'failed_rolledback_instance_count': {'readonly': True},
+        'rollback_error': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'successfully_rolledback_instance_count': {'key': 'successfullyRolledbackInstanceCount', 'type': 'int'},
+        'failed_rolledback_instance_count': {'key': 'failedRolledbackInstanceCount', 'type': 'int'},
+        'rollback_error': {'key': 'rollbackError', 'type': 'ApiError'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(RollbackStatusInfo, self).__init__(**kwargs)
+        self.successfully_rolledback_instance_count = None
+        self.failed_rolledback_instance_count = None
+        self.rollback_error = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_policy.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_policy.py
new file mode 100644
index 000000000000..1eecaa5e2e65
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_policy.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 RollingUpgradePolicy(Model):
+    """The configuration parameters used while performing a rolling upgrade.
+
+    :param max_batch_instance_percent: The maximum percent of total virtual
+     machine instances that will be upgraded simultaneously by the rolling
+     upgrade in one batch. As this is a maximum, unhealthy instances in
+     previous or future batches can cause the percentage of instances in a
+     batch to decrease to ensure higher reliability. The default value for this
+     parameter is 20%.
+    :type max_batch_instance_percent: int
+    :param max_unhealthy_instance_percent: The maximum percentage of the total
+     virtual machine instances in the scale set that can be simultaneously
+     unhealthy, either as a result of being upgraded, or by being found in an
+     unhealthy state by the virtual machine health checks before the rolling
+     upgrade aborts. This constraint will be checked prior to starting any
+     batch. The default value for this parameter is 20%.
+    :type max_unhealthy_instance_percent: int
+    :param max_unhealthy_upgraded_instance_percent: The maximum percentage of
+     upgraded virtual machine instances that can be found to be in an unhealthy
+     state. This check will happen after each batch is upgraded. If this
+     percentage is ever exceeded, the rolling update aborts. The default value
+     for this parameter is 20%.
+    :type max_unhealthy_upgraded_instance_percent: int
+    :param pause_time_between_batches: The wait time between completing the
+     update for all virtual machines in one batch and starting the next batch.
+     The time duration should be specified in ISO 8601 format. The default
+     value is 0 seconds (PT0S).
+    :type pause_time_between_batches: str
+    """
+
+    _validation = {
+        'max_batch_instance_percent': {'maximum': 100, 'minimum': 5},
+        'max_unhealthy_instance_percent': {'maximum': 100, 'minimum': 5},
+        'max_unhealthy_upgraded_instance_percent': {'maximum': 100, 'minimum': 0},
+    }
+
+    _attribute_map = {
+        'max_batch_instance_percent': {'key': 'maxBatchInstancePercent', 'type': 'int'},
+        'max_unhealthy_instance_percent': {'key': 'maxUnhealthyInstancePercent', 'type': 'int'},
+        'max_unhealthy_upgraded_instance_percent': {'key': 'maxUnhealthyUpgradedInstancePercent', 'type': 'int'},
+        'pause_time_between_batches': {'key': 'pauseTimeBetweenBatches', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RollingUpgradePolicy, self).__init__(**kwargs)
+        self.max_batch_instance_percent = kwargs.get('max_batch_instance_percent', None)
+        self.max_unhealthy_instance_percent = kwargs.get('max_unhealthy_instance_percent', None)
+        self.max_unhealthy_upgraded_instance_percent = kwargs.get('max_unhealthy_upgraded_instance_percent', None)
+        self.pause_time_between_batches = kwargs.get('pause_time_between_batches', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_policy_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_policy_py3.py
new file mode 100644
index 000000000000..e698a382f112
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_policy_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 RollingUpgradePolicy(Model):
+    """The configuration parameters used while performing a rolling upgrade.
+
+    :param max_batch_instance_percent: The maximum percent of total virtual
+     machine instances that will be upgraded simultaneously by the rolling
+     upgrade in one batch. As this is a maximum, unhealthy instances in
+     previous or future batches can cause the percentage of instances in a
+     batch to decrease to ensure higher reliability. The default value for this
+     parameter is 20%.
+    :type max_batch_instance_percent: int
+    :param max_unhealthy_instance_percent: The maximum percentage of the total
+     virtual machine instances in the scale set that can be simultaneously
+     unhealthy, either as a result of being upgraded, or by being found in an
+     unhealthy state by the virtual machine health checks before the rolling
+     upgrade aborts. This constraint will be checked prior to starting any
+     batch. The default value for this parameter is 20%.
+    :type max_unhealthy_instance_percent: int
+    :param max_unhealthy_upgraded_instance_percent: The maximum percentage of
+     upgraded virtual machine instances that can be found to be in an unhealthy
+     state. This check will happen after each batch is upgraded. If this
+     percentage is ever exceeded, the rolling update aborts. The default value
+     for this parameter is 20%.
+    :type max_unhealthy_upgraded_instance_percent: int
+    :param pause_time_between_batches: The wait time between completing the
+     update for all virtual machines in one batch and starting the next batch.
+     The time duration should be specified in ISO 8601 format. The default
+     value is 0 seconds (PT0S).
+    :type pause_time_between_batches: str
+    """
+
+    _validation = {
+        'max_batch_instance_percent': {'maximum': 100, 'minimum': 5},
+        'max_unhealthy_instance_percent': {'maximum': 100, 'minimum': 5},
+        'max_unhealthy_upgraded_instance_percent': {'maximum': 100, 'minimum': 0},
+    }
+
+    _attribute_map = {
+        'max_batch_instance_percent': {'key': 'maxBatchInstancePercent', 'type': 'int'},
+        'max_unhealthy_instance_percent': {'key': 'maxUnhealthyInstancePercent', 'type': 'int'},
+        'max_unhealthy_upgraded_instance_percent': {'key': 'maxUnhealthyUpgradedInstancePercent', 'type': 'int'},
+        'pause_time_between_batches': {'key': 'pauseTimeBetweenBatches', 'type': 'str'},
+    }
+
+    def __init__(self, *, max_batch_instance_percent: int=None, max_unhealthy_instance_percent: int=None, max_unhealthy_upgraded_instance_percent: int=None, pause_time_between_batches: str=None, **kwargs) -> None:
+        super(RollingUpgradePolicy, self).__init__(**kwargs)
+        self.max_batch_instance_percent = max_batch_instance_percent
+        self.max_unhealthy_instance_percent = max_unhealthy_instance_percent
+        self.max_unhealthy_upgraded_instance_percent = max_unhealthy_upgraded_instance_percent
+        self.pause_time_between_batches = pause_time_between_batches
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_progress_info.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_progress_info.py
new file mode 100644
index 000000000000..87e40590e275
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_progress_info.py
@@ -0,0 +1,55 @@
+# 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 RollingUpgradeProgressInfo(Model):
+    """Information about the number of virtual machine instances in each upgrade
+    state.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar successful_instance_count: The number of instances that have been
+     successfully upgraded.
+    :vartype successful_instance_count: int
+    :ivar failed_instance_count: The number of instances that have failed to
+     be upgraded successfully.
+    :vartype failed_instance_count: int
+    :ivar in_progress_instance_count: The number of instances that are
+     currently being upgraded.
+    :vartype in_progress_instance_count: int
+    :ivar pending_instance_count: The number of instances that have not yet
+     begun to be upgraded.
+    :vartype pending_instance_count: int
+    """
+
+    _validation = {
+        'successful_instance_count': {'readonly': True},
+        'failed_instance_count': {'readonly': True},
+        'in_progress_instance_count': {'readonly': True},
+        'pending_instance_count': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'successful_instance_count': {'key': 'successfulInstanceCount', 'type': 'int'},
+        'failed_instance_count': {'key': 'failedInstanceCount', 'type': 'int'},
+        'in_progress_instance_count': {'key': 'inProgressInstanceCount', 'type': 'int'},
+        'pending_instance_count': {'key': 'pendingInstanceCount', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RollingUpgradeProgressInfo, self).__init__(**kwargs)
+        self.successful_instance_count = None
+        self.failed_instance_count = None
+        self.in_progress_instance_count = None
+        self.pending_instance_count = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_progress_info_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_progress_info_py3.py
new file mode 100644
index 000000000000..060abc3063b4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_progress_info_py3.py
@@ -0,0 +1,55 @@
+# 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 RollingUpgradeProgressInfo(Model):
+    """Information about the number of virtual machine instances in each upgrade
+    state.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar successful_instance_count: The number of instances that have been
+     successfully upgraded.
+    :vartype successful_instance_count: int
+    :ivar failed_instance_count: The number of instances that have failed to
+     be upgraded successfully.
+    :vartype failed_instance_count: int
+    :ivar in_progress_instance_count: The number of instances that are
+     currently being upgraded.
+    :vartype in_progress_instance_count: int
+    :ivar pending_instance_count: The number of instances that have not yet
+     begun to be upgraded.
+    :vartype pending_instance_count: int
+    """
+
+    _validation = {
+        'successful_instance_count': {'readonly': True},
+        'failed_instance_count': {'readonly': True},
+        'in_progress_instance_count': {'readonly': True},
+        'pending_instance_count': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'successful_instance_count': {'key': 'successfulInstanceCount', 'type': 'int'},
+        'failed_instance_count': {'key': 'failedInstanceCount', 'type': 'int'},
+        'in_progress_instance_count': {'key': 'inProgressInstanceCount', 'type': 'int'},
+        'pending_instance_count': {'key': 'pendingInstanceCount', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(RollingUpgradeProgressInfo, self).__init__(**kwargs)
+        self.successful_instance_count = None
+        self.failed_instance_count = None
+        self.in_progress_instance_count = None
+        self.pending_instance_count = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_running_status.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_running_status.py
new file mode 100644
index 000000000000..0fc6dadaaac9
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_running_status.py
@@ -0,0 +1,54 @@
+# 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 RollingUpgradeRunningStatus(Model):
+    """Information about the current running state of the overall upgrade.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar code: Code indicating the current status of the upgrade. Possible
+     values include: 'RollingForward', 'Cancelled', 'Completed', 'Faulted'
+    :vartype code: str or
+     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeStatusCode
+    :ivar start_time: Start time of the upgrade.
+    :vartype start_time: datetime
+    :ivar last_action: The last action performed on the rolling upgrade.
+     Possible values include: 'Start', 'Cancel'
+    :vartype last_action: str or
+     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeActionType
+    :ivar last_action_time: Last action time of the upgrade.
+    :vartype last_action_time: datetime
+    """
+
+    _validation = {
+        'code': {'readonly': True},
+        'start_time': {'readonly': True},
+        'last_action': {'readonly': True},
+        'last_action_time': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'RollingUpgradeStatusCode'},
+        'start_time': {'key': 'startTime', 'type': 'iso-8601'},
+        'last_action': {'key': 'lastAction', 'type': 'RollingUpgradeActionType'},
+        'last_action_time': {'key': 'lastActionTime', 'type': 'iso-8601'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RollingUpgradeRunningStatus, self).__init__(**kwargs)
+        self.code = None
+        self.start_time = None
+        self.last_action = None
+        self.last_action_time = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_running_status_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_running_status_py3.py
new file mode 100644
index 000000000000..013502d02229
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_running_status_py3.py
@@ -0,0 +1,54 @@
+# 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 RollingUpgradeRunningStatus(Model):
+    """Information about the current running state of the overall upgrade.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar code: Code indicating the current status of the upgrade. Possible
+     values include: 'RollingForward', 'Cancelled', 'Completed', 'Faulted'
+    :vartype code: str or
+     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeStatusCode
+    :ivar start_time: Start time of the upgrade.
+    :vartype start_time: datetime
+    :ivar last_action: The last action performed on the rolling upgrade.
+     Possible values include: 'Start', 'Cancel'
+    :vartype last_action: str or
+     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeActionType
+    :ivar last_action_time: Last action time of the upgrade.
+    :vartype last_action_time: datetime
+    """
+
+    _validation = {
+        'code': {'readonly': True},
+        'start_time': {'readonly': True},
+        'last_action': {'readonly': True},
+        'last_action_time': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'RollingUpgradeStatusCode'},
+        'start_time': {'key': 'startTime', 'type': 'iso-8601'},
+        'last_action': {'key': 'lastAction', 'type': 'RollingUpgradeActionType'},
+        'last_action_time': {'key': 'lastActionTime', 'type': 'iso-8601'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(RollingUpgradeRunningStatus, self).__init__(**kwargs)
+        self.code = None
+        self.start_time = None
+        self.last_action = None
+        self.last_action_time = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_status_info.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_status_info.py
new file mode 100644
index 000000000000..eb679db28958
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_status_info.py
@@ -0,0 +1,76 @@
+# 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 RollingUpgradeStatusInfo(Resource):
+    """The status of the latest virtual machine scale set rolling upgrade.
+
+    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 policy: The rolling upgrade policies applied for this upgrade.
+    :vartype policy:
+     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradePolicy
+    :ivar running_status: Information about the current running state of the
+     overall upgrade.
+    :vartype running_status:
+     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeRunningStatus
+    :ivar progress: Information about the number of virtual machine instances
+     in each upgrade state.
+    :vartype progress:
+     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeProgressInfo
+    :ivar error: Error details for this upgrade, if there are any.
+    :vartype error: ~azure.mgmt.compute.v2018_04_01.models.ApiError
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'policy': {'readonly': True},
+        'running_status': {'readonly': True},
+        'progress': {'readonly': True},
+        'error': {'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}'},
+        'policy': {'key': 'properties.policy', 'type': 'RollingUpgradePolicy'},
+        'running_status': {'key': 'properties.runningStatus', 'type': 'RollingUpgradeRunningStatus'},
+        'progress': {'key': 'properties.progress', 'type': 'RollingUpgradeProgressInfo'},
+        'error': {'key': 'properties.error', 'type': 'ApiError'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RollingUpgradeStatusInfo, self).__init__(**kwargs)
+        self.policy = None
+        self.running_status = None
+        self.progress = None
+        self.error = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_status_info_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_status_info_py3.py
new file mode 100644
index 000000000000..8baa5b20df04
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_status_info_py3.py
@@ -0,0 +1,76 @@
+# 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 RollingUpgradeStatusInfo(Resource):
+    """The status of the latest virtual machine scale set rolling upgrade.
+
+    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 policy: The rolling upgrade policies applied for this upgrade.
+    :vartype policy:
+     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradePolicy
+    :ivar running_status: Information about the current running state of the
+     overall upgrade.
+    :vartype running_status:
+     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeRunningStatus
+    :ivar progress: Information about the number of virtual machine instances
+     in each upgrade state.
+    :vartype progress:
+     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeProgressInfo
+    :ivar error: Error details for this upgrade, if there are any.
+    :vartype error: ~azure.mgmt.compute.v2018_04_01.models.ApiError
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'policy': {'readonly': True},
+        'running_status': {'readonly': True},
+        'progress': {'readonly': True},
+        'error': {'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}'},
+        'policy': {'key': 'properties.policy', 'type': 'RollingUpgradePolicy'},
+        'running_status': {'key': 'properties.runningStatus', 'type': 'RollingUpgradeRunningStatus'},
+        'progress': {'key': 'properties.progress', 'type': 'RollingUpgradeProgressInfo'},
+        'error': {'key': 'properties.error', 'type': 'ApiError'},
+    }
+
+    def __init__(self, *, location: str, tags=None, **kwargs) -> None:
+        super(RollingUpgradeStatusInfo, self).__init__(location=location, tags=tags, **kwargs)
+        self.policy = None
+        self.running_status = None
+        self.progress = None
+        self.error = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document.py
new file mode 100644
index 000000000000..fb511a45281d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document.py
@@ -0,0 +1,61 @@
+# 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 .run_command_document_base import RunCommandDocumentBase
+
+
+class RunCommandDocument(RunCommandDocumentBase):
+    """Describes the properties of a Run Command.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param schema: Required. The VM run command schema.
+    :type schema: str
+    :param id: Required. The VM run command id.
+    :type id: str
+    :param os_type: Required. The Operating System type. Possible values
+     include: 'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
+    :param label: Required. The VM run command label.
+    :type label: str
+    :param description: Required. The VM run command description.
+    :type description: str
+    :param script: Required. The script to be executed.
+    :type script: list[str]
+    :param parameters: The parameters used by the script.
+    :type parameters:
+     list[~azure.mgmt.compute.v2018_04_01.models.RunCommandParameterDefinition]
+    """
+
+    _validation = {
+        'schema': {'required': True},
+        'id': {'required': True},
+        'os_type': {'required': True},
+        'label': {'required': True},
+        'description': {'required': True},
+        'script': {'required': True},
+    }
+
+    _attribute_map = {
+        'schema': {'key': '$schema', 'type': 'str'},
+        'id': {'key': 'id', 'type': 'str'},
+        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
+        'label': {'key': 'label', 'type': 'str'},
+        'description': {'key': 'description', 'type': 'str'},
+        'script': {'key': 'script', 'type': '[str]'},
+        'parameters': {'key': 'parameters', 'type': '[RunCommandParameterDefinition]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RunCommandDocument, self).__init__(**kwargs)
+        self.script = kwargs.get('script', None)
+        self.parameters = kwargs.get('parameters', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base.py
new file mode 100644
index 000000000000..2ae3371b83e7
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base.py
@@ -0,0 +1,56 @@
+# 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 RunCommandDocumentBase(Model):
+    """Describes the properties of a Run Command metadata.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param schema: Required. The VM run command schema.
+    :type schema: str
+    :param id: Required. The VM run command id.
+    :type id: str
+    :param os_type: Required. The Operating System type. Possible values
+     include: 'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
+    :param label: Required. The VM run command label.
+    :type label: str
+    :param description: Required. The VM run command description.
+    :type description: str
+    """
+
+    _validation = {
+        'schema': {'required': True},
+        'id': {'required': True},
+        'os_type': {'required': True},
+        'label': {'required': True},
+        'description': {'required': True},
+    }
+
+    _attribute_map = {
+        'schema': {'key': '$schema', 'type': 'str'},
+        'id': {'key': 'id', 'type': 'str'},
+        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
+        'label': {'key': 'label', 'type': 'str'},
+        'description': {'key': 'description', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RunCommandDocumentBase, self).__init__(**kwargs)
+        self.schema = kwargs.get('schema', None)
+        self.id = kwargs.get('id', None)
+        self.os_type = kwargs.get('os_type', None)
+        self.label = kwargs.get('label', None)
+        self.description = kwargs.get('description', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base_paged.py
new file mode 100644
index 000000000000..1ac583338364
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base_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 RunCommandDocumentBasePaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`RunCommandDocumentBase <azure.mgmt.compute.v2018_04_01.models.RunCommandDocumentBase>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[RunCommandDocumentBase]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(RunCommandDocumentBasePaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base_py3.py
new file mode 100644
index 000000000000..45919bf4d325
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base_py3.py
@@ -0,0 +1,56 @@
+# 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 RunCommandDocumentBase(Model):
+    """Describes the properties of a Run Command metadata.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param schema: Required. The VM run command schema.
+    :type schema: str
+    :param id: Required. The VM run command id.
+    :type id: str
+    :param os_type: Required. The Operating System type. Possible values
+     include: 'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
+    :param label: Required. The VM run command label.
+    :type label: str
+    :param description: Required. The VM run command description.
+    :type description: str
+    """
+
+    _validation = {
+        'schema': {'required': True},
+        'id': {'required': True},
+        'os_type': {'required': True},
+        'label': {'required': True},
+        'description': {'required': True},
+    }
+
+    _attribute_map = {
+        'schema': {'key': '$schema', 'type': 'str'},
+        'id': {'key': 'id', 'type': 'str'},
+        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
+        'label': {'key': 'label', 'type': 'str'},
+        'description': {'key': 'description', 'type': 'str'},
+    }
+
+    def __init__(self, *, schema: str, id: str, os_type, label: str, description: str, **kwargs) -> None:
+        super(RunCommandDocumentBase, self).__init__(**kwargs)
+        self.schema = schema
+        self.id = id
+        self.os_type = os_type
+        self.label = label
+        self.description = description
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_py3.py
new file mode 100644
index 000000000000..3543a6d45ef5
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_py3.py
@@ -0,0 +1,61 @@
+# 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 .run_command_document_base_py3 import RunCommandDocumentBase
+
+
+class RunCommandDocument(RunCommandDocumentBase):
+    """Describes the properties of a Run Command.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param schema: Required. The VM run command schema.
+    :type schema: str
+    :param id: Required. The VM run command id.
+    :type id: str
+    :param os_type: Required. The Operating System type. Possible values
+     include: 'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
+    :param label: Required. The VM run command label.
+    :type label: str
+    :param description: Required. The VM run command description.
+    :type description: str
+    :param script: Required. The script to be executed.
+    :type script: list[str]
+    :param parameters: The parameters used by the script.
+    :type parameters:
+     list[~azure.mgmt.compute.v2018_04_01.models.RunCommandParameterDefinition]
+    """
+
+    _validation = {
+        'schema': {'required': True},
+        'id': {'required': True},
+        'os_type': {'required': True},
+        'label': {'required': True},
+        'description': {'required': True},
+        'script': {'required': True},
+    }
+
+    _attribute_map = {
+        'schema': {'key': '$schema', 'type': 'str'},
+        'id': {'key': 'id', 'type': 'str'},
+        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
+        'label': {'key': 'label', 'type': 'str'},
+        'description': {'key': 'description', 'type': 'str'},
+        'script': {'key': 'script', 'type': '[str]'},
+        'parameters': {'key': 'parameters', 'type': '[RunCommandParameterDefinition]'},
+    }
+
+    def __init__(self, *, schema: str, id: str, os_type, label: str, description: str, script, parameters=None, **kwargs) -> None:
+        super(RunCommandDocument, self).__init__(schema=schema, id=id, os_type=os_type, label=label, description=description, **kwargs)
+        self.script = script
+        self.parameters = parameters
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input.py
new file mode 100644
index 000000000000..25b53a1f0336
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input.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 RunCommandInput(Model):
+    """Capture Virtual Machine parameters.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param command_id: Required. The run command id.
+    :type command_id: str
+    :param script: Optional. The script to be executed.  When this value is
+     given, the given script will override the default script of the command.
+    :type script: list[str]
+    :param parameters: The run command parameters.
+    :type parameters:
+     list[~azure.mgmt.compute.v2018_04_01.models.RunCommandInputParameter]
+    """
+
+    _validation = {
+        'command_id': {'required': True},
+    }
+
+    _attribute_map = {
+        'command_id': {'key': 'commandId', 'type': 'str'},
+        'script': {'key': 'script', 'type': '[str]'},
+        'parameters': {'key': 'parameters', 'type': '[RunCommandInputParameter]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RunCommandInput, self).__init__(**kwargs)
+        self.command_id = kwargs.get('command_id', None)
+        self.script = kwargs.get('script', None)
+        self.parameters = kwargs.get('parameters', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_parameter.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_parameter.py
new file mode 100644
index 000000000000..cd76ad81bfa2
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_parameter.py
@@ -0,0 +1,39 @@
+# 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 RunCommandInputParameter(Model):
+    """Describes the properties of a run command parameter.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: Required. The run command parameter name.
+    :type name: str
+    :param value: Required. The run command parameter value.
+    :type value: str
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'value': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'value': {'key': 'value', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RunCommandInputParameter, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.value = kwargs.get('value', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_parameter_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_parameter_py3.py
new file mode 100644
index 000000000000..6013f038a1c3
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_parameter_py3.py
@@ -0,0 +1,39 @@
+# 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 RunCommandInputParameter(Model):
+    """Describes the properties of a run command parameter.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: Required. The run command parameter name.
+    :type name: str
+    :param value: Required. The run command parameter value.
+    :type value: str
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'value': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'value': {'key': 'value', 'type': 'str'},
+    }
+
+    def __init__(self, *, name: str, value: str, **kwargs) -> None:
+        super(RunCommandInputParameter, self).__init__(**kwargs)
+        self.name = name
+        self.value = value
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_py3.py
new file mode 100644
index 000000000000..ae2a3588c64d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_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 RunCommandInput(Model):
+    """Capture Virtual Machine parameters.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param command_id: Required. The run command id.
+    :type command_id: str
+    :param script: Optional. The script to be executed.  When this value is
+     given, the given script will override the default script of the command.
+    :type script: list[str]
+    :param parameters: The run command parameters.
+    :type parameters:
+     list[~azure.mgmt.compute.v2018_04_01.models.RunCommandInputParameter]
+    """
+
+    _validation = {
+        'command_id': {'required': True},
+    }
+
+    _attribute_map = {
+        'command_id': {'key': 'commandId', 'type': 'str'},
+        'script': {'key': 'script', 'type': '[str]'},
+        'parameters': {'key': 'parameters', 'type': '[RunCommandInputParameter]'},
+    }
+
+    def __init__(self, *, command_id: str, script=None, parameters=None, **kwargs) -> None:
+        super(RunCommandInput, self).__init__(**kwargs)
+        self.command_id = command_id
+        self.script = script
+        self.parameters = parameters
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_parameter_definition.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_parameter_definition.py
new file mode 100644
index 000000000000..e09f774d8241
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_parameter_definition.py
@@ -0,0 +1,48 @@
+# 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 RunCommandParameterDefinition(Model):
+    """Describes the properties of a run command parameter.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: Required. The run command parameter name.
+    :type name: str
+    :param type: Required. The run command parameter type.
+    :type type: str
+    :param default_value: The run command parameter default value.
+    :type default_value: str
+    :param required: The run command parameter required. Default value: False
+     .
+    :type required: bool
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'type': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'default_value': {'key': 'defaultValue', 'type': 'str'},
+        'required': {'key': 'required', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RunCommandParameterDefinition, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.type = kwargs.get('type', None)
+        self.default_value = kwargs.get('default_value', None)
+        self.required = kwargs.get('required', False)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_parameter_definition_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_parameter_definition_py3.py
new file mode 100644
index 000000000000..e5fbc708f965
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_parameter_definition_py3.py
@@ -0,0 +1,48 @@
+# 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 RunCommandParameterDefinition(Model):
+    """Describes the properties of a run command parameter.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: Required. The run command parameter name.
+    :type name: str
+    :param type: Required. The run command parameter type.
+    :type type: str
+    :param default_value: The run command parameter default value.
+    :type default_value: str
+    :param required: The run command parameter required. Default value: False
+     .
+    :type required: bool
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'type': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'default_value': {'key': 'defaultValue', 'type': 'str'},
+        'required': {'key': 'required', 'type': 'bool'},
+    }
+
+    def __init__(self, *, name: str, type: str, default_value: str=None, required: bool=False, **kwargs) -> None:
+        super(RunCommandParameterDefinition, self).__init__(**kwargs)
+        self.name = name
+        self.type = type
+        self.default_value = default_value
+        self.required = required
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result.py
new file mode 100644
index 000000000000..8fafc31dd548
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result.py
@@ -0,0 +1,28 @@
+# 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 RunCommandResult(Model):
+    """Run command operation response.
+
+    :param output: Operation output data (raw JSON)
+    :type output: object
+    """
+
+    _attribute_map = {
+        'output': {'key': 'properties.output', 'type': 'object'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RunCommandResult, self).__init__(**kwargs)
+        self.output = kwargs.get('output', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result_py3.py
new file mode 100644
index 000000000000..852c2895dcee
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result_py3.py
@@ -0,0 +1,28 @@
+# 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 RunCommandResult(Model):
+    """Run command operation response.
+
+    :param output: Operation output data (raw JSON)
+    :type output: object
+    """
+
+    _attribute_map = {
+        'output': {'key': 'properties.output', 'type': 'object'},
+    }
+
+    def __init__(self, *, output=None, **kwargs) -> None:
+        super(RunCommandResult, self).__init__(**kwargs)
+        self.output = output
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sku.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sku.py
new file mode 100644
index 000000000000..5c07709435e0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sku.py
@@ -0,0 +1,38 @@
+# 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 Sku(Model):
+    """Describes a virtual machine scale set sku.
+
+    :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**
+    :type tier: str
+    :param capacity: Specifies the number of virtual machines in the scale
+     set.
+    :type capacity: long
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'tier': {'key': 'tier', 'type': 'str'},
+        'capacity': {'key': 'capacity', 'type': 'long'},
+    }
+
+    def __init__(self, **kwargs):
+        super(Sku, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.tier = kwargs.get('tier', None)
+        self.capacity = kwargs.get('capacity', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sku_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sku_py3.py
new file mode 100644
index 000000000000..f6bc74afaadc
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sku_py3.py
@@ -0,0 +1,38 @@
+# 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 Sku(Model):
+    """Describes a virtual machine scale set sku.
+
+    :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**
+    :type tier: str
+    :param capacity: Specifies the number of virtual machines in the scale
+     set.
+    :type capacity: long
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'tier': {'key': 'tier', 'type': 'str'},
+        'capacity': {'key': 'capacity', 'type': 'long'},
+    }
+
+    def __init__(self, *, name: str=None, tier: str=None, capacity: int=None, **kwargs) -> None:
+        super(Sku, self).__init__(**kwargs)
+        self.name = name
+        self.tier = tier
+        self.capacity = capacity
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_configuration.py
new file mode 100644
index 000000000000..ff92fd1a9376
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_configuration.py
@@ -0,0 +1,30 @@
+# 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 SshConfiguration(Model):
+    """SSH configuration for Linux based VMs running on Azure.
+
+    :param public_keys: The list of SSH public keys used to authenticate with
+     linux based VMs.
+    :type public_keys:
+     list[~azure.mgmt.compute.v2018_04_01.models.SshPublicKey]
+    """
+
+    _attribute_map = {
+        'public_keys': {'key': 'publicKeys', 'type': '[SshPublicKey]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(SshConfiguration, self).__init__(**kwargs)
+        self.public_keys = kwargs.get('public_keys', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_configuration_py3.py
new file mode 100644
index 000000000000..e81ca2f47af3
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_configuration_py3.py
@@ -0,0 +1,30 @@
+# 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 SshConfiguration(Model):
+    """SSH configuration for Linux based VMs running on Azure.
+
+    :param public_keys: The list of SSH public keys used to authenticate with
+     linux based VMs.
+    :type public_keys:
+     list[~azure.mgmt.compute.v2018_04_01.models.SshPublicKey]
+    """
+
+    _attribute_map = {
+        'public_keys': {'key': 'publicKeys', 'type': '[SshPublicKey]'},
+    }
+
+    def __init__(self, *, public_keys=None, **kwargs) -> None:
+        super(SshConfiguration, self).__init__(**kwargs)
+        self.public_keys = public_keys
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_public_key.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_public_key.py
new file mode 100644
index 000000000000..122e0d3b9fdd
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_public_key.py
@@ -0,0 +1,39 @@
+# 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 SshPublicKey(Model):
+    """Contains information about SSH certificate public key and the path on the
+    Linux VM where the public key is placed.
+
+    :param path: Specifies the full path on the created VM where ssh public
+     key is stored. If the file already exists, the specified key is appended
+     to the file. Example: /home/user/.ssh/authorized_keys
+    :type path: str
+    :param key_data: SSH public key certificate used to authenticate with the
+     VM through ssh. The key needs to be at least 2048-bit and in ssh-rsa
+     format. <br><br> For creating ssh keys, see [Create SSH keys on Linux and
+     Mac for Linux VMs in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-mac-create-ssh-keys?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
+    :type key_data: str
+    """
+
+    _attribute_map = {
+        'path': {'key': 'path', 'type': 'str'},
+        'key_data': {'key': 'keyData', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(SshPublicKey, self).__init__(**kwargs)
+        self.path = kwargs.get('path', None)
+        self.key_data = kwargs.get('key_data', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_public_key_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_public_key_py3.py
new file mode 100644
index 000000000000..b16ee085b36b
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_public_key_py3.py
@@ -0,0 +1,39 @@
+# 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 SshPublicKey(Model):
+    """Contains information about SSH certificate public key and the path on the
+    Linux VM where the public key is placed.
+
+    :param path: Specifies the full path on the created VM where ssh public
+     key is stored. If the file already exists, the specified key is appended
+     to the file. Example: /home/user/.ssh/authorized_keys
+    :type path: str
+    :param key_data: SSH public key certificate used to authenticate with the
+     VM through ssh. The key needs to be at least 2048-bit and in ssh-rsa
+     format. <br><br> For creating ssh keys, see [Create SSH keys on Linux and
+     Mac for Linux VMs in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-mac-create-ssh-keys?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
+    :type key_data: str
+    """
+
+    _attribute_map = {
+        'path': {'key': 'path', 'type': 'str'},
+        'key_data': {'key': 'keyData', 'type': 'str'},
+    }
+
+    def __init__(self, *, path: str=None, key_data: str=None, **kwargs) -> None:
+        super(SshPublicKey, self).__init__(**kwargs)
+        self.path = path
+        self.key_data = key_data
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/storage_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/storage_profile.py
new file mode 100644
index 000000000000..da1fef243048
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/storage_profile.py
@@ -0,0 +1,47 @@
+# 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 StorageProfile(Model):
+    """Specifies the storage settings for the virtual machine disks.
+
+    :param image_reference: Specifies information about the image to use. You
+     can specify information about platform images, marketplace images, or
+     virtual machine images. This element is required when you want to use a
+     platform image, marketplace image, or virtual machine image, but is not
+     used in other creation operations.
+    :type image_reference:
+     ~azure.mgmt.compute.v2018_04_01.models.ImageReference
+    :param os_disk: Specifies information about the operating system disk used
+     by the virtual machine. <br><br> For more information about disks, see
+     [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type os_disk: ~azure.mgmt.compute.v2018_04_01.models.OSDisk
+    :param data_disks: Specifies the parameters that are used to add a data
+     disk to a virtual machine. <br><br> For more information about disks, see
+     [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type data_disks: list[~azure.mgmt.compute.v2018_04_01.models.DataDisk]
+    """
+
+    _attribute_map = {
+        'image_reference': {'key': 'imageReference', 'type': 'ImageReference'},
+        'os_disk': {'key': 'osDisk', 'type': 'OSDisk'},
+        'data_disks': {'key': 'dataDisks', 'type': '[DataDisk]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(StorageProfile, self).__init__(**kwargs)
+        self.image_reference = kwargs.get('image_reference', None)
+        self.os_disk = kwargs.get('os_disk', None)
+        self.data_disks = kwargs.get('data_disks', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/storage_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/storage_profile_py3.py
new file mode 100644
index 000000000000..62cb9eb9b38e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/storage_profile_py3.py
@@ -0,0 +1,47 @@
+# 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 StorageProfile(Model):
+    """Specifies the storage settings for the virtual machine disks.
+
+    :param image_reference: Specifies information about the image to use. You
+     can specify information about platform images, marketplace images, or
+     virtual machine images. This element is required when you want to use a
+     platform image, marketplace image, or virtual machine image, but is not
+     used in other creation operations.
+    :type image_reference:
+     ~azure.mgmt.compute.v2018_04_01.models.ImageReference
+    :param os_disk: Specifies information about the operating system disk used
+     by the virtual machine. <br><br> For more information about disks, see
+     [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type os_disk: ~azure.mgmt.compute.v2018_04_01.models.OSDisk
+    :param data_disks: Specifies the parameters that are used to add a data
+     disk to a virtual machine. <br><br> For more information about disks, see
+     [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type data_disks: list[~azure.mgmt.compute.v2018_04_01.models.DataDisk]
+    """
+
+    _attribute_map = {
+        'image_reference': {'key': 'imageReference', 'type': 'ImageReference'},
+        'os_disk': {'key': 'osDisk', 'type': 'OSDisk'},
+        'data_disks': {'key': 'dataDisks', 'type': '[DataDisk]'},
+    }
+
+    def __init__(self, *, image_reference=None, os_disk=None, data_disks=None, **kwargs) -> None:
+        super(StorageProfile, self).__init__(**kwargs)
+        self.image_reference = image_reference
+        self.os_disk = os_disk
+        self.data_disks = data_disks
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource.py
new file mode 100644
index 000000000000..11e092cc6ff5
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource.py
@@ -0,0 +1,28 @@
+# 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 SubResource(Model):
+    """SubResource.
+
+    :param id: Resource Id
+    :type id: str
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(SubResource, self).__init__(**kwargs)
+        self.id = kwargs.get('id', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_py3.py
new file mode 100644
index 000000000000..29e5afee38f9
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_py3.py
@@ -0,0 +1,28 @@
+# 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 SubResource(Model):
+    """SubResource.
+
+    :param id: Resource Id
+    :type id: str
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+    }
+
+    def __init__(self, *, id: str=None, **kwargs) -> None:
+        super(SubResource, self).__init__(**kwargs)
+        self.id = id
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_read_only.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_read_only.py
new file mode 100644
index 000000000000..4a0ec466c0d4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_read_only.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 SubResourceReadOnly(Model):
+    """SubResourceReadOnly.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(SubResourceReadOnly, self).__init__(**kwargs)
+        self.id = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_read_only_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_read_only_py3.py
new file mode 100644
index 000000000000..cb918e9a2ac6
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_read_only_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 SubResourceReadOnly(Model):
+    """SubResourceReadOnly.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(SubResourceReadOnly, self).__init__(**kwargs)
+        self.id = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/throttled_requests_input.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/throttled_requests_input.py
new file mode 100644
index 000000000000..5eac2a5540ac
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/throttled_requests_input.py
@@ -0,0 +1,52 @@
+# 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 .log_analytics_input_base import LogAnalyticsInputBase
+
+
+class ThrottledRequestsInput(LogAnalyticsInputBase):
+    """Api request input for LogAnalytics getThrottledRequests Api.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param blob_container_sas_uri: Required. SAS Uri of the logging blob
+     container to which LogAnalytics Api writes output logs to.
+    :type blob_container_sas_uri: str
+    :param from_time: Required. From time of the query
+    :type from_time: datetime
+    :param to_time: Required. To time of the query
+    :type to_time: datetime
+    :param group_by_throttle_policy: Group query result by Throttle Policy
+     applied.
+    :type group_by_throttle_policy: bool
+    :param group_by_operation_name: Group query result by  by Operation Name.
+    :type group_by_operation_name: bool
+    :param group_by_resource_name: Group query result by Resource Name.
+    :type group_by_resource_name: bool
+    """
+
+    _validation = {
+        'blob_container_sas_uri': {'required': True},
+        'from_time': {'required': True},
+        'to_time': {'required': True},
+    }
+
+    _attribute_map = {
+        'blob_container_sas_uri': {'key': 'blobContainerSasUri', 'type': 'str'},
+        'from_time': {'key': 'fromTime', 'type': 'iso-8601'},
+        'to_time': {'key': 'toTime', 'type': 'iso-8601'},
+        'group_by_throttle_policy': {'key': 'groupByThrottlePolicy', 'type': 'bool'},
+        'group_by_operation_name': {'key': 'groupByOperationName', 'type': 'bool'},
+        'group_by_resource_name': {'key': 'groupByResourceName', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ThrottledRequestsInput, self).__init__(**kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/throttled_requests_input_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/throttled_requests_input_py3.py
new file mode 100644
index 000000000000..025900705375
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/throttled_requests_input_py3.py
@@ -0,0 +1,52 @@
+# 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 .log_analytics_input_base_py3 import LogAnalyticsInputBase
+
+
+class ThrottledRequestsInput(LogAnalyticsInputBase):
+    """Api request input for LogAnalytics getThrottledRequests Api.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param blob_container_sas_uri: Required. SAS Uri of the logging blob
+     container to which LogAnalytics Api writes output logs to.
+    :type blob_container_sas_uri: str
+    :param from_time: Required. From time of the query
+    :type from_time: datetime
+    :param to_time: Required. To time of the query
+    :type to_time: datetime
+    :param group_by_throttle_policy: Group query result by Throttle Policy
+     applied.
+    :type group_by_throttle_policy: bool
+    :param group_by_operation_name: Group query result by  by Operation Name.
+    :type group_by_operation_name: bool
+    :param group_by_resource_name: Group query result by Resource Name.
+    :type group_by_resource_name: bool
+    """
+
+    _validation = {
+        'blob_container_sas_uri': {'required': True},
+        'from_time': {'required': True},
+        'to_time': {'required': True},
+    }
+
+    _attribute_map = {
+        'blob_container_sas_uri': {'key': 'blobContainerSasUri', 'type': 'str'},
+        'from_time': {'key': 'fromTime', 'type': 'iso-8601'},
+        'to_time': {'key': 'toTime', 'type': 'iso-8601'},
+        'group_by_throttle_policy': {'key': 'groupByThrottlePolicy', 'type': 'bool'},
+        'group_by_operation_name': {'key': 'groupByOperationName', 'type': 'bool'},
+        'group_by_resource_name': {'key': 'groupByResourceName', 'type': 'bool'},
+    }
+
+    def __init__(self, *, blob_container_sas_uri: str, from_time, to_time, group_by_throttle_policy: bool=None, group_by_operation_name: bool=None, group_by_resource_name: bool=None, **kwargs) -> None:
+        super(ThrottledRequestsInput, self).__init__(blob_container_sas_uri=blob_container_sas_uri, from_time=from_time, to_time=to_time, group_by_throttle_policy=group_by_throttle_policy, group_by_operation_name=group_by_operation_name, group_by_resource_name=group_by_resource_name, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/update_resource.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/update_resource.py
new file mode 100644
index 000000000000..b1d2898ff082
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/update_resource.py
@@ -0,0 +1,28 @@
+# 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 UpdateResource(Model):
+    """The Update Resource model definition.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    """
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+    }
+
+    def __init__(self, **kwargs):
+        super(UpdateResource, self).__init__(**kwargs)
+        self.tags = kwargs.get('tags', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/update_resource_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/update_resource_py3.py
new file mode 100644
index 000000000000..c06c17c124d9
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/update_resource_py3.py
@@ -0,0 +1,28 @@
+# 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 UpdateResource(Model):
+    """The Update Resource model definition.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    """
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+    }
+
+    def __init__(self, *, tags=None, **kwargs) -> None:
+        super(UpdateResource, self).__init__(**kwargs)
+        self.tags = tags
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info.py
new file mode 100644
index 000000000000..d243b61b2e80
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info.py
@@ -0,0 +1,47 @@
+# 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 UpgradeOperationHistoricalStatusInfo(Model):
+    """Virtual Machine Scale Set OS Upgrade History operation response.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar properties: Information about the properties of the upgrade
+     operation.
+    :vartype properties:
+     ~azure.mgmt.compute.v2018_04_01.models.UpgradeOperationHistoricalStatusInfoProperties
+    :ivar type: Resource type
+    :vartype type: str
+    :ivar location: Resource location
+    :vartype location: str
+    """
+
+    _validation = {
+        'properties': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'properties': {'key': 'properties', 'type': 'UpgradeOperationHistoricalStatusInfoProperties'},
+        'type': {'key': 'type', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(UpgradeOperationHistoricalStatusInfo, self).__init__(**kwargs)
+        self.properties = None
+        self.type = None
+        self.location = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_paged.py
new file mode 100644
index 000000000000..b7296a3dedb1
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_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 UpgradeOperationHistoricalStatusInfoPaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`UpgradeOperationHistoricalStatusInfo <azure.mgmt.compute.v2018_04_01.models.UpgradeOperationHistoricalStatusInfo>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[UpgradeOperationHistoricalStatusInfo]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(UpgradeOperationHistoricalStatusInfoPaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_properties.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_properties.py
new file mode 100644
index 000000000000..45437a8f2f76
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_properties.py
@@ -0,0 +1,67 @@
+# 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 UpgradeOperationHistoricalStatusInfoProperties(Model):
+    """Describes each OS upgrade on the Virtual Machine Scale Set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar running_status: Information about the overall status of the upgrade
+     operation.
+    :vartype running_status:
+     ~azure.mgmt.compute.v2018_04_01.models.UpgradeOperationHistoryStatus
+    :ivar progress: Counts of the VM's in each state.
+    :vartype progress:
+     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeProgressInfo
+    :ivar error: Error Details for this upgrade if there are any.
+    :vartype error: ~azure.mgmt.compute.v2018_04_01.models.ApiError
+    :ivar started_by: Invoker of the Upgrade Operation. Possible values
+     include: 'Unknown', 'User', 'Platform'
+    :vartype started_by: str or
+     ~azure.mgmt.compute.v2018_04_01.models.UpgradeOperationInvoker
+    :ivar target_image_reference: Image Reference details
+    :vartype target_image_reference:
+     ~azure.mgmt.compute.v2018_04_01.models.ImageReference
+    :ivar rollback_info: Information about OS rollback if performed
+    :vartype rollback_info:
+     ~azure.mgmt.compute.v2018_04_01.models.RollbackStatusInfo
+    """
+
+    _validation = {
+        'running_status': {'readonly': True},
+        'progress': {'readonly': True},
+        'error': {'readonly': True},
+        'started_by': {'readonly': True},
+        'target_image_reference': {'readonly': True},
+        'rollback_info': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'running_status': {'key': 'runningStatus', 'type': 'UpgradeOperationHistoryStatus'},
+        'progress': {'key': 'progress', 'type': 'RollingUpgradeProgressInfo'},
+        'error': {'key': 'error', 'type': 'ApiError'},
+        'started_by': {'key': 'startedBy', 'type': 'UpgradeOperationInvoker'},
+        'target_image_reference': {'key': 'targetImageReference', 'type': 'ImageReference'},
+        'rollback_info': {'key': 'rollbackInfo', 'type': 'RollbackStatusInfo'},
+    }
+
+    def __init__(self, **kwargs):
+        super(UpgradeOperationHistoricalStatusInfoProperties, self).__init__(**kwargs)
+        self.running_status = None
+        self.progress = None
+        self.error = None
+        self.started_by = None
+        self.target_image_reference = None
+        self.rollback_info = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_properties_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_properties_py3.py
new file mode 100644
index 000000000000..b06dcb8a034a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_properties_py3.py
@@ -0,0 +1,67 @@
+# 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 UpgradeOperationHistoricalStatusInfoProperties(Model):
+    """Describes each OS upgrade on the Virtual Machine Scale Set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar running_status: Information about the overall status of the upgrade
+     operation.
+    :vartype running_status:
+     ~azure.mgmt.compute.v2018_04_01.models.UpgradeOperationHistoryStatus
+    :ivar progress: Counts of the VM's in each state.
+    :vartype progress:
+     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeProgressInfo
+    :ivar error: Error Details for this upgrade if there are any.
+    :vartype error: ~azure.mgmt.compute.v2018_04_01.models.ApiError
+    :ivar started_by: Invoker of the Upgrade Operation. Possible values
+     include: 'Unknown', 'User', 'Platform'
+    :vartype started_by: str or
+     ~azure.mgmt.compute.v2018_04_01.models.UpgradeOperationInvoker
+    :ivar target_image_reference: Image Reference details
+    :vartype target_image_reference:
+     ~azure.mgmt.compute.v2018_04_01.models.ImageReference
+    :ivar rollback_info: Information about OS rollback if performed
+    :vartype rollback_info:
+     ~azure.mgmt.compute.v2018_04_01.models.RollbackStatusInfo
+    """
+
+    _validation = {
+        'running_status': {'readonly': True},
+        'progress': {'readonly': True},
+        'error': {'readonly': True},
+        'started_by': {'readonly': True},
+        'target_image_reference': {'readonly': True},
+        'rollback_info': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'running_status': {'key': 'runningStatus', 'type': 'UpgradeOperationHistoryStatus'},
+        'progress': {'key': 'progress', 'type': 'RollingUpgradeProgressInfo'},
+        'error': {'key': 'error', 'type': 'ApiError'},
+        'started_by': {'key': 'startedBy', 'type': 'UpgradeOperationInvoker'},
+        'target_image_reference': {'key': 'targetImageReference', 'type': 'ImageReference'},
+        'rollback_info': {'key': 'rollbackInfo', 'type': 'RollbackStatusInfo'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(UpgradeOperationHistoricalStatusInfoProperties, self).__init__(**kwargs)
+        self.running_status = None
+        self.progress = None
+        self.error = None
+        self.started_by = None
+        self.target_image_reference = None
+        self.rollback_info = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_py3.py
new file mode 100644
index 000000000000..9e967e04a07d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_py3.py
@@ -0,0 +1,47 @@
+# 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 UpgradeOperationHistoricalStatusInfo(Model):
+    """Virtual Machine Scale Set OS Upgrade History operation response.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar properties: Information about the properties of the upgrade
+     operation.
+    :vartype properties:
+     ~azure.mgmt.compute.v2018_04_01.models.UpgradeOperationHistoricalStatusInfoProperties
+    :ivar type: Resource type
+    :vartype type: str
+    :ivar location: Resource location
+    :vartype location: str
+    """
+
+    _validation = {
+        'properties': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'properties': {'key': 'properties', 'type': 'UpgradeOperationHistoricalStatusInfoProperties'},
+        'type': {'key': 'type', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(UpgradeOperationHistoricalStatusInfo, self).__init__(**kwargs)
+        self.properties = None
+        self.type = None
+        self.location = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_history_status.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_history_status.py
new file mode 100644
index 000000000000..e0d6390aeeb5
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_history_status.py
@@ -0,0 +1,46 @@
+# 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 UpgradeOperationHistoryStatus(Model):
+    """Information about the current running state of the overall upgrade.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar code: Code indicating the current status of the upgrade. Possible
+     values include: 'RollingForward', 'Cancelled', 'Completed', 'Faulted'
+    :vartype code: str or ~azure.mgmt.compute.v2018_04_01.models.UpgradeState
+    :ivar start_time: Start time of the upgrade.
+    :vartype start_time: datetime
+    :ivar end_time: End time of the upgrade.
+    :vartype end_time: datetime
+    """
+
+    _validation = {
+        'code': {'readonly': True},
+        'start_time': {'readonly': True},
+        'end_time': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'UpgradeState'},
+        'start_time': {'key': 'startTime', 'type': 'iso-8601'},
+        'end_time': {'key': 'endTime', 'type': 'iso-8601'},
+    }
+
+    def __init__(self, **kwargs):
+        super(UpgradeOperationHistoryStatus, self).__init__(**kwargs)
+        self.code = None
+        self.start_time = None
+        self.end_time = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_history_status_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_history_status_py3.py
new file mode 100644
index 000000000000..a7e9eaa62a69
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_history_status_py3.py
@@ -0,0 +1,46 @@
+# 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 UpgradeOperationHistoryStatus(Model):
+    """Information about the current running state of the overall upgrade.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar code: Code indicating the current status of the upgrade. Possible
+     values include: 'RollingForward', 'Cancelled', 'Completed', 'Faulted'
+    :vartype code: str or ~azure.mgmt.compute.v2018_04_01.models.UpgradeState
+    :ivar start_time: Start time of the upgrade.
+    :vartype start_time: datetime
+    :ivar end_time: End time of the upgrade.
+    :vartype end_time: datetime
+    """
+
+    _validation = {
+        'code': {'readonly': True},
+        'start_time': {'readonly': True},
+        'end_time': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'UpgradeState'},
+        'start_time': {'key': 'startTime', 'type': 'iso-8601'},
+        'end_time': {'key': 'endTime', 'type': 'iso-8601'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(UpgradeOperationHistoryStatus, self).__init__(**kwargs)
+        self.code = None
+        self.start_time = None
+        self.end_time = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_policy.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_policy.py
new file mode 100644
index 000000000000..4335909afd81
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_policy.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 UpgradePolicy(Model):
+    """Describes an upgrade policy - automatic, manual, or rolling.
+
+    :param mode: Specifies the mode of an upgrade to virtual machines in the
+     scale set.<br /><br /> Possible values are:<br /><br /> **Manual** - You
+     control the application of updates to virtual machines in the scale set.
+     You do this by using the manualUpgrade action.<br /><br /> **Automatic** -
+     All virtual machines in the scale set are  automatically updated at the
+     same time. Possible values include: 'Automatic', 'Manual', 'Rolling'
+    :type mode: str or ~azure.mgmt.compute.v2018_04_01.models.UpgradeMode
+    :param rolling_upgrade_policy: The configuration parameters used while
+     performing a rolling upgrade.
+    :type rolling_upgrade_policy:
+     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradePolicy
+    :param automatic_os_upgrade: Whether OS upgrades should automatically be
+     applied to scale set instances in a rolling fashion when a newer version
+     of the image becomes available.
+    :type automatic_os_upgrade: bool
+    :param auto_os_upgrade_policy: Configuration parameters used for
+     performing automatic OS Upgrade.
+    :type auto_os_upgrade_policy:
+     ~azure.mgmt.compute.v2018_04_01.models.AutoOSUpgradePolicy
+    """
+
+    _attribute_map = {
+        'mode': {'key': 'mode', 'type': 'UpgradeMode'},
+        'rolling_upgrade_policy': {'key': 'rollingUpgradePolicy', 'type': 'RollingUpgradePolicy'},
+        'automatic_os_upgrade': {'key': 'automaticOSUpgrade', 'type': 'bool'},
+        'auto_os_upgrade_policy': {'key': 'autoOSUpgradePolicy', 'type': 'AutoOSUpgradePolicy'},
+    }
+
+    def __init__(self, **kwargs):
+        super(UpgradePolicy, self).__init__(**kwargs)
+        self.mode = kwargs.get('mode', None)
+        self.rolling_upgrade_policy = kwargs.get('rolling_upgrade_policy', None)
+        self.automatic_os_upgrade = kwargs.get('automatic_os_upgrade', None)
+        self.auto_os_upgrade_policy = kwargs.get('auto_os_upgrade_policy', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_policy_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_policy_py3.py
new file mode 100644
index 000000000000..526357dfaf1c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_policy_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 UpgradePolicy(Model):
+    """Describes an upgrade policy - automatic, manual, or rolling.
+
+    :param mode: Specifies the mode of an upgrade to virtual machines in the
+     scale set.<br /><br /> Possible values are:<br /><br /> **Manual** - You
+     control the application of updates to virtual machines in the scale set.
+     You do this by using the manualUpgrade action.<br /><br /> **Automatic** -
+     All virtual machines in the scale set are  automatically updated at the
+     same time. Possible values include: 'Automatic', 'Manual', 'Rolling'
+    :type mode: str or ~azure.mgmt.compute.v2018_04_01.models.UpgradeMode
+    :param rolling_upgrade_policy: The configuration parameters used while
+     performing a rolling upgrade.
+    :type rolling_upgrade_policy:
+     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradePolicy
+    :param automatic_os_upgrade: Whether OS upgrades should automatically be
+     applied to scale set instances in a rolling fashion when a newer version
+     of the image becomes available.
+    :type automatic_os_upgrade: bool
+    :param auto_os_upgrade_policy: Configuration parameters used for
+     performing automatic OS Upgrade.
+    :type auto_os_upgrade_policy:
+     ~azure.mgmt.compute.v2018_04_01.models.AutoOSUpgradePolicy
+    """
+
+    _attribute_map = {
+        'mode': {'key': 'mode', 'type': 'UpgradeMode'},
+        'rolling_upgrade_policy': {'key': 'rollingUpgradePolicy', 'type': 'RollingUpgradePolicy'},
+        'automatic_os_upgrade': {'key': 'automaticOSUpgrade', 'type': 'bool'},
+        'auto_os_upgrade_policy': {'key': 'autoOSUpgradePolicy', 'type': 'AutoOSUpgradePolicy'},
+    }
+
+    def __init__(self, *, mode=None, rolling_upgrade_policy=None, automatic_os_upgrade: bool=None, auto_os_upgrade_policy=None, **kwargs) -> None:
+        super(UpgradePolicy, self).__init__(**kwargs)
+        self.mode = mode
+        self.rolling_upgrade_policy = rolling_upgrade_policy
+        self.automatic_os_upgrade = automatic_os_upgrade
+        self.auto_os_upgrade_policy = auto_os_upgrade_policy
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage.py
new file mode 100644
index 000000000000..eae36ebf0dc2
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage.py
@@ -0,0 +1,54 @@
+# 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 Usage(Model):
+    """Describes Compute Resource Usage.
+
+    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 unit: Required. An enum describing the unit of usage measurement.
+     Default value: "Count" .
+    :vartype unit: str
+    :param current_value: Required. The current usage of the resource.
+    :type current_value: int
+    :param limit: Required. The maximum permitted usage of the resource.
+    :type limit: long
+    :param name: Required. The name of the type of usage.
+    :type name: ~azure.mgmt.compute.v2018_04_01.models.UsageName
+    """
+
+    _validation = {
+        'unit': {'required': True, 'constant': True},
+        'current_value': {'required': True},
+        'limit': {'required': True},
+        'name': {'required': True},
+    }
+
+    _attribute_map = {
+        'unit': {'key': 'unit', 'type': 'str'},
+        'current_value': {'key': 'currentValue', 'type': 'int'},
+        'limit': {'key': 'limit', 'type': 'long'},
+        'name': {'key': 'name', 'type': 'UsageName'},
+    }
+
+    unit = "Count"
+
+    def __init__(self, **kwargs):
+        super(Usage, self).__init__(**kwargs)
+        self.current_value = kwargs.get('current_value', None)
+        self.limit = kwargs.get('limit', None)
+        self.name = kwargs.get('name', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_name.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_name.py
new file mode 100644
index 000000000000..e2560936493e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_name.py
@@ -0,0 +1,32 @@
+# 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 UsageName(Model):
+    """The Usage Names.
+
+    :param value: The name of the resource.
+    :type value: str
+    :param localized_value: The localized name of the resource.
+    :type localized_value: str
+    """
+
+    _attribute_map = {
+        'value': {'key': 'value', 'type': 'str'},
+        'localized_value': {'key': 'localizedValue', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(UsageName, self).__init__(**kwargs)
+        self.value = kwargs.get('value', None)
+        self.localized_value = kwargs.get('localized_value', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_name_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_name_py3.py
new file mode 100644
index 000000000000..ad0b77459f75
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_name_py3.py
@@ -0,0 +1,32 @@
+# 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 UsageName(Model):
+    """The Usage Names.
+
+    :param value: The name of the resource.
+    :type value: str
+    :param localized_value: The localized name of the resource.
+    :type localized_value: str
+    """
+
+    _attribute_map = {
+        'value': {'key': 'value', 'type': 'str'},
+        'localized_value': {'key': 'localizedValue', 'type': 'str'},
+    }
+
+    def __init__(self, *, value: str=None, localized_value: str=None, **kwargs) -> None:
+        super(UsageName, self).__init__(**kwargs)
+        self.value = value
+        self.localized_value = localized_value
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_paged.py
new file mode 100644
index 000000000000..d3533ab09848
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_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 UsagePaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`Usage <azure.mgmt.compute.v2018_04_01.models.Usage>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[Usage]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(UsagePaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_py3.py
new file mode 100644
index 000000000000..7a2ae5cbd250
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_py3.py
@@ -0,0 +1,54 @@
+# 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 Usage(Model):
+    """Describes Compute Resource Usage.
+
+    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 unit: Required. An enum describing the unit of usage measurement.
+     Default value: "Count" .
+    :vartype unit: str
+    :param current_value: Required. The current usage of the resource.
+    :type current_value: int
+    :param limit: Required. The maximum permitted usage of the resource.
+    :type limit: long
+    :param name: Required. The name of the type of usage.
+    :type name: ~azure.mgmt.compute.v2018_04_01.models.UsageName
+    """
+
+    _validation = {
+        'unit': {'required': True, 'constant': True},
+        'current_value': {'required': True},
+        'limit': {'required': True},
+        'name': {'required': True},
+    }
+
+    _attribute_map = {
+        'unit': {'key': 'unit', 'type': 'str'},
+        'current_value': {'key': 'currentValue', 'type': 'int'},
+        'limit': {'key': 'limit', 'type': 'long'},
+        'name': {'key': 'name', 'type': 'UsageName'},
+    }
+
+    unit = "Count"
+
+    def __init__(self, *, current_value: int, limit: int, name, **kwargs) -> None:
+        super(Usage, self).__init__(**kwargs)
+        self.current_value = current_value
+        self.limit = limit
+        self.name = name
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_certificate.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_certificate.py
new file mode 100644
index 000000000000..b173def6f820
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_certificate.py
@@ -0,0 +1,46 @@
+# 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 VaultCertificate(Model):
+    """Describes a single certificate reference in a Key Vault, and where the
+    certificate should reside on the VM.
+
+    :param certificate_url: This is the URL of a certificate that has been
+     uploaded to Key Vault as a secret. For adding a secret to the Key Vault,
+     see [Add a key or secret to the key
+     vault](https://docs.microsoft.com/azure/key-vault/key-vault-get-started/#add).
+     In this case, your certificate needs to be It is the Base64 encoding of
+     the following JSON Object which is encoded in UTF-8: <br><br> {<br>
+     "data":"<Base64-encoded-certificate>",<br>  "dataType":"pfx",<br>
+     "password":"<pfx-file-password>"<br>}
+    :type certificate_url: str
+    :param certificate_store: For Windows VMs, specifies the certificate store
+     on the Virtual Machine to which the certificate should be added. The
+     specified certificate store is implicitly in the LocalMachine account.
+     <br><br>For Linux VMs, the certificate file is placed under the
+     /var/lib/waagent directory, with the file name <UppercaseThumbprint>.crt
+     for the X509 certificate file and <UppercaseThumbpring>.prv for private
+     key. Both of these files are .pem formatted.
+    :type certificate_store: str
+    """
+
+    _attribute_map = {
+        'certificate_url': {'key': 'certificateUrl', 'type': 'str'},
+        'certificate_store': {'key': 'certificateStore', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VaultCertificate, self).__init__(**kwargs)
+        self.certificate_url = kwargs.get('certificate_url', None)
+        self.certificate_store = kwargs.get('certificate_store', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_certificate_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_certificate_py3.py
new file mode 100644
index 000000000000..eda5ba1c3f1d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_certificate_py3.py
@@ -0,0 +1,46 @@
+# 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 VaultCertificate(Model):
+    """Describes a single certificate reference in a Key Vault, and where the
+    certificate should reside on the VM.
+
+    :param certificate_url: This is the URL of a certificate that has been
+     uploaded to Key Vault as a secret. For adding a secret to the Key Vault,
+     see [Add a key or secret to the key
+     vault](https://docs.microsoft.com/azure/key-vault/key-vault-get-started/#add).
+     In this case, your certificate needs to be It is the Base64 encoding of
+     the following JSON Object which is encoded in UTF-8: <br><br> {<br>
+     "data":"<Base64-encoded-certificate>",<br>  "dataType":"pfx",<br>
+     "password":"<pfx-file-password>"<br>}
+    :type certificate_url: str
+    :param certificate_store: For Windows VMs, specifies the certificate store
+     on the Virtual Machine to which the certificate should be added. The
+     specified certificate store is implicitly in the LocalMachine account.
+     <br><br>For Linux VMs, the certificate file is placed under the
+     /var/lib/waagent directory, with the file name <UppercaseThumbprint>.crt
+     for the X509 certificate file and <UppercaseThumbpring>.prv for private
+     key. Both of these files are .pem formatted.
+    :type certificate_store: str
+    """
+
+    _attribute_map = {
+        'certificate_url': {'key': 'certificateUrl', 'type': 'str'},
+        'certificate_store': {'key': 'certificateStore', 'type': 'str'},
+    }
+
+    def __init__(self, *, certificate_url: str=None, certificate_store: str=None, **kwargs) -> None:
+        super(VaultCertificate, self).__init__(**kwargs)
+        self.certificate_url = certificate_url
+        self.certificate_store = certificate_store
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_secret_group.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_secret_group.py
new file mode 100644
index 000000000000..182f200952fc
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_secret_group.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 VaultSecretGroup(Model):
+    """Describes a set of certificates which are all in the same Key Vault.
+
+    :param source_vault: The relative URL of the Key Vault containing all of
+     the certificates in VaultCertificates.
+    :type source_vault: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param vault_certificates: The list of key vault references in SourceVault
+     which contain certificates.
+    :type vault_certificates:
+     list[~azure.mgmt.compute.v2018_04_01.models.VaultCertificate]
+    """
+
+    _attribute_map = {
+        'source_vault': {'key': 'sourceVault', 'type': 'SubResource'},
+        'vault_certificates': {'key': 'vaultCertificates', 'type': '[VaultCertificate]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VaultSecretGroup, self).__init__(**kwargs)
+        self.source_vault = kwargs.get('source_vault', None)
+        self.vault_certificates = kwargs.get('vault_certificates', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_secret_group_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_secret_group_py3.py
new file mode 100644
index 000000000000..c92697778df0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_secret_group_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 VaultSecretGroup(Model):
+    """Describes a set of certificates which are all in the same Key Vault.
+
+    :param source_vault: The relative URL of the Key Vault containing all of
+     the certificates in VaultCertificates.
+    :type source_vault: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param vault_certificates: The list of key vault references in SourceVault
+     which contain certificates.
+    :type vault_certificates:
+     list[~azure.mgmt.compute.v2018_04_01.models.VaultCertificate]
+    """
+
+    _attribute_map = {
+        'source_vault': {'key': 'sourceVault', 'type': 'SubResource'},
+        'vault_certificates': {'key': 'vaultCertificates', 'type': '[VaultCertificate]'},
+    }
+
+    def __init__(self, *, source_vault=None, vault_certificates=None, **kwargs) -> None:
+        super(VaultSecretGroup, self).__init__(**kwargs)
+        self.source_vault = source_vault
+        self.vault_certificates = vault_certificates
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_hard_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_hard_disk.py
new file mode 100644
index 000000000000..5e3ad9dea7d4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_hard_disk.py
@@ -0,0 +1,28 @@
+# 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 VirtualHardDisk(Model):
+    """Describes the uri of a disk.
+
+    :param uri: Specifies the virtual hard disk's uri.
+    :type uri: str
+    """
+
+    _attribute_map = {
+        'uri': {'key': 'uri', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualHardDisk, self).__init__(**kwargs)
+        self.uri = kwargs.get('uri', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_hard_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_hard_disk_py3.py
new file mode 100644
index 000000000000..9c069b95f084
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_hard_disk_py3.py
@@ -0,0 +1,28 @@
+# 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 VirtualHardDisk(Model):
+    """Describes the uri of a disk.
+
+    :param uri: Specifies the virtual hard disk's uri.
+    :type uri: str
+    """
+
+    _attribute_map = {
+        'uri': {'key': 'uri', 'type': 'str'},
+    }
+
+    def __init__(self, *, uri: str=None, **kwargs) -> None:
+        super(VirtualHardDisk, self).__init__(**kwargs)
+        self.uri = uri
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine.py
new file mode 100644
index 000000000000..2a6eb930517d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine.py
@@ -0,0 +1,150 @@
+# 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 VirtualMachine(Resource):
+    """Describes a Virtual Machine.
+
+    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]
+    :param plan: Specifies information about the marketplace image used to
+     create the virtual machine. This element is only used for marketplace
+     images. Before you can use a marketplace image from an API, you must
+     enable the image for programmatic use.  In the Azure portal, find the
+     marketplace image that you want to use and then click **Want to deploy
+     programmatically, Get Started ->**. Enter any required information and
+     then click **Save**.
+    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
+    :param hardware_profile: Specifies the hardware settings for the virtual
+     machine.
+    :type hardware_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.HardwareProfile
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.StorageProfile
+    :param os_profile: Specifies the operating system settings for the virtual
+     machine.
+    :type os_profile: ~azure.mgmt.compute.v2018_04_01.models.OSProfile
+    :param network_profile: Specifies the network interfaces of the virtual
+     machine.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.NetworkProfile
+    :param diagnostics_profile: Specifies the boot diagnostic settings state.
+     <br><br>Minimum api-version: 2015-06-15.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
+    :param availability_set: Specifies information about the availability set
+     that the virtual machine should be assigned to. Virtual machines specified
+     in the same availability set are allocated to different nodes to maximize
+     availability. For more information about availability sets, see [Manage
+     the availability of virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+     <br><br> For more information on Azure planned maintainance, see [Planned
+     maintenance for virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Currently, a VM can only be added to availability set at creation
+     time. An existing VM cannot be added to an availability set.
+    :type availability_set: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :ivar instance_view: The virtual machine instance view.
+    :vartype instance_view:
+     ~azure.mgmt.compute.v2018_04_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:
+     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
+     is included in a request for an update, the value must match the initial
+     value. This value cannot be updated. <br><br> For more information, see
+     [Azure Hybrid Use Benefit for Windows
+     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Minimum api-version: 2015-06-15
+    :type license_type: str
+    :ivar vm_id: Specifies the VM unique ID which is a 128-bits identifier
+     that is encoded and stored in all Azure IaaS VMs SMBIOS and can be read
+     using platform BIOS commands.
+    :vartype vm_id: str
+    :ivar resources: The virtual machine child extension resources.
+    :vartype resources:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]
+    :param identity: The identity of the virtual machine, if configured.
+    :type identity:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineIdentity
+    :param zones: The virtual machine zones.
+    :type zones: list[str]
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'provisioning_state': {'readonly': True},
+        'instance_view': {'readonly': True},
+        'vm_id': {'readonly': True},
+        'resources': {'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}'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
+        'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
+        'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
+        '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': 'VirtualMachineInstanceView'},
+        'license_type': {'key': 'properties.licenseType', 'type': 'str'},
+        'vm_id': {'key': 'properties.vmId', 'type': 'str'},
+        'resources': {'key': 'resources', 'type': '[VirtualMachineExtension]'},
+        'identity': {'key': 'identity', 'type': 'VirtualMachineIdentity'},
+        'zones': {'key': 'zones', 'type': '[str]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachine, self).__init__(**kwargs)
+        self.plan = kwargs.get('plan', None)
+        self.hardware_profile = kwargs.get('hardware_profile', None)
+        self.storage_profile = kwargs.get('storage_profile', 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)
+        self.availability_set = kwargs.get('availability_set', None)
+        self.provisioning_state = None
+        self.instance_view = None
+        self.license_type = kwargs.get('license_type', None)
+        self.vm_id = None
+        self.resources = None
+        self.identity = kwargs.get('identity', None)
+        self.zones = kwargs.get('zones', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_agent_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_agent_instance_view.py
new file mode 100644
index 000000000000..a2ad4c4f8bc8
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_agent_instance_view.py
@@ -0,0 +1,39 @@
+# 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 VirtualMachineAgentInstanceView(Model):
+    """The instance view of the VM Agent running on the virtual machine.
+
+    :param vm_agent_version: The VM Agent full version.
+    :type vm_agent_version: str
+    :param extension_handlers: The virtual machine extension handler instance
+     view.
+    :type extension_handlers:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionHandlerInstanceView]
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    """
+
+    _attribute_map = {
+        'vm_agent_version': {'key': 'vmAgentVersion', 'type': 'str'},
+        'extension_handlers': {'key': 'extensionHandlers', 'type': '[VirtualMachineExtensionHandlerInstanceView]'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineAgentInstanceView, self).__init__(**kwargs)
+        self.vm_agent_version = kwargs.get('vm_agent_version', None)
+        self.extension_handlers = kwargs.get('extension_handlers', None)
+        self.statuses = kwargs.get('statuses', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_agent_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_agent_instance_view_py3.py
new file mode 100644
index 000000000000..dce8f0d40cc8
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_agent_instance_view_py3.py
@@ -0,0 +1,39 @@
+# 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 VirtualMachineAgentInstanceView(Model):
+    """The instance view of the VM Agent running on the virtual machine.
+
+    :param vm_agent_version: The VM Agent full version.
+    :type vm_agent_version: str
+    :param extension_handlers: The virtual machine extension handler instance
+     view.
+    :type extension_handlers:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionHandlerInstanceView]
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    """
+
+    _attribute_map = {
+        'vm_agent_version': {'key': 'vmAgentVersion', 'type': 'str'},
+        'extension_handlers': {'key': 'extensionHandlers', 'type': '[VirtualMachineExtensionHandlerInstanceView]'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, *, vm_agent_version: str=None, extension_handlers=None, statuses=None, **kwargs) -> None:
+        super(VirtualMachineAgentInstanceView, self).__init__(**kwargs)
+        self.vm_agent_version = vm_agent_version
+        self.extension_handlers = extension_handlers
+        self.statuses = statuses
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_parameters.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_parameters.py
new file mode 100644
index 000000000000..4e6ffbea7a4f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_parameters.py
@@ -0,0 +1,46 @@
+# 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 VirtualMachineCaptureParameters(Model):
+    """Capture Virtual Machine parameters.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param vhd_prefix: Required. The captured virtual hard disk's name prefix.
+    :type vhd_prefix: str
+    :param destination_container_name: Required. The destination container
+     name.
+    :type destination_container_name: str
+    :param overwrite_vhds: Required. Specifies whether to overwrite the
+     destination virtual hard disk, in case of conflict.
+    :type overwrite_vhds: bool
+    """
+
+    _validation = {
+        'vhd_prefix': {'required': True},
+        'destination_container_name': {'required': True},
+        'overwrite_vhds': {'required': True},
+    }
+
+    _attribute_map = {
+        'vhd_prefix': {'key': 'vhdPrefix', 'type': 'str'},
+        'destination_container_name': {'key': 'destinationContainerName', 'type': 'str'},
+        'overwrite_vhds': {'key': 'overwriteVhds', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineCaptureParameters, self).__init__(**kwargs)
+        self.vhd_prefix = kwargs.get('vhd_prefix', None)
+        self.destination_container_name = kwargs.get('destination_container_name', None)
+        self.overwrite_vhds = kwargs.get('overwrite_vhds', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_parameters_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_parameters_py3.py
new file mode 100644
index 000000000000..1866cdc23300
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_parameters_py3.py
@@ -0,0 +1,46 @@
+# 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 VirtualMachineCaptureParameters(Model):
+    """Capture Virtual Machine parameters.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param vhd_prefix: Required. The captured virtual hard disk's name prefix.
+    :type vhd_prefix: str
+    :param destination_container_name: Required. The destination container
+     name.
+    :type destination_container_name: str
+    :param overwrite_vhds: Required. Specifies whether to overwrite the
+     destination virtual hard disk, in case of conflict.
+    :type overwrite_vhds: bool
+    """
+
+    _validation = {
+        'vhd_prefix': {'required': True},
+        'destination_container_name': {'required': True},
+        'overwrite_vhds': {'required': True},
+    }
+
+    _attribute_map = {
+        'vhd_prefix': {'key': 'vhdPrefix', 'type': 'str'},
+        'destination_container_name': {'key': 'destinationContainerName', 'type': 'str'},
+        'overwrite_vhds': {'key': 'overwriteVhds', 'type': 'bool'},
+    }
+
+    def __init__(self, *, vhd_prefix: str, destination_container_name: str, overwrite_vhds: bool, **kwargs) -> None:
+        super(VirtualMachineCaptureParameters, self).__init__(**kwargs)
+        self.vhd_prefix = vhd_prefix
+        self.destination_container_name = destination_container_name
+        self.overwrite_vhds = overwrite_vhds
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_result.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_result.py
new file mode 100644
index 000000000000..2972e1f2fcda
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_result.py
@@ -0,0 +1,53 @@
+# 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 .sub_resource import SubResource
+
+
+class VirtualMachineCaptureResult(SubResource):
+    """Output of virtual machine capture operation.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param id: Resource Id
+    :type id: str
+    :ivar schema: the schema of the captured virtual machine
+    :vartype schema: str
+    :ivar content_version: the version of the content
+    :vartype content_version: str
+    :ivar parameters: parameters of the captured virtual machine
+    :vartype parameters: object
+    :ivar resources: a list of resource items of the captured virtual machine
+    :vartype resources: list[object]
+    """
+
+    _validation = {
+        'schema': {'readonly': True},
+        'content_version': {'readonly': True},
+        'parameters': {'readonly': True},
+        'resources': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'schema': {'key': '$schema', 'type': 'str'},
+        'content_version': {'key': 'contentVersion', 'type': 'str'},
+        'parameters': {'key': 'parameters', 'type': 'object'},
+        'resources': {'key': 'resources', 'type': '[object]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineCaptureResult, self).__init__(**kwargs)
+        self.schema = None
+        self.content_version = None
+        self.parameters = None
+        self.resources = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_result_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_result_py3.py
new file mode 100644
index 000000000000..09e8afde1591
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_result_py3.py
@@ -0,0 +1,53 @@
+# 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 .sub_resource_py3 import SubResource
+
+
+class VirtualMachineCaptureResult(SubResource):
+    """Output of virtual machine capture operation.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param id: Resource Id
+    :type id: str
+    :ivar schema: the schema of the captured virtual machine
+    :vartype schema: str
+    :ivar content_version: the version of the content
+    :vartype content_version: str
+    :ivar parameters: parameters of the captured virtual machine
+    :vartype parameters: object
+    :ivar resources: a list of resource items of the captured virtual machine
+    :vartype resources: list[object]
+    """
+
+    _validation = {
+        'schema': {'readonly': True},
+        'content_version': {'readonly': True},
+        'parameters': {'readonly': True},
+        'resources': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'schema': {'key': '$schema', 'type': 'str'},
+        'content_version': {'key': 'contentVersion', 'type': 'str'},
+        'parameters': {'key': 'parameters', 'type': 'object'},
+        'resources': {'key': 'resources', 'type': '[object]'},
+    }
+
+    def __init__(self, *, id: str=None, **kwargs) -> None:
+        super(VirtualMachineCaptureResult, self).__init__(id=id, **kwargs)
+        self.schema = None
+        self.content_version = None
+        self.parameters = None
+        self.resources = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension.py
new file mode 100644
index 000000000000..02db951458f4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension.py
@@ -0,0 +1,97 @@
+# 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 VirtualMachineExtension(Resource):
+    """Describes a Virtual Machine Extension.
+
+    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]
+    :param force_update_tag: How the extension handler should be forced to
+     update even if the extension configuration has not changed.
+    :type force_update_tag: str
+    :param publisher: The name of the extension handler publisher.
+    :type publisher: str
+    :param virtual_machine_extension_type: Specifies the type of the
+     extension; an example is "CustomScriptExtension".
+    :type virtual_machine_extension_type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param auto_upgrade_minor_version: Indicates whether the extension should
+     use a newer minor version if one is available at deployment time. Once
+     deployed, however, the extension will not upgrade minor versions unless
+     redeployed, even with this property set to true.
+    :type auto_upgrade_minor_version: bool
+    :param settings: Json formatted public settings for the extension.
+    :type settings: object
+    :param protected_settings: The extension can contain either
+     protectedSettings or protectedSettingsFromKeyVault or no protected
+     settings at all.
+    :type protected_settings: object
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :param instance_view: The virtual machine extension instance view.
+    :type instance_view:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionInstanceView
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'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}'},
+        'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'},
+        'publisher': {'key': 'properties.publisher', 'type': 'str'},
+        'virtual_machine_extension_type': {'key': 'properties.type', 'type': 'str'},
+        'type_handler_version': {'key': 'properties.typeHandlerVersion', 'type': 'str'},
+        'auto_upgrade_minor_version': {'key': 'properties.autoUpgradeMinorVersion', 'type': 'bool'},
+        'settings': {'key': 'properties.settings', 'type': 'object'},
+        'protected_settings': {'key': 'properties.protectedSettings', 'type': 'object'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineExtensionInstanceView'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineExtension, self).__init__(**kwargs)
+        self.force_update_tag = kwargs.get('force_update_tag', None)
+        self.publisher = kwargs.get('publisher', None)
+        self.virtual_machine_extension_type = kwargs.get('virtual_machine_extension_type', None)
+        self.type_handler_version = kwargs.get('type_handler_version', None)
+        self.auto_upgrade_minor_version = kwargs.get('auto_upgrade_minor_version', None)
+        self.settings = kwargs.get('settings', None)
+        self.protected_settings = kwargs.get('protected_settings', None)
+        self.provisioning_state = None
+        self.instance_view = kwargs.get('instance_view', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_handler_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_handler_instance_view.py
new file mode 100644
index 000000000000..2d7ec6ac6782
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_handler_instance_view.py
@@ -0,0 +1,37 @@
+# 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 VirtualMachineExtensionHandlerInstanceView(Model):
+    """The instance view of a virtual machine extension handler.
+
+    :param type: Specifies the type of the extension; an example is
+     "CustomScriptExtension".
+    :type type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param status: The extension handler status.
+    :type status: ~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus
+    """
+
+    _attribute_map = {
+        'type': {'key': 'type', 'type': 'str'},
+        'type_handler_version': {'key': 'typeHandlerVersion', 'type': 'str'},
+        'status': {'key': 'status', 'type': 'InstanceViewStatus'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineExtensionHandlerInstanceView, self).__init__(**kwargs)
+        self.type = kwargs.get('type', None)
+        self.type_handler_version = kwargs.get('type_handler_version', None)
+        self.status = kwargs.get('status', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_handler_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_handler_instance_view_py3.py
new file mode 100644
index 000000000000..ba82a5e876e4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_handler_instance_view_py3.py
@@ -0,0 +1,37 @@
+# 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 VirtualMachineExtensionHandlerInstanceView(Model):
+    """The instance view of a virtual machine extension handler.
+
+    :param type: Specifies the type of the extension; an example is
+     "CustomScriptExtension".
+    :type type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param status: The extension handler status.
+    :type status: ~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus
+    """
+
+    _attribute_map = {
+        'type': {'key': 'type', 'type': 'str'},
+        'type_handler_version': {'key': 'typeHandlerVersion', 'type': 'str'},
+        'status': {'key': 'status', 'type': 'InstanceViewStatus'},
+    }
+
+    def __init__(self, *, type: str=None, type_handler_version: str=None, status=None, **kwargs) -> None:
+        super(VirtualMachineExtensionHandlerInstanceView, self).__init__(**kwargs)
+        self.type = type
+        self.type_handler_version = type_handler_version
+        self.status = status
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_image.py
new file mode 100644
index 000000000000..7273e2b84754
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_image.py
@@ -0,0 +1,81 @@
+# 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 VirtualMachineExtensionImage(Resource):
+    """Describes a Virtual Machine Extension Image.
+
+    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]
+    :param operating_system: Required. The operating system this extension
+     supports.
+    :type operating_system: str
+    :param compute_role: Required. The type of role (IaaS or PaaS) this
+     extension supports.
+    :type compute_role: str
+    :param handler_schema: Required. The schema defined by publisher, where
+     extension consumers should provide settings in a matching schema.
+    :type handler_schema: str
+    :param vm_scale_set_enabled: Whether the extension can be used on xRP
+     VMScaleSets. By default existing extensions are usable on scalesets, but
+     there might be cases where a publisher wants to explicitly indicate the
+     extension is only enabled for CRP VMs but not VMSS.
+    :type vm_scale_set_enabled: bool
+    :param supports_multiple_extensions: Whether the handler can support
+     multiple extensions.
+    :type supports_multiple_extensions: bool
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'operating_system': {'required': True},
+        'compute_role': {'required': True},
+        'handler_schema': {'required': 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}'},
+        'operating_system': {'key': 'properties.operatingSystem', 'type': 'str'},
+        'compute_role': {'key': 'properties.computeRole', 'type': 'str'},
+        'handler_schema': {'key': 'properties.handlerSchema', 'type': 'str'},
+        'vm_scale_set_enabled': {'key': 'properties.vmScaleSetEnabled', 'type': 'bool'},
+        'supports_multiple_extensions': {'key': 'properties.supportsMultipleExtensions', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineExtensionImage, self).__init__(**kwargs)
+        self.operating_system = kwargs.get('operating_system', None)
+        self.compute_role = kwargs.get('compute_role', None)
+        self.handler_schema = kwargs.get('handler_schema', None)
+        self.vm_scale_set_enabled = kwargs.get('vm_scale_set_enabled', None)
+        self.supports_multiple_extensions = kwargs.get('supports_multiple_extensions', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_image_py3.py
new file mode 100644
index 000000000000..3d48c3a87fb0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_image_py3.py
@@ -0,0 +1,81 @@
+# 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 VirtualMachineExtensionImage(Resource):
+    """Describes a Virtual Machine Extension Image.
+
+    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]
+    :param operating_system: Required. The operating system this extension
+     supports.
+    :type operating_system: str
+    :param compute_role: Required. The type of role (IaaS or PaaS) this
+     extension supports.
+    :type compute_role: str
+    :param handler_schema: Required. The schema defined by publisher, where
+     extension consumers should provide settings in a matching schema.
+    :type handler_schema: str
+    :param vm_scale_set_enabled: Whether the extension can be used on xRP
+     VMScaleSets. By default existing extensions are usable on scalesets, but
+     there might be cases where a publisher wants to explicitly indicate the
+     extension is only enabled for CRP VMs but not VMSS.
+    :type vm_scale_set_enabled: bool
+    :param supports_multiple_extensions: Whether the handler can support
+     multiple extensions.
+    :type supports_multiple_extensions: bool
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'operating_system': {'required': True},
+        'compute_role': {'required': True},
+        'handler_schema': {'required': 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}'},
+        'operating_system': {'key': 'properties.operatingSystem', 'type': 'str'},
+        'compute_role': {'key': 'properties.computeRole', 'type': 'str'},
+        'handler_schema': {'key': 'properties.handlerSchema', 'type': 'str'},
+        'vm_scale_set_enabled': {'key': 'properties.vmScaleSetEnabled', 'type': 'bool'},
+        'supports_multiple_extensions': {'key': 'properties.supportsMultipleExtensions', 'type': 'bool'},
+    }
+
+    def __init__(self, *, location: str, operating_system: str, compute_role: str, handler_schema: str, tags=None, vm_scale_set_enabled: bool=None, supports_multiple_extensions: bool=None, **kwargs) -> None:
+        super(VirtualMachineExtensionImage, self).__init__(location=location, tags=tags, **kwargs)
+        self.operating_system = operating_system
+        self.compute_role = compute_role
+        self.handler_schema = handler_schema
+        self.vm_scale_set_enabled = vm_scale_set_enabled
+        self.supports_multiple_extensions = supports_multiple_extensions
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_instance_view.py
new file mode 100644
index 000000000000..d79fad9754ac
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_instance_view.py
@@ -0,0 +1,47 @@
+# 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 VirtualMachineExtensionInstanceView(Model):
+    """The instance view of a virtual machine extension.
+
+    :param name: The virtual machine extension name.
+    :type name: str
+    :param type: Specifies the type of the extension; an example is
+     "CustomScriptExtension".
+    :type type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param substatuses: The resource status information.
+    :type substatuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'type_handler_version': {'key': 'typeHandlerVersion', 'type': 'str'},
+        'substatuses': {'key': 'substatuses', 'type': '[InstanceViewStatus]'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineExtensionInstanceView, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.type = kwargs.get('type', None)
+        self.type_handler_version = kwargs.get('type_handler_version', None)
+        self.substatuses = kwargs.get('substatuses', None)
+        self.statuses = kwargs.get('statuses', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_instance_view_py3.py
new file mode 100644
index 000000000000..4de254438718
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_instance_view_py3.py
@@ -0,0 +1,47 @@
+# 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 VirtualMachineExtensionInstanceView(Model):
+    """The instance view of a virtual machine extension.
+
+    :param name: The virtual machine extension name.
+    :type name: str
+    :param type: Specifies the type of the extension; an example is
+     "CustomScriptExtension".
+    :type type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param substatuses: The resource status information.
+    :type substatuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'type_handler_version': {'key': 'typeHandlerVersion', 'type': 'str'},
+        'substatuses': {'key': 'substatuses', 'type': '[InstanceViewStatus]'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, *, name: str=None, type: str=None, type_handler_version: str=None, substatuses=None, statuses=None, **kwargs) -> None:
+        super(VirtualMachineExtensionInstanceView, self).__init__(**kwargs)
+        self.name = name
+        self.type = type
+        self.type_handler_version = type_handler_version
+        self.substatuses = substatuses
+        self.statuses = statuses
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_py3.py
new file mode 100644
index 000000000000..8fa667369a33
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_py3.py
@@ -0,0 +1,97 @@
+# 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 VirtualMachineExtension(Resource):
+    """Describes a Virtual Machine Extension.
+
+    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]
+    :param force_update_tag: How the extension handler should be forced to
+     update even if the extension configuration has not changed.
+    :type force_update_tag: str
+    :param publisher: The name of the extension handler publisher.
+    :type publisher: str
+    :param virtual_machine_extension_type: Specifies the type of the
+     extension; an example is "CustomScriptExtension".
+    :type virtual_machine_extension_type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param auto_upgrade_minor_version: Indicates whether the extension should
+     use a newer minor version if one is available at deployment time. Once
+     deployed, however, the extension will not upgrade minor versions unless
+     redeployed, even with this property set to true.
+    :type auto_upgrade_minor_version: bool
+    :param settings: Json formatted public settings for the extension.
+    :type settings: object
+    :param protected_settings: The extension can contain either
+     protectedSettings or protectedSettingsFromKeyVault or no protected
+     settings at all.
+    :type protected_settings: object
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :param instance_view: The virtual machine extension instance view.
+    :type instance_view:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionInstanceView
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'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}'},
+        'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'},
+        'publisher': {'key': 'properties.publisher', 'type': 'str'},
+        'virtual_machine_extension_type': {'key': 'properties.type', 'type': 'str'},
+        'type_handler_version': {'key': 'properties.typeHandlerVersion', 'type': 'str'},
+        'auto_upgrade_minor_version': {'key': 'properties.autoUpgradeMinorVersion', 'type': 'bool'},
+        'settings': {'key': 'properties.settings', 'type': 'object'},
+        'protected_settings': {'key': 'properties.protectedSettings', 'type': 'object'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineExtensionInstanceView'},
+    }
+
+    def __init__(self, *, location: str, tags=None, force_update_tag: str=None, publisher: str=None, virtual_machine_extension_type: str=None, type_handler_version: str=None, auto_upgrade_minor_version: bool=None, settings=None, protected_settings=None, instance_view=None, **kwargs) -> None:
+        super(VirtualMachineExtension, self).__init__(location=location, tags=tags, **kwargs)
+        self.force_update_tag = force_update_tag
+        self.publisher = publisher
+        self.virtual_machine_extension_type = virtual_machine_extension_type
+        self.type_handler_version = type_handler_version
+        self.auto_upgrade_minor_version = auto_upgrade_minor_version
+        self.settings = settings
+        self.protected_settings = protected_settings
+        self.provisioning_state = None
+        self.instance_view = instance_view
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_update.py
new file mode 100644
index 000000000000..b920ff57ff96
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_update.py
@@ -0,0 +1,62 @@
+# 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 .update_resource import UpdateResource
+
+
+class VirtualMachineExtensionUpdate(UpdateResource):
+    """Describes a Virtual Machine Extension.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param force_update_tag: How the extension handler should be forced to
+     update even if the extension configuration has not changed.
+    :type force_update_tag: str
+    :param publisher: The name of the extension handler publisher.
+    :type publisher: str
+    :param type: Specifies the type of the extension; an example is
+     "CustomScriptExtension".
+    :type type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param auto_upgrade_minor_version: Indicates whether the extension should
+     use a newer minor version if one is available at deployment time. Once
+     deployed, however, the extension will not upgrade minor versions unless
+     redeployed, even with this property set to true.
+    :type auto_upgrade_minor_version: bool
+    :param settings: Json formatted public settings for the extension.
+    :type settings: object
+    :param protected_settings: The extension can contain either
+     protectedSettings or protectedSettingsFromKeyVault or no protected
+     settings at all.
+    :type protected_settings: object
+    """
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'},
+        'publisher': {'key': 'properties.publisher', 'type': 'str'},
+        'type': {'key': 'properties.type', 'type': 'str'},
+        'type_handler_version': {'key': 'properties.typeHandlerVersion', 'type': 'str'},
+        'auto_upgrade_minor_version': {'key': 'properties.autoUpgradeMinorVersion', 'type': 'bool'},
+        'settings': {'key': 'properties.settings', 'type': 'object'},
+        'protected_settings': {'key': 'properties.protectedSettings', 'type': 'object'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineExtensionUpdate, self).__init__(**kwargs)
+        self.force_update_tag = kwargs.get('force_update_tag', None)
+        self.publisher = kwargs.get('publisher', None)
+        self.type = kwargs.get('type', None)
+        self.type_handler_version = kwargs.get('type_handler_version', None)
+        self.auto_upgrade_minor_version = kwargs.get('auto_upgrade_minor_version', None)
+        self.settings = kwargs.get('settings', None)
+        self.protected_settings = kwargs.get('protected_settings', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_update_py3.py
new file mode 100644
index 000000000000..c32c18d32759
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_update_py3.py
@@ -0,0 +1,62 @@
+# 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 .update_resource_py3 import UpdateResource
+
+
+class VirtualMachineExtensionUpdate(UpdateResource):
+    """Describes a Virtual Machine Extension.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param force_update_tag: How the extension handler should be forced to
+     update even if the extension configuration has not changed.
+    :type force_update_tag: str
+    :param publisher: The name of the extension handler publisher.
+    :type publisher: str
+    :param type: Specifies the type of the extension; an example is
+     "CustomScriptExtension".
+    :type type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param auto_upgrade_minor_version: Indicates whether the extension should
+     use a newer minor version if one is available at deployment time. Once
+     deployed, however, the extension will not upgrade minor versions unless
+     redeployed, even with this property set to true.
+    :type auto_upgrade_minor_version: bool
+    :param settings: Json formatted public settings for the extension.
+    :type settings: object
+    :param protected_settings: The extension can contain either
+     protectedSettings or protectedSettingsFromKeyVault or no protected
+     settings at all.
+    :type protected_settings: object
+    """
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'},
+        'publisher': {'key': 'properties.publisher', 'type': 'str'},
+        'type': {'key': 'properties.type', 'type': 'str'},
+        'type_handler_version': {'key': 'properties.typeHandlerVersion', 'type': 'str'},
+        'auto_upgrade_minor_version': {'key': 'properties.autoUpgradeMinorVersion', 'type': 'bool'},
+        'settings': {'key': 'properties.settings', 'type': 'object'},
+        'protected_settings': {'key': 'properties.protectedSettings', 'type': 'object'},
+    }
+
+    def __init__(self, *, tags=None, force_update_tag: str=None, publisher: str=None, type: str=None, type_handler_version: str=None, auto_upgrade_minor_version: bool=None, settings=None, protected_settings=None, **kwargs) -> None:
+        super(VirtualMachineExtensionUpdate, self).__init__(tags=tags, **kwargs)
+        self.force_update_tag = force_update_tag
+        self.publisher = publisher
+        self.type = type
+        self.type_handler_version = type_handler_version
+        self.auto_upgrade_minor_version = auto_upgrade_minor_version
+        self.settings = settings
+        self.protected_settings = protected_settings
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extensions_list_result.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extensions_list_result.py
new file mode 100644
index 000000000000..a00529b436fb
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extensions_list_result.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 VirtualMachineExtensionsListResult(Model):
+    """The List Extension operation response.
+
+    :param value: The list of extensions
+    :type value:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]
+    """
+
+    _attribute_map = {
+        'value': {'key': 'value', 'type': '[VirtualMachineExtension]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineExtensionsListResult, self).__init__(**kwargs)
+        self.value = kwargs.get('value', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extensions_list_result_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extensions_list_result_py3.py
new file mode 100644
index 000000000000..0b64c0d2cd38
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extensions_list_result_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 VirtualMachineExtensionsListResult(Model):
+    """The List Extension operation response.
+
+    :param value: The list of extensions
+    :type value:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]
+    """
+
+    _attribute_map = {
+        'value': {'key': 'value', 'type': '[VirtualMachineExtension]'},
+    }
+
+    def __init__(self, *, value=None, **kwargs) -> None:
+        super(VirtualMachineExtensionsListResult, self).__init__(**kwargs)
+        self.value = value
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_health_status.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_health_status.py
new file mode 100644
index 000000000000..28c49e91d1e1
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_health_status.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 VirtualMachineHealthStatus(Model):
+    """The health status of the VM.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar status: The health status information for the VM.
+    :vartype status: ~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus
+    """
+
+    _validation = {
+        'status': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'status': {'key': 'status', 'type': 'InstanceViewStatus'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineHealthStatus, self).__init__(**kwargs)
+        self.status = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_health_status_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_health_status_py3.py
new file mode 100644
index 000000000000..b6311ea93d34
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_health_status_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 VirtualMachineHealthStatus(Model):
+    """The health status of the VM.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar status: The health status information for the VM.
+    :vartype status: ~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus
+    """
+
+    _validation = {
+        'status': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'status': {'key': 'status', 'type': 'InstanceViewStatus'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(VirtualMachineHealthStatus, self).__init__(**kwargs)
+        self.status = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_identity.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_identity.py
new file mode 100644
index 000000000000..3c9fa46adfb9
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_identity.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 VirtualMachineIdentity(Model):
+    """Identity for the virtual machine.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar principal_id: The principal id of virtual machine identity. This
+     property will only be provided for a system assigned identity.
+    :vartype principal_id: str
+    :ivar tenant_id: The tenant id associated with the virtual machine. This
+     property will only be provided for a system assigned identity.
+    :vartype tenant_id: str
+    :param type: The type of identity used for the virtual machine. The type
+     'SystemAssigned, UserAssigned' includes both an implicitly created
+     identity and a set of user assigned identities. The type 'None' will
+     remove any identities from the virtual machine. Possible values include:
+     'SystemAssigned', 'UserAssigned', 'SystemAssigned, UserAssigned', 'None'
+    :type type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.ResourceIdentityType
+    :param identity_ids: The list of user identities associated with the
+     Virtual Machine. The user identity references will be ARM resource ids in
+     the form:
+     '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/identities/{identityName}'.
+    :type identity_ids: list[str]
+    """
+
+    _validation = {
+        'principal_id': {'readonly': True},
+        'tenant_id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'principal_id': {'key': 'principalId', 'type': 'str'},
+        'tenant_id': {'key': 'tenantId', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'ResourceIdentityType'},
+        'identity_ids': {'key': 'identityIds', 'type': '[str]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineIdentity, self).__init__(**kwargs)
+        self.principal_id = None
+        self.tenant_id = None
+        self.type = kwargs.get('type', None)
+        self.identity_ids = kwargs.get('identity_ids', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_identity_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_identity_py3.py
new file mode 100644
index 000000000000..96d2849dfd9d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_identity_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 VirtualMachineIdentity(Model):
+    """Identity for the virtual machine.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar principal_id: The principal id of virtual machine identity. This
+     property will only be provided for a system assigned identity.
+    :vartype principal_id: str
+    :ivar tenant_id: The tenant id associated with the virtual machine. This
+     property will only be provided for a system assigned identity.
+    :vartype tenant_id: str
+    :param type: The type of identity used for the virtual machine. The type
+     'SystemAssigned, UserAssigned' includes both an implicitly created
+     identity and a set of user assigned identities. The type 'None' will
+     remove any identities from the virtual machine. Possible values include:
+     'SystemAssigned', 'UserAssigned', 'SystemAssigned, UserAssigned', 'None'
+    :type type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.ResourceIdentityType
+    :param identity_ids: The list of user identities associated with the
+     Virtual Machine. The user identity references will be ARM resource ids in
+     the form:
+     '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/identities/{identityName}'.
+    :type identity_ids: list[str]
+    """
+
+    _validation = {
+        'principal_id': {'readonly': True},
+        'tenant_id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'principal_id': {'key': 'principalId', 'type': 'str'},
+        'tenant_id': {'key': 'tenantId', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'ResourceIdentityType'},
+        'identity_ids': {'key': 'identityIds', 'type': '[str]'},
+    }
+
+    def __init__(self, *, type=None, identity_ids=None, **kwargs) -> None:
+        super(VirtualMachineIdentity, self).__init__(**kwargs)
+        self.principal_id = None
+        self.tenant_id = None
+        self.type = type
+        self.identity_ids = identity_ids
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image.py
new file mode 100644
index 000000000000..ea35eefb5ad4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image.py
@@ -0,0 +1,59 @@
+# 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 .virtual_machine_image_resource import VirtualMachineImageResource
+
+
+class VirtualMachineImage(VirtualMachineImageResource):
+    """Describes a Virtual Machine Image.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: Required. The name of the resource.
+    :type name: str
+    :param location: Required. The supported Azure location of the resource.
+    :type location: str
+    :param tags: Specifies the tags that are assigned to the virtual machine.
+     For more information about using tags, see [Using tags to organize your
+     Azure
+     resources](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-using-tags.md).
+    :type tags: dict[str, str]
+    :param plan:
+    :type plan: ~azure.mgmt.compute.v2018_04_01.models.PurchasePlan
+    :param os_disk_image:
+    :type os_disk_image: ~azure.mgmt.compute.v2018_04_01.models.OSDiskImage
+    :param data_disk_images:
+    :type data_disk_images:
+     list[~azure.mgmt.compute.v2018_04_01.models.DataDiskImage]
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'location': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'plan': {'key': 'properties.plan', 'type': 'PurchasePlan'},
+        'os_disk_image': {'key': 'properties.osDiskImage', 'type': 'OSDiskImage'},
+        'data_disk_images': {'key': 'properties.dataDiskImages', 'type': '[DataDiskImage]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineImage, self).__init__(**kwargs)
+        self.plan = kwargs.get('plan', None)
+        self.os_disk_image = kwargs.get('os_disk_image', None)
+        self.data_disk_images = kwargs.get('data_disk_images', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_py3.py
new file mode 100644
index 000000000000..655c2909f7aa
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_py3.py
@@ -0,0 +1,59 @@
+# 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 .virtual_machine_image_resource_py3 import VirtualMachineImageResource
+
+
+class VirtualMachineImage(VirtualMachineImageResource):
+    """Describes a Virtual Machine Image.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: Required. The name of the resource.
+    :type name: str
+    :param location: Required. The supported Azure location of the resource.
+    :type location: str
+    :param tags: Specifies the tags that are assigned to the virtual machine.
+     For more information about using tags, see [Using tags to organize your
+     Azure
+     resources](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-using-tags.md).
+    :type tags: dict[str, str]
+    :param plan:
+    :type plan: ~azure.mgmt.compute.v2018_04_01.models.PurchasePlan
+    :param os_disk_image:
+    :type os_disk_image: ~azure.mgmt.compute.v2018_04_01.models.OSDiskImage
+    :param data_disk_images:
+    :type data_disk_images:
+     list[~azure.mgmt.compute.v2018_04_01.models.DataDiskImage]
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'location': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'plan': {'key': 'properties.plan', 'type': 'PurchasePlan'},
+        'os_disk_image': {'key': 'properties.osDiskImage', 'type': 'OSDiskImage'},
+        'data_disk_images': {'key': 'properties.dataDiskImages', 'type': '[DataDiskImage]'},
+    }
+
+    def __init__(self, *, name: str, location: str, id: str=None, tags=None, plan=None, os_disk_image=None, data_disk_images=None, **kwargs) -> None:
+        super(VirtualMachineImage, self).__init__(id=id, name=name, location=location, tags=tags, **kwargs)
+        self.plan = plan
+        self.os_disk_image = os_disk_image
+        self.data_disk_images = data_disk_images
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_resource.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_resource.py
new file mode 100644
index 000000000000..8807cc8f391b
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_resource.py
@@ -0,0 +1,49 @@
+# 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 .sub_resource import SubResource
+
+
+class VirtualMachineImageResource(SubResource):
+    """Virtual machine image resource information.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: Required. The name of the resource.
+    :type name: str
+    :param location: Required. The supported Azure location of the resource.
+    :type location: str
+    :param tags: Specifies the tags that are assigned to the virtual machine.
+     For more information about using tags, see [Using tags to organize your
+     Azure
+     resources](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-using-tags.md).
+    :type tags: dict[str, str]
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'location': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+        'tags': {'key': 'tags', 'type': '{str}'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineImageResource, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.location = kwargs.get('location', None)
+        self.tags = kwargs.get('tags', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_resource_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_resource_py3.py
new file mode 100644
index 000000000000..b9d63a8bc9e0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_resource_py3.py
@@ -0,0 +1,49 @@
+# 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 .sub_resource_py3 import SubResource
+
+
+class VirtualMachineImageResource(SubResource):
+    """Virtual machine image resource information.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: Required. The name of the resource.
+    :type name: str
+    :param location: Required. The supported Azure location of the resource.
+    :type location: str
+    :param tags: Specifies the tags that are assigned to the virtual machine.
+     For more information about using tags, see [Using tags to organize your
+     Azure
+     resources](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-using-tags.md).
+    :type tags: dict[str, str]
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'location': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+        'tags': {'key': 'tags', 'type': '{str}'},
+    }
+
+    def __init__(self, *, name: str, location: str, id: str=None, tags=None, **kwargs) -> None:
+        super(VirtualMachineImageResource, self).__init__(id=id, **kwargs)
+        self.name = name
+        self.location = location
+        self.tags = tags
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_instance_view.py
new file mode 100644
index 000000000000..8ba2eaf2f52a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_instance_view.py
@@ -0,0 +1,85 @@
+# 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 VirtualMachineInstanceView(Model):
+    """The instance view of a virtual machine.
+
+    :param platform_update_domain: Specifies the update domain of the virtual
+     machine.
+    :type platform_update_domain: int
+    :param platform_fault_domain: Specifies the fault domain of the virtual
+     machine.
+    :type platform_fault_domain: int
+    :param computer_name: The computer name assigned to the virtual machine.
+    :type computer_name: str
+    :param os_name: The Operating System running on the virtual machine.
+    :type os_name: str
+    :param os_version: The version of Operating System running on the virtual
+     machine.
+    :type os_version: str
+    :param rdp_thumb_print: The Remote desktop certificate thumbprint.
+    :type rdp_thumb_print: str
+    :param vm_agent: The VM Agent running on the virtual machine.
+    :type vm_agent:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineAgentInstanceView
+    :param maintenance_redeploy_status: The Maintenance Operation status on
+     the virtual machine.
+    :type maintenance_redeploy_status:
+     ~azure.mgmt.compute.v2018_04_01.models.MaintenanceRedeployStatus
+    :param disks: The virtual machine disk information.
+    :type disks: list[~azure.mgmt.compute.v2018_04_01.models.DiskInstanceView]
+    :param extensions: The extensions information.
+    :type extensions:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionInstanceView]
+    :param boot_diagnostics: Boot Diagnostics is a debugging feature which
+     allows you to view Console Output and Screenshot to diagnose VM status.
+     <br><br> For Linux Virtual Machines, you can easily view the output of
+     your console log. <br><br> For both Windows and Linux virtual machines,
+     Azure also enables you to see a screenshot of the VM from the hypervisor.
+    :type boot_diagnostics:
+     ~azure.mgmt.compute.v2018_04_01.models.BootDiagnosticsInstanceView
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    """
+
+    _attribute_map = {
+        'platform_update_domain': {'key': 'platformUpdateDomain', 'type': 'int'},
+        'platform_fault_domain': {'key': 'platformFaultDomain', 'type': 'int'},
+        'computer_name': {'key': 'computerName', 'type': 'str'},
+        'os_name': {'key': 'osName', 'type': 'str'},
+        'os_version': {'key': 'osVersion', 'type': 'str'},
+        'rdp_thumb_print': {'key': 'rdpThumbPrint', 'type': 'str'},
+        'vm_agent': {'key': 'vmAgent', 'type': 'VirtualMachineAgentInstanceView'},
+        'maintenance_redeploy_status': {'key': 'maintenanceRedeployStatus', 'type': 'MaintenanceRedeployStatus'},
+        'disks': {'key': 'disks', 'type': '[DiskInstanceView]'},
+        'extensions': {'key': 'extensions', 'type': '[VirtualMachineExtensionInstanceView]'},
+        'boot_diagnostics': {'key': 'bootDiagnostics', 'type': 'BootDiagnosticsInstanceView'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineInstanceView, self).__init__(**kwargs)
+        self.platform_update_domain = kwargs.get('platform_update_domain', None)
+        self.platform_fault_domain = kwargs.get('platform_fault_domain', None)
+        self.computer_name = kwargs.get('computer_name', None)
+        self.os_name = kwargs.get('os_name', None)
+        self.os_version = kwargs.get('os_version', None)
+        self.rdp_thumb_print = kwargs.get('rdp_thumb_print', None)
+        self.vm_agent = kwargs.get('vm_agent', None)
+        self.maintenance_redeploy_status = kwargs.get('maintenance_redeploy_status', None)
+        self.disks = kwargs.get('disks', None)
+        self.extensions = kwargs.get('extensions', None)
+        self.boot_diagnostics = kwargs.get('boot_diagnostics', None)
+        self.statuses = kwargs.get('statuses', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_instance_view_py3.py
new file mode 100644
index 000000000000..8c9fcff69f26
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_instance_view_py3.py
@@ -0,0 +1,85 @@
+# 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 VirtualMachineInstanceView(Model):
+    """The instance view of a virtual machine.
+
+    :param platform_update_domain: Specifies the update domain of the virtual
+     machine.
+    :type platform_update_domain: int
+    :param platform_fault_domain: Specifies the fault domain of the virtual
+     machine.
+    :type platform_fault_domain: int
+    :param computer_name: The computer name assigned to the virtual machine.
+    :type computer_name: str
+    :param os_name: The Operating System running on the virtual machine.
+    :type os_name: str
+    :param os_version: The version of Operating System running on the virtual
+     machine.
+    :type os_version: str
+    :param rdp_thumb_print: The Remote desktop certificate thumbprint.
+    :type rdp_thumb_print: str
+    :param vm_agent: The VM Agent running on the virtual machine.
+    :type vm_agent:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineAgentInstanceView
+    :param maintenance_redeploy_status: The Maintenance Operation status on
+     the virtual machine.
+    :type maintenance_redeploy_status:
+     ~azure.mgmt.compute.v2018_04_01.models.MaintenanceRedeployStatus
+    :param disks: The virtual machine disk information.
+    :type disks: list[~azure.mgmt.compute.v2018_04_01.models.DiskInstanceView]
+    :param extensions: The extensions information.
+    :type extensions:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionInstanceView]
+    :param boot_diagnostics: Boot Diagnostics is a debugging feature which
+     allows you to view Console Output and Screenshot to diagnose VM status.
+     <br><br> For Linux Virtual Machines, you can easily view the output of
+     your console log. <br><br> For both Windows and Linux virtual machines,
+     Azure also enables you to see a screenshot of the VM from the hypervisor.
+    :type boot_diagnostics:
+     ~azure.mgmt.compute.v2018_04_01.models.BootDiagnosticsInstanceView
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    """
+
+    _attribute_map = {
+        'platform_update_domain': {'key': 'platformUpdateDomain', 'type': 'int'},
+        'platform_fault_domain': {'key': 'platformFaultDomain', 'type': 'int'},
+        'computer_name': {'key': 'computerName', 'type': 'str'},
+        'os_name': {'key': 'osName', 'type': 'str'},
+        'os_version': {'key': 'osVersion', 'type': 'str'},
+        'rdp_thumb_print': {'key': 'rdpThumbPrint', 'type': 'str'},
+        'vm_agent': {'key': 'vmAgent', 'type': 'VirtualMachineAgentInstanceView'},
+        'maintenance_redeploy_status': {'key': 'maintenanceRedeployStatus', 'type': 'MaintenanceRedeployStatus'},
+        'disks': {'key': 'disks', 'type': '[DiskInstanceView]'},
+        'extensions': {'key': 'extensions', 'type': '[VirtualMachineExtensionInstanceView]'},
+        'boot_diagnostics': {'key': 'bootDiagnostics', 'type': 'BootDiagnosticsInstanceView'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, *, platform_update_domain: int=None, platform_fault_domain: int=None, computer_name: str=None, os_name: str=None, os_version: str=None, rdp_thumb_print: str=None, vm_agent=None, maintenance_redeploy_status=None, disks=None, extensions=None, boot_diagnostics=None, statuses=None, **kwargs) -> None:
+        super(VirtualMachineInstanceView, self).__init__(**kwargs)
+        self.platform_update_domain = platform_update_domain
+        self.platform_fault_domain = platform_fault_domain
+        self.computer_name = computer_name
+        self.os_name = os_name
+        self.os_version = os_version
+        self.rdp_thumb_print = rdp_thumb_print
+        self.vm_agent = vm_agent
+        self.maintenance_redeploy_status = maintenance_redeploy_status
+        self.disks = disks
+        self.extensions = extensions
+        self.boot_diagnostics = boot_diagnostics
+        self.statuses = statuses
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_paged.py
new file mode 100644
index 000000000000..387e4c3f253f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_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 VirtualMachinePaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`VirtualMachine <azure.mgmt.compute.v2018_04_01.models.VirtualMachine>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[VirtualMachine]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(VirtualMachinePaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_py3.py
new file mode 100644
index 000000000000..8b8bfcc1bcee
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_py3.py
@@ -0,0 +1,150 @@
+# 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 VirtualMachine(Resource):
+    """Describes a Virtual Machine.
+
+    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]
+    :param plan: Specifies information about the marketplace image used to
+     create the virtual machine. This element is only used for marketplace
+     images. Before you can use a marketplace image from an API, you must
+     enable the image for programmatic use.  In the Azure portal, find the
+     marketplace image that you want to use and then click **Want to deploy
+     programmatically, Get Started ->**. Enter any required information and
+     then click **Save**.
+    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
+    :param hardware_profile: Specifies the hardware settings for the virtual
+     machine.
+    :type hardware_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.HardwareProfile
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.StorageProfile
+    :param os_profile: Specifies the operating system settings for the virtual
+     machine.
+    :type os_profile: ~azure.mgmt.compute.v2018_04_01.models.OSProfile
+    :param network_profile: Specifies the network interfaces of the virtual
+     machine.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.NetworkProfile
+    :param diagnostics_profile: Specifies the boot diagnostic settings state.
+     <br><br>Minimum api-version: 2015-06-15.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
+    :param availability_set: Specifies information about the availability set
+     that the virtual machine should be assigned to. Virtual machines specified
+     in the same availability set are allocated to different nodes to maximize
+     availability. For more information about availability sets, see [Manage
+     the availability of virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+     <br><br> For more information on Azure planned maintainance, see [Planned
+     maintenance for virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Currently, a VM can only be added to availability set at creation
+     time. An existing VM cannot be added to an availability set.
+    :type availability_set: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :ivar instance_view: The virtual machine instance view.
+    :vartype instance_view:
+     ~azure.mgmt.compute.v2018_04_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:
+     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
+     is included in a request for an update, the value must match the initial
+     value. This value cannot be updated. <br><br> For more information, see
+     [Azure Hybrid Use Benefit for Windows
+     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Minimum api-version: 2015-06-15
+    :type license_type: str
+    :ivar vm_id: Specifies the VM unique ID which is a 128-bits identifier
+     that is encoded and stored in all Azure IaaS VMs SMBIOS and can be read
+     using platform BIOS commands.
+    :vartype vm_id: str
+    :ivar resources: The virtual machine child extension resources.
+    :vartype resources:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]
+    :param identity: The identity of the virtual machine, if configured.
+    :type identity:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineIdentity
+    :param zones: The virtual machine zones.
+    :type zones: list[str]
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'provisioning_state': {'readonly': True},
+        'instance_view': {'readonly': True},
+        'vm_id': {'readonly': True},
+        'resources': {'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}'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
+        'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
+        'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
+        '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': 'VirtualMachineInstanceView'},
+        'license_type': {'key': 'properties.licenseType', 'type': 'str'},
+        'vm_id': {'key': 'properties.vmId', 'type': 'str'},
+        'resources': {'key': 'resources', 'type': '[VirtualMachineExtension]'},
+        'identity': {'key': 'identity', 'type': 'VirtualMachineIdentity'},
+        '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:
+        super(VirtualMachine, self).__init__(location=location, tags=tags, **kwargs)
+        self.plan = plan
+        self.hardware_profile = hardware_profile
+        self.storage_profile = storage_profile
+        self.os_profile = os_profile
+        self.network_profile = network_profile
+        self.diagnostics_profile = diagnostics_profile
+        self.availability_set = availability_set
+        self.provisioning_state = None
+        self.instance_view = None
+        self.license_type = license_type
+        self.vm_id = None
+        self.resources = None
+        self.identity = identity
+        self.zones = zones
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set.py
new file mode 100644
index 000000000000..17f274dd926f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set.py
@@ -0,0 +1,116 @@
+# 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 VirtualMachineScaleSet(Resource):
+    """Describes a Virtual Machine Scale Set.
+
+    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]
+    :param sku: The virtual machine scale set sku.
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
+    :param plan: Specifies information about the marketplace image used to
+     create the virtual machine. This element is only used for marketplace
+     images. Before you can use a marketplace image from an API, you must
+     enable the image for programmatic use.  In the Azure portal, find the
+     marketplace image that you want to use and then click **Want to deploy
+     programmatically, Get Started ->**. Enter any required information and
+     then click **Save**.
+    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
+    :param upgrade_policy: The upgrade policy.
+    :type upgrade_policy: ~azure.mgmt.compute.v2018_04_01.models.UpgradePolicy
+    :param virtual_machine_profile: The virtual machine profile.
+    :type virtual_machine_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVMProfile
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :param overprovision: Specifies whether the Virtual Machine Scale Set
+     should be overprovisioned.
+    :type overprovision: bool
+    :ivar unique_id: Specifies the ID which uniquely identifies a Virtual
+     Machine Scale Set.
+    :vartype unique_id: str
+    :param single_placement_group: When true this limits the scale set to a
+     single placement group, of max size 100 virtual machines.
+    :type single_placement_group: bool
+    :param zone_balance: Whether to force stictly even Virtual Machine
+     distribution cross x-zones in case there is zone outage.
+    :type zone_balance: bool
+    :param platform_fault_domain_count: Fault Domain count for each placement
+     group.
+    :type platform_fault_domain_count: int
+    :param identity: The identity of the virtual machine scale set, if
+     configured.
+    :type identity:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetIdentity
+    :param zones: The virtual machine scale set zones.
+    :type zones: list[str]
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'provisioning_state': {'readonly': True},
+        'unique_id': {'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}'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'upgrade_policy': {'key': 'properties.upgradePolicy', 'type': 'UpgradePolicy'},
+        'virtual_machine_profile': {'key': 'properties.virtualMachineProfile', 'type': 'VirtualMachineScaleSetVMProfile'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'overprovision': {'key': 'properties.overprovision', 'type': 'bool'},
+        'unique_id': {'key': 'properties.uniqueId', 'type': 'str'},
+        'single_placement_group': {'key': 'properties.singlePlacementGroup', 'type': 'bool'},
+        'zone_balance': {'key': 'properties.zoneBalance', 'type': 'bool'},
+        'platform_fault_domain_count': {'key': 'properties.platformFaultDomainCount', 'type': 'int'},
+        'identity': {'key': 'identity', 'type': 'VirtualMachineScaleSetIdentity'},
+        'zones': {'key': 'zones', 'type': '[str]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSet, self).__init__(**kwargs)
+        self.sku = kwargs.get('sku', None)
+        self.plan = kwargs.get('plan', None)
+        self.upgrade_policy = kwargs.get('upgrade_policy', None)
+        self.virtual_machine_profile = kwargs.get('virtual_machine_profile', None)
+        self.provisioning_state = None
+        self.overprovision = kwargs.get('overprovision', None)
+        self.unique_id = None
+        self.single_placement_group = kwargs.get('single_placement_group', None)
+        self.zone_balance = kwargs.get('zone_balance', None)
+        self.platform_fault_domain_count = kwargs.get('platform_fault_domain_count', None)
+        self.identity = kwargs.get('identity', None)
+        self.zones = kwargs.get('zones', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_data_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_data_disk.py
new file mode 100644
index 000000000000..945726144fd2
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_data_disk.py
@@ -0,0 +1,70 @@
+# 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 VirtualMachineScaleSetDataDisk(Model):
+    """Describes a virtual machine scale set data disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: The disk name.
+    :type name: str
+    :param lun: Required. Specifies the logical unit number of the data disk.
+     This value is used to identify data disks within the VM and therefore must
+     be unique for each data disk attached to a VM.
+    :type lun: int
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :param create_option: Required. The create option. Possible values
+     include: 'FromImage', 'Empty', 'Attach'
+    :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
+     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.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetManagedDiskParameters
+    """
+
+    _validation = {
+        'lun': {'required': True},
+        'create_option': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'lun': {'key': 'lun', 'type': 'int'},
+        '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'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'VirtualMachineScaleSetManagedDiskParameters'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetDataDisk, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.lun = kwargs.get('lun', None)
+        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.managed_disk = kwargs.get('managed_disk', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_data_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_data_disk_py3.py
new file mode 100644
index 000000000000..8ff1b974e334
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_data_disk_py3.py
@@ -0,0 +1,70 @@
+# 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 VirtualMachineScaleSetDataDisk(Model):
+    """Describes a virtual machine scale set data disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: The disk name.
+    :type name: str
+    :param lun: Required. Specifies the logical unit number of the data disk.
+     This value is used to identify data disks within the VM and therefore must
+     be unique for each data disk attached to a VM.
+    :type lun: int
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :param create_option: Required. The create option. Possible values
+     include: 'FromImage', 'Empty', 'Attach'
+    :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
+     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.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetManagedDiskParameters
+    """
+
+    _validation = {
+        'lun': {'required': True},
+        'create_option': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'lun': {'key': 'lun', 'type': 'int'},
+        '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'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'VirtualMachineScaleSetManagedDiskParameters'},
+    }
+
+    def __init__(self, *, lun: int, create_option, name: str=None, caching=None, write_accelerator_enabled: bool=None, disk_size_gb: int=None, managed_disk=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetDataDisk, self).__init__(**kwargs)
+        self.name = name
+        self.lun = lun
+        self.caching = caching
+        self.write_accelerator_enabled = write_accelerator_enabled
+        self.create_option = create_option
+        self.disk_size_gb = disk_size_gb
+        self.managed_disk = managed_disk
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension.py
new file mode 100644
index 000000000000..24a487547a2a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension.py
@@ -0,0 +1,80 @@
+# 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 .sub_resource_read_only import SubResourceReadOnly
+
+
+class VirtualMachineScaleSetExtension(SubResourceReadOnly):
+    """Describes a Virtual Machine Scale Set Extension.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    :param name: The name of the extension.
+    :type name: str
+    :param force_update_tag: If a value is provided and is different from the
+     previous value, the extension handler will be forced to update even if the
+     extension configuration has not changed.
+    :type force_update_tag: str
+    :param publisher: The name of the extension handler publisher.
+    :type publisher: str
+    :param type: Specifies the type of the extension; an example is
+     "CustomScriptExtension".
+    :type type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param auto_upgrade_minor_version: Indicates whether the extension should
+     use a newer minor version if one is available at deployment time. Once
+     deployed, however, the extension will not upgrade minor versions unless
+     redeployed, even with this property set to true.
+    :type auto_upgrade_minor_version: bool
+    :param settings: Json formatted public settings for the extension.
+    :type settings: object
+    :param protected_settings: The extension can contain either
+     protectedSettings or protectedSettingsFromKeyVault or no protected
+     settings at all.
+    :type protected_settings: object
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'provisioning_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'},
+        'publisher': {'key': 'properties.publisher', 'type': 'str'},
+        'type': {'key': 'properties.type', 'type': 'str'},
+        'type_handler_version': {'key': 'properties.typeHandlerVersion', 'type': 'str'},
+        'auto_upgrade_minor_version': {'key': 'properties.autoUpgradeMinorVersion', 'type': 'bool'},
+        'settings': {'key': 'properties.settings', 'type': 'object'},
+        'protected_settings': {'key': 'properties.protectedSettings', 'type': 'object'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetExtension, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.force_update_tag = kwargs.get('force_update_tag', None)
+        self.publisher = kwargs.get('publisher', None)
+        self.type = kwargs.get('type', None)
+        self.type_handler_version = kwargs.get('type_handler_version', None)
+        self.auto_upgrade_minor_version = kwargs.get('auto_upgrade_minor_version', None)
+        self.settings = kwargs.get('settings', None)
+        self.protected_settings = kwargs.get('protected_settings', None)
+        self.provisioning_state = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_paged.py
new file mode 100644
index 000000000000..36a70d58d957
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_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 VirtualMachineScaleSetExtensionPaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`VirtualMachineScaleSetExtension <azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtension>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[VirtualMachineScaleSetExtension]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(VirtualMachineScaleSetExtensionPaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_profile.py
new file mode 100644
index 000000000000..918951d9fe26
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_profile.py
@@ -0,0 +1,30 @@
+# 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 VirtualMachineScaleSetExtensionProfile(Model):
+    """Describes a virtual machine scale set extension profile.
+
+    :param extensions: The virtual machine scale set child extension
+     resources.
+    :type extensions:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtension]
+    """
+
+    _attribute_map = {
+        'extensions': {'key': 'extensions', 'type': '[VirtualMachineScaleSetExtension]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetExtensionProfile, self).__init__(**kwargs)
+        self.extensions = kwargs.get('extensions', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_profile_py3.py
new file mode 100644
index 000000000000..c00f190696d9
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_profile_py3.py
@@ -0,0 +1,30 @@
+# 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 VirtualMachineScaleSetExtensionProfile(Model):
+    """Describes a virtual machine scale set extension profile.
+
+    :param extensions: The virtual machine scale set child extension
+     resources.
+    :type extensions:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtension]
+    """
+
+    _attribute_map = {
+        'extensions': {'key': 'extensions', 'type': '[VirtualMachineScaleSetExtension]'},
+    }
+
+    def __init__(self, *, extensions=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetExtensionProfile, self).__init__(**kwargs)
+        self.extensions = extensions
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_py3.py
new file mode 100644
index 000000000000..27392a2de9fd
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_py3.py
@@ -0,0 +1,80 @@
+# 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 .sub_resource_read_only_py3 import SubResourceReadOnly
+
+
+class VirtualMachineScaleSetExtension(SubResourceReadOnly):
+    """Describes a Virtual Machine Scale Set Extension.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    :param name: The name of the extension.
+    :type name: str
+    :param force_update_tag: If a value is provided and is different from the
+     previous value, the extension handler will be forced to update even if the
+     extension configuration has not changed.
+    :type force_update_tag: str
+    :param publisher: The name of the extension handler publisher.
+    :type publisher: str
+    :param type: Specifies the type of the extension; an example is
+     "CustomScriptExtension".
+    :type type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param auto_upgrade_minor_version: Indicates whether the extension should
+     use a newer minor version if one is available at deployment time. Once
+     deployed, however, the extension will not upgrade minor versions unless
+     redeployed, even with this property set to true.
+    :type auto_upgrade_minor_version: bool
+    :param settings: Json formatted public settings for the extension.
+    :type settings: object
+    :param protected_settings: The extension can contain either
+     protectedSettings or protectedSettingsFromKeyVault or no protected
+     settings at all.
+    :type protected_settings: object
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'provisioning_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'},
+        'publisher': {'key': 'properties.publisher', 'type': 'str'},
+        'type': {'key': 'properties.type', 'type': 'str'},
+        'type_handler_version': {'key': 'properties.typeHandlerVersion', 'type': 'str'},
+        'auto_upgrade_minor_version': {'key': 'properties.autoUpgradeMinorVersion', 'type': 'bool'},
+        'settings': {'key': 'properties.settings', 'type': 'object'},
+        'protected_settings': {'key': 'properties.protectedSettings', 'type': 'object'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+    }
+
+    def __init__(self, *, name: str=None, force_update_tag: str=None, publisher: str=None, type: str=None, type_handler_version: str=None, auto_upgrade_minor_version: bool=None, settings=None, protected_settings=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetExtension, self).__init__(**kwargs)
+        self.name = name
+        self.force_update_tag = force_update_tag
+        self.publisher = publisher
+        self.type = type
+        self.type_handler_version = type_handler_version
+        self.auto_upgrade_minor_version = auto_upgrade_minor_version
+        self.settings = settings
+        self.protected_settings = protected_settings
+        self.provisioning_state = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_identity.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_identity.py
new file mode 100644
index 000000000000..0d3064e622d2
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_identity.py
@@ -0,0 +1,60 @@
+# 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 VirtualMachineScaleSetIdentity(Model):
+    """Identity for the virtual machine scale set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar principal_id: The principal id of virtual machine scale set
+     identity. This property will only be provided for a system assigned
+     identity.
+    :vartype principal_id: str
+    :ivar tenant_id: The tenant id associated with the virtual machine scale
+     set. This property will only be provided for a system assigned identity.
+    :vartype tenant_id: str
+    :param type: The type of identity used for the virtual machine scale set.
+     The type 'SystemAssigned, UserAssigned' includes both an implicitly
+     created identity and a set of user assigned identities. The type 'None'
+     will remove any identities from the virtual machine scale set. Possible
+     values include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned,
+     UserAssigned', 'None'
+    :type type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.ResourceIdentityType
+    :param identity_ids: The list of user identities associated with the
+     virtual machine scale set. The user identity references will be ARM
+     resource ids in the form:
+     '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/identities/{identityName}'.
+    :type identity_ids: list[str]
+    """
+
+    _validation = {
+        'principal_id': {'readonly': True},
+        'tenant_id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'principal_id': {'key': 'principalId', 'type': 'str'},
+        'tenant_id': {'key': 'tenantId', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'ResourceIdentityType'},
+        'identity_ids': {'key': 'identityIds', 'type': '[str]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetIdentity, self).__init__(**kwargs)
+        self.principal_id = None
+        self.tenant_id = None
+        self.type = kwargs.get('type', None)
+        self.identity_ids = kwargs.get('identity_ids', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_identity_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_identity_py3.py
new file mode 100644
index 000000000000..0d4c71f5c2e4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_identity_py3.py
@@ -0,0 +1,60 @@
+# 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 VirtualMachineScaleSetIdentity(Model):
+    """Identity for the virtual machine scale set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar principal_id: The principal id of virtual machine scale set
+     identity. This property will only be provided for a system assigned
+     identity.
+    :vartype principal_id: str
+    :ivar tenant_id: The tenant id associated with the virtual machine scale
+     set. This property will only be provided for a system assigned identity.
+    :vartype tenant_id: str
+    :param type: The type of identity used for the virtual machine scale set.
+     The type 'SystemAssigned, UserAssigned' includes both an implicitly
+     created identity and a set of user assigned identities. The type 'None'
+     will remove any identities from the virtual machine scale set. Possible
+     values include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned,
+     UserAssigned', 'None'
+    :type type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.ResourceIdentityType
+    :param identity_ids: The list of user identities associated with the
+     virtual machine scale set. The user identity references will be ARM
+     resource ids in the form:
+     '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/identities/{identityName}'.
+    :type identity_ids: list[str]
+    """
+
+    _validation = {
+        'principal_id': {'readonly': True},
+        'tenant_id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'principal_id': {'key': 'principalId', 'type': 'str'},
+        'tenant_id': {'key': 'tenantId', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'ResourceIdentityType'},
+        'identity_ids': {'key': 'identityIds', 'type': '[str]'},
+    }
+
+    def __init__(self, *, type=None, identity_ids=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetIdentity, self).__init__(**kwargs)
+        self.principal_id = None
+        self.tenant_id = None
+        self.type = type
+        self.identity_ids = identity_ids
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view.py
new file mode 100644
index 000000000000..1622490f7033
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view.py
@@ -0,0 +1,48 @@
+# 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 VirtualMachineScaleSetInstanceView(Model):
+    """The instance view of a virtual machine scale set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar virtual_machine: The instance view status summary for the virtual
+     machine scale set.
+    :vartype virtual_machine:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetInstanceViewStatusesSummary
+    :ivar extensions: The extensions information.
+    :vartype extensions:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVMExtensionsSummary]
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    """
+
+    _validation = {
+        'virtual_machine': {'readonly': True},
+        'extensions': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'virtual_machine': {'key': 'virtualMachine', 'type': 'VirtualMachineScaleSetInstanceViewStatusesSummary'},
+        'extensions': {'key': 'extensions', 'type': '[VirtualMachineScaleSetVMExtensionsSummary]'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetInstanceView, self).__init__(**kwargs)
+        self.virtual_machine = None
+        self.extensions = None
+        self.statuses = kwargs.get('statuses', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_py3.py
new file mode 100644
index 000000000000..b32213a53b1e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_py3.py
@@ -0,0 +1,48 @@
+# 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 VirtualMachineScaleSetInstanceView(Model):
+    """The instance view of a virtual machine scale set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar virtual_machine: The instance view status summary for the virtual
+     machine scale set.
+    :vartype virtual_machine:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetInstanceViewStatusesSummary
+    :ivar extensions: The extensions information.
+    :vartype extensions:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVMExtensionsSummary]
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    """
+
+    _validation = {
+        'virtual_machine': {'readonly': True},
+        'extensions': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'virtual_machine': {'key': 'virtualMachine', 'type': 'VirtualMachineScaleSetInstanceViewStatusesSummary'},
+        'extensions': {'key': 'extensions', 'type': '[VirtualMachineScaleSetVMExtensionsSummary]'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, *, statuses=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetInstanceView, self).__init__(**kwargs)
+        self.virtual_machine = None
+        self.extensions = None
+        self.statuses = statuses
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_statuses_summary.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_statuses_summary.py
new file mode 100644
index 000000000000..b0166ebb5800
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_statuses_summary.py
@@ -0,0 +1,37 @@
+# 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 VirtualMachineScaleSetInstanceViewStatusesSummary(Model):
+    """Instance view statuses summary for virtual machines of a virtual machine
+    scale set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar statuses_summary: The extensions information.
+    :vartype statuses_summary:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineStatusCodeCount]
+    """
+
+    _validation = {
+        'statuses_summary': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'statuses_summary': {'key': 'statusesSummary', 'type': '[VirtualMachineStatusCodeCount]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetInstanceViewStatusesSummary, self).__init__(**kwargs)
+        self.statuses_summary = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_statuses_summary_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_statuses_summary_py3.py
new file mode 100644
index 000000000000..40b07db6f65e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_statuses_summary_py3.py
@@ -0,0 +1,37 @@
+# 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 VirtualMachineScaleSetInstanceViewStatusesSummary(Model):
+    """Instance view statuses summary for virtual machines of a virtual machine
+    scale set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar statuses_summary: The extensions information.
+    :vartype statuses_summary:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineStatusCodeCount]
+    """
+
+    _validation = {
+        'statuses_summary': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'statuses_summary': {'key': 'statusesSummary', 'type': '[VirtualMachineStatusCodeCount]'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(VirtualMachineScaleSetInstanceViewStatusesSummary, self).__init__(**kwargs)
+        self.statuses_summary = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_configuration.py
new file mode 100644
index 000000000000..cab729ab5dba
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_configuration.py
@@ -0,0 +1,83 @@
+# 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 .sub_resource import SubResource
+
+
+class VirtualMachineScaleSetIPConfiguration(SubResource):
+    """Describes a virtual machine scale set network profile's IP configuration.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: Required. The IP configuration name.
+    :type name: str
+    :param subnet: Specifies the identifier of the subnet.
+    :type subnet: ~azure.mgmt.compute.v2018_04_01.models.ApiEntityReference
+    :param primary: Specifies the primary network interface in case the
+     virtual machine has more than 1 network interface.
+    :type primary: bool
+    :param public_ip_address_configuration: The publicIPAddressConfiguration.
+    :type public_ip_address_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetPublicIPAddressConfiguration
+    :param private_ip_address_version: Available from Api-Version 2017-03-30
+     onwards, it represents whether the specific ipconfiguration is IPv4 or
+     IPv6. Default is taken as IPv4.  Possible values are: 'IPv4' and 'IPv6'.
+     Possible values include: 'IPv4', 'IPv6'
+    :type private_ip_address_version: str or
+     ~azure.mgmt.compute.v2018_04_01.models.IPVersion
+    :param application_gateway_backend_address_pools: Specifies an array of
+     references to backend address pools of application gateways. A scale set
+     can reference backend address pools of multiple application gateways.
+     Multiple scale sets cannot use the same application gateway.
+    :type application_gateway_backend_address_pools:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    :param load_balancer_backend_address_pools: Specifies an array of
+     references to backend address pools of load balancers. A scale set can
+     reference backend address pools of one public and one internal load
+     balancer. Multiple scale sets cannot use the same load balancer.
+    :type load_balancer_backend_address_pools:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    :param load_balancer_inbound_nat_pools: Specifies an array of references
+     to inbound Nat pools of the load balancers. A scale set can reference
+     inbound nat pools of one public and one internal load balancer. Multiple
+     scale sets cannot use the same load balancer
+    :type load_balancer_inbound_nat_pools:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    """
+
+    _validation = {
+        'name': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'subnet': {'key': 'properties.subnet', 'type': 'ApiEntityReference'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+        'public_ip_address_configuration': {'key': 'properties.publicIPAddressConfiguration', 'type': 'VirtualMachineScaleSetPublicIPAddressConfiguration'},
+        'private_ip_address_version': {'key': 'properties.privateIPAddressVersion', 'type': 'str'},
+        'application_gateway_backend_address_pools': {'key': 'properties.applicationGatewayBackendAddressPools', 'type': '[SubResource]'},
+        'load_balancer_backend_address_pools': {'key': 'properties.loadBalancerBackendAddressPools', 'type': '[SubResource]'},
+        'load_balancer_inbound_nat_pools': {'key': 'properties.loadBalancerInboundNatPools', 'type': '[SubResource]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetIPConfiguration, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.subnet = kwargs.get('subnet', None)
+        self.primary = kwargs.get('primary', None)
+        self.public_ip_address_configuration = kwargs.get('public_ip_address_configuration', None)
+        self.private_ip_address_version = kwargs.get('private_ip_address_version', None)
+        self.application_gateway_backend_address_pools = kwargs.get('application_gateway_backend_address_pools', None)
+        self.load_balancer_backend_address_pools = kwargs.get('load_balancer_backend_address_pools', None)
+        self.load_balancer_inbound_nat_pools = kwargs.get('load_balancer_inbound_nat_pools', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_configuration_py3.py
new file mode 100644
index 000000000000..1c73ea10f6fd
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_configuration_py3.py
@@ -0,0 +1,83 @@
+# 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 .sub_resource_py3 import SubResource
+
+
+class VirtualMachineScaleSetIPConfiguration(SubResource):
+    """Describes a virtual machine scale set network profile's IP configuration.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: Required. The IP configuration name.
+    :type name: str
+    :param subnet: Specifies the identifier of the subnet.
+    :type subnet: ~azure.mgmt.compute.v2018_04_01.models.ApiEntityReference
+    :param primary: Specifies the primary network interface in case the
+     virtual machine has more than 1 network interface.
+    :type primary: bool
+    :param public_ip_address_configuration: The publicIPAddressConfiguration.
+    :type public_ip_address_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetPublicIPAddressConfiguration
+    :param private_ip_address_version: Available from Api-Version 2017-03-30
+     onwards, it represents whether the specific ipconfiguration is IPv4 or
+     IPv6. Default is taken as IPv4.  Possible values are: 'IPv4' and 'IPv6'.
+     Possible values include: 'IPv4', 'IPv6'
+    :type private_ip_address_version: str or
+     ~azure.mgmt.compute.v2018_04_01.models.IPVersion
+    :param application_gateway_backend_address_pools: Specifies an array of
+     references to backend address pools of application gateways. A scale set
+     can reference backend address pools of multiple application gateways.
+     Multiple scale sets cannot use the same application gateway.
+    :type application_gateway_backend_address_pools:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    :param load_balancer_backend_address_pools: Specifies an array of
+     references to backend address pools of load balancers. A scale set can
+     reference backend address pools of one public and one internal load
+     balancer. Multiple scale sets cannot use the same load balancer.
+    :type load_balancer_backend_address_pools:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    :param load_balancer_inbound_nat_pools: Specifies an array of references
+     to inbound Nat pools of the load balancers. A scale set can reference
+     inbound nat pools of one public and one internal load balancer. Multiple
+     scale sets cannot use the same load balancer
+    :type load_balancer_inbound_nat_pools:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    """
+
+    _validation = {
+        'name': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'subnet': {'key': 'properties.subnet', 'type': 'ApiEntityReference'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+        'public_ip_address_configuration': {'key': 'properties.publicIPAddressConfiguration', 'type': 'VirtualMachineScaleSetPublicIPAddressConfiguration'},
+        'private_ip_address_version': {'key': 'properties.privateIPAddressVersion', 'type': 'str'},
+        'application_gateway_backend_address_pools': {'key': 'properties.applicationGatewayBackendAddressPools', 'type': '[SubResource]'},
+        'load_balancer_backend_address_pools': {'key': 'properties.loadBalancerBackendAddressPools', 'type': '[SubResource]'},
+        'load_balancer_inbound_nat_pools': {'key': 'properties.loadBalancerInboundNatPools', 'type': '[SubResource]'},
+    }
+
+    def __init__(self, *, name: str, id: str=None, subnet=None, primary: bool=None, public_ip_address_configuration=None, private_ip_address_version=None, application_gateway_backend_address_pools=None, load_balancer_backend_address_pools=None, load_balancer_inbound_nat_pools=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetIPConfiguration, self).__init__(id=id, **kwargs)
+        self.name = name
+        self.subnet = subnet
+        self.primary = primary
+        self.public_ip_address_configuration = public_ip_address_configuration
+        self.private_ip_address_version = private_ip_address_version
+        self.application_gateway_backend_address_pools = application_gateway_backend_address_pools
+        self.load_balancer_backend_address_pools = load_balancer_backend_address_pools
+        self.load_balancer_inbound_nat_pools = load_balancer_inbound_nat_pools
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py
new file mode 100644
index 000000000000..495309b9b2cf
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py
@@ -0,0 +1,31 @@
+# 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 VirtualMachineScaleSetManagedDiskParameters(Model):
+    """Describes the parameters of a ScaleSet managed disk.
+
+    :param storage_account_type: Specifies the storage account type for the
+     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
+    :type storage_account_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
+    """
+
+    _attribute_map = {
+        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetManagedDiskParameters, self).__init__(**kwargs)
+        self.storage_account_type = kwargs.get('storage_account_type', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py
new file mode 100644
index 000000000000..68f66be2e34e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py
@@ -0,0 +1,31 @@
+# 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 VirtualMachineScaleSetManagedDiskParameters(Model):
+    """Describes the parameters of a ScaleSet managed disk.
+
+    :param storage_account_type: Specifies the storage account type for the
+     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
+    :type storage_account_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
+    """
+
+    _attribute_map = {
+        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
+    }
+
+    def __init__(self, *, storage_account_type=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetManagedDiskParameters, self).__init__(**kwargs)
+        self.storage_account_type = storage_account_type
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration.py
new file mode 100644
index 000000000000..232955519b0f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration.py
@@ -0,0 +1,70 @@
+# 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 .sub_resource import SubResource
+
+
+class VirtualMachineScaleSetNetworkConfiguration(SubResource):
+    """Describes a virtual machine scale set network profile's network
+    configurations.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: Required. The network configuration name.
+    :type name: str
+    :param primary: Specifies the primary network interface in case the
+     virtual machine has more than 1 network interface.
+    :type primary: bool
+    :param enable_accelerated_networking: Specifies whether the network
+     interface is accelerated networking-enabled.
+    :type enable_accelerated_networking: bool
+    :param network_security_group: The network security group.
+    :type network_security_group:
+     ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param dns_settings: The dns settings to be applied on the network
+     interfaces.
+    :type dns_settings:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetNetworkConfigurationDnsSettings
+    :param ip_configurations: Required. Specifies the IP configurations of the
+     network interface.
+    :type ip_configurations:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetIPConfiguration]
+    :param enable_ip_forwarding: Whether IP forwarding enabled on this NIC.
+    :type enable_ip_forwarding: bool
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'ip_configurations': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+        'enable_accelerated_networking': {'key': 'properties.enableAcceleratedNetworking', 'type': 'bool'},
+        'network_security_group': {'key': 'properties.networkSecurityGroup', 'type': 'SubResource'},
+        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetNetworkConfigurationDnsSettings'},
+        'ip_configurations': {'key': 'properties.ipConfigurations', 'type': '[VirtualMachineScaleSetIPConfiguration]'},
+        'enable_ip_forwarding': {'key': 'properties.enableIPForwarding', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetNetworkConfiguration, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.primary = kwargs.get('primary', None)
+        self.enable_accelerated_networking = kwargs.get('enable_accelerated_networking', None)
+        self.network_security_group = kwargs.get('network_security_group', None)
+        self.dns_settings = kwargs.get('dns_settings', None)
+        self.ip_configurations = kwargs.get('ip_configurations', None)
+        self.enable_ip_forwarding = kwargs.get('enable_ip_forwarding', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_dns_settings.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_dns_settings.py
new file mode 100644
index 000000000000..04e1c619383f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_dns_settings.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 VirtualMachineScaleSetNetworkConfigurationDnsSettings(Model):
+    """Describes a virtual machines scale sets network configuration's DNS
+    settings.
+
+    :param dns_servers: List of DNS servers IP addresses
+    :type dns_servers: list[str]
+    """
+
+    _attribute_map = {
+        'dns_servers': {'key': 'dnsServers', 'type': '[str]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetNetworkConfigurationDnsSettings, self).__init__(**kwargs)
+        self.dns_servers = kwargs.get('dns_servers', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_dns_settings_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_dns_settings_py3.py
new file mode 100644
index 000000000000..5607f74d3c6a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_dns_settings_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 VirtualMachineScaleSetNetworkConfigurationDnsSettings(Model):
+    """Describes a virtual machines scale sets network configuration's DNS
+    settings.
+
+    :param dns_servers: List of DNS servers IP addresses
+    :type dns_servers: list[str]
+    """
+
+    _attribute_map = {
+        'dns_servers': {'key': 'dnsServers', 'type': '[str]'},
+    }
+
+    def __init__(self, *, dns_servers=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetNetworkConfigurationDnsSettings, self).__init__(**kwargs)
+        self.dns_servers = dns_servers
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_py3.py
new file mode 100644
index 000000000000..d8847da6356d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_py3.py
@@ -0,0 +1,70 @@
+# 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 .sub_resource_py3 import SubResource
+
+
+class VirtualMachineScaleSetNetworkConfiguration(SubResource):
+    """Describes a virtual machine scale set network profile's network
+    configurations.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: Required. The network configuration name.
+    :type name: str
+    :param primary: Specifies the primary network interface in case the
+     virtual machine has more than 1 network interface.
+    :type primary: bool
+    :param enable_accelerated_networking: Specifies whether the network
+     interface is accelerated networking-enabled.
+    :type enable_accelerated_networking: bool
+    :param network_security_group: The network security group.
+    :type network_security_group:
+     ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param dns_settings: The dns settings to be applied on the network
+     interfaces.
+    :type dns_settings:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetNetworkConfigurationDnsSettings
+    :param ip_configurations: Required. Specifies the IP configurations of the
+     network interface.
+    :type ip_configurations:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetIPConfiguration]
+    :param enable_ip_forwarding: Whether IP forwarding enabled on this NIC.
+    :type enable_ip_forwarding: bool
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'ip_configurations': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+        'enable_accelerated_networking': {'key': 'properties.enableAcceleratedNetworking', 'type': 'bool'},
+        'network_security_group': {'key': 'properties.networkSecurityGroup', 'type': 'SubResource'},
+        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetNetworkConfigurationDnsSettings'},
+        'ip_configurations': {'key': 'properties.ipConfigurations', 'type': '[VirtualMachineScaleSetIPConfiguration]'},
+        'enable_ip_forwarding': {'key': 'properties.enableIPForwarding', 'type': 'bool'},
+    }
+
+    def __init__(self, *, name: str, ip_configurations, id: str=None, primary: bool=None, enable_accelerated_networking: bool=None, network_security_group=None, dns_settings=None, enable_ip_forwarding: bool=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetNetworkConfiguration, self).__init__(id=id, **kwargs)
+        self.name = name
+        self.primary = primary
+        self.enable_accelerated_networking = enable_accelerated_networking
+        self.network_security_group = network_security_group
+        self.dns_settings = dns_settings
+        self.ip_configurations = ip_configurations
+        self.enable_ip_forwarding = enable_ip_forwarding
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_profile.py
new file mode 100644
index 000000000000..b7b3854e671e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_profile.py
@@ -0,0 +1,38 @@
+# 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 VirtualMachineScaleSetNetworkProfile(Model):
+    """Describes a virtual machine scale set network profile.
+
+    :param health_probe: A reference to a load balancer probe used to
+     determine the health of an instance in the virtual machine scale set. The
+     reference will be in the form:
+     '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/probes/{probeName}'.
+    :type health_probe:
+     ~azure.mgmt.compute.v2018_04_01.models.ApiEntityReference
+    :param network_interface_configurations: The list of network
+     configurations.
+    :type network_interface_configurations:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetNetworkConfiguration]
+    """
+
+    _attribute_map = {
+        'health_probe': {'key': 'healthProbe', 'type': 'ApiEntityReference'},
+        'network_interface_configurations': {'key': 'networkInterfaceConfigurations', 'type': '[VirtualMachineScaleSetNetworkConfiguration]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetNetworkProfile, self).__init__(**kwargs)
+        self.health_probe = kwargs.get('health_probe', None)
+        self.network_interface_configurations = kwargs.get('network_interface_configurations', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_profile_py3.py
new file mode 100644
index 000000000000..4fd85adaca7a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_profile_py3.py
@@ -0,0 +1,38 @@
+# 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 VirtualMachineScaleSetNetworkProfile(Model):
+    """Describes a virtual machine scale set network profile.
+
+    :param health_probe: A reference to a load balancer probe used to
+     determine the health of an instance in the virtual machine scale set. The
+     reference will be in the form:
+     '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/probes/{probeName}'.
+    :type health_probe:
+     ~azure.mgmt.compute.v2018_04_01.models.ApiEntityReference
+    :param network_interface_configurations: The list of network
+     configurations.
+    :type network_interface_configurations:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetNetworkConfiguration]
+    """
+
+    _attribute_map = {
+        'health_probe': {'key': 'healthProbe', 'type': 'ApiEntityReference'},
+        'network_interface_configurations': {'key': 'networkInterfaceConfigurations', 'type': '[VirtualMachineScaleSetNetworkConfiguration]'},
+    }
+
+    def __init__(self, *, health_probe=None, network_interface_configurations=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetNetworkProfile, self).__init__(**kwargs)
+        self.health_probe = health_probe
+        self.network_interface_configurations = network_interface_configurations
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_disk.py
new file mode 100644
index 000000000000..3c27a4373376
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_disk.py
@@ -0,0 +1,80 @@
+# 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 VirtualMachineScaleSetOSDisk(Model):
+    """Describes a virtual machine scale set operating system disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: The disk name.
+    :type name: str
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :param create_option: Required. Specifies how the virtual machines in the
+     scale set should be created.<br><br> The only allowed value is:
+     **FromImage** \\u2013 This value is used when you are using an image to
+     create the virtual machine. If you are using a platform image, you also
+     use the imageReference element described above. If you are using a
+     marketplace image, you  also use the plan element previously described.
+     Possible values include: 'FromImage', 'Empty', 'Attach'
+    :type create_option: str or
+     ~azure.mgmt.compute.v2018_04_01.models.DiskCreateOptionTypes
+    :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**
+     <br><br> **Linux**. Possible values include: 'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
+    :param image: Specifies information about the unmanaged user image to base
+     the scale set on.
+    :type image: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
+    :param vhd_containers: Specifies the container urls that are used to store
+     operating system disks for the scale set.
+    :type vhd_containers: list[str]
+    :param managed_disk: The managed disk parameters.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetManagedDiskParameters
+    """
+
+    _validation = {
+        'create_option': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'caching': {'key': 'caching', 'type': 'CachingTypes'},
+        'write_accelerator_enabled': {'key': 'writeAcceleratorEnabled', 'type': 'bool'},
+        'create_option': {'key': 'createOption', 'type': 'str'},
+        '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, **kwargs):
+        super(VirtualMachineScaleSetOSDisk, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        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.os_type = kwargs.get('os_type', 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_04_01/models/virtual_machine_scale_set_os_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_disk_py3.py
new file mode 100644
index 000000000000..a9e21e153d4d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_disk_py3.py
@@ -0,0 +1,80 @@
+# 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 VirtualMachineScaleSetOSDisk(Model):
+    """Describes a virtual machine scale set operating system disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: The disk name.
+    :type name: str
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :param create_option: Required. Specifies how the virtual machines in the
+     scale set should be created.<br><br> The only allowed value is:
+     **FromImage** \\u2013 This value is used when you are using an image to
+     create the virtual machine. If you are using a platform image, you also
+     use the imageReference element described above. If you are using a
+     marketplace image, you  also use the plan element previously described.
+     Possible values include: 'FromImage', 'Empty', 'Attach'
+    :type create_option: str or
+     ~azure.mgmt.compute.v2018_04_01.models.DiskCreateOptionTypes
+    :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**
+     <br><br> **Linux**. Possible values include: 'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
+    :param image: Specifies information about the unmanaged user image to base
+     the scale set on.
+    :type image: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
+    :param vhd_containers: Specifies the container urls that are used to store
+     operating system disks for the scale set.
+    :type vhd_containers: list[str]
+    :param managed_disk: The managed disk parameters.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetManagedDiskParameters
+    """
+
+    _validation = {
+        'create_option': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'caching': {'key': 'caching', 'type': 'CachingTypes'},
+        'write_accelerator_enabled': {'key': 'writeAcceleratorEnabled', 'type': 'bool'},
+        'create_option': {'key': 'createOption', 'type': 'str'},
+        '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:
+        super(VirtualMachineScaleSetOSDisk, self).__init__(**kwargs)
+        self.name = name
+        self.caching = caching
+        self.write_accelerator_enabled = write_accelerator_enabled
+        self.create_option = create_option
+        self.os_type = os_type
+        self.image = image
+        self.vhd_containers = vhd_containers
+        self.managed_disk = managed_disk
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_profile.py
new file mode 100644
index 000000000000..fc813cc7a45f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_profile.py
@@ -0,0 +1,97 @@
+# 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 VirtualMachineScaleSetOSProfile(Model):
+    """Describes a virtual machine scale set OS profile.
+
+    :param computer_name_prefix: Specifies the computer name prefix for all of
+     the virtual machines in the scale set. Computer name prefixes must be 1 to
+     15 characters long.
+    :type computer_name_prefix: str
+    :param admin_username: Specifies the name of the administrator account.
+     <br><br> **Windows-only restriction:** Cannot end in "." <br><br>
+     **Disallowed values:** "administrator", "admin", "user", "user1", "test",
+     "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm",
+     "admin2", "aspnet", "backup", "console", "david", "guest", "john",
+     "owner", "root", "server", "sql", "support", "support_388945a0", "sys",
+     "test2", "test3", "user4", "user5". <br><br> **Minimum-length (Linux):** 1
+     character <br><br> **Max-length (Linux):** 64 characters <br><br>
+     **Max-length (Windows):** 20 characters  <br><br><li> For root access to
+     the Linux VM, see [Using root privileges on Linux virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-use-root-privileges?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)<br><li>
+     For a list of built-in system users on Linux that should not be used in
+     this field, see [Selecting User Names for Linux on
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-usernames?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    :type admin_username: str
+    :param admin_password: Specifies the password of the administrator
+     account. <br><br> **Minimum-length (Windows):** 8 characters <br><br>
+     **Minimum-length (Linux):** 6 characters <br><br> **Max-length
+     (Windows):** 123 characters <br><br> **Max-length (Linux):** 72 characters
+     <br><br> **Complexity requirements:** 3 out of 4 conditions below need to
+     be fulfilled <br> Has lower characters <br>Has upper characters <br> Has a
+     digit <br> Has a special character (Regex match [\\W_]) <br><br>
+     **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123",
+     "Pa$$word", "pass@word1", "Password!", "Password1", "Password22",
+     "iloveyou!" <br><br> For resetting the password, see [How to reset the
+     Remote Desktop service or its login password in a Windows
+     VM](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-reset-rdp?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> For resetting root password, see [Manage users, SSH, and check or
+     repair disks on Azure Linux VMs using the VMAccess
+     Extension](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-vmaccess-extension?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#reset-root-password)
+    :type admin_password: str
+    :param custom_data: Specifies a base-64 encoded string of custom data. The
+     base-64 encoded string is decoded to a binary array that is saved as a
+     file on the Virtual Machine. The maximum length of the binary array is
+     65535 bytes. <br><br> For using cloud-init for your VM, see [Using
+     cloud-init to customize a Linux VM during
+     creation](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-cloud-init?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    :type custom_data: str
+    :param windows_configuration: Specifies Windows operating system settings
+     on the virtual machine.
+    :type windows_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.WindowsConfiguration
+    :param linux_configuration: Specifies the Linux operating system settings
+     on the virtual machine. <br><br>For a list of supported Linux
+     distributions, see [Linux on Azure-Endorsed
+     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+     <br><br> For running non-endorsed distributions, see [Information for
+     Non-Endorsed
+     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
+    :type linux_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.LinuxConfiguration
+    :param secrets: Specifies set of certificates that should be installed
+     onto the virtual machines in the scale set.
+    :type secrets:
+     list[~azure.mgmt.compute.v2018_04_01.models.VaultSecretGroup]
+    """
+
+    _attribute_map = {
+        'computer_name_prefix': {'key': 'computerNamePrefix', 'type': 'str'},
+        'admin_username': {'key': 'adminUsername', 'type': 'str'},
+        'admin_password': {'key': 'adminPassword', 'type': 'str'},
+        'custom_data': {'key': 'customData', 'type': 'str'},
+        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'WindowsConfiguration'},
+        'linux_configuration': {'key': 'linuxConfiguration', 'type': 'LinuxConfiguration'},
+        'secrets': {'key': 'secrets', 'type': '[VaultSecretGroup]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetOSProfile, self).__init__(**kwargs)
+        self.computer_name_prefix = kwargs.get('computer_name_prefix', None)
+        self.admin_username = kwargs.get('admin_username', None)
+        self.admin_password = kwargs.get('admin_password', None)
+        self.custom_data = kwargs.get('custom_data', None)
+        self.windows_configuration = kwargs.get('windows_configuration', None)
+        self.linux_configuration = kwargs.get('linux_configuration', None)
+        self.secrets = kwargs.get('secrets', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_profile_py3.py
new file mode 100644
index 000000000000..f6f5abf8eb58
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_profile_py3.py
@@ -0,0 +1,97 @@
+# 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 VirtualMachineScaleSetOSProfile(Model):
+    """Describes a virtual machine scale set OS profile.
+
+    :param computer_name_prefix: Specifies the computer name prefix for all of
+     the virtual machines in the scale set. Computer name prefixes must be 1 to
+     15 characters long.
+    :type computer_name_prefix: str
+    :param admin_username: Specifies the name of the administrator account.
+     <br><br> **Windows-only restriction:** Cannot end in "." <br><br>
+     **Disallowed values:** "administrator", "admin", "user", "user1", "test",
+     "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm",
+     "admin2", "aspnet", "backup", "console", "david", "guest", "john",
+     "owner", "root", "server", "sql", "support", "support_388945a0", "sys",
+     "test2", "test3", "user4", "user5". <br><br> **Minimum-length (Linux):** 1
+     character <br><br> **Max-length (Linux):** 64 characters <br><br>
+     **Max-length (Windows):** 20 characters  <br><br><li> For root access to
+     the Linux VM, see [Using root privileges on Linux virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-use-root-privileges?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)<br><li>
+     For a list of built-in system users on Linux that should not be used in
+     this field, see [Selecting User Names for Linux on
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-usernames?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    :type admin_username: str
+    :param admin_password: Specifies the password of the administrator
+     account. <br><br> **Minimum-length (Windows):** 8 characters <br><br>
+     **Minimum-length (Linux):** 6 characters <br><br> **Max-length
+     (Windows):** 123 characters <br><br> **Max-length (Linux):** 72 characters
+     <br><br> **Complexity requirements:** 3 out of 4 conditions below need to
+     be fulfilled <br> Has lower characters <br>Has upper characters <br> Has a
+     digit <br> Has a special character (Regex match [\\W_]) <br><br>
+     **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123",
+     "Pa$$word", "pass@word1", "Password!", "Password1", "Password22",
+     "iloveyou!" <br><br> For resetting the password, see [How to reset the
+     Remote Desktop service or its login password in a Windows
+     VM](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-reset-rdp?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> For resetting root password, see [Manage users, SSH, and check or
+     repair disks on Azure Linux VMs using the VMAccess
+     Extension](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-vmaccess-extension?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#reset-root-password)
+    :type admin_password: str
+    :param custom_data: Specifies a base-64 encoded string of custom data. The
+     base-64 encoded string is decoded to a binary array that is saved as a
+     file on the Virtual Machine. The maximum length of the binary array is
+     65535 bytes. <br><br> For using cloud-init for your VM, see [Using
+     cloud-init to customize a Linux VM during
+     creation](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-cloud-init?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    :type custom_data: str
+    :param windows_configuration: Specifies Windows operating system settings
+     on the virtual machine.
+    :type windows_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.WindowsConfiguration
+    :param linux_configuration: Specifies the Linux operating system settings
+     on the virtual machine. <br><br>For a list of supported Linux
+     distributions, see [Linux on Azure-Endorsed
+     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+     <br><br> For running non-endorsed distributions, see [Information for
+     Non-Endorsed
+     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
+    :type linux_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.LinuxConfiguration
+    :param secrets: Specifies set of certificates that should be installed
+     onto the virtual machines in the scale set.
+    :type secrets:
+     list[~azure.mgmt.compute.v2018_04_01.models.VaultSecretGroup]
+    """
+
+    _attribute_map = {
+        'computer_name_prefix': {'key': 'computerNamePrefix', 'type': 'str'},
+        'admin_username': {'key': 'adminUsername', 'type': 'str'},
+        'admin_password': {'key': 'adminPassword', 'type': 'str'},
+        'custom_data': {'key': 'customData', 'type': 'str'},
+        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'WindowsConfiguration'},
+        'linux_configuration': {'key': 'linuxConfiguration', 'type': 'LinuxConfiguration'},
+        'secrets': {'key': 'secrets', 'type': '[VaultSecretGroup]'},
+    }
+
+    def __init__(self, *, computer_name_prefix: str=None, admin_username: str=None, admin_password: str=None, custom_data: str=None, windows_configuration=None, linux_configuration=None, secrets=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetOSProfile, self).__init__(**kwargs)
+        self.computer_name_prefix = computer_name_prefix
+        self.admin_username = admin_username
+        self.admin_password = admin_password
+        self.custom_data = custom_data
+        self.windows_configuration = windows_configuration
+        self.linux_configuration = linux_configuration
+        self.secrets = secrets
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_paged.py
new file mode 100644
index 000000000000..5492e1f69e53
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_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 VirtualMachineScaleSetPaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`VirtualMachineScaleSet <azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSet>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[VirtualMachineScaleSet]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(VirtualMachineScaleSetPaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration.py
new file mode 100644
index 000000000000..d2d78be5db52
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration.py
@@ -0,0 +1,45 @@
+# 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 VirtualMachineScaleSetPublicIPAddressConfiguration(Model):
+    """Describes a virtual machines scale set IP Configuration's PublicIPAddress
+    configuration.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: Required. The publicIP address configuration name.
+    :type name: str
+    :param idle_timeout_in_minutes: The idle timeout of the public IP address.
+    :type idle_timeout_in_minutes: int
+    :param dns_settings: The dns settings to be applied on the publicIP
+     addresses .
+    :type dns_settings:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings
+    """
+
+    _validation = {
+        'name': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'idle_timeout_in_minutes': {'key': 'properties.idleTimeoutInMinutes', 'type': 'int'},
+        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetPublicIPAddressConfiguration, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.idle_timeout_in_minutes = kwargs.get('idle_timeout_in_minutes', None)
+        self.dns_settings = kwargs.get('dns_settings', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings.py
new file mode 100644
index 000000000000..2fe562244372
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings.py
@@ -0,0 +1,37 @@
+# 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 VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings(Model):
+    """Describes a virtual machines scale sets network configuration's DNS
+    settings.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param domain_name_label: Required. The Domain name label.The
+     concatenation of the domain name label and vm index will be the domain
+     name labels of the PublicIPAddress resources that will be created
+    :type domain_name_label: str
+    """
+
+    _validation = {
+        'domain_name_label': {'required': True},
+    }
+
+    _attribute_map = {
+        'domain_name_label': {'key': 'domainNameLabel', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings, self).__init__(**kwargs)
+        self.domain_name_label = kwargs.get('domain_name_label', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings_py3.py
new file mode 100644
index 000000000000..326a36708ff4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings_py3.py
@@ -0,0 +1,37 @@
+# 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 VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings(Model):
+    """Describes a virtual machines scale sets network configuration's DNS
+    settings.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param domain_name_label: Required. The Domain name label.The
+     concatenation of the domain name label and vm index will be the domain
+     name labels of the PublicIPAddress resources that will be created
+    :type domain_name_label: str
+    """
+
+    _validation = {
+        'domain_name_label': {'required': True},
+    }
+
+    _attribute_map = {
+        'domain_name_label': {'key': 'domainNameLabel', 'type': 'str'},
+    }
+
+    def __init__(self, *, domain_name_label: str, **kwargs) -> None:
+        super(VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings, self).__init__(**kwargs)
+        self.domain_name_label = domain_name_label
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_py3.py
new file mode 100644
index 000000000000..36fceb407e7f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_py3.py
@@ -0,0 +1,45 @@
+# 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 VirtualMachineScaleSetPublicIPAddressConfiguration(Model):
+    """Describes a virtual machines scale set IP Configuration's PublicIPAddress
+    configuration.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: Required. The publicIP address configuration name.
+    :type name: str
+    :param idle_timeout_in_minutes: The idle timeout of the public IP address.
+    :type idle_timeout_in_minutes: int
+    :param dns_settings: The dns settings to be applied on the publicIP
+     addresses .
+    :type dns_settings:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings
+    """
+
+    _validation = {
+        'name': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'idle_timeout_in_minutes': {'key': 'properties.idleTimeoutInMinutes', 'type': 'int'},
+        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings'},
+    }
+
+    def __init__(self, *, name: str, idle_timeout_in_minutes: int=None, dns_settings=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
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_py3.py
new file mode 100644
index 000000000000..a618d08a4ee6
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_py3.py
@@ -0,0 +1,116 @@
+# 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 VirtualMachineScaleSet(Resource):
+    """Describes a Virtual Machine Scale Set.
+
+    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]
+    :param sku: The virtual machine scale set sku.
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
+    :param plan: Specifies information about the marketplace image used to
+     create the virtual machine. This element is only used for marketplace
+     images. Before you can use a marketplace image from an API, you must
+     enable the image for programmatic use.  In the Azure portal, find the
+     marketplace image that you want to use and then click **Want to deploy
+     programmatically, Get Started ->**. Enter any required information and
+     then click **Save**.
+    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
+    :param upgrade_policy: The upgrade policy.
+    :type upgrade_policy: ~azure.mgmt.compute.v2018_04_01.models.UpgradePolicy
+    :param virtual_machine_profile: The virtual machine profile.
+    :type virtual_machine_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVMProfile
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :param overprovision: Specifies whether the Virtual Machine Scale Set
+     should be overprovisioned.
+    :type overprovision: bool
+    :ivar unique_id: Specifies the ID which uniquely identifies a Virtual
+     Machine Scale Set.
+    :vartype unique_id: str
+    :param single_placement_group: When true this limits the scale set to a
+     single placement group, of max size 100 virtual machines.
+    :type single_placement_group: bool
+    :param zone_balance: Whether to force stictly even Virtual Machine
+     distribution cross x-zones in case there is zone outage.
+    :type zone_balance: bool
+    :param platform_fault_domain_count: Fault Domain count for each placement
+     group.
+    :type platform_fault_domain_count: int
+    :param identity: The identity of the virtual machine scale set, if
+     configured.
+    :type identity:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetIdentity
+    :param zones: The virtual machine scale set zones.
+    :type zones: list[str]
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'provisioning_state': {'readonly': True},
+        'unique_id': {'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}'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'upgrade_policy': {'key': 'properties.upgradePolicy', 'type': 'UpgradePolicy'},
+        'virtual_machine_profile': {'key': 'properties.virtualMachineProfile', 'type': 'VirtualMachineScaleSetVMProfile'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'overprovision': {'key': 'properties.overprovision', 'type': 'bool'},
+        'unique_id': {'key': 'properties.uniqueId', 'type': 'str'},
+        'single_placement_group': {'key': 'properties.singlePlacementGroup', 'type': 'bool'},
+        'zone_balance': {'key': 'properties.zoneBalance', 'type': 'bool'},
+        'platform_fault_domain_count': {'key': 'properties.platformFaultDomainCount', 'type': 'int'},
+        'identity': {'key': 'identity', 'type': 'VirtualMachineScaleSetIdentity'},
+        'zones': {'key': 'zones', 'type': '[str]'},
+    }
+
+    def __init__(self, *, location: str, tags=None, sku=None, plan=None, upgrade_policy=None, virtual_machine_profile=None, overprovision: bool=None, single_placement_group: bool=None, zone_balance: bool=None, platform_fault_domain_count: int=None, identity=None, zones=None, **kwargs) -> None:
+        super(VirtualMachineScaleSet, self).__init__(location=location, tags=tags, **kwargs)
+        self.sku = sku
+        self.plan = plan
+        self.upgrade_policy = upgrade_policy
+        self.virtual_machine_profile = virtual_machine_profile
+        self.provisioning_state = None
+        self.overprovision = overprovision
+        self.unique_id = None
+        self.single_placement_group = single_placement_group
+        self.zone_balance = zone_balance
+        self.platform_fault_domain_count = platform_fault_domain_count
+        self.identity = identity
+        self.zones = zones
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku.py
new file mode 100644
index 000000000000..3c601b81ecda
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku.py
@@ -0,0 +1,46 @@
+# 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 VirtualMachineScaleSetSku(Model):
+    """Describes an available virtual machine scale set sku.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar resource_type: The type of resource the sku applies to.
+    :vartype resource_type: str
+    :ivar sku: The Sku.
+    :vartype sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
+    :ivar capacity: Specifies the number of virtual machines in the scale set.
+    :vartype capacity:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetSkuCapacity
+    """
+
+    _validation = {
+        'resource_type': {'readonly': True},
+        'sku': {'readonly': True},
+        'capacity': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'resource_type': {'key': 'resourceType', 'type': 'str'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+        'capacity': {'key': 'capacity', 'type': 'VirtualMachineScaleSetSkuCapacity'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetSku, self).__init__(**kwargs)
+        self.resource_type = None
+        self.sku = None
+        self.capacity = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_capacity.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_capacity.py
new file mode 100644
index 000000000000..a54bfd2b20b1
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_capacity.py
@@ -0,0 +1,52 @@
+# 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 VirtualMachineScaleSetSkuCapacity(Model):
+    """Describes scaling information of a sku.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar minimum: The minimum capacity.
+    :vartype minimum: long
+    :ivar maximum: The maximum capacity that can be set.
+    :vartype maximum: long
+    :ivar default_capacity: The default capacity.
+    :vartype default_capacity: long
+    :ivar scale_type: The scale type applicable to the sku. Possible values
+     include: 'Automatic', 'None'
+    :vartype scale_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetSkuScaleType
+    """
+
+    _validation = {
+        'minimum': {'readonly': True},
+        'maximum': {'readonly': True},
+        'default_capacity': {'readonly': True},
+        'scale_type': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'minimum': {'key': 'minimum', 'type': 'long'},
+        'maximum': {'key': 'maximum', 'type': 'long'},
+        'default_capacity': {'key': 'defaultCapacity', 'type': 'long'},
+        'scale_type': {'key': 'scaleType', 'type': 'VirtualMachineScaleSetSkuScaleType'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetSkuCapacity, self).__init__(**kwargs)
+        self.minimum = None
+        self.maximum = None
+        self.default_capacity = None
+        self.scale_type = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_capacity_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_capacity_py3.py
new file mode 100644
index 000000000000..e3906808d039
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_capacity_py3.py
@@ -0,0 +1,52 @@
+# 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 VirtualMachineScaleSetSkuCapacity(Model):
+    """Describes scaling information of a sku.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar minimum: The minimum capacity.
+    :vartype minimum: long
+    :ivar maximum: The maximum capacity that can be set.
+    :vartype maximum: long
+    :ivar default_capacity: The default capacity.
+    :vartype default_capacity: long
+    :ivar scale_type: The scale type applicable to the sku. Possible values
+     include: 'Automatic', 'None'
+    :vartype scale_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetSkuScaleType
+    """
+
+    _validation = {
+        'minimum': {'readonly': True},
+        'maximum': {'readonly': True},
+        'default_capacity': {'readonly': True},
+        'scale_type': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'minimum': {'key': 'minimum', 'type': 'long'},
+        'maximum': {'key': 'maximum', 'type': 'long'},
+        'default_capacity': {'key': 'defaultCapacity', 'type': 'long'},
+        'scale_type': {'key': 'scaleType', 'type': 'VirtualMachineScaleSetSkuScaleType'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(VirtualMachineScaleSetSkuCapacity, self).__init__(**kwargs)
+        self.minimum = None
+        self.maximum = None
+        self.default_capacity = None
+        self.scale_type = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_paged.py
new file mode 100644
index 000000000000..e4ea6350b52c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_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 VirtualMachineScaleSetSkuPaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`VirtualMachineScaleSetSku <azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetSku>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[VirtualMachineScaleSetSku]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(VirtualMachineScaleSetSkuPaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_py3.py
new file mode 100644
index 000000000000..2c0303850bc0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_py3.py
@@ -0,0 +1,46 @@
+# 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 VirtualMachineScaleSetSku(Model):
+    """Describes an available virtual machine scale set sku.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar resource_type: The type of resource the sku applies to.
+    :vartype resource_type: str
+    :ivar sku: The Sku.
+    :vartype sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
+    :ivar capacity: Specifies the number of virtual machines in the scale set.
+    :vartype capacity:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetSkuCapacity
+    """
+
+    _validation = {
+        'resource_type': {'readonly': True},
+        'sku': {'readonly': True},
+        'capacity': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'resource_type': {'key': 'resourceType', 'type': 'str'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+        'capacity': {'key': 'capacity', 'type': 'VirtualMachineScaleSetSkuCapacity'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(VirtualMachineScaleSetSku, self).__init__(**kwargs)
+        self.resource_type = None
+        self.sku = None
+        self.capacity = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_storage_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_storage_profile.py
new file mode 100644
index 000000000000..c80219cb987d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_storage_profile.py
@@ -0,0 +1,49 @@
+# 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 VirtualMachineScaleSetStorageProfile(Model):
+    """Describes a virtual machine scale set storage profile.
+
+    :param image_reference: Specifies information about the image to use. You
+     can specify information about platform images, marketplace images, or
+     virtual machine images. This element is required when you want to use a
+     platform image, marketplace image, or virtual machine image, but is not
+     used in other creation operations.
+    :type image_reference:
+     ~azure.mgmt.compute.v2018_04_01.models.ImageReference
+    :param os_disk: Specifies information about the operating system disk used
+     by the virtual machines in the scale set. <br><br> For more information
+     about disks, see [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type os_disk:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetOSDisk
+    :param data_disks: Specifies the parameters that are used to add data
+     disks to the virtual machines in the scale set. <br><br> For more
+     information about disks, see [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type data_disks:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetDataDisk]
+    """
+
+    _attribute_map = {
+        'image_reference': {'key': 'imageReference', 'type': 'ImageReference'},
+        'os_disk': {'key': 'osDisk', 'type': 'VirtualMachineScaleSetOSDisk'},
+        'data_disks': {'key': 'dataDisks', 'type': '[VirtualMachineScaleSetDataDisk]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetStorageProfile, self).__init__(**kwargs)
+        self.image_reference = kwargs.get('image_reference', None)
+        self.os_disk = kwargs.get('os_disk', None)
+        self.data_disks = kwargs.get('data_disks', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_storage_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_storage_profile_py3.py
new file mode 100644
index 000000000000..e10ef0ecaed2
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_storage_profile_py3.py
@@ -0,0 +1,49 @@
+# 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 VirtualMachineScaleSetStorageProfile(Model):
+    """Describes a virtual machine scale set storage profile.
+
+    :param image_reference: Specifies information about the image to use. You
+     can specify information about platform images, marketplace images, or
+     virtual machine images. This element is required when you want to use a
+     platform image, marketplace image, or virtual machine image, but is not
+     used in other creation operations.
+    :type image_reference:
+     ~azure.mgmt.compute.v2018_04_01.models.ImageReference
+    :param os_disk: Specifies information about the operating system disk used
+     by the virtual machines in the scale set. <br><br> For more information
+     about disks, see [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type os_disk:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetOSDisk
+    :param data_disks: Specifies the parameters that are used to add data
+     disks to the virtual machines in the scale set. <br><br> For more
+     information about disks, see [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type data_disks:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetDataDisk]
+    """
+
+    _attribute_map = {
+        'image_reference': {'key': 'imageReference', 'type': 'ImageReference'},
+        'os_disk': {'key': 'osDisk', 'type': 'VirtualMachineScaleSetOSDisk'},
+        'data_disks': {'key': 'dataDisks', 'type': '[VirtualMachineScaleSetDataDisk]'},
+    }
+
+    def __init__(self, *, image_reference=None, os_disk=None, data_disks=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetStorageProfile, self).__init__(**kwargs)
+        self.image_reference = image_reference
+        self.os_disk = os_disk
+        self.data_disks = data_disks
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update.py
new file mode 100644
index 000000000000..150098be5e3a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update.py
@@ -0,0 +1,61 @@
+# 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 .update_resource import UpdateResource
+
+
+class VirtualMachineScaleSetUpdate(UpdateResource):
+    """Describes a Virtual Machine Scale Set.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param sku: The virtual machine scale set sku.
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
+    :param plan: The purchase plan when deploying a virtual machine scale set
+     from VM Marketplace images.
+    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
+    :param upgrade_policy: The upgrade policy.
+    :type upgrade_policy: ~azure.mgmt.compute.v2018_04_01.models.UpgradePolicy
+    :param virtual_machine_profile: The virtual machine profile.
+    :type virtual_machine_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateVMProfile
+    :param overprovision: Specifies whether the Virtual Machine Scale Set
+     should be overprovisioned.
+    :type overprovision: bool
+    :param single_placement_group: When true this limits the scale set to a
+     single placement group, of max size 100 virtual machines.
+    :type single_placement_group: bool
+    :param identity: The identity of the virtual machine scale set, if
+     configured.
+    :type identity:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetIdentity
+    """
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'upgrade_policy': {'key': 'properties.upgradePolicy', 'type': 'UpgradePolicy'},
+        'virtual_machine_profile': {'key': 'properties.virtualMachineProfile', 'type': 'VirtualMachineScaleSetUpdateVMProfile'},
+        'overprovision': {'key': 'properties.overprovision', 'type': 'bool'},
+        'single_placement_group': {'key': 'properties.singlePlacementGroup', 'type': 'bool'},
+        'identity': {'key': 'identity', 'type': 'VirtualMachineScaleSetIdentity'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetUpdate, self).__init__(**kwargs)
+        self.sku = kwargs.get('sku', None)
+        self.plan = kwargs.get('plan', None)
+        self.upgrade_policy = kwargs.get('upgrade_policy', None)
+        self.virtual_machine_profile = kwargs.get('virtual_machine_profile', None)
+        self.overprovision = kwargs.get('overprovision', None)
+        self.single_placement_group = kwargs.get('single_placement_group', None)
+        self.identity = kwargs.get('identity', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_ip_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_ip_configuration.py
new file mode 100644
index 000000000000..6b71a481c5a0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_ip_configuration.py
@@ -0,0 +1,71 @@
+# 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 .sub_resource import SubResource
+
+
+class VirtualMachineScaleSetUpdateIPConfiguration(SubResource):
+    """Describes a virtual machine scale set network profile's IP configuration.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: The IP configuration name.
+    :type name: str
+    :param subnet: The subnet.
+    :type subnet: ~azure.mgmt.compute.v2018_04_01.models.ApiEntityReference
+    :param primary: Specifies the primary IP Configuration in case the network
+     interface has more than one IP Configuration.
+    :type primary: bool
+    :param public_ip_address_configuration: The publicIPAddressConfiguration.
+    :type public_ip_address_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdatePublicIPAddressConfiguration
+    :param private_ip_address_version: Available from Api-Version 2017-03-30
+     onwards, it represents whether the specific ipconfiguration is IPv4 or
+     IPv6. Default is taken as IPv4.  Possible values are: 'IPv4' and 'IPv6'.
+     Possible values include: 'IPv4', 'IPv6'
+    :type private_ip_address_version: str or
+     ~azure.mgmt.compute.v2018_04_01.models.IPVersion
+    :param application_gateway_backend_address_pools: The application gateway
+     backend address pools.
+    :type application_gateway_backend_address_pools:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    :param load_balancer_backend_address_pools: The load balancer backend
+     address pools.
+    :type load_balancer_backend_address_pools:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    :param load_balancer_inbound_nat_pools: The load balancer inbound nat
+     pools.
+    :type load_balancer_inbound_nat_pools:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'subnet': {'key': 'properties.subnet', 'type': 'ApiEntityReference'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+        'public_ip_address_configuration': {'key': 'properties.publicIPAddressConfiguration', 'type': 'VirtualMachineScaleSetUpdatePublicIPAddressConfiguration'},
+        'private_ip_address_version': {'key': 'properties.privateIPAddressVersion', 'type': 'str'},
+        'application_gateway_backend_address_pools': {'key': 'properties.applicationGatewayBackendAddressPools', 'type': '[SubResource]'},
+        'load_balancer_backend_address_pools': {'key': 'properties.loadBalancerBackendAddressPools', 'type': '[SubResource]'},
+        'load_balancer_inbound_nat_pools': {'key': 'properties.loadBalancerInboundNatPools', 'type': '[SubResource]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetUpdateIPConfiguration, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.subnet = kwargs.get('subnet', None)
+        self.primary = kwargs.get('primary', None)
+        self.public_ip_address_configuration = kwargs.get('public_ip_address_configuration', None)
+        self.private_ip_address_version = kwargs.get('private_ip_address_version', None)
+        self.application_gateway_backend_address_pools = kwargs.get('application_gateway_backend_address_pools', None)
+        self.load_balancer_backend_address_pools = kwargs.get('load_balancer_backend_address_pools', None)
+        self.load_balancer_inbound_nat_pools = kwargs.get('load_balancer_inbound_nat_pools', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_ip_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_ip_configuration_py3.py
new file mode 100644
index 000000000000..25a443480dba
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_ip_configuration_py3.py
@@ -0,0 +1,71 @@
+# 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 .sub_resource_py3 import SubResource
+
+
+class VirtualMachineScaleSetUpdateIPConfiguration(SubResource):
+    """Describes a virtual machine scale set network profile's IP configuration.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: The IP configuration name.
+    :type name: str
+    :param subnet: The subnet.
+    :type subnet: ~azure.mgmt.compute.v2018_04_01.models.ApiEntityReference
+    :param primary: Specifies the primary IP Configuration in case the network
+     interface has more than one IP Configuration.
+    :type primary: bool
+    :param public_ip_address_configuration: The publicIPAddressConfiguration.
+    :type public_ip_address_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdatePublicIPAddressConfiguration
+    :param private_ip_address_version: Available from Api-Version 2017-03-30
+     onwards, it represents whether the specific ipconfiguration is IPv4 or
+     IPv6. Default is taken as IPv4.  Possible values are: 'IPv4' and 'IPv6'.
+     Possible values include: 'IPv4', 'IPv6'
+    :type private_ip_address_version: str or
+     ~azure.mgmt.compute.v2018_04_01.models.IPVersion
+    :param application_gateway_backend_address_pools: The application gateway
+     backend address pools.
+    :type application_gateway_backend_address_pools:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    :param load_balancer_backend_address_pools: The load balancer backend
+     address pools.
+    :type load_balancer_backend_address_pools:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    :param load_balancer_inbound_nat_pools: The load balancer inbound nat
+     pools.
+    :type load_balancer_inbound_nat_pools:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'subnet': {'key': 'properties.subnet', 'type': 'ApiEntityReference'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+        'public_ip_address_configuration': {'key': 'properties.publicIPAddressConfiguration', 'type': 'VirtualMachineScaleSetUpdatePublicIPAddressConfiguration'},
+        'private_ip_address_version': {'key': 'properties.privateIPAddressVersion', 'type': 'str'},
+        'application_gateway_backend_address_pools': {'key': 'properties.applicationGatewayBackendAddressPools', 'type': '[SubResource]'},
+        'load_balancer_backend_address_pools': {'key': 'properties.loadBalancerBackendAddressPools', 'type': '[SubResource]'},
+        'load_balancer_inbound_nat_pools': {'key': 'properties.loadBalancerInboundNatPools', 'type': '[SubResource]'},
+    }
+
+    def __init__(self, *, id: str=None, name: str=None, subnet=None, primary: bool=None, public_ip_address_configuration=None, private_ip_address_version=None, application_gateway_backend_address_pools=None, load_balancer_backend_address_pools=None, load_balancer_inbound_nat_pools=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetUpdateIPConfiguration, self).__init__(id=id, **kwargs)
+        self.name = name
+        self.subnet = subnet
+        self.primary = primary
+        self.public_ip_address_configuration = public_ip_address_configuration
+        self.private_ip_address_version = private_ip_address_version
+        self.application_gateway_backend_address_pools = application_gateway_backend_address_pools
+        self.load_balancer_backend_address_pools = load_balancer_backend_address_pools
+        self.load_balancer_inbound_nat_pools = load_balancer_inbound_nat_pools
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_configuration.py
new file mode 100644
index 000000000000..d0fcbff4ffb9
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_configuration.py
@@ -0,0 +1,61 @@
+# 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 .sub_resource import SubResource
+
+
+class VirtualMachineScaleSetUpdateNetworkConfiguration(SubResource):
+    """Describes a virtual machine scale set network profile's network
+    configurations.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: The network configuration name.
+    :type name: str
+    :param primary: Whether this is a primary NIC on a virtual machine.
+    :type primary: bool
+    :param enable_accelerated_networking: Specifies whether the network
+     interface is accelerated networking-enabled.
+    :type enable_accelerated_networking: bool
+    :param network_security_group: The network security group.
+    :type network_security_group:
+     ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param dns_settings: The dns settings to be applied on the network
+     interfaces.
+    :type dns_settings:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetNetworkConfigurationDnsSettings
+    :param ip_configurations: The virtual machine scale set IP Configuration.
+    :type ip_configurations:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateIPConfiguration]
+    :param enable_ip_forwarding: Whether IP forwarding enabled on this NIC.
+    :type enable_ip_forwarding: bool
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+        'enable_accelerated_networking': {'key': 'properties.enableAcceleratedNetworking', 'type': 'bool'},
+        'network_security_group': {'key': 'properties.networkSecurityGroup', 'type': 'SubResource'},
+        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetNetworkConfigurationDnsSettings'},
+        'ip_configurations': {'key': 'properties.ipConfigurations', 'type': '[VirtualMachineScaleSetUpdateIPConfiguration]'},
+        'enable_ip_forwarding': {'key': 'properties.enableIPForwarding', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetUpdateNetworkConfiguration, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.primary = kwargs.get('primary', None)
+        self.enable_accelerated_networking = kwargs.get('enable_accelerated_networking', None)
+        self.network_security_group = kwargs.get('network_security_group', None)
+        self.dns_settings = kwargs.get('dns_settings', None)
+        self.ip_configurations = kwargs.get('ip_configurations', None)
+        self.enable_ip_forwarding = kwargs.get('enable_ip_forwarding', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_configuration_py3.py
new file mode 100644
index 000000000000..131729e4532c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_configuration_py3.py
@@ -0,0 +1,61 @@
+# 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 .sub_resource_py3 import SubResource
+
+
+class VirtualMachineScaleSetUpdateNetworkConfiguration(SubResource):
+    """Describes a virtual machine scale set network profile's network
+    configurations.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: The network configuration name.
+    :type name: str
+    :param primary: Whether this is a primary NIC on a virtual machine.
+    :type primary: bool
+    :param enable_accelerated_networking: Specifies whether the network
+     interface is accelerated networking-enabled.
+    :type enable_accelerated_networking: bool
+    :param network_security_group: The network security group.
+    :type network_security_group:
+     ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param dns_settings: The dns settings to be applied on the network
+     interfaces.
+    :type dns_settings:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetNetworkConfigurationDnsSettings
+    :param ip_configurations: The virtual machine scale set IP Configuration.
+    :type ip_configurations:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateIPConfiguration]
+    :param enable_ip_forwarding: Whether IP forwarding enabled on this NIC.
+    :type enable_ip_forwarding: bool
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+        'enable_accelerated_networking': {'key': 'properties.enableAcceleratedNetworking', 'type': 'bool'},
+        'network_security_group': {'key': 'properties.networkSecurityGroup', 'type': 'SubResource'},
+        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetNetworkConfigurationDnsSettings'},
+        'ip_configurations': {'key': 'properties.ipConfigurations', 'type': '[VirtualMachineScaleSetUpdateIPConfiguration]'},
+        'enable_ip_forwarding': {'key': 'properties.enableIPForwarding', 'type': 'bool'},
+    }
+
+    def __init__(self, *, id: str=None, name: str=None, primary: bool=None, enable_accelerated_networking: bool=None, network_security_group=None, dns_settings=None, ip_configurations=None, enable_ip_forwarding: bool=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetUpdateNetworkConfiguration, self).__init__(id=id, **kwargs)
+        self.name = name
+        self.primary = primary
+        self.enable_accelerated_networking = enable_accelerated_networking
+        self.network_security_group = network_security_group
+        self.dns_settings = dns_settings
+        self.ip_configurations = ip_configurations
+        self.enable_ip_forwarding = enable_ip_forwarding
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_profile.py
new file mode 100644
index 000000000000..cd4f5f839764
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_profile.py
@@ -0,0 +1,30 @@
+# 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 VirtualMachineScaleSetUpdateNetworkProfile(Model):
+    """Describes a virtual machine scale set network profile.
+
+    :param network_interface_configurations: The list of network
+     configurations.
+    :type network_interface_configurations:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateNetworkConfiguration]
+    """
+
+    _attribute_map = {
+        'network_interface_configurations': {'key': 'networkInterfaceConfigurations', 'type': '[VirtualMachineScaleSetUpdateNetworkConfiguration]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetUpdateNetworkProfile, self).__init__(**kwargs)
+        self.network_interface_configurations = kwargs.get('network_interface_configurations', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_profile_py3.py
new file mode 100644
index 000000000000..5dcc3e1dd1f2
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_profile_py3.py
@@ -0,0 +1,30 @@
+# 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 VirtualMachineScaleSetUpdateNetworkProfile(Model):
+    """Describes a virtual machine scale set network profile.
+
+    :param network_interface_configurations: The list of network
+     configurations.
+    :type network_interface_configurations:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateNetworkConfiguration]
+    """
+
+    _attribute_map = {
+        'network_interface_configurations': {'key': 'networkInterfaceConfigurations', 'type': '[VirtualMachineScaleSetUpdateNetworkConfiguration]'},
+    }
+
+    def __init__(self, *, network_interface_configurations=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetUpdateNetworkProfile, self).__init__(**kwargs)
+        self.network_interface_configurations = network_interface_configurations
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_disk.py
new file mode 100644
index 000000000000..1f48890ba840
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_disk.py
@@ -0,0 +1,50 @@
+# 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 VirtualMachineScaleSetUpdateOSDisk(Model):
+    """Describes virtual machine scale set operating system disk Update Object.
+    This should be used for Updating VMSS OS Disk.
+
+    :param caching: The caching type. Possible values include: 'None',
+     'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :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.
+    :type image: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
+    :param vhd_containers: The list of virtual hard disk container uris.
+    :type vhd_containers: list[str]
+    :param managed_disk: The managed disk parameters.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetManagedDiskParameters
+    """
+
+    _attribute_map = {
+        'caching': {'key': 'caching', 'type': 'CachingTypes'},
+        'write_accelerator_enabled': {'key': 'writeAcceleratorEnabled', 'type': 'bool'},
+        'image': {'key': 'image', 'type': 'VirtualHardDisk'},
+        'vhd_containers': {'key': 'vhdContainers', 'type': '[str]'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'VirtualMachineScaleSetManagedDiskParameters'},
+    }
+
+    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.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_04_01/models/virtual_machine_scale_set_update_os_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_disk_py3.py
new file mode 100644
index 000000000000..420daf4f2dcf
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_disk_py3.py
@@ -0,0 +1,50 @@
+# 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 VirtualMachineScaleSetUpdateOSDisk(Model):
+    """Describes virtual machine scale set operating system disk Update Object.
+    This should be used for Updating VMSS OS Disk.
+
+    :param caching: The caching type. Possible values include: 'None',
+     'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :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.
+    :type image: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
+    :param vhd_containers: The list of virtual hard disk container uris.
+    :type vhd_containers: list[str]
+    :param managed_disk: The managed disk parameters.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetManagedDiskParameters
+    """
+
+    _attribute_map = {
+        'caching': {'key': 'caching', 'type': 'CachingTypes'},
+        'write_accelerator_enabled': {'key': 'writeAcceleratorEnabled', 'type': 'bool'},
+        '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:
+        super(VirtualMachineScaleSetUpdateOSDisk, self).__init__(**kwargs)
+        self.caching = caching
+        self.write_accelerator_enabled = write_accelerator_enabled
+        self.image = image
+        self.vhd_containers = vhd_containers
+        self.managed_disk = managed_disk
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_profile.py
new file mode 100644
index 000000000000..2ebc2b14b292
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_profile.py
@@ -0,0 +1,43 @@
+# 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 VirtualMachineScaleSetUpdateOSProfile(Model):
+    """Describes a virtual machine scale set OS profile.
+
+    :param custom_data: A base-64 encoded string of custom data.
+    :type custom_data: str
+    :param windows_configuration: The Windows Configuration of the OS profile.
+    :type windows_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.WindowsConfiguration
+    :param linux_configuration: The Linux Configuration of the OS profile.
+    :type linux_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.LinuxConfiguration
+    :param secrets: The List of certificates for addition to the VM.
+    :type secrets:
+     list[~azure.mgmt.compute.v2018_04_01.models.VaultSecretGroup]
+    """
+
+    _attribute_map = {
+        'custom_data': {'key': 'customData', 'type': 'str'},
+        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'WindowsConfiguration'},
+        'linux_configuration': {'key': 'linuxConfiguration', 'type': 'LinuxConfiguration'},
+        'secrets': {'key': 'secrets', 'type': '[VaultSecretGroup]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetUpdateOSProfile, self).__init__(**kwargs)
+        self.custom_data = kwargs.get('custom_data', None)
+        self.windows_configuration = kwargs.get('windows_configuration', None)
+        self.linux_configuration = kwargs.get('linux_configuration', None)
+        self.secrets = kwargs.get('secrets', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_profile_py3.py
new file mode 100644
index 000000000000..b54bfc2b563a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_profile_py3.py
@@ -0,0 +1,43 @@
+# 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 VirtualMachineScaleSetUpdateOSProfile(Model):
+    """Describes a virtual machine scale set OS profile.
+
+    :param custom_data: A base-64 encoded string of custom data.
+    :type custom_data: str
+    :param windows_configuration: The Windows Configuration of the OS profile.
+    :type windows_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.WindowsConfiguration
+    :param linux_configuration: The Linux Configuration of the OS profile.
+    :type linux_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.LinuxConfiguration
+    :param secrets: The List of certificates for addition to the VM.
+    :type secrets:
+     list[~azure.mgmt.compute.v2018_04_01.models.VaultSecretGroup]
+    """
+
+    _attribute_map = {
+        'custom_data': {'key': 'customData', 'type': 'str'},
+        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'WindowsConfiguration'},
+        'linux_configuration': {'key': 'linuxConfiguration', 'type': 'LinuxConfiguration'},
+        'secrets': {'key': 'secrets', 'type': '[VaultSecretGroup]'},
+    }
+
+    def __init__(self, *, custom_data: str=None, windows_configuration=None, linux_configuration=None, secrets=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetUpdateOSProfile, self).__init__(**kwargs)
+        self.custom_data = custom_data
+        self.windows_configuration = windows_configuration
+        self.linux_configuration = linux_configuration
+        self.secrets = secrets
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_public_ip_address_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_public_ip_address_configuration.py
new file mode 100644
index 000000000000..0fc8d8517fcf
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_public_ip_address_configuration.py
@@ -0,0 +1,39 @@
+# 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 VirtualMachineScaleSetUpdatePublicIPAddressConfiguration(Model):
+    """Describes a virtual machines scale set IP Configuration's PublicIPAddress
+    configuration.
+
+    :param name: The publicIP address configuration name.
+    :type name: str
+    :param idle_timeout_in_minutes: The idle timeout of the public IP address.
+    :type idle_timeout_in_minutes: int
+    :param dns_settings: The dns settings to be applied on the publicIP
+     addresses .
+    :type dns_settings:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'idle_timeout_in_minutes': {'key': 'properties.idleTimeoutInMinutes', 'type': 'int'},
+        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetUpdatePublicIPAddressConfiguration, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.idle_timeout_in_minutes = kwargs.get('idle_timeout_in_minutes', None)
+        self.dns_settings = kwargs.get('dns_settings', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_public_ip_address_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_public_ip_address_configuration_py3.py
new file mode 100644
index 000000000000..6675e7831652
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_public_ip_address_configuration_py3.py
@@ -0,0 +1,39 @@
+# 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 VirtualMachineScaleSetUpdatePublicIPAddressConfiguration(Model):
+    """Describes a virtual machines scale set IP Configuration's PublicIPAddress
+    configuration.
+
+    :param name: The publicIP address configuration name.
+    :type name: str
+    :param idle_timeout_in_minutes: The idle timeout of the public IP address.
+    :type idle_timeout_in_minutes: int
+    :param dns_settings: The dns settings to be applied on the publicIP
+     addresses .
+    :type dns_settings:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'idle_timeout_in_minutes': {'key': 'properties.idleTimeoutInMinutes', 'type': 'int'},
+        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings'},
+    }
+
+    def __init__(self, *, name: str=None, idle_timeout_in_minutes: int=None, dns_settings=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetUpdatePublicIPAddressConfiguration, self).__init__(**kwargs)
+        self.name = name
+        self.idle_timeout_in_minutes = idle_timeout_in_minutes
+        self.dns_settings = dns_settings
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_py3.py
new file mode 100644
index 000000000000..48bb74fb1948
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_py3.py
@@ -0,0 +1,61 @@
+# 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 .update_resource_py3 import UpdateResource
+
+
+class VirtualMachineScaleSetUpdate(UpdateResource):
+    """Describes a Virtual Machine Scale Set.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param sku: The virtual machine scale set sku.
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
+    :param plan: The purchase plan when deploying a virtual machine scale set
+     from VM Marketplace images.
+    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
+    :param upgrade_policy: The upgrade policy.
+    :type upgrade_policy: ~azure.mgmt.compute.v2018_04_01.models.UpgradePolicy
+    :param virtual_machine_profile: The virtual machine profile.
+    :type virtual_machine_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateVMProfile
+    :param overprovision: Specifies whether the Virtual Machine Scale Set
+     should be overprovisioned.
+    :type overprovision: bool
+    :param single_placement_group: When true this limits the scale set to a
+     single placement group, of max size 100 virtual machines.
+    :type single_placement_group: bool
+    :param identity: The identity of the virtual machine scale set, if
+     configured.
+    :type identity:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetIdentity
+    """
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'upgrade_policy': {'key': 'properties.upgradePolicy', 'type': 'UpgradePolicy'},
+        'virtual_machine_profile': {'key': 'properties.virtualMachineProfile', 'type': 'VirtualMachineScaleSetUpdateVMProfile'},
+        'overprovision': {'key': 'properties.overprovision', 'type': 'bool'},
+        'single_placement_group': {'key': 'properties.singlePlacementGroup', 'type': 'bool'},
+        'identity': {'key': 'identity', 'type': 'VirtualMachineScaleSetIdentity'},
+    }
+
+    def __init__(self, *, tags=None, sku=None, plan=None, upgrade_policy=None, virtual_machine_profile=None, overprovision: bool=None, single_placement_group: bool=None, identity=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetUpdate, self).__init__(tags=tags, **kwargs)
+        self.sku = sku
+        self.plan = plan
+        self.upgrade_policy = upgrade_policy
+        self.virtual_machine_profile = virtual_machine_profile
+        self.overprovision = overprovision
+        self.single_placement_group = single_placement_group
+        self.identity = identity
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_storage_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_storage_profile.py
new file mode 100644
index 000000000000..037ebc157fc8
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_storage_profile.py
@@ -0,0 +1,39 @@
+# 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 VirtualMachineScaleSetUpdateStorageProfile(Model):
+    """Describes a virtual machine scale set storage profile.
+
+    :param image_reference: The image reference.
+    :type image_reference:
+     ~azure.mgmt.compute.v2018_04_01.models.ImageReference
+    :param os_disk: The OS disk.
+    :type os_disk:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateOSDisk
+    :param data_disks: The data disks.
+    :type data_disks:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetDataDisk]
+    """
+
+    _attribute_map = {
+        'image_reference': {'key': 'imageReference', 'type': 'ImageReference'},
+        'os_disk': {'key': 'osDisk', 'type': 'VirtualMachineScaleSetUpdateOSDisk'},
+        'data_disks': {'key': 'dataDisks', 'type': '[VirtualMachineScaleSetDataDisk]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetUpdateStorageProfile, self).__init__(**kwargs)
+        self.image_reference = kwargs.get('image_reference', None)
+        self.os_disk = kwargs.get('os_disk', None)
+        self.data_disks = kwargs.get('data_disks', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_storage_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_storage_profile_py3.py
new file mode 100644
index 000000000000..b442b5196c4e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_storage_profile_py3.py
@@ -0,0 +1,39 @@
+# 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 VirtualMachineScaleSetUpdateStorageProfile(Model):
+    """Describes a virtual machine scale set storage profile.
+
+    :param image_reference: The image reference.
+    :type image_reference:
+     ~azure.mgmt.compute.v2018_04_01.models.ImageReference
+    :param os_disk: The OS disk.
+    :type os_disk:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateOSDisk
+    :param data_disks: The data disks.
+    :type data_disks:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetDataDisk]
+    """
+
+    _attribute_map = {
+        'image_reference': {'key': 'imageReference', 'type': 'ImageReference'},
+        'os_disk': {'key': 'osDisk', 'type': 'VirtualMachineScaleSetUpdateOSDisk'},
+        'data_disks': {'key': 'dataDisks', 'type': '[VirtualMachineScaleSetDataDisk]'},
+    }
+
+    def __init__(self, *, image_reference=None, os_disk=None, data_disks=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetUpdateStorageProfile, self).__init__(**kwargs)
+        self.image_reference = image_reference
+        self.os_disk = os_disk
+        self.data_disks = data_disks
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_vm_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_vm_profile.py
new file mode 100644
index 000000000000..88d5c0c10149
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_vm_profile.py
@@ -0,0 +1,55 @@
+# 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 VirtualMachineScaleSetUpdateVMProfile(Model):
+    """Describes a virtual machine scale set virtual machine profile.
+
+    :param os_profile: The virtual machine scale set OS profile.
+    :type os_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateOSProfile
+    :param storage_profile: The virtual machine scale set storage profile.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateStorageProfile
+    :param network_profile: The virtual machine scale set network profile.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateNetworkProfile
+    :param diagnostics_profile: The virtual machine scale set diagnostics
+     profile.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
+    :param extension_profile: The virtual machine scale set extension profile.
+    :type extension_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtensionProfile
+    :param license_type: The license type, which is for bring your own license
+     scenario.
+    :type license_type: str
+    """
+
+    _attribute_map = {
+        'os_profile': {'key': 'osProfile', 'type': 'VirtualMachineScaleSetUpdateOSProfile'},
+        'storage_profile': {'key': 'storageProfile', 'type': 'VirtualMachineScaleSetUpdateStorageProfile'},
+        'network_profile': {'key': 'networkProfile', 'type': 'VirtualMachineScaleSetUpdateNetworkProfile'},
+        'diagnostics_profile': {'key': 'diagnosticsProfile', 'type': 'DiagnosticsProfile'},
+        'extension_profile': {'key': 'extensionProfile', 'type': 'VirtualMachineScaleSetExtensionProfile'},
+        'license_type': {'key': 'licenseType', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetUpdateVMProfile, self).__init__(**kwargs)
+        self.os_profile = kwargs.get('os_profile', None)
+        self.storage_profile = kwargs.get('storage_profile', 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)
+        self.license_type = kwargs.get('license_type', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_vm_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_vm_profile_py3.py
new file mode 100644
index 000000000000..83cab7cf6fd0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_vm_profile_py3.py
@@ -0,0 +1,55 @@
+# 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 VirtualMachineScaleSetUpdateVMProfile(Model):
+    """Describes a virtual machine scale set virtual machine profile.
+
+    :param os_profile: The virtual machine scale set OS profile.
+    :type os_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateOSProfile
+    :param storage_profile: The virtual machine scale set storage profile.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateStorageProfile
+    :param network_profile: The virtual machine scale set network profile.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateNetworkProfile
+    :param diagnostics_profile: The virtual machine scale set diagnostics
+     profile.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
+    :param extension_profile: The virtual machine scale set extension profile.
+    :type extension_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtensionProfile
+    :param license_type: The license type, which is for bring your own license
+     scenario.
+    :type license_type: str
+    """
+
+    _attribute_map = {
+        'os_profile': {'key': 'osProfile', 'type': 'VirtualMachineScaleSetUpdateOSProfile'},
+        'storage_profile': {'key': 'storageProfile', 'type': 'VirtualMachineScaleSetUpdateStorageProfile'},
+        'network_profile': {'key': 'networkProfile', 'type': 'VirtualMachineScaleSetUpdateNetworkProfile'},
+        'diagnostics_profile': {'key': 'diagnosticsProfile', 'type': 'DiagnosticsProfile'},
+        'extension_profile': {'key': 'extensionProfile', 'type': 'VirtualMachineScaleSetExtensionProfile'},
+        'license_type': {'key': 'licenseType', 'type': 'str'},
+    }
+
+    def __init__(self, *, os_profile=None, storage_profile=None, network_profile=None, diagnostics_profile=None, extension_profile=None, license_type: str=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetUpdateVMProfile, self).__init__(**kwargs)
+        self.os_profile = os_profile
+        self.storage_profile = storage_profile
+        self.network_profile = network_profile
+        self.diagnostics_profile = diagnostics_profile
+        self.extension_profile = extension_profile
+        self.license_type = license_type
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm.py
new file mode 100644
index 000000000000..204a62f62a0c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm.py
@@ -0,0 +1,155 @@
+# 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 VirtualMachineScaleSetVM(Resource):
+    """Describes a virtual machine scale set virtual machine.
+
+    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 instance_id: The virtual machine instance ID.
+    :vartype instance_id: str
+    :ivar sku: The virtual machine SKU.
+    :vartype sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
+    :ivar latest_model_applied: Specifies whether the latest model has been
+     applied to the virtual machine.
+    :vartype latest_model_applied: bool
+    :ivar vm_id: Azure VM unique ID.
+    :vartype vm_id: str
+    :ivar instance_view: The virtual machine instance view.
+    :vartype instance_view:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineInstanceView
+    :param hardware_profile: Specifies the hardware settings for the virtual
+     machine.
+    :type hardware_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.HardwareProfile
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.StorageProfile
+    :param os_profile: Specifies the operating system settings for the virtual
+     machine.
+    :type os_profile: ~azure.mgmt.compute.v2018_04_01.models.OSProfile
+    :param network_profile: Specifies the network interfaces of the virtual
+     machine.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.NetworkProfile
+    :param diagnostics_profile: Specifies the boot diagnostic settings state.
+     <br><br>Minimum api-version: 2015-06-15.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
+    :param availability_set: Specifies information about the availability set
+     that the virtual machine should be assigned to. Virtual machines specified
+     in the same availability set are allocated to different nodes to maximize
+     availability. For more information about availability sets, see [Manage
+     the availability of virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+     <br><br> For more information on Azure planned maintainance, see [Planned
+     maintenance for virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Currently, a VM can only be added to availability set at creation
+     time. An existing VM cannot be added to an availability set.
+    :type availability_set: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :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:
+     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
+     is included in a request for an update, the value must match the initial
+     value. This value cannot be updated. <br><br> For more information, see
+     [Azure Hybrid Use Benefit for Windows
+     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Minimum api-version: 2015-06-15
+    :type license_type: str
+    :param plan: Specifies information about the marketplace image used to
+     create the virtual machine. This element is only used for marketplace
+     images. Before you can use a marketplace image from an API, you must
+     enable the image for programmatic use.  In the Azure portal, find the
+     marketplace image that you want to use and then click **Want to deploy
+     programmatically, Get Started ->**. Enter any required information and
+     then click **Save**.
+    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
+    :ivar resources: The virtual machine child extension resources.
+    :vartype resources:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'instance_id': {'readonly': True},
+        'sku': {'readonly': True},
+        'latest_model_applied': {'readonly': True},
+        'vm_id': {'readonly': True},
+        'instance_view': {'readonly': True},
+        'provisioning_state': {'readonly': True},
+        'resources': {'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}'},
+        'instance_id': {'key': 'instanceId', 'type': 'str'},
+        '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'},
+        'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
+        'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
+        'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
+        'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'},
+        'availability_set': {'key': 'properties.availabilitySet', 'type': 'SubResource'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'license_type': {'key': 'properties.licenseType', 'type': 'str'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'resources': {'key': 'resources', 'type': '[VirtualMachineExtension]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetVM, self).__init__(**kwargs)
+        self.instance_id = None
+        self.sku = None
+        self.latest_model_applied = None
+        self.vm_id = None
+        self.instance_view = None
+        self.hardware_profile = kwargs.get('hardware_profile', None)
+        self.storage_profile = kwargs.get('storage_profile', 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)
+        self.availability_set = kwargs.get('availability_set', None)
+        self.provisioning_state = None
+        self.license_type = kwargs.get('license_type', None)
+        self.plan = kwargs.get('plan', None)
+        self.resources = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_extensions_summary.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_extensions_summary.py
new file mode 100644
index 000000000000..e9e19adfc1b6
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_extensions_summary.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 VirtualMachineScaleSetVMExtensionsSummary(Model):
+    """Extensions summary for virtual machines of a virtual machine scale set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar name: The extension name.
+    :vartype name: str
+    :ivar statuses_summary: The extensions information.
+    :vartype statuses_summary:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineStatusCodeCount]
+    """
+
+    _validation = {
+        'name': {'readonly': True},
+        'statuses_summary': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'statuses_summary': {'key': 'statusesSummary', 'type': '[VirtualMachineStatusCodeCount]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetVMExtensionsSummary, self).__init__(**kwargs)
+        self.name = None
+        self.statuses_summary = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_extensions_summary_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_extensions_summary_py3.py
new file mode 100644
index 000000000000..c88df418881b
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_extensions_summary_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 VirtualMachineScaleSetVMExtensionsSummary(Model):
+    """Extensions summary for virtual machines of a virtual machine scale set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar name: The extension name.
+    :vartype name: str
+    :ivar statuses_summary: The extensions information.
+    :vartype statuses_summary:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineStatusCodeCount]
+    """
+
+    _validation = {
+        'name': {'readonly': True},
+        'statuses_summary': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'statuses_summary': {'key': 'statusesSummary', 'type': '[VirtualMachineStatusCodeCount]'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(VirtualMachineScaleSetVMExtensionsSummary, self).__init__(**kwargs)
+        self.name = None
+        self.statuses_summary = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_ids.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_ids.py
new file mode 100644
index 000000000000..772c66dad326
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_ids.py
@@ -0,0 +1,30 @@
+# 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 VirtualMachineScaleSetVMInstanceIDs(Model):
+    """Specifies a list of virtual machine instance IDs from the VM scale set.
+
+    :param instance_ids: The virtual machine scale set instance ids. Omitting
+     the virtual machine scale set instance ids will result in the operation
+     being performed on all virtual machines in the virtual machine scale set.
+    :type instance_ids: list[str]
+    """
+
+    _attribute_map = {
+        'instance_ids': {'key': 'instanceIds', 'type': '[str]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetVMInstanceIDs, self).__init__(**kwargs)
+        self.instance_ids = kwargs.get('instance_ids', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_ids_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_ids_py3.py
new file mode 100644
index 000000000000..658a8ccb87d5
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_ids_py3.py
@@ -0,0 +1,30 @@
+# 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 VirtualMachineScaleSetVMInstanceIDs(Model):
+    """Specifies a list of virtual machine instance IDs from the VM scale set.
+
+    :param instance_ids: The virtual machine scale set instance ids. Omitting
+     the virtual machine scale set instance ids will result in the operation
+     being performed on all virtual machines in the virtual machine scale set.
+    :type instance_ids: list[str]
+    """
+
+    _attribute_map = {
+        'instance_ids': {'key': 'instanceIds', 'type': '[str]'},
+    }
+
+    def __init__(self, *, instance_ids=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetVMInstanceIDs, self).__init__(**kwargs)
+        self.instance_ids = instance_ids
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_required_ids.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_required_ids.py
new file mode 100644
index 000000000000..ece250dd4fd4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_required_ids.py
@@ -0,0 +1,34 @@
+# 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 VirtualMachineScaleSetVMInstanceRequiredIDs(Model):
+    """Specifies a list of virtual machine instance IDs from the VM scale set.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param instance_ids: Required. The virtual machine scale set instance ids.
+    :type instance_ids: list[str]
+    """
+
+    _validation = {
+        'instance_ids': {'required': True},
+    }
+
+    _attribute_map = {
+        'instance_ids': {'key': 'instanceIds', 'type': '[str]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetVMInstanceRequiredIDs, self).__init__(**kwargs)
+        self.instance_ids = kwargs.get('instance_ids', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_required_ids_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_required_ids_py3.py
new file mode 100644
index 000000000000..f32c6181467d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_required_ids_py3.py
@@ -0,0 +1,34 @@
+# 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 VirtualMachineScaleSetVMInstanceRequiredIDs(Model):
+    """Specifies a list of virtual machine instance IDs from the VM scale set.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param instance_ids: Required. The virtual machine scale set instance ids.
+    :type instance_ids: list[str]
+    """
+
+    _validation = {
+        'instance_ids': {'required': True},
+    }
+
+    _attribute_map = {
+        'instance_ids': {'key': 'instanceIds', 'type': '[str]'},
+    }
+
+    def __init__(self, *, instance_ids, **kwargs) -> None:
+        super(VirtualMachineScaleSetVMInstanceRequiredIDs, self).__init__(**kwargs)
+        self.instance_ids = instance_ids
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_view.py
new file mode 100644
index 000000000000..46c835c4dfd5
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_view.py
@@ -0,0 +1,87 @@
+# 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 VirtualMachineScaleSetVMInstanceView(Model):
+    """The instance view of a virtual machine scale set VM.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param platform_update_domain: The Update Domain count.
+    :type platform_update_domain: int
+    :param platform_fault_domain: The Fault Domain count.
+    :type platform_fault_domain: int
+    :param rdp_thumb_print: The Remote desktop certificate thumbprint.
+    :type rdp_thumb_print: str
+    :param vm_agent: The VM Agent running on the virtual machine.
+    :type vm_agent:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineAgentInstanceView
+    :param maintenance_redeploy_status: The Maintenance Operation status on
+     the virtual machine.
+    :type maintenance_redeploy_status:
+     ~azure.mgmt.compute.v2018_04_01.models.MaintenanceRedeployStatus
+    :param disks: The disks information.
+    :type disks: list[~azure.mgmt.compute.v2018_04_01.models.DiskInstanceView]
+    :param extensions: The extensions information.
+    :type extensions:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionInstanceView]
+    :ivar vm_health: The health status for the VM.
+    :vartype vm_health:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineHealthStatus
+    :param boot_diagnostics: Boot Diagnostics is a debugging feature which
+     allows you to view Console Output and Screenshot to diagnose VM status.
+     <br><br> For Linux Virtual Machines, you can easily view the output of
+     your console log. <br><br> For both Windows and Linux virtual machines,
+     Azure also enables you to see a screenshot of the VM from the hypervisor.
+    :type boot_diagnostics:
+     ~azure.mgmt.compute.v2018_04_01.models.BootDiagnosticsInstanceView
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    :param placement_group_id: The placement group in which the VM is running.
+     If the VM is deallocated it will not have a placementGroupId.
+    :type placement_group_id: str
+    """
+
+    _validation = {
+        'vm_health': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'platform_update_domain': {'key': 'platformUpdateDomain', 'type': 'int'},
+        'platform_fault_domain': {'key': 'platformFaultDomain', 'type': 'int'},
+        'rdp_thumb_print': {'key': 'rdpThumbPrint', 'type': 'str'},
+        'vm_agent': {'key': 'vmAgent', 'type': 'VirtualMachineAgentInstanceView'},
+        'maintenance_redeploy_status': {'key': 'maintenanceRedeployStatus', 'type': 'MaintenanceRedeployStatus'},
+        'disks': {'key': 'disks', 'type': '[DiskInstanceView]'},
+        'extensions': {'key': 'extensions', 'type': '[VirtualMachineExtensionInstanceView]'},
+        'vm_health': {'key': 'vmHealth', 'type': 'VirtualMachineHealthStatus'},
+        'boot_diagnostics': {'key': 'bootDiagnostics', 'type': 'BootDiagnosticsInstanceView'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+        'placement_group_id': {'key': 'placementGroupId', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetVMInstanceView, self).__init__(**kwargs)
+        self.platform_update_domain = kwargs.get('platform_update_domain', None)
+        self.platform_fault_domain = kwargs.get('platform_fault_domain', None)
+        self.rdp_thumb_print = kwargs.get('rdp_thumb_print', None)
+        self.vm_agent = kwargs.get('vm_agent', None)
+        self.maintenance_redeploy_status = kwargs.get('maintenance_redeploy_status', None)
+        self.disks = kwargs.get('disks', None)
+        self.extensions = kwargs.get('extensions', None)
+        self.vm_health = None
+        self.boot_diagnostics = kwargs.get('boot_diagnostics', None)
+        self.statuses = kwargs.get('statuses', None)
+        self.placement_group_id = kwargs.get('placement_group_id', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_view_py3.py
new file mode 100644
index 000000000000..6854c21d4706
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_view_py3.py
@@ -0,0 +1,87 @@
+# 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 VirtualMachineScaleSetVMInstanceView(Model):
+    """The instance view of a virtual machine scale set VM.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param platform_update_domain: The Update Domain count.
+    :type platform_update_domain: int
+    :param platform_fault_domain: The Fault Domain count.
+    :type platform_fault_domain: int
+    :param rdp_thumb_print: The Remote desktop certificate thumbprint.
+    :type rdp_thumb_print: str
+    :param vm_agent: The VM Agent running on the virtual machine.
+    :type vm_agent:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineAgentInstanceView
+    :param maintenance_redeploy_status: The Maintenance Operation status on
+     the virtual machine.
+    :type maintenance_redeploy_status:
+     ~azure.mgmt.compute.v2018_04_01.models.MaintenanceRedeployStatus
+    :param disks: The disks information.
+    :type disks: list[~azure.mgmt.compute.v2018_04_01.models.DiskInstanceView]
+    :param extensions: The extensions information.
+    :type extensions:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionInstanceView]
+    :ivar vm_health: The health status for the VM.
+    :vartype vm_health:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineHealthStatus
+    :param boot_diagnostics: Boot Diagnostics is a debugging feature which
+     allows you to view Console Output and Screenshot to diagnose VM status.
+     <br><br> For Linux Virtual Machines, you can easily view the output of
+     your console log. <br><br> For both Windows and Linux virtual machines,
+     Azure also enables you to see a screenshot of the VM from the hypervisor.
+    :type boot_diagnostics:
+     ~azure.mgmt.compute.v2018_04_01.models.BootDiagnosticsInstanceView
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    :param placement_group_id: The placement group in which the VM is running.
+     If the VM is deallocated it will not have a placementGroupId.
+    :type placement_group_id: str
+    """
+
+    _validation = {
+        'vm_health': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'platform_update_domain': {'key': 'platformUpdateDomain', 'type': 'int'},
+        'platform_fault_domain': {'key': 'platformFaultDomain', 'type': 'int'},
+        'rdp_thumb_print': {'key': 'rdpThumbPrint', 'type': 'str'},
+        'vm_agent': {'key': 'vmAgent', 'type': 'VirtualMachineAgentInstanceView'},
+        'maintenance_redeploy_status': {'key': 'maintenanceRedeployStatus', 'type': 'MaintenanceRedeployStatus'},
+        'disks': {'key': 'disks', 'type': '[DiskInstanceView]'},
+        'extensions': {'key': 'extensions', 'type': '[VirtualMachineExtensionInstanceView]'},
+        'vm_health': {'key': 'vmHealth', 'type': 'VirtualMachineHealthStatus'},
+        'boot_diagnostics': {'key': 'bootDiagnostics', 'type': 'BootDiagnosticsInstanceView'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+        'placement_group_id': {'key': 'placementGroupId', 'type': 'str'},
+    }
+
+    def __init__(self, *, platform_update_domain: int=None, platform_fault_domain: int=None, rdp_thumb_print: str=None, vm_agent=None, maintenance_redeploy_status=None, disks=None, extensions=None, boot_diagnostics=None, statuses=None, placement_group_id: str=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetVMInstanceView, self).__init__(**kwargs)
+        self.platform_update_domain = platform_update_domain
+        self.platform_fault_domain = platform_fault_domain
+        self.rdp_thumb_print = rdp_thumb_print
+        self.vm_agent = vm_agent
+        self.maintenance_redeploy_status = maintenance_redeploy_status
+        self.disks = disks
+        self.extensions = extensions
+        self.vm_health = None
+        self.boot_diagnostics = boot_diagnostics
+        self.statuses = statuses
+        self.placement_group_id = placement_group_id
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_paged.py
new file mode 100644
index 000000000000..52a46c26fd23
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_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 VirtualMachineScaleSetVMPaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`VirtualMachineScaleSetVM <azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVM>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[VirtualMachineScaleSetVM]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(VirtualMachineScaleSetVMPaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_profile.py
new file mode 100644
index 000000000000..177efbb43373
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_profile.py
@@ -0,0 +1,80 @@
+# 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 VirtualMachineScaleSetVMProfile(Model):
+    """Describes a virtual machine scale set virtual machine profile.
+
+    :param os_profile: Specifies the operating system settings for the virtual
+     machines in the scale set.
+    :type os_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetOSProfile
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetStorageProfile
+    :param network_profile: Specifies properties of the network interfaces of
+     the virtual machines in the scale set.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetNetworkProfile
+    :param diagnostics_profile: Specifies the boot diagnostic settings state.
+     <br><br>Minimum api-version: 2015-06-15.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
+    :param extension_profile: Specifies a collection of settings for
+     extensions installed on virtual machines in the scale set.
+    :type extension_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtensionProfile
+    :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:
+     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
+     is included in a request for an update, the value must match the initial
+     value. This value cannot be updated. <br><br> For more information, see
+     [Azure Hybrid Use Benefit for Windows
+     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Minimum api-version: 2015-06-15
+    :type license_type: str
+    :param priority: Specifies the priority for the virtual machines in the
+     scale set. <br><br>Minimum api-version: 2017-10-30-preview. Possible
+     values include: 'Regular', 'Low'
+    :type priority: str or
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachinePriorityTypes
+    :param eviction_policy: Specifies the eviction policy for virtual machines
+     in a low priority scale set. <br><br>Minimum api-version:
+     2017-10-30-preview. Possible values include: 'Deallocate', 'Delete'
+    :type eviction_policy: str or
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineEvictionPolicyTypes
+    """
+
+    _attribute_map = {
+        'os_profile': {'key': 'osProfile', 'type': 'VirtualMachineScaleSetOSProfile'},
+        'storage_profile': {'key': 'storageProfile', 'type': 'VirtualMachineScaleSetStorageProfile'},
+        'network_profile': {'key': 'networkProfile', 'type': 'VirtualMachineScaleSetNetworkProfile'},
+        'diagnostics_profile': {'key': 'diagnosticsProfile', 'type': 'DiagnosticsProfile'},
+        'extension_profile': {'key': 'extensionProfile', 'type': 'VirtualMachineScaleSetExtensionProfile'},
+        'license_type': {'key': 'licenseType', 'type': 'str'},
+        'priority': {'key': 'priority', 'type': 'str'},
+        'eviction_policy': {'key': 'evictionPolicy', 'type': 'str'},
+    }
+
+    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.network_profile = kwargs.get('network_profile', None)
+        self.diagnostics_profile = kwargs.get('diagnostics_profile', None)
+        self.extension_profile = kwargs.get('extension_profile', None)
+        self.license_type = kwargs.get('license_type', None)
+        self.priority = kwargs.get('priority', None)
+        self.eviction_policy = kwargs.get('eviction_policy', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_profile_py3.py
new file mode 100644
index 000000000000..d7e74bb365b2
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_profile_py3.py
@@ -0,0 +1,80 @@
+# 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 VirtualMachineScaleSetVMProfile(Model):
+    """Describes a virtual machine scale set virtual machine profile.
+
+    :param os_profile: Specifies the operating system settings for the virtual
+     machines in the scale set.
+    :type os_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetOSProfile
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetStorageProfile
+    :param network_profile: Specifies properties of the network interfaces of
+     the virtual machines in the scale set.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetNetworkProfile
+    :param diagnostics_profile: Specifies the boot diagnostic settings state.
+     <br><br>Minimum api-version: 2015-06-15.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
+    :param extension_profile: Specifies a collection of settings for
+     extensions installed on virtual machines in the scale set.
+    :type extension_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtensionProfile
+    :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:
+     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
+     is included in a request for an update, the value must match the initial
+     value. This value cannot be updated. <br><br> For more information, see
+     [Azure Hybrid Use Benefit for Windows
+     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Minimum api-version: 2015-06-15
+    :type license_type: str
+    :param priority: Specifies the priority for the virtual machines in the
+     scale set. <br><br>Minimum api-version: 2017-10-30-preview. Possible
+     values include: 'Regular', 'Low'
+    :type priority: str or
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachinePriorityTypes
+    :param eviction_policy: Specifies the eviction policy for virtual machines
+     in a low priority scale set. <br><br>Minimum api-version:
+     2017-10-30-preview. Possible values include: 'Deallocate', 'Delete'
+    :type eviction_policy: str or
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineEvictionPolicyTypes
+    """
+
+    _attribute_map = {
+        'os_profile': {'key': 'osProfile', 'type': 'VirtualMachineScaleSetOSProfile'},
+        'storage_profile': {'key': 'storageProfile', 'type': 'VirtualMachineScaleSetStorageProfile'},
+        'network_profile': {'key': 'networkProfile', 'type': 'VirtualMachineScaleSetNetworkProfile'},
+        'diagnostics_profile': {'key': 'diagnosticsProfile', 'type': 'DiagnosticsProfile'},
+        'extension_profile': {'key': 'extensionProfile', 'type': 'VirtualMachineScaleSetExtensionProfile'},
+        'license_type': {'key': 'licenseType', 'type': 'str'},
+        'priority': {'key': 'priority', 'type': 'str'},
+        '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:
+        super(VirtualMachineScaleSetVMProfile, self).__init__(**kwargs)
+        self.os_profile = os_profile
+        self.storage_profile = storage_profile
+        self.network_profile = network_profile
+        self.diagnostics_profile = diagnostics_profile
+        self.extension_profile = extension_profile
+        self.license_type = license_type
+        self.priority = priority
+        self.eviction_policy = eviction_policy
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_py3.py
new file mode 100644
index 000000000000..bf822844f993
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_py3.py
@@ -0,0 +1,155 @@
+# 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 VirtualMachineScaleSetVM(Resource):
+    """Describes a virtual machine scale set virtual machine.
+
+    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 instance_id: The virtual machine instance ID.
+    :vartype instance_id: str
+    :ivar sku: The virtual machine SKU.
+    :vartype sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
+    :ivar latest_model_applied: Specifies whether the latest model has been
+     applied to the virtual machine.
+    :vartype latest_model_applied: bool
+    :ivar vm_id: Azure VM unique ID.
+    :vartype vm_id: str
+    :ivar instance_view: The virtual machine instance view.
+    :vartype instance_view:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineInstanceView
+    :param hardware_profile: Specifies the hardware settings for the virtual
+     machine.
+    :type hardware_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.HardwareProfile
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.StorageProfile
+    :param os_profile: Specifies the operating system settings for the virtual
+     machine.
+    :type os_profile: ~azure.mgmt.compute.v2018_04_01.models.OSProfile
+    :param network_profile: Specifies the network interfaces of the virtual
+     machine.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.NetworkProfile
+    :param diagnostics_profile: Specifies the boot diagnostic settings state.
+     <br><br>Minimum api-version: 2015-06-15.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
+    :param availability_set: Specifies information about the availability set
+     that the virtual machine should be assigned to. Virtual machines specified
+     in the same availability set are allocated to different nodes to maximize
+     availability. For more information about availability sets, see [Manage
+     the availability of virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+     <br><br> For more information on Azure planned maintainance, see [Planned
+     maintenance for virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Currently, a VM can only be added to availability set at creation
+     time. An existing VM cannot be added to an availability set.
+    :type availability_set: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :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:
+     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
+     is included in a request for an update, the value must match the initial
+     value. This value cannot be updated. <br><br> For more information, see
+     [Azure Hybrid Use Benefit for Windows
+     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Minimum api-version: 2015-06-15
+    :type license_type: str
+    :param plan: Specifies information about the marketplace image used to
+     create the virtual machine. This element is only used for marketplace
+     images. Before you can use a marketplace image from an API, you must
+     enable the image for programmatic use.  In the Azure portal, find the
+     marketplace image that you want to use and then click **Want to deploy
+     programmatically, Get Started ->**. Enter any required information and
+     then click **Save**.
+    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
+    :ivar resources: The virtual machine child extension resources.
+    :vartype resources:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'instance_id': {'readonly': True},
+        'sku': {'readonly': True},
+        'latest_model_applied': {'readonly': True},
+        'vm_id': {'readonly': True},
+        'instance_view': {'readonly': True},
+        'provisioning_state': {'readonly': True},
+        'resources': {'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}'},
+        'instance_id': {'key': 'instanceId', 'type': 'str'},
+        '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'},
+        'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
+        'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
+        'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
+        'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'},
+        'availability_set': {'key': 'properties.availabilitySet', 'type': 'SubResource'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'license_type': {'key': 'properties.licenseType', 'type': 'str'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'resources': {'key': 'resources', 'type': '[VirtualMachineExtension]'},
+    }
+
+    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:
+        super(VirtualMachineScaleSetVM, self).__init__(location=location, tags=tags, **kwargs)
+        self.instance_id = None
+        self.sku = None
+        self.latest_model_applied = None
+        self.vm_id = None
+        self.instance_view = None
+        self.hardware_profile = hardware_profile
+        self.storage_profile = storage_profile
+        self.os_profile = os_profile
+        self.network_profile = network_profile
+        self.diagnostics_profile = diagnostics_profile
+        self.availability_set = availability_set
+        self.provisioning_state = None
+        self.license_type = license_type
+        self.plan = plan
+        self.resources = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size.py
new file mode 100644
index 000000000000..0fef3efd6c8e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size.py
@@ -0,0 +1,53 @@
+# 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 VirtualMachineSize(Model):
+    """Describes the properties of a VM size.
+
+    :param name: The name of the virtual machine size.
+    :type name: str
+    :param number_of_cores: The number of cores supported by the virtual
+     machine size.
+    :type number_of_cores: int
+    :param os_disk_size_in_mb: The OS disk size, in MB, allowed by the virtual
+     machine size.
+    :type os_disk_size_in_mb: int
+    :param resource_disk_size_in_mb: The resource disk size, in MB, allowed by
+     the virtual machine size.
+    :type resource_disk_size_in_mb: int
+    :param memory_in_mb: The amount of memory, in MB, supported by the virtual
+     machine size.
+    :type memory_in_mb: int
+    :param max_data_disk_count: The maximum number of data disks that can be
+     attached to the virtual machine size.
+    :type max_data_disk_count: int
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'number_of_cores': {'key': 'numberOfCores', 'type': 'int'},
+        'os_disk_size_in_mb': {'key': 'osDiskSizeInMB', 'type': 'int'},
+        'resource_disk_size_in_mb': {'key': 'resourceDiskSizeInMB', 'type': 'int'},
+        'memory_in_mb': {'key': 'memoryInMB', 'type': 'int'},
+        'max_data_disk_count': {'key': 'maxDataDiskCount', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineSize, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.number_of_cores = kwargs.get('number_of_cores', None)
+        self.os_disk_size_in_mb = kwargs.get('os_disk_size_in_mb', None)
+        self.resource_disk_size_in_mb = kwargs.get('resource_disk_size_in_mb', None)
+        self.memory_in_mb = kwargs.get('memory_in_mb', None)
+        self.max_data_disk_count = kwargs.get('max_data_disk_count', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size_paged.py
new file mode 100644
index 000000000000..d8dc313a5c4a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size_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 VirtualMachineSizePaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`VirtualMachineSize <azure.mgmt.compute.v2018_04_01.models.VirtualMachineSize>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[VirtualMachineSize]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(VirtualMachineSizePaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size_py3.py
new file mode 100644
index 000000000000..9f99ba20ce42
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size_py3.py
@@ -0,0 +1,53 @@
+# 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 VirtualMachineSize(Model):
+    """Describes the properties of a VM size.
+
+    :param name: The name of the virtual machine size.
+    :type name: str
+    :param number_of_cores: The number of cores supported by the virtual
+     machine size.
+    :type number_of_cores: int
+    :param os_disk_size_in_mb: The OS disk size, in MB, allowed by the virtual
+     machine size.
+    :type os_disk_size_in_mb: int
+    :param resource_disk_size_in_mb: The resource disk size, in MB, allowed by
+     the virtual machine size.
+    :type resource_disk_size_in_mb: int
+    :param memory_in_mb: The amount of memory, in MB, supported by the virtual
+     machine size.
+    :type memory_in_mb: int
+    :param max_data_disk_count: The maximum number of data disks that can be
+     attached to the virtual machine size.
+    :type max_data_disk_count: int
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'number_of_cores': {'key': 'numberOfCores', 'type': 'int'},
+        'os_disk_size_in_mb': {'key': 'osDiskSizeInMB', 'type': 'int'},
+        'resource_disk_size_in_mb': {'key': 'resourceDiskSizeInMB', 'type': 'int'},
+        'memory_in_mb': {'key': 'memoryInMB', 'type': 'int'},
+        'max_data_disk_count': {'key': 'maxDataDiskCount', 'type': 'int'},
+    }
+
+    def __init__(self, *, name: str=None, number_of_cores: int=None, os_disk_size_in_mb: int=None, resource_disk_size_in_mb: int=None, memory_in_mb: int=None, max_data_disk_count: int=None, **kwargs) -> None:
+        super(VirtualMachineSize, self).__init__(**kwargs)
+        self.name = name
+        self.number_of_cores = number_of_cores
+        self.os_disk_size_in_mb = os_disk_size_in_mb
+        self.resource_disk_size_in_mb = resource_disk_size_in_mb
+        self.memory_in_mb = memory_in_mb
+        self.max_data_disk_count = max_data_disk_count
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_status_code_count.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_status_code_count.py
new file mode 100644
index 000000000000..7df7b702acd7
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_status_code_count.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 VirtualMachineStatusCodeCount(Model):
+    """The status code and count of the virtual machine scale set instance view
+    status summary.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar code: The instance view status code.
+    :vartype code: str
+    :ivar count: The number of instances having a particular status code.
+    :vartype count: int
+    """
+
+    _validation = {
+        'code': {'readonly': True},
+        'count': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'str'},
+        'count': {'key': 'count', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineStatusCodeCount, self).__init__(**kwargs)
+        self.code = None
+        self.count = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_status_code_count_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_status_code_count_py3.py
new file mode 100644
index 000000000000..c38800073a95
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_status_code_count_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 VirtualMachineStatusCodeCount(Model):
+    """The status code and count of the virtual machine scale set instance view
+    status summary.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar code: The instance view status code.
+    :vartype code: str
+    :ivar count: The number of instances having a particular status code.
+    :vartype count: int
+    """
+
+    _validation = {
+        'code': {'readonly': True},
+        'count': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'str'},
+        'count': {'key': 'count', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(VirtualMachineStatusCodeCount, self).__init__(**kwargs)
+        self.code = None
+        self.count = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_update.py
new file mode 100644
index 000000000000..2b254de4ccaf
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_update.py
@@ -0,0 +1,126 @@
+# 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 .update_resource import UpdateResource
+
+
+class VirtualMachineUpdate(UpdateResource):
+    """Describes a Virtual Machine Update.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param plan: Specifies information about the marketplace image used to
+     create the virtual machine. This element is only used for marketplace
+     images. Before you can use a marketplace image from an API, you must
+     enable the image for programmatic use.  In the Azure portal, find the
+     marketplace image that you want to use and then click **Want to deploy
+     programmatically, Get Started ->**. Enter any required information and
+     then click **Save**.
+    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
+    :param hardware_profile: Specifies the hardware settings for the virtual
+     machine.
+    :type hardware_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.HardwareProfile
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.StorageProfile
+    :param os_profile: Specifies the operating system settings for the virtual
+     machine.
+    :type os_profile: ~azure.mgmt.compute.v2018_04_01.models.OSProfile
+    :param network_profile: Specifies the network interfaces of the virtual
+     machine.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.NetworkProfile
+    :param diagnostics_profile: Specifies the boot diagnostic settings state.
+     <br><br>Minimum api-version: 2015-06-15.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
+    :param availability_set: Specifies information about the availability set
+     that the virtual machine should be assigned to. Virtual machines specified
+     in the same availability set are allocated to different nodes to maximize
+     availability. For more information about availability sets, see [Manage
+     the availability of virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+     <br><br> For more information on Azure planned maintainance, see [Planned
+     maintenance for virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Currently, a VM can only be added to availability set at creation
+     time. An existing VM cannot be added to an availability set.
+    :type availability_set: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :ivar instance_view: The virtual machine instance view.
+    :vartype instance_view:
+     ~azure.mgmt.compute.v2018_04_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:
+     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
+     is included in a request for an update, the value must match the initial
+     value. This value cannot be updated. <br><br> For more information, see
+     [Azure Hybrid Use Benefit for Windows
+     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Minimum api-version: 2015-06-15
+    :type license_type: str
+    :ivar vm_id: Specifies the VM unique ID which is a 128-bits identifier
+     that is encoded and stored in all Azure IaaS VMs SMBIOS and can be read
+     using platform BIOS commands.
+    :vartype vm_id: str
+    :param identity: The identity of the virtual machine, if configured.
+    :type identity:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineIdentity
+    :param zones: The virtual machine zones.
+    :type zones: list[str]
+    """
+
+    _validation = {
+        'provisioning_state': {'readonly': True},
+        'instance_view': {'readonly': True},
+        'vm_id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
+        'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
+        'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
+        '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': 'VirtualMachineInstanceView'},
+        'license_type': {'key': 'properties.licenseType', 'type': 'str'},
+        'vm_id': {'key': 'properties.vmId', 'type': 'str'},
+        'identity': {'key': 'identity', 'type': 'VirtualMachineIdentity'},
+        'zones': {'key': 'zones', 'type': '[str]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineUpdate, self).__init__(**kwargs)
+        self.plan = kwargs.get('plan', None)
+        self.hardware_profile = kwargs.get('hardware_profile', None)
+        self.storage_profile = kwargs.get('storage_profile', 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)
+        self.availability_set = kwargs.get('availability_set', None)
+        self.provisioning_state = None
+        self.instance_view = None
+        self.license_type = kwargs.get('license_type', None)
+        self.vm_id = None
+        self.identity = kwargs.get('identity', None)
+        self.zones = kwargs.get('zones', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_update_py3.py
new file mode 100644
index 000000000000..be9a3fc3e904
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_update_py3.py
@@ -0,0 +1,126 @@
+# 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 .update_resource_py3 import UpdateResource
+
+
+class VirtualMachineUpdate(UpdateResource):
+    """Describes a Virtual Machine Update.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param plan: Specifies information about the marketplace image used to
+     create the virtual machine. This element is only used for marketplace
+     images. Before you can use a marketplace image from an API, you must
+     enable the image for programmatic use.  In the Azure portal, find the
+     marketplace image that you want to use and then click **Want to deploy
+     programmatically, Get Started ->**. Enter any required information and
+     then click **Save**.
+    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
+    :param hardware_profile: Specifies the hardware settings for the virtual
+     machine.
+    :type hardware_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.HardwareProfile
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.StorageProfile
+    :param os_profile: Specifies the operating system settings for the virtual
+     machine.
+    :type os_profile: ~azure.mgmt.compute.v2018_04_01.models.OSProfile
+    :param network_profile: Specifies the network interfaces of the virtual
+     machine.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.NetworkProfile
+    :param diagnostics_profile: Specifies the boot diagnostic settings state.
+     <br><br>Minimum api-version: 2015-06-15.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
+    :param availability_set: Specifies information about the availability set
+     that the virtual machine should be assigned to. Virtual machines specified
+     in the same availability set are allocated to different nodes to maximize
+     availability. For more information about availability sets, see [Manage
+     the availability of virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+     <br><br> For more information on Azure planned maintainance, see [Planned
+     maintenance for virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Currently, a VM can only be added to availability set at creation
+     time. An existing VM cannot be added to an availability set.
+    :type availability_set: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :ivar instance_view: The virtual machine instance view.
+    :vartype instance_view:
+     ~azure.mgmt.compute.v2018_04_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:
+     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
+     is included in a request for an update, the value must match the initial
+     value. This value cannot be updated. <br><br> For more information, see
+     [Azure Hybrid Use Benefit for Windows
+     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Minimum api-version: 2015-06-15
+    :type license_type: str
+    :ivar vm_id: Specifies the VM unique ID which is a 128-bits identifier
+     that is encoded and stored in all Azure IaaS VMs SMBIOS and can be read
+     using platform BIOS commands.
+    :vartype vm_id: str
+    :param identity: The identity of the virtual machine, if configured.
+    :type identity:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineIdentity
+    :param zones: The virtual machine zones.
+    :type zones: list[str]
+    """
+
+    _validation = {
+        'provisioning_state': {'readonly': True},
+        'instance_view': {'readonly': True},
+        'vm_id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
+        'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
+        'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
+        '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': 'VirtualMachineInstanceView'},
+        'license_type': {'key': 'properties.licenseType', 'type': 'str'},
+        'vm_id': {'key': 'properties.vmId', 'type': 'str'},
+        'identity': {'key': 'identity', 'type': 'VirtualMachineIdentity'},
+        '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:
+        super(VirtualMachineUpdate, self).__init__(tags=tags, **kwargs)
+        self.plan = plan
+        self.hardware_profile = hardware_profile
+        self.storage_profile = storage_profile
+        self.os_profile = os_profile
+        self.network_profile = network_profile
+        self.diagnostics_profile = diagnostics_profile
+        self.availability_set = availability_set
+        self.provisioning_state = None
+        self.instance_view = None
+        self.license_type = license_type
+        self.vm_id = None
+        self.identity = identity
+        self.zones = zones
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_configuration.py
new file mode 100644
index 000000000000..0d429a3c06eb
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_configuration.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 WinRMConfiguration(Model):
+    """Describes Windows Remote Management configuration of the VM.
+
+    :param listeners: The list of Windows Remote Management listeners
+    :type listeners:
+     list[~azure.mgmt.compute.v2018_04_01.models.WinRMListener]
+    """
+
+    _attribute_map = {
+        'listeners': {'key': 'listeners', 'type': '[WinRMListener]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(WinRMConfiguration, self).__init__(**kwargs)
+        self.listeners = kwargs.get('listeners', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_configuration_py3.py
new file mode 100644
index 000000000000..4a3c13531623
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_configuration_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 WinRMConfiguration(Model):
+    """Describes Windows Remote Management configuration of the VM.
+
+    :param listeners: The list of Windows Remote Management listeners
+    :type listeners:
+     list[~azure.mgmt.compute.v2018_04_01.models.WinRMListener]
+    """
+
+    _attribute_map = {
+        'listeners': {'key': 'listeners', 'type': '[WinRMListener]'},
+    }
+
+    def __init__(self, *, listeners=None, **kwargs) -> None:
+        super(WinRMConfiguration, self).__init__(**kwargs)
+        self.listeners = listeners
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_listener.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_listener.py
new file mode 100644
index 000000000000..dd80b495e328
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_listener.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 WinRMListener(Model):
+    """Describes Protocol and thumbprint of Windows Remote Management listener.
+
+    :param protocol: Specifies the protocol of listener. <br><br> Possible
+     values are: <br>**http** <br><br> **https**. Possible values include:
+     'Http', 'Https'
+    :type protocol: str or
+     ~azure.mgmt.compute.v2018_04_01.models.ProtocolTypes
+    :param certificate_url: This is the URL of a certificate that has been
+     uploaded to Key Vault as a secret. For adding a secret to the Key Vault,
+     see [Add a key or secret to the key
+     vault](https://docs.microsoft.com/azure/key-vault/key-vault-get-started/#add).
+     In this case, your certificate needs to be It is the Base64 encoding of
+     the following JSON Object which is encoded in UTF-8: <br><br> {<br>
+     "data":"<Base64-encoded-certificate>",<br>  "dataType":"pfx",<br>
+     "password":"<pfx-file-password>"<br>}
+    :type certificate_url: str
+    """
+
+    _attribute_map = {
+        'protocol': {'key': 'protocol', 'type': 'ProtocolTypes'},
+        'certificate_url': {'key': 'certificateUrl', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(WinRMListener, self).__init__(**kwargs)
+        self.protocol = kwargs.get('protocol', None)
+        self.certificate_url = kwargs.get('certificate_url', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_listener_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_listener_py3.py
new file mode 100644
index 000000000000..a4aae022b007
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_listener_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 WinRMListener(Model):
+    """Describes Protocol and thumbprint of Windows Remote Management listener.
+
+    :param protocol: Specifies the protocol of listener. <br><br> Possible
+     values are: <br>**http** <br><br> **https**. Possible values include:
+     'Http', 'Https'
+    :type protocol: str or
+     ~azure.mgmt.compute.v2018_04_01.models.ProtocolTypes
+    :param certificate_url: This is the URL of a certificate that has been
+     uploaded to Key Vault as a secret. For adding a secret to the Key Vault,
+     see [Add a key or secret to the key
+     vault](https://docs.microsoft.com/azure/key-vault/key-vault-get-started/#add).
+     In this case, your certificate needs to be It is the Base64 encoding of
+     the following JSON Object which is encoded in UTF-8: <br><br> {<br>
+     "data":"<Base64-encoded-certificate>",<br>  "dataType":"pfx",<br>
+     "password":"<pfx-file-password>"<br>}
+    :type certificate_url: str
+    """
+
+    _attribute_map = {
+        'protocol': {'key': 'protocol', 'type': 'ProtocolTypes'},
+        'certificate_url': {'key': 'certificateUrl', 'type': 'str'},
+    }
+
+    def __init__(self, *, protocol=None, certificate_url: str=None, **kwargs) -> None:
+        super(WinRMListener, self).__init__(**kwargs)
+        self.protocol = protocol
+        self.certificate_url = certificate_url
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/windows_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/windows_configuration.py
new file mode 100644
index 000000000000..a8341ce9d8bb
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/windows_configuration.py
@@ -0,0 +1,54 @@
+# 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 WindowsConfiguration(Model):
+    """Specifies Windows operating system settings on the virtual machine.
+
+    :param provision_vm_agent: Indicates whether virtual machine agent should
+     be provisioned on the virtual machine. <br><br> When this property is not
+     specified in the request body, default behavior is to set it to true.
+     This will ensure that VM Agent is installed on the VM so that extensions
+     can be added to the VM later.
+    :type provision_vm_agent: bool
+    :param enable_automatic_updates: Indicates whether virtual machine is
+     enabled for automatic updates.
+    :type enable_automatic_updates: bool
+    :param time_zone: Specifies the time zone of the virtual machine. e.g.
+     "Pacific Standard Time"
+    :type time_zone: str
+    :param additional_unattend_content: Specifies additional base-64 encoded
+     XML formatted information that can be included in the Unattend.xml file,
+     which is used by Windows Setup.
+    :type additional_unattend_content:
+     list[~azure.mgmt.compute.v2018_04_01.models.AdditionalUnattendContent]
+    :param win_rm: Specifies the Windows Remote Management listeners. This
+     enables remote Windows PowerShell.
+    :type win_rm: ~azure.mgmt.compute.v2018_04_01.models.WinRMConfiguration
+    """
+
+    _attribute_map = {
+        'provision_vm_agent': {'key': 'provisionVMAgent', 'type': 'bool'},
+        'enable_automatic_updates': {'key': 'enableAutomaticUpdates', 'type': 'bool'},
+        'time_zone': {'key': 'timeZone', 'type': 'str'},
+        'additional_unattend_content': {'key': 'additionalUnattendContent', 'type': '[AdditionalUnattendContent]'},
+        'win_rm': {'key': 'winRM', 'type': 'WinRMConfiguration'},
+    }
+
+    def __init__(self, **kwargs):
+        super(WindowsConfiguration, self).__init__(**kwargs)
+        self.provision_vm_agent = kwargs.get('provision_vm_agent', None)
+        self.enable_automatic_updates = kwargs.get('enable_automatic_updates', None)
+        self.time_zone = kwargs.get('time_zone', None)
+        self.additional_unattend_content = kwargs.get('additional_unattend_content', None)
+        self.win_rm = kwargs.get('win_rm', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/windows_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/windows_configuration_py3.py
new file mode 100644
index 000000000000..fe5fc14e963f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/windows_configuration_py3.py
@@ -0,0 +1,54 @@
+# 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 WindowsConfiguration(Model):
+    """Specifies Windows operating system settings on the virtual machine.
+
+    :param provision_vm_agent: Indicates whether virtual machine agent should
+     be provisioned on the virtual machine. <br><br> When this property is not
+     specified in the request body, default behavior is to set it to true.
+     This will ensure that VM Agent is installed on the VM so that extensions
+     can be added to the VM later.
+    :type provision_vm_agent: bool
+    :param enable_automatic_updates: Indicates whether virtual machine is
+     enabled for automatic updates.
+    :type enable_automatic_updates: bool
+    :param time_zone: Specifies the time zone of the virtual machine. e.g.
+     "Pacific Standard Time"
+    :type time_zone: str
+    :param additional_unattend_content: Specifies additional base-64 encoded
+     XML formatted information that can be included in the Unattend.xml file,
+     which is used by Windows Setup.
+    :type additional_unattend_content:
+     list[~azure.mgmt.compute.v2018_04_01.models.AdditionalUnattendContent]
+    :param win_rm: Specifies the Windows Remote Management listeners. This
+     enables remote Windows PowerShell.
+    :type win_rm: ~azure.mgmt.compute.v2018_04_01.models.WinRMConfiguration
+    """
+
+    _attribute_map = {
+        'provision_vm_agent': {'key': 'provisionVMAgent', 'type': 'bool'},
+        'enable_automatic_updates': {'key': 'enableAutomaticUpdates', 'type': 'bool'},
+        'time_zone': {'key': 'timeZone', 'type': 'str'},
+        'additional_unattend_content': {'key': 'additionalUnattendContent', 'type': '[AdditionalUnattendContent]'},
+        'win_rm': {'key': 'winRM', 'type': 'WinRMConfiguration'},
+    }
+
+    def __init__(self, *, provision_vm_agent: bool=None, enable_automatic_updates: bool=None, time_zone: str=None, additional_unattend_content=None, win_rm=None, **kwargs) -> None:
+        super(WindowsConfiguration, self).__init__(**kwargs)
+        self.provision_vm_agent = provision_vm_agent
+        self.enable_automatic_updates = enable_automatic_updates
+        self.time_zone = time_zone
+        self.additional_unattend_content = additional_unattend_content
+        self.win_rm = win_rm
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/__init__.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/__init__.py
index aceddf83543c..576455e18810 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/__init__.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/__init__.py
@@ -9,10 +9,40 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
+from .operations import Operations
+from .availability_sets_operations import AvailabilitySetsOperations
+from .virtual_machine_extension_images_operations import VirtualMachineExtensionImagesOperations
+from .virtual_machine_extensions_operations import VirtualMachineExtensionsOperations
+from .virtual_machines_operations import VirtualMachinesOperations
+from .virtual_machine_images_operations import VirtualMachineImagesOperations
+from .usage_operations import UsageOperations
+from .virtual_machine_sizes_operations import VirtualMachineSizesOperations
+from .images_operations import ImagesOperations
+from .virtual_machine_scale_sets_operations import VirtualMachineScaleSetsOperations
+from .virtual_machine_scale_set_extensions_operations import VirtualMachineScaleSetExtensionsOperations
+from .virtual_machine_scale_set_rolling_upgrades_operations import VirtualMachineScaleSetRollingUpgradesOperations
+from .virtual_machine_scale_set_vms_operations import VirtualMachineScaleSetVMsOperations
+from .log_analytics_operations import LogAnalyticsOperations
+from .virtual_machine_run_commands_operations import VirtualMachineRunCommandsOperations
 from .disks_operations import DisksOperations
 from .snapshots_operations import SnapshotsOperations
 
 __all__ = [
+    'Operations',
+    'AvailabilitySetsOperations',
+    'VirtualMachineExtensionImagesOperations',
+    'VirtualMachineExtensionsOperations',
+    'VirtualMachinesOperations',
+    'VirtualMachineImagesOperations',
+    'UsageOperations',
+    'VirtualMachineSizesOperations',
+    'ImagesOperations',
+    'VirtualMachineScaleSetsOperations',
+    'VirtualMachineScaleSetExtensionsOperations',
+    'VirtualMachineScaleSetRollingUpgradesOperations',
+    'VirtualMachineScaleSetVMsOperations',
+    'LogAnalyticsOperations',
+    'VirtualMachineRunCommandsOperations',
     'DisksOperations',
     'SnapshotsOperations',
 ]
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py
new file mode 100644
index 000000000000..ba8e21445a27
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py
@@ -0,0 +1,434 @@
+# 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 .. import models
+
+
+class AvailabilitySetsOperations(object):
+    """AvailabilitySetsOperations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+    def create_or_update(
+            self, resource_group_name, availability_set_name, parameters, custom_headers=None, raw=False, **operation_config):
+        """Create or update an availability set.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param availability_set_name: The name of the availability set.
+        :type availability_set_name: str
+        :param parameters: Parameters supplied to the Create Availability Set
+         operation.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_04_01.models.AvailabilitySet
+        :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: AvailabilitySet or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_04_01.models.AvailabilitySet or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.create_or_update.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'availabilitySetName': self._serialize.url("availability_set_name", availability_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 = {}
+        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(parameters, 'AvailabilitySet')
+
+        # Construct and send request
+        request = self._client.put(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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('AvailabilitySet', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
+
+    def update(
+            self, resource_group_name, availability_set_name, parameters, custom_headers=None, raw=False, **operation_config):
+        """Update an availability set.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param availability_set_name: The name of the availability set.
+        :type availability_set_name: str
+        :param parameters: Parameters supplied to the Update Availability Set
+         operation.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_04_01.models.AvailabilitySetUpdate
+        :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: AvailabilitySet or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_04_01.models.AvailabilitySet or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.update.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'availabilitySetName': self._serialize.url("availability_set_name", availability_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 = {}
+        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(parameters, 'AvailabilitySetUpdate')
+
+        # Construct and send request
+        request = self._client.patch(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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('AvailabilitySet', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
+
+    def delete(
+            self, resource_group_name, availability_set_name, custom_headers=None, raw=False, **operation_config):
+        """Delete an availability set.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param availability_set_name: The name of the availability set.
+        :type availability_set_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: None or ClientRawResponse if raw=true
+        :rtype: None or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.delete.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'availabilitySetName': self._serialize.url("availability_set_name", availability_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 = {}
+        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 and send request
+        request = self._client.delete(url, query_parameters)
+        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+
+        if response.status_code not in [200, 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
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
+
+    def get(
+            self, resource_group_name, availability_set_name, custom_headers=None, raw=False, **operation_config):
+        """Retrieves information about an availability set.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param availability_set_name: The name of the availability set.
+        :type availability_set_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: AvailabilitySet or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_04_01.models.AvailabilitySet or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'availabilitySetName': self._serialize.url("availability_set_name", availability_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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('AvailabilitySet', 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/availabilitySets/{availabilitySetName}'}
+
+    def list(
+            self, resource_group_name, custom_headers=None, raw=False, **operation_config):
+        """Lists all availability sets in 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 AvailabilitySet
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.AvailabilitySetPaged[~azure.mgmt.compute.v2018_04_01.models.AvailabilitySet]
+        :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 = {
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_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')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets'}
+
+    def list_available_sizes(
+            self, resource_group_name, availability_set_name, custom_headers=None, raw=False, **operation_config):
+        """Lists all available virtual machine sizes that can be used to create a
+        new virtual machine in an existing availability set.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param availability_set_name: The name of the availability set.
+        :type availability_set_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 VirtualMachineSize
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineSizePaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineSize]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        def internal_paging(next_link=None, raw=False):
+
+            if not next_link:
+                # Construct URL
+                url = self.list_available_sizes.metadata['url']
+                path_format_arguments = {
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+                    'availabilitySetName': self._serialize.url("availability_set_name", availability_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')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachineSizePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachineSizePaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_available_sizes.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}/vmSizes'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/images_operations.py
new file mode 100644
index 000000000000..030bf14e5115
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/images_operations.py
@@ -0,0 +1,525 @@
+# 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 ImagesOperations(object):
+    """ImagesOperations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+
+    def _create_or_update_initial(
+            self, resource_group_name, image_name, parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.create_or_update.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'imageName': self._serialize.url("image_name", image_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 = {}
+        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(parameters, 'Image')
+
+        # Construct and send request
+        request = self._client.put(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, stream=False, **operation_config)
+
+        if response.status_code not in [200, 201]:
+            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('Image', response)
+        if response.status_code == 201:
+            deserialized = self._deserialize('Image', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def create_or_update(
+            self, resource_group_name, image_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Create or update an image.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param image_name: The name of the image.
+        :type image_name: str
+        :param parameters: Parameters supplied to the Create Image operation.
+        :type parameters: ~azure.mgmt.compute.v2018_04_01.models.Image
+        :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 Image or
+         ClientRawResponse<Image> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.Image]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.Image]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._create_or_update_initial(
+            resource_group_name=resource_group_name,
+            image_name=image_name,
+            parameters=parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('Image', 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/images/{imageName}'}
+
+
+    def _update_initial(
+            self, resource_group_name, image_name, parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.update.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'imageName': self._serialize.url("image_name", image_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 = {}
+        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(parameters, 'ImageUpdate')
+
+        # Construct and send request
+        request = self._client.patch(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, stream=False, **operation_config)
+
+        if response.status_code not in [200, 201]:
+            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('Image', response)
+        if response.status_code == 201:
+            deserialized = self._deserialize('Image', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def update(
+            self, resource_group_name, image_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Update an image.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param image_name: The name of the image.
+        :type image_name: str
+        :param parameters: Parameters supplied to the Update Image operation.
+        :type parameters: ~azure.mgmt.compute.v2018_04_01.models.ImageUpdate
+        :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 Image or
+         ClientRawResponse<Image> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.Image]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.Image]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._update_initial(
+            resource_group_name=resource_group_name,
+            image_name=image_name,
+            parameters=parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('Image', 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/images/{imageName}'}
+
+
+    def _delete_initial(
+            self, resource_group_name, image_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.delete.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'imageName': self._serialize.url("image_name", image_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 = {}
+        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 and send request
+        request = self._client.delete(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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, image_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Deletes an Image.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param image_name: The name of the image.
+        :type image_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,
+            image_name=image_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/images/{imageName}'}
+
+    def get(
+            self, resource_group_name, image_name, expand=None, custom_headers=None, raw=False, **operation_config):
+        """Gets an image.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param image_name: The name of the image.
+        :type image_name: str
+        :param expand: The expand expression to apply on the operation.
+        :type expand: 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: Image or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_04_01.models.Image or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'imageName': self._serialize.url("image_name", image_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 = {}
+        if expand is not None:
+            query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('Image', 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/images/{imageName}'}
+
+    def list_by_resource_group(
+            self, resource_group_name, custom_headers=None, raw=False, **operation_config):
+        """Gets the list of images 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 Image
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.ImagePaged[~azure.mgmt.compute.v2018_04_01.models.Image]
+        :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 = {
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_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')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.ImagePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.ImagePaged(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/images'}
+
+    def list(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Gets the list of Images in the subscription. Use nextLink property in
+        the response to get the next page of Images. Do this till nextLink is
+        null to fetch all the Images.
+
+        :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 Image
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.ImagePaged[~azure.mgmt.compute.v2018_04_01.models.Image]
+        :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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.ImagePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.ImagePaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/images'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/log_analytics_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/log_analytics_operations.py
new file mode 100644
index 000000000000..0471d6db9c03
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/log_analytics_operations.py
@@ -0,0 +1,242 @@
+# 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 LogAnalyticsOperations(object):
+    """LogAnalyticsOperations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+
+    def _export_request_rate_by_interval_initial(
+            self, parameters, location, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.export_request_rate_by_interval.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str', pattern=r'^[-\w\._]+$'),
+            '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 = {}
+        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(parameters, 'RequestRateByIntervalInput')
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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('LogAnalyticsOperationResult', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def export_request_rate_by_interval(
+            self, parameters, location, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Export logs that show Api requests made by this subscription in the
+        given time window to show throttling activities.
+
+        :param parameters: Parameters supplied to the LogAnalytics
+         getRequestRateByInterval Api.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_04_01.models.RequestRateByIntervalInput
+        :param location: The location upon which virtual-machine-sizes is
+         queried.
+        :type location: 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
+         LogAnalyticsOperationResult or
+         ClientRawResponse<LogAnalyticsOperationResult> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.LogAnalyticsOperationResult]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.LogAnalyticsOperationResult]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._export_request_rate_by_interval_initial(
+            parameters=parameters,
+            location=location,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('LogAnalyticsOperationResult', 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)
+    export_request_rate_by_interval.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/logAnalytics/apiAccess/getRequestRateByInterval'}
+
+
+    def _export_throttled_requests_initial(
+            self, parameters, location, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.export_throttled_requests.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str', pattern=r'^[-\w\._]+$'),
+            '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 = {}
+        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(parameters, 'ThrottledRequestsInput')
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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('LogAnalyticsOperationResult', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def export_throttled_requests(
+            self, parameters, location, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Export logs that show total throttled Api requests for this
+        subscription in the given time window.
+
+        :param parameters: Parameters supplied to the LogAnalytics
+         getThrottledRequests Api.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_04_01.models.ThrottledRequestsInput
+        :param location: The location upon which virtual-machine-sizes is
+         queried.
+        :type location: 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
+         LogAnalyticsOperationResult or
+         ClientRawResponse<LogAnalyticsOperationResult> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.LogAnalyticsOperationResult]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.LogAnalyticsOperationResult]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._export_throttled_requests_initial(
+            parameters=parameters,
+            location=location,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('LogAnalyticsOperationResult', 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)
+    export_throttled_requests.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/logAnalytics/apiAccess/getThrottledRequests'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/operations.py
new file mode 100644
index 000000000000..a392e2cea622
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/operations.py
@@ -0,0 +1,99 @@
+# 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 .. import models
+
+
+class Operations(object):
+    """Operations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+    def list(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of compute operations.
+
+        :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 ComputeOperationValue
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.ComputeOperationValuePaged[~azure.mgmt.compute.v2018_04_01.models.ComputeOperationValue]
+        :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']
+
+                # 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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.ComputeOperationValuePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.ComputeOperationValuePaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/providers/Microsoft.Compute/operations'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/usage_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/usage_operations.py
new file mode 100644
index 000000000000..607b8419477c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/usage_operations.py
@@ -0,0 +1,108 @@
+# 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 .. import models
+
+
+class UsageOperations(object):
+    """UsageOperations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+    def list(
+            self, location, custom_headers=None, raw=False, **operation_config):
+        """Gets, for the specified location, the current compute resource usage
+        information as well as the limits for compute resources under the
+        subscription.
+
+        :param location: The location for which resource usage is queried.
+        :type location: 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 Usage
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.UsagePaged[~azure.mgmt.compute.v2018_04_01.models.Usage]
+        :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 = {
+                    'location': self._serialize.url("location", location, 'str', pattern=r'^[-\w\._]+$'),
+                    '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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.UsagePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.UsagePaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/usages'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extension_images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extension_images_operations.py
new file mode 100644
index 000000000000..f190183923a8
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extension_images_operations.py
@@ -0,0 +1,248 @@
+# 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 .. import models
+
+
+class VirtualMachineExtensionImagesOperations(object):
+    """VirtualMachineExtensionImagesOperations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+    def get(
+            self, location, publisher_name, type, version, custom_headers=None, raw=False, **operation_config):
+        """Gets a virtual machine extension image.
+
+        :param location: The name of a supported Azure region.
+        :type location: str
+        :param publisher_name:
+        :type publisher_name: str
+        :param type:
+        :type type: str
+        :param version:
+        :type version: 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: VirtualMachineExtensionImage or ClientRawResponse if raw=true
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionImage or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str'),
+            'publisherName': self._serialize.url("publisher_name", publisher_name, 'str'),
+            'type': self._serialize.url("type", type, 'str'),
+            'version': self._serialize.url("version", version, '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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineExtensionImage', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmextension/types/{type}/versions/{version}'}
+
+    def list_types(
+            self, location, publisher_name, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of virtual machine extension image types.
+
+        :param location: The name of a supported Azure region.
+        :type location: str
+        :param publisher_name:
+        :type publisher_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: list or ClientRawResponse if raw=true
+        :rtype:
+         list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionImage]
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.list_types.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str'),
+            'publisherName': self._serialize.url("publisher_name", publisher_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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('[VirtualMachineExtensionImage]', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    list_types.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmextension/types'}
+
+    def list_versions(
+            self, location, publisher_name, type, filter=None, top=None, orderby=None, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of virtual machine extension image versions.
+
+        :param location: The name of a supported Azure region.
+        :type location: str
+        :param publisher_name:
+        :type publisher_name: str
+        :param type:
+        :type type: str
+        :param filter: The filter to apply on the operation.
+        :type filter: str
+        :param top:
+        :type top: int
+        :param orderby:
+        :type orderby: 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: list or ClientRawResponse if raw=true
+        :rtype:
+         list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionImage]
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.list_versions.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str'),
+            'publisherName': self._serialize.url("publisher_name", publisher_name, 'str'),
+            'type': self._serialize.url("type", type, '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 = {}
+        if filter is not None:
+            query_parameters['$filter'] = self._serialize.query("filter", filter, 'str')
+        if top is not None:
+            query_parameters['$top'] = self._serialize.query("top", top, 'int')
+        if orderby is not None:
+            query_parameters['$orderby'] = self._serialize.query("orderby", orderby, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('[VirtualMachineExtensionImage]', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    list_versions.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmextension/types/{type}/versions'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extensions_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extensions_operations.py
new file mode 100644
index 000000000000..cce4450abd70
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extensions_operations.py
@@ -0,0 +1,411 @@
+# 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 VirtualMachineExtensionsOperations(object):
+    """VirtualMachineExtensionsOperations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+
+    def _create_or_update_initial(
+            self, resource_group_name, vm_name, vm_extension_name, extension_parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.create_or_update.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_name, 'str'),
+            'vmExtensionName': self._serialize.url("vm_extension_name", vm_extension_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 = {}
+        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(extension_parameters, 'VirtualMachineExtension')
+
+        # Construct and send request
+        request = self._client.put(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, stream=False, **operation_config)
+
+        if response.status_code not in [200, 201]:
+            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('VirtualMachineExtension', response)
+        if response.status_code == 201:
+            deserialized = self._deserialize('VirtualMachineExtension', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def create_or_update(
+            self, resource_group_name, vm_name, vm_extension_name, extension_parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to create or update the extension.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine where the extension
+         should be created or updated.
+        :type vm_name: str
+        :param vm_extension_name: The name of the virtual machine extension.
+        :type vm_extension_name: str
+        :param extension_parameters: Parameters supplied to the Create Virtual
+         Machine Extension operation.
+        :type extension_parameters:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension
+        :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 VirtualMachineExtension
+         or ClientRawResponse<VirtualMachineExtension> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._create_or_update_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_name,
+            vm_extension_name=vm_extension_name,
+            extension_parameters=extension_parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('VirtualMachineExtension', 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/virtualMachines/{vmName}/extensions/{vmExtensionName}'}
+
+
+    def _update_initial(
+            self, resource_group_name, vm_name, vm_extension_name, extension_parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.update.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_name, 'str'),
+            'vmExtensionName': self._serialize.url("vm_extension_name", vm_extension_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 = {}
+        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(extension_parameters, 'VirtualMachineExtensionUpdate')
+
+        # Construct and send request
+        request = self._client.patch(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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('VirtualMachineExtension', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def update(
+            self, resource_group_name, vm_name, vm_extension_name, extension_parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to update the extension.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine where the extension
+         should be updated.
+        :type vm_name: str
+        :param vm_extension_name: The name of the virtual machine extension.
+        :type vm_extension_name: str
+        :param extension_parameters: Parameters supplied to the Update Virtual
+         Machine Extension operation.
+        :type extension_parameters:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionUpdate
+        :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 VirtualMachineExtension
+         or ClientRawResponse<VirtualMachineExtension> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._update_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_name,
+            vm_extension_name=vm_extension_name,
+            extension_parameters=extension_parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('VirtualMachineExtension', 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/virtualMachines/{vmName}/extensions/{vmExtensionName}'}
+
+
+    def _delete_initial(
+            self, resource_group_name, vm_name, vm_extension_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.delete.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_name, 'str'),
+            'vmExtensionName': self._serialize.url("vm_extension_name", vm_extension_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 = {}
+        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 and send request
+        request = self._client.delete(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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, vm_name, vm_extension_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to delete the extension.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine where the extension
+         should be deleted.
+        :type vm_name: str
+        :param vm_extension_name: The name of the virtual machine extension.
+        :type vm_extension_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,
+            vm_name=vm_name,
+            vm_extension_name=vm_extension_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/virtualMachines/{vmName}/extensions/{vmExtensionName}'}
+
+    def get(
+            self, resource_group_name, vm_name, vm_extension_name, expand=None, custom_headers=None, raw=False, **operation_config):
+        """The operation to get the extension.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine containing the
+         extension.
+        :type vm_name: str
+        :param vm_extension_name: The name of the virtual machine extension.
+        :type vm_extension_name: str
+        :param expand: The expand expression to apply on the operation.
+        :type expand: 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: VirtualMachineExtension or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_name, 'str'),
+            'vmExtensionName': self._serialize.url("vm_extension_name", vm_extension_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 = {}
+        if expand is not None:
+            query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineExtension', 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/virtualMachines/{vmName}/extensions/{vmExtensionName}'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_images_operations.py
new file mode 100644
index 000000000000..a58d2e394655
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_images_operations.py
@@ -0,0 +1,383 @@
+# 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 .. import models
+
+
+class VirtualMachineImagesOperations(object):
+    """VirtualMachineImagesOperations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+    def get(
+            self, location, publisher_name, offer, skus, version, custom_headers=None, raw=False, **operation_config):
+        """Gets a virtual machine image.
+
+        :param location: The name of a supported Azure region.
+        :type location: str
+        :param publisher_name: A valid image publisher.
+        :type publisher_name: str
+        :param offer: A valid image publisher offer.
+        :type offer: str
+        :param skus: A valid image SKU.
+        :type skus: str
+        :param version: A valid image SKU version.
+        :type version: 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: VirtualMachineImage or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineImage or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str'),
+            'publisherName': self._serialize.url("publisher_name", publisher_name, 'str'),
+            'offer': self._serialize.url("offer", offer, 'str'),
+            'skus': self._serialize.url("skus", skus, 'str'),
+            'version': self._serialize.url("version", version, '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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineImage', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmimage/offers/{offer}/skus/{skus}/versions/{version}'}
+
+    def list(
+            self, location, publisher_name, offer, skus, filter=None, top=None, orderby=None, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of all virtual machine image versions for the specified
+        location, publisher, offer, and SKU.
+
+        :param location: The name of a supported Azure region.
+        :type location: str
+        :param publisher_name: A valid image publisher.
+        :type publisher_name: str
+        :param offer: A valid image publisher offer.
+        :type offer: str
+        :param skus: A valid image SKU.
+        :type skus: str
+        :param filter: The filter to apply on the operation.
+        :type filter: str
+        :param top:
+        :type top: int
+        :param orderby:
+        :type orderby: 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: list or ClientRawResponse if raw=true
+        :rtype:
+         list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineImageResource]
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.list.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str'),
+            'publisherName': self._serialize.url("publisher_name", publisher_name, 'str'),
+            'offer': self._serialize.url("offer", offer, 'str'),
+            'skus': self._serialize.url("skus", skus, '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 = {}
+        if filter is not None:
+            query_parameters['$filter'] = self._serialize.query("filter", filter, 'str')
+        if top is not None:
+            query_parameters['$top'] = self._serialize.query("top", top, 'int')
+        if orderby is not None:
+            query_parameters['$orderby'] = self._serialize.query("orderby", orderby, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('[VirtualMachineImageResource]', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmimage/offers/{offer}/skus/{skus}/versions'}
+
+    def list_offers(
+            self, location, publisher_name, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of virtual machine image offers for the specified location
+        and publisher.
+
+        :param location: The name of a supported Azure region.
+        :type location: str
+        :param publisher_name: A valid image publisher.
+        :type publisher_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: list or ClientRawResponse if raw=true
+        :rtype:
+         list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineImageResource]
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.list_offers.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str'),
+            'publisherName': self._serialize.url("publisher_name", publisher_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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('[VirtualMachineImageResource]', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    list_offers.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmimage/offers'}
+
+    def list_publishers(
+            self, location, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of virtual machine image publishers for the specified Azure
+        location.
+
+        :param location: The name of a supported Azure region.
+        :type location: 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: list or ClientRawResponse if raw=true
+        :rtype:
+         list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineImageResource]
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.list_publishers.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, '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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('[VirtualMachineImageResource]', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    list_publishers.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers'}
+
+    def list_skus(
+            self, location, publisher_name, offer, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of virtual machine image SKUs for the specified location,
+        publisher, and offer.
+
+        :param location: The name of a supported Azure region.
+        :type location: str
+        :param publisher_name: A valid image publisher.
+        :type publisher_name: str
+        :param offer: A valid image publisher offer.
+        :type offer: 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: list or ClientRawResponse if raw=true
+        :rtype:
+         list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineImageResource]
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.list_skus.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str'),
+            'publisherName': self._serialize.url("publisher_name", publisher_name, 'str'),
+            'offer': self._serialize.url("offer", offer, '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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('[VirtualMachineImageResource]', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    list_skus.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmimage/offers/{offer}/skus'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_run_commands_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_run_commands_operations.py
new file mode 100644
index 000000000000..9d04988797f7
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_run_commands_operations.py
@@ -0,0 +1,168 @@
+# 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 .. import models
+
+
+class VirtualMachineRunCommandsOperations(object):
+    """VirtualMachineRunCommandsOperations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+    def list(
+            self, location, custom_headers=None, raw=False, **operation_config):
+        """Lists all available run commands for a subscription in a location.
+
+        :param location: The location upon which run commands is queried.
+        :type location: 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 RunCommandDocumentBase
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.RunCommandDocumentBasePaged[~azure.mgmt.compute.v2018_04_01.models.RunCommandDocumentBase]
+        :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 = {
+                    'location': self._serialize.url("location", location, 'str', pattern=r'^[-\w\._]+$'),
+                    '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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.RunCommandDocumentBasePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.RunCommandDocumentBasePaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/runCommands'}
+
+    def get(
+            self, location, command_id, custom_headers=None, raw=False, **operation_config):
+        """Gets specific run command for a subscription in a location.
+
+        :param location: The location upon which run commands is queried.
+        :type location: str
+        :param command_id: The command id.
+        :type command_id: 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: RunCommandDocument or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_04_01.models.RunCommandDocument or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str', pattern=r'^[-\w\._]+$'),
+            'commandId': self._serialize.url("command_id", command_id, '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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('RunCommandDocument', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/runCommands/{commandId}'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_extensions_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_extensions_operations.py
new file mode 100644
index 000000000000..5d5476f92263
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_extensions_operations.py
@@ -0,0 +1,379 @@
+# 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 VirtualMachineScaleSetExtensionsOperations(object):
+    """VirtualMachineScaleSetExtensionsOperations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+
+    def _create_or_update_initial(
+            self, resource_group_name, vm_scale_set_name, vmss_extension_name, extension_parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.create_or_update.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'),
+            'vmssExtensionName': self._serialize.url("vmss_extension_name", vmss_extension_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 = {}
+        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(extension_parameters, 'VirtualMachineScaleSetExtension')
+
+        # Construct and send request
+        request = self._client.put(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, stream=False, **operation_config)
+
+        if response.status_code not in [200, 201]:
+            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('VirtualMachineScaleSetExtension', response)
+        if response.status_code == 201:
+            deserialized = self._deserialize('VirtualMachineScaleSetExtension', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def create_or_update(
+            self, resource_group_name, vm_scale_set_name, vmss_extension_name, extension_parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to create or update an extension.
+
+        :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 where the
+         extension should be create or updated.
+        :type vm_scale_set_name: str
+        :param vmss_extension_name: The name of the VM scale set extension.
+        :type vmss_extension_name: str
+        :param extension_parameters: Parameters supplied to the Create VM
+         scale set Extension operation.
+        :type extension_parameters:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtension
+        :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
+         VirtualMachineScaleSetExtension or
+         ClientRawResponse<VirtualMachineScaleSetExtension> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtension]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtension]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._create_or_update_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            vmss_extension_name=vmss_extension_name,
+            extension_parameters=extension_parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('VirtualMachineScaleSetExtension', 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/virtualMachineScaleSets/{vmScaleSetName}/extensions/{vmssExtensionName}'}
+
+
+    def _delete_initial(
+            self, resource_group_name, vm_scale_set_name, vmss_extension_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.delete.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'),
+            'vmssExtensionName': self._serialize.url("vmss_extension_name", vmss_extension_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 = {}
+        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 and send request
+        request = self._client.delete(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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, vm_scale_set_name, vmss_extension_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to delete the extension.
+
+        :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 where the
+         extension should be deleted.
+        :type vm_scale_set_name: str
+        :param vmss_extension_name: The name of the VM scale set extension.
+        :type vmss_extension_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,
+            vm_scale_set_name=vm_scale_set_name,
+            vmss_extension_name=vmss_extension_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/virtualMachineScaleSets/{vmScaleSetName}/extensions/{vmssExtensionName}'}
+
+    def get(
+            self, resource_group_name, vm_scale_set_name, vmss_extension_name, expand=None, custom_headers=None, raw=False, **operation_config):
+        """The operation to get the extension.
+
+        :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 containing the
+         extension.
+        :type vm_scale_set_name: str
+        :param vmss_extension_name: The name of the VM scale set extension.
+        :type vmss_extension_name: str
+        :param expand: The expand expression to apply on the operation.
+        :type expand: 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: VirtualMachineScaleSetExtension or ClientRawResponse if
+         raw=true
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtension
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.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'),
+            'vmssExtensionName': self._serialize.url("vmss_extension_name", vmss_extension_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 = {}
+        if expand is not None:
+            query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineScaleSetExtension', 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/virtualMachineScaleSets/{vmScaleSetName}/extensions/{vmssExtensionName}'}
+
+    def list(
+            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of all extensions in a VM scale set.
+
+        :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 containing the
+         extension.
+        :type vm_scale_set_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 VirtualMachineScaleSetExtension
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtensionPaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtension]
+        :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 = {
+                    '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')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachineScaleSetExtensionPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachineScaleSetExtensionPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/extensions'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_rolling_upgrades_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_rolling_upgrades_operations.py
new file mode 100644
index 000000000000..81ffdda5f87e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_rolling_upgrades_operations.py
@@ -0,0 +1,267 @@
+# 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 VirtualMachineScaleSetRollingUpgradesOperations(object):
+    """VirtualMachineScaleSetRollingUpgradesOperations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+
+    def _cancel_initial(
+            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.cancel.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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 cancel(
+            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Cancels the current virtual machine scale set rolling upgrade.
+
+        :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._cancel_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)
+    cancel.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/rollingUpgrades/cancel'}
+
+
+    def _start_os_upgrade_initial(
+            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.start_os_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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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_os_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 virtual machine scale set
+        instances to the latest available Platform Image OS version. Instances
+        which are already running the latest available OS version 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_os_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_os_upgrade.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/osRollingUpgrade'}
+
+    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
+        upgrade.
+
+        :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: returns the direct response alongside the
+         deserialized response
+        :param operation_config: :ref:`Operation configuration
+         overrides<msrest:optionsforoperations>`.
+        :return: RollingUpgradeStatusInfo or ClientRawResponse if raw=true
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeStatusInfo or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get_latest.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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('RollingUpgradeStatusInfo', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    get_latest.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/rollingUpgrades/latest'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_vms_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_vms_operations.py
new file mode 100644
index 000000000000..8ebd8a2fd266
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_vms_operations.py
@@ -0,0 +1,1131 @@
+# 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 VirtualMachineScaleSetVMsOperations(object):
+    """VirtualMachineScaleSetVMsOperations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+
+    def _reimage_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.reimage.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 reimage(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Reimages (upgrade the operating system) a specific virtual machine in a
+        VM scale set.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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._reimage_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            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)
+    reimage.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/reimage'}
+
+
+    def _reimage_all_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.reimage_all.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 reimage_all(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Allows you to re-image all the disks ( including data disks ) in the a
+        VM scale set instance. This operation is only supported for managed
+        disks.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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._reimage_all_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            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)
+    reimage_all.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/reimageall'}
+
+
+    def _deallocate_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.deallocate.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 deallocate(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Deallocates a specific virtual machine in a VM scale set. Shuts down
+        the virtual machine and releases the compute resources it uses. You are
+        not billed for the compute resources of this virtual machine once it is
+        deallocated.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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._deallocate_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            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)
+    deallocate.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/deallocate'}
+
+
+    def _update_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.update.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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(parameters, 'VirtualMachineScaleSetVM')
+
+        # Construct and send request
+        request = self._client.put(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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('VirtualMachineScaleSetVM', response)
+        if response.status_code == 202:
+            deserialized = self._deserialize('VirtualMachineScaleSetVM', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def update(
+            self, resource_group_name, vm_scale_set_name, instance_id, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Updates a virtual machine of a VM scale set.
+
+        :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 where the
+         extension should be create or updated.
+        :type vm_scale_set_name: str
+        :param instance_id: The instance ID of the virtual machine.
+        :type instance_id: str
+        :param parameters: Parameters supplied to the Update Virtual Machine
+         Scale Sets VM operation.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVM
+        :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
+         VirtualMachineScaleSetVM or
+         ClientRawResponse<VirtualMachineScaleSetVM> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVM]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVM]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._update_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            parameters=parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('VirtualMachineScaleSetVM', 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/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}'}
+
+
+    def _delete_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.delete.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.delete(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Deletes a virtual machine from a VM scale set.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            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/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}'}
+
+    def get(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        """Gets a virtual machine from a VM scale set.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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: VirtualMachineScaleSetVM or ClientRawResponse if raw=true
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVM or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineScaleSetVM', 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/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}'}
+
+    def get_instance_view(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        """Gets the status of a virtual machine from a VM scale set.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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: VirtualMachineScaleSetVMInstanceView or ClientRawResponse if
+         raw=true
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVMInstanceView
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get_instance_view.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineScaleSetVMInstanceView', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    get_instance_view.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/instanceView'}
+
+    def list(
+            self, resource_group_name, virtual_machine_scale_set_name, filter=None, select=None, expand=None, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of all virtual machines in a VM scale sets.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param virtual_machine_scale_set_name: The name of the VM scale set.
+        :type virtual_machine_scale_set_name: str
+        :param filter: The filter to apply to the operation.
+        :type filter: str
+        :param select: The list parameters.
+        :type select: str
+        :param expand: The expand expression to apply to the operation.
+        :type expand: 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 VirtualMachineScaleSetVM
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVMPaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVM]
+        :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 = {
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+                    'virtualMachineScaleSetName': self._serialize.url("virtual_machine_scale_set_name", virtual_machine_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 = {}
+                if filter is not None:
+                    query_parameters['$filter'] = self._serialize.query("filter", filter, 'str')
+                if select is not None:
+                    query_parameters['$select'] = self._serialize.query("select", select, 'str')
+                if expand is not None:
+                    query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
+                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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachineScaleSetVMPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachineScaleSetVMPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{virtualMachineScaleSetName}/virtualMachines'}
+
+
+    def _power_off_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.power_off.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 power_off(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Power off (stop) a virtual machine in a VM scale set. Note that
+        resources are still attached and you are getting charged for the
+        resources. Instead, use deallocate to release resources and avoid
+        charges.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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._power_off_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            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)
+    power_off.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/poweroff'}
+
+
+    def _restart_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.restart.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 restart(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Restarts a virtual machine in a VM scale set.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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._restart_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            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)
+    restart.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/restart'}
+
+
+    def _start_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.start.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Starts a virtual machine in a VM scale set.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            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.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/start'}
+
+
+    def _redeploy_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.redeploy.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 redeploy(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Redeploys a virtual machine in a VM scale set.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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._redeploy_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            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)
+    redeploy.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/redeploy'}
+
+
+    def _perform_maintenance_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.perform_maintenance.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 perform_maintenance(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Performs maintenance on a virtual machine in a VM scale set.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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._perform_maintenance_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            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)
+    perform_maintenance.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/performMaintenance'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_sets_operations.py
new file mode 100644
index 000000000000..0b8f451521c5
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_sets_operations.py
@@ -0,0 +1,1762 @@
+# 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 VirtualMachineScaleSetsOperations(object):
+    """VirtualMachineScaleSetsOperations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+
+    def _create_or_update_initial(
+            self, resource_group_name, vm_scale_set_name, parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.create_or_update.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 = {}
+        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(parameters, 'VirtualMachineScaleSet')
+
+        # Construct and send request
+        request = self._client.put(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, stream=False, **operation_config)
+
+        if response.status_code not in [200, 201]:
+            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('VirtualMachineScaleSet', response)
+        if response.status_code == 201:
+            deserialized = self._deserialize('VirtualMachineScaleSet', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def create_or_update(
+            self, resource_group_name, vm_scale_set_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Create or update a VM scale set.
+
+        :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 to create or
+         update.
+        :type vm_scale_set_name: str
+        :param parameters: The scale set object.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSet
+        :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 VirtualMachineScaleSet
+         or ClientRawResponse<VirtualMachineScaleSet> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSet]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSet]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._create_or_update_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            parameters=parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('VirtualMachineScaleSet', 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/virtualMachineScaleSets/{vmScaleSetName}'}
+
+
+    def _update_initial(
+            self, resource_group_name, vm_scale_set_name, parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.update.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 = {}
+        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(parameters, 'VirtualMachineScaleSetUpdate')
+
+        # Construct and send request
+        request = self._client.patch(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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('VirtualMachineScaleSet', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def update(
+            self, resource_group_name, vm_scale_set_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Update a VM scale set.
+
+        :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 to create or
+         update.
+        :type vm_scale_set_name: str
+        :param parameters: The scale set object.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdate
+        :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 VirtualMachineScaleSet
+         or ClientRawResponse<VirtualMachineScaleSet> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSet]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSet]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._update_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            parameters=parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('VirtualMachineScaleSet', 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/virtualMachineScaleSets/{vmScaleSetName}'}
+
+
+    def _delete_initial(
+            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.delete.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 = {}
+        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 and send request
+        request = self._client.delete(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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, vm_scale_set_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Deletes a VM scale set.
+
+        :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._delete_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)
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}'}
+
+    def get(
+            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
+        """Display information about a virtual machine scale set.
+
+        :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: returns the direct response alongside the
+         deserialized response
+        :param operation_config: :ref:`Operation configuration
+         overrides<msrest:optionsforoperations>`.
+        :return: VirtualMachineScaleSet or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSet
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineScaleSet', 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/virtualMachineScaleSets/{vmScaleSetName}'}
+
+
+    def _deallocate_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = None
+        if instance_ids is not None:
+            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.deallocate.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 = {}
+        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
+        if vm_instance_ids is not None:
+            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
+        else:
+            body_content = None
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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 deallocate(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Deallocates specific virtual machines in a VM scale set. Shuts down the
+        virtual machines and releases the compute resources. You are not billed
+        for the compute resources that this virtual machine scale set
+        deallocates.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+         Omitting the virtual machine scale set instance ids will result in the
+         operation being performed on all virtual machines in the virtual
+         machine scale set.
+        :type instance_ids: list[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._deallocate_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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)
+    deallocate.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/deallocate'}
+
+
+    def _delete_instances_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = models.VirtualMachineScaleSetVMInstanceRequiredIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.delete_instances.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 = {}
+        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(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceRequiredIDs')
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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 delete_instances(
+            self, resource_group_name, vm_scale_set_name, instance_ids, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Deletes virtual machines in a VM scale set.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+        :type instance_ids: list[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_instances_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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_instances.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/delete'}
+
+    def get_instance_view(
+            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
+        """Gets the status of a VM scale set instance.
+
+        :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: returns the direct response alongside the
+         deserialized response
+        :param operation_config: :ref:`Operation configuration
+         overrides<msrest:optionsforoperations>`.
+        :return: VirtualMachineScaleSetInstanceView or ClientRawResponse if
+         raw=true
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetInstanceView
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get_instance_view.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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineScaleSetInstanceView', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    get_instance_view.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/instanceView'}
+
+    def list(
+            self, resource_group_name, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of all VM scale sets 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 VirtualMachineScaleSet
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetPaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSet]
+        :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 = {
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_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')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachineScaleSetPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachineScaleSetPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets'}
+
+    def list_all(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of all VM Scale Sets in the subscription, regardless of the
+        associated resource group. Use nextLink property in the response to get
+        the next page of VM Scale Sets. Do this till nextLink is null to fetch
+        all the VM Scale Sets.
+
+        :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 VirtualMachineScaleSet
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetPaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSet]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        def internal_paging(next_link=None, raw=False):
+
+            if not next_link:
+                # Construct URL
+                url = self.list_all.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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachineScaleSetPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachineScaleSetPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_all.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/virtualMachineScaleSets'}
+
+    def list_skus(
+            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of SKUs available for your VM scale set, including the
+        minimum and maximum VM instances allowed for each SKU.
+
+        :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: returns the direct response alongside the
+         deserialized response
+        :param operation_config: :ref:`Operation configuration
+         overrides<msrest:optionsforoperations>`.
+        :return: An iterator like instance of VirtualMachineScaleSetSku
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetSkuPaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetSku]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        def internal_paging(next_link=None, raw=False):
+
+            if not next_link:
+                # Construct URL
+                url = self.list_skus.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')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachineScaleSetSkuPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachineScaleSetSkuPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_skus.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/skus'}
+
+    def get_os_upgrade_history(
+            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
+        """Gets list of OS upgrades on a VM scale set instance.
+
+        :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: returns the direct response alongside the
+         deserialized response
+        :param operation_config: :ref:`Operation configuration
+         overrides<msrest:optionsforoperations>`.
+        :return: An iterator like instance of
+         UpgradeOperationHistoricalStatusInfo
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.UpgradeOperationHistoricalStatusInfoPaged[~azure.mgmt.compute.v2018_04_01.models.UpgradeOperationHistoricalStatusInfo]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        def internal_paging(next_link=None, raw=False):
+
+            if not next_link:
+                # Construct URL
+                url = self.get_os_upgrade_history.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')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.UpgradeOperationHistoricalStatusInfoPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.UpgradeOperationHistoricalStatusInfoPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    get_os_upgrade_history.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/osUpgradeHistory'}
+
+
+    def _power_off_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = None
+        if instance_ids is not None:
+            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.power_off.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 = {}
+        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
+        if vm_instance_ids is not None:
+            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
+        else:
+            body_content = None
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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 power_off(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Power off (stop) one or more virtual machines in a VM scale set. Note
+        that resources are still attached and you are getting charged for the
+        resources. Instead, use deallocate to release resources and avoid
+        charges.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+         Omitting the virtual machine scale set instance ids will result in the
+         operation being performed on all virtual machines in the virtual
+         machine scale set.
+        :type instance_ids: list[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._power_off_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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)
+    power_off.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/poweroff'}
+
+
+    def _restart_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = None
+        if instance_ids is not None:
+            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.restart.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 = {}
+        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
+        if vm_instance_ids is not None:
+            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
+        else:
+            body_content = None
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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 restart(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Restarts one or more virtual machines in a VM scale set.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+         Omitting the virtual machine scale set instance ids will result in the
+         operation being performed on all virtual machines in the virtual
+         machine scale set.
+        :type instance_ids: list[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._restart_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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)
+    restart.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/restart'}
+
+
+    def _start_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = None
+        if instance_ids is not None:
+            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.start.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 = {}
+        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
+        if vm_instance_ids is not None:
+            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
+        else:
+            body_content = None
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Starts one or more virtual machines in a VM scale set.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+         Omitting the virtual machine scale set instance ids will result in the
+         operation being performed on all virtual machines in the virtual
+         machine scale set.
+        :type instance_ids: list[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_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/start'}
+
+
+    def _redeploy_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = None
+        if instance_ids is not None:
+            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.redeploy.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 = {}
+        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
+        if vm_instance_ids is not None:
+            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
+        else:
+            body_content = None
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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 redeploy(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Redeploy one or more virtual machines in a VM scale set.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+         Omitting the virtual machine scale set instance ids will result in the
+         operation being performed on all virtual machines in the virtual
+         machine scale set.
+        :type instance_ids: list[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._redeploy_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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)
+    redeploy.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/redeploy'}
+
+
+    def _perform_maintenance_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = None
+        if instance_ids is not None:
+            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.perform_maintenance.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 = {}
+        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
+        if vm_instance_ids is not None:
+            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
+        else:
+            body_content = None
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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 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.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+         Omitting the virtual machine scale set instance ids will result in the
+         operation being performed on all virtual machines in the virtual
+         machine scale set.
+        :type instance_ids: list[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._perform_maintenance_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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)
+    perform_maintenance.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/performMaintenance'}
+
+
+    def _update_instances_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = models.VirtualMachineScaleSetVMInstanceRequiredIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.update_instances.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 = {}
+        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(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceRequiredIDs')
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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 update_instances(
+            self, resource_group_name, vm_scale_set_name, instance_ids, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Upgrades one or more virtual machines to the latest SKU set in the VM
+        scale set model.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+        :type instance_ids: list[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._update_instances_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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)
+    update_instances.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/manualupgrade'}
+
+
+    def _reimage_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = None
+        if instance_ids is not None:
+            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.reimage.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 = {}
+        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
+        if vm_instance_ids is not None:
+            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
+        else:
+            body_content = None
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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 reimage(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Reimages (upgrade the operating system) one or more virtual machines in
+        a VM scale set.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+         Omitting the virtual machine scale set instance ids will result in the
+         operation being performed on all virtual machines in the virtual
+         machine scale set.
+        :type instance_ids: list[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._reimage_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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)
+    reimage.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/reimage'}
+
+
+    def _reimage_all_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = None
+        if instance_ids is not None:
+            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.reimage_all.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 = {}
+        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
+        if vm_instance_ids is not None:
+            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
+        else:
+            body_content = None
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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 reimage_all(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Reimages all the disks ( including data disks ) in the virtual machines
+        in a VM scale set. This operation is only supported for managed disks.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+         Omitting the virtual machine scale set instance ids will result in the
+         operation being performed on all virtual machines in the virtual
+         machine scale set.
+        :type instance_ids: list[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._reimage_all_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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)
+    reimage_all.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/reimageall'}
+
+    def force_recovery_service_fabric_platform_update_domain_walk(
+            self, resource_group_name, vm_scale_set_name, platform_update_domain, custom_headers=None, raw=False, **operation_config):
+        """Manual platform update domain walk to update virtual machines in a
+        service fabric virtual machine scale set.
+
+        :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 platform_update_domain: The platform update domain for which a
+         manual recovery walk is requested
+        :type platform_update_domain: int
+        :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: RecoveryWalkResponse or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_04_01.models.RecoveryWalkResponse or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.force_recovery_service_fabric_platform_update_domain_walk.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')
+        query_parameters['platformUpdateDomain'] = self._serialize.query("platform_update_domain", platform_update_domain, 'int')
+
+        # Construct headers
+        header_parameters = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('RecoveryWalkResponse', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    force_recovery_service_fabric_platform_update_domain_walk.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/forceRecoveryServiceFabricPlatformUpdateDomainWalk'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_sizes_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_sizes_operations.py
new file mode 100644
index 000000000000..0eef7f65066c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_sizes_operations.py
@@ -0,0 +1,108 @@
+# 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 .. import models
+
+
+class VirtualMachineSizesOperations(object):
+    """VirtualMachineSizesOperations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+    def list(
+            self, location, custom_headers=None, raw=False, **operation_config):
+        """Lists all available virtual machine sizes for a subscription in a
+        location.
+
+        :param location: The location upon which virtual-machine-sizes is
+         queried.
+        :type location: 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 VirtualMachineSize
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineSizePaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineSize]
+        :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 = {
+                    'location': self._serialize.url("location", location, 'str', pattern=r'^[-\w\._]+$'),
+                    '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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachineSizePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachineSizePaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/vmSizes'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machines_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machines_operations.py
new file mode 100644
index 000000000000..0f0c13d75ea6
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machines_operations.py
@@ -0,0 +1,1563 @@
+# 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 VirtualMachinesOperations(object):
+    """VirtualMachinesOperations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+    def get_extensions(
+            self, resource_group_name, vm_name, expand=None, custom_headers=None, raw=False, **operation_config):
+        """The operation to get all extensions of a Virtual Machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine containing the
+         extension.
+        :type vm_name: str
+        :param expand: The expand expression to apply on the operation.
+        :type expand: 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: VirtualMachineExtensionsListResult or ClientRawResponse if
+         raw=true
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionsListResult
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get_extensions.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        if expand is not None:
+            query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineExtensionsListResult', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    get_extensions.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/extensions'}
+
+
+    def _capture_initial(
+            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.capture.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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(parameters, 'VirtualMachineCaptureParameters')
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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('VirtualMachineCaptureResult', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def capture(
+            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Captures the VM by copying virtual hard disks of the VM and outputs a
+        template that can be used to create similar VMs.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_name: str
+        :param parameters: Parameters supplied to the Capture Virtual Machine
+         operation.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineCaptureParameters
+        :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
+         VirtualMachineCaptureResult or
+         ClientRawResponse<VirtualMachineCaptureResult> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineCaptureResult]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineCaptureResult]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._capture_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_name,
+            parameters=parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('VirtualMachineCaptureResult', 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)
+    capture.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/capture'}
+
+
+    def _create_or_update_initial(
+            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.create_or_update.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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(parameters, 'VirtualMachine')
+
+        # Construct and send request
+        request = self._client.put(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, stream=False, **operation_config)
+
+        if response.status_code not in [200, 201]:
+            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('VirtualMachine', response)
+        if response.status_code == 201:
+            deserialized = self._deserialize('VirtualMachine', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def create_or_update(
+            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to create or update a virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_name: str
+        :param parameters: Parameters supplied to the Create Virtual Machine
+         operation.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachine
+        :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 VirtualMachine or
+         ClientRawResponse<VirtualMachine> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.VirtualMachine]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.VirtualMachine]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._create_or_update_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_name,
+            parameters=parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('VirtualMachine', 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/virtualMachines/{vmName}'}
+
+
+    def _update_initial(
+            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.update.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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(parameters, 'VirtualMachineUpdate')
+
+        # Construct and send request
+        request = self._client.patch(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, stream=False, **operation_config)
+
+        if response.status_code not in [200, 201]:
+            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('VirtualMachine', response)
+        if response.status_code == 201:
+            deserialized = self._deserialize('VirtualMachine', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def update(
+            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to update a virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_name: str
+        :param parameters: Parameters supplied to the Update Virtual Machine
+         operation.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineUpdate
+        :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 VirtualMachine or
+         ClientRawResponse<VirtualMachine> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.VirtualMachine]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.VirtualMachine]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._update_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_name,
+            parameters=parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('VirtualMachine', 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/virtualMachines/{vmName}'}
+
+
+    def _delete_initial(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.delete.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.delete(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to delete a virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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,
+            vm_name=vm_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/virtualMachines/{vmName}'}
+
+    def get(
+            self, resource_group_name, vm_name, expand=None, custom_headers=None, raw=False, **operation_config):
+        """Retrieves information about the model view or the instance view of a
+        virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_name: str
+        :param expand: The expand expression to apply on the operation.
+         Possible values include: 'instanceView'
+        :type expand: str or
+         ~azure.mgmt.compute.v2018_04_01.models.InstanceViewTypes
+        :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: VirtualMachine or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_04_01.models.VirtualMachine or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        if expand is not None:
+            query_parameters['$expand'] = self._serialize.query("expand", expand, 'InstanceViewTypes')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachine', 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/virtualMachines/{vmName}'}
+
+    def instance_view(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        """Retrieves information about the run-time state of a virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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: VirtualMachineInstanceView or ClientRawResponse if raw=true
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineInstanceView or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.instance_view.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineInstanceView', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    instance_view.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/instanceView'}
+
+
+    def _convert_to_managed_disks_initial(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.convert_to_managed_disks.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 convert_to_managed_disks(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Converts virtual machine disks from blob-based to managed disks.
+        Virtual machine must be stop-deallocated before invoking this
+        operation.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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._convert_to_managed_disks_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_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)
+    convert_to_managed_disks.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/convertToManagedDisks'}
+
+
+    def _deallocate_initial(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.deallocate.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 deallocate(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Shuts down the virtual machine and releases the compute resources. You
+        are not billed for the compute resources that this virtual machine
+        uses.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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._deallocate_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_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)
+    deallocate.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/deallocate'}
+
+    def generalize(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        """Sets the state of the virtual machine to generalized.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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: None or ClientRawResponse if raw=true
+        :rtype: None or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.generalize.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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
+
+        if raw:
+            client_raw_response = ClientRawResponse(None, response)
+            return client_raw_response
+    generalize.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/generalize'}
+
+    def list(
+            self, resource_group_name, custom_headers=None, raw=False, **operation_config):
+        """Lists all of the virtual machines in the specified resource group. Use
+        the nextLink property in the response to get the next page of virtual
+        machines.
+
+        :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 VirtualMachine
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachinePaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachine]
+        :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 = {
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_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')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachinePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachinePaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines'}
+
+    def list_all(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Lists all of the virtual machines in the specified subscription. Use
+        the nextLink property in the response to get the next page of virtual
+        machines.
+
+        :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 VirtualMachine
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachinePaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachine]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        def internal_paging(next_link=None, raw=False):
+
+            if not next_link:
+                # Construct URL
+                url = self.list_all.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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachinePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachinePaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_all.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/virtualMachines'}
+
+    def list_available_sizes(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        """Lists all available virtual machine sizes to which the specified
+        virtual machine can be resized.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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 VirtualMachineSize
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineSizePaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineSize]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        def internal_paging(next_link=None, raw=False):
+
+            if not next_link:
+                # Construct URL
+                url = self.list_available_sizes.metadata['url']
+                path_format_arguments = {
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+                    'vmName': self._serialize.url("vm_name", vm_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')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachineSizePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachineSizePaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_available_sizes.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/vmSizes'}
+
+
+    def _power_off_initial(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.power_off.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 power_off(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to power off (stop) a virtual machine. The virtual
+        machine can be restarted with the same provisioned resources. You are
+        still charged for this virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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._power_off_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_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)
+    power_off.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/powerOff'}
+
+
+    def _restart_initial(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.restart.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 restart(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to restart a virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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._restart_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_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)
+    restart.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/restart'}
+
+
+    def _start_initial(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.start.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to start a virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_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.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/start'}
+
+
+    def _redeploy_initial(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.redeploy.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 redeploy(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to redeploy a virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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._redeploy_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_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)
+    redeploy.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/redeploy'}
+
+
+    def _perform_maintenance_initial(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.perform_maintenance.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 perform_maintenance(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to perform maintenance on a virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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._perform_maintenance_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_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)
+    perform_maintenance.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/performMaintenance'}
+
+
+    def _run_command_initial(
+            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.run_command.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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(parameters, 'RunCommandInput')
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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('[InstanceViewStatus]', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def run_command(
+            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Run command on the VM.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_name: str
+        :param parameters: Parameters supplied to the Run command operation.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_04_01.models.RunCommandInput
+        :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 list or
+         ClientRawResponse<list> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._run_command_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_name,
+            parameters=parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('[InstanceViewStatus]', 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)
+    run_command.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/runCommand'}

From 2bcc242ea90b4169c00a89bb866b350009324a81 Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Sat, 2 Jun 2018 06:20:48 -0700
Subject: [PATCH 09/29] [AutoPR compute/resource-manager] [Compute] Fix List VM
 Extension API name, description updates and other fixes. (#2677)

* Generated from e1a86d44e0c41fe932513a0d2c96c0852c382aa0

Fix List VM Extension API name, description updates and fix for 2018-06-01 version

* Generated from d4855e2ca85a8ed773644fdb69da2a852097cca4

Add VMSS Ip Tag

* Generated from d4855e2ca85a8ed773644fdb69da2a852097cca4

Add VMSS Ip Tag
---
 .../mgmt/compute/compute_management_client.py |   45 -
 .../compute/v2017_12_01/models/data_disk.py   |   14 +-
 .../v2017_12_01/models/data_disk_py3.py       |   14 +-
 .../compute/v2017_12_01/models/os_disk.py     |   14 +-
 .../compute/v2017_12_01/models/os_disk_py3.py |   14 +-
 .../models/rollback_status_info.py            |    2 +-
 .../models/rollback_status_info_py3.py        |    2 +-
 .../virtual_machine_scale_set_os_disk.py      |   10 +-
 .../virtual_machine_scale_set_os_disk_py3.py  |   10 +-
 .../v2018_04_01/compute_management_client.py  |   75 -
 .../compute/v2018_04_01/models/__init__.py    |  447 +----
 .../models/additional_unattend_content.py     |   52 -
 .../models/additional_unattend_content_py3.py |   52 -
 .../models/api_entity_reference.py            |   29 -
 .../models/api_entity_reference_py3.py        |   29 -
 .../compute/v2018_04_01/models/api_error.py   |   44 -
 .../v2018_04_01/models/api_error_base.py      |   36 -
 .../v2018_04_01/models/api_error_base_py3.py  |   36 -
 .../v2018_04_01/models/api_error_py3.py       |   44 -
 .../models/auto_os_upgrade_policy.py          |   29 -
 .../models/auto_os_upgrade_policy_py3.py      |   29 -
 .../v2018_04_01/models/availability_set.py    |   85 -
 .../models/availability_set_paged.py          |   27 -
 .../models/availability_set_py3.py            |   85 -
 .../models/availability_set_update.py         |   58 -
 .../models/availability_set_update_py3.py     |   58 -
 .../v2018_04_01/models/boot_diagnostics.py    |   38 -
 .../models/boot_diagnostics_instance_view.py  |   32 -
 .../boot_diagnostics_instance_view_py3.py     |   32 -
 .../models/boot_diagnostics_py3.py            |   38 -
 .../models/compute_management_client_enums.py |  314 +--
 .../models/compute_operation_value.py         |   60 -
 .../models/compute_operation_value_paged.py   |   27 -
 .../models/compute_operation_value_py3.py     |   60 -
 .../compute/v2018_04_01/models/data_disk.py   |   87 -
 .../v2018_04_01/models/data_disk_image.py     |   37 -
 .../v2018_04_01/models/data_disk_image_py3.py |   37 -
 .../v2018_04_01/models/data_disk_py3.py       |   87 -
 .../v2018_04_01/models/diagnostics_profile.py |   34 -
 .../models/diagnostics_profile_py3.py         |   34 -
 .../models/disk_encryption_settings.py        |   41 -
 .../models/disk_encryption_settings_py3.py    |   41 -
 .../v2018_04_01/models/disk_instance_view.py  |   39 -
 .../models/disk_instance_view_py3.py          |   39 -
 .../compute/v2018_04_01/models/disk_update.py |   18 +-
 .../v2018_04_01/models/disk_update_py3.py     |   22 +-
 .../v2018_04_01/models/hardware_profile.py    |   85 -
 .../models/hardware_profile_py3.py            |   85 -
 .../mgmt/compute/v2018_04_01/models/image.py  |   70 -
 .../v2018_04_01/models/image_data_disk.py     |   68 -
 .../v2018_04_01/models/image_data_disk_py3.py |   68 -
 .../v2018_04_01/models/image_os_disk.py       |   77 -
 .../v2018_04_01/models/image_os_disk_py3.py   |   77 -
 .../compute/v2018_04_01/models/image_paged.py |   27 -
 .../compute/v2018_04_01/models/image_py3.py   |   70 -
 .../v2018_04_01/models/image_reference.py     |   54 -
 .../v2018_04_01/models/image_reference_py3.py |   54 -
 .../models/image_storage_profile.py           |   45 -
 .../models/image_storage_profile_py3.py       |   45 -
 .../v2018_04_01/models/image_update.py        |   50 -
 .../v2018_04_01/models/image_update_py3.py    |   50 -
 .../compute/v2018_04_01/models/inner_error.py |   32 -
 .../v2018_04_01/models/inner_error_py3.py     |   32 -
 .../models/instance_view_status.py            |   47 -
 .../models/instance_view_status_py3.py        |   47 -
 .../models/key_vault_key_reference.py         |   41 -
 .../models/key_vault_key_reference_py3.py     |   41 -
 .../models/key_vault_secret_reference.py      |   40 -
 .../models/key_vault_secret_reference_py3.py  |   40 -
 .../v2018_04_01/models/linux_configuration.py |   39 -
 .../models/linux_configuration_py3.py         |   39 -
 .../models/log_analytics_input_base.py        |   58 -
 .../models/log_analytics_input_base_py3.py    |   58 -
 .../models/log_analytics_operation_result.py  |   36 -
 .../log_analytics_operation_result_py3.py     |   36 -
 .../models/log_analytics_output.py            |   35 -
 .../models/log_analytics_output_py3.py        |   35 -
 .../models/maintenance_redeploy_status.py     |   60 -
 .../models/maintenance_redeploy_status_py3.py |   60 -
 .../models/managed_disk_parameters.py         |   34 -
 .../models/managed_disk_parameters_py3.py     |   34 -
 .../models/network_interface_reference.py     |   32 -
 .../models/network_interface_reference_py3.py |   32 -
 .../v2018_04_01/models/network_profile.py     |   30 -
 .../v2018_04_01/models/network_profile_py3.py |   30 -
 .../compute/v2018_04_01/models/os_disk.py     |   97 -
 .../v2018_04_01/models/os_disk_image.py       |   36 -
 .../v2018_04_01/models/os_disk_image_py3.py   |   36 -
 .../compute/v2018_04_01/models/os_disk_py3.py |   97 -
 .../compute/v2018_04_01/models/os_profile.py  |   99 -
 .../v2018_04_01/models/os_profile_py3.py      |   99 -
 .../mgmt/compute/v2018_04_01/models/plan.py   |   46 -
 .../compute/v2018_04_01/models/plan_py3.py    |   46 -
 .../v2018_04_01/models/purchase_plan.py       |   47 -
 .../v2018_04_01/models/purchase_plan_py3.py   |   47 -
 .../models/recovery_walk_response.py          |   41 -
 .../models/recovery_walk_response_py3.py      |   41 -
 .../models/request_rate_by_interval_input.py  |   60 -
 .../request_rate_by_interval_input_py3.py     |   60 -
 ...{update_resource.py => resource_update.py} |   10 +-
 ...resource_py3.py => resource_update_py3.py} |   12 +-
 .../models/rollback_status_info.py            |   48 -
 .../models/rollback_status_info_py3.py        |   48 -
 .../models/rolling_upgrade_policy.py          |   63 -
 .../models/rolling_upgrade_policy_py3.py      |   63 -
 .../models/rolling_upgrade_progress_info.py   |   55 -
 .../rolling_upgrade_progress_info_py3.py      |   55 -
 .../models/rolling_upgrade_running_status.py  |   54 -
 .../rolling_upgrade_running_status_py3.py     |   54 -
 .../models/rolling_upgrade_status_info.py     |   76 -
 .../models/rolling_upgrade_status_info_py3.py |   76 -
 .../models/run_command_document.py            |   61 -
 .../models/run_command_document_base.py       |   56 -
 .../models/run_command_document_base_paged.py |   27 -
 .../models/run_command_document_base_py3.py   |   56 -
 .../models/run_command_document_py3.py        |   61 -
 .../v2018_04_01/models/run_command_input.py   |   44 -
 .../models/run_command_input_parameter.py     |   39 -
 .../models/run_command_input_parameter_py3.py |   39 -
 .../models/run_command_input_py3.py           |   44 -
 .../run_command_parameter_definition.py       |   48 -
 .../run_command_parameter_definition_py3.py   |   48 -
 .../v2018_04_01/models/run_command_result.py  |   28 -
 .../models/run_command_result_py3.py          |   28 -
 .../mgmt/compute/v2018_04_01/models/sku.py    |   38 -
 .../compute/v2018_04_01/models/sku_py3.py     |   38 -
 .../v2018_04_01/models/snapshot_update.py     |   18 +-
 .../v2018_04_01/models/snapshot_update_py3.py |   22 +-
 .../v2018_04_01/models/ssh_configuration.py   |   30 -
 .../models/ssh_configuration_py3.py           |   30 -
 .../v2018_04_01/models/ssh_public_key.py      |   39 -
 .../v2018_04_01/models/ssh_public_key_py3.py  |   39 -
 .../v2018_04_01/models/storage_profile.py     |   47 -
 .../v2018_04_01/models/storage_profile_py3.py |   47 -
 .../v2018_04_01/models/sub_resource.py        |   28 -
 .../v2018_04_01/models/sub_resource_py3.py    |   28 -
 .../models/sub_resource_read_only.py          |   35 -
 .../models/sub_resource_read_only_py3.py      |   35 -
 .../models/throttled_requests_input.py        |   52 -
 .../models/throttled_requests_input_py3.py    |   52 -
 ...pgrade_operation_historical_status_info.py |   47 -
 ..._operation_historical_status_info_paged.py |   27 -
 ...ation_historical_status_info_properties.py |   67 -
 ...n_historical_status_info_properties_py3.py |   67 -
 ...de_operation_historical_status_info_py3.py |   47 -
 .../upgrade_operation_history_status.py       |   46 -
 .../upgrade_operation_history_status_py3.py   |   46 -
 .../v2018_04_01/models/upgrade_policy.py      |   51 -
 .../v2018_04_01/models/upgrade_policy_py3.py  |   51 -
 .../mgmt/compute/v2018_04_01/models/usage.py  |   54 -
 .../compute/v2018_04_01/models/usage_name.py  |   32 -
 .../v2018_04_01/models/usage_name_py3.py      |   32 -
 .../compute/v2018_04_01/models/usage_paged.py |   27 -
 .../compute/v2018_04_01/models/usage_py3.py   |   54 -
 .../v2018_04_01/models/vault_certificate.py   |   46 -
 .../models/vault_certificate_py3.py           |   46 -
 .../v2018_04_01/models/vault_secret_group.py  |   35 -
 .../models/vault_secret_group_py3.py          |   35 -
 .../v2018_04_01/models/virtual_hard_disk.py   |   28 -
 .../models/virtual_hard_disk_py3.py           |   28 -
 .../v2018_04_01/models/virtual_machine.py     |  150 --
 .../virtual_machine_agent_instance_view.py    |   39 -
 ...virtual_machine_agent_instance_view_py3.py |   39 -
 .../virtual_machine_capture_parameters.py     |   46 -
 .../virtual_machine_capture_parameters_py3.py |   46 -
 .../models/virtual_machine_capture_result.py  |   53 -
 .../virtual_machine_capture_result_py3.py     |   53 -
 .../models/virtual_machine_extension.py       |   97 -
 ...machine_extension_handler_instance_view.py |   37 -
 ...ine_extension_handler_instance_view_py3.py |   37 -
 .../models/virtual_machine_extension_image.py |   81 -
 .../virtual_machine_extension_image_py3.py    |   81 -
 ...virtual_machine_extension_instance_view.py |   47 -
 ...ual_machine_extension_instance_view_py3.py |   47 -
 .../models/virtual_machine_extension_py3.py   |   97 -
 .../virtual_machine_extension_update.py       |   62 -
 .../virtual_machine_extension_update_py3.py   |   62 -
 .../virtual_machine_extensions_list_result.py |   29 -
 ...tual_machine_extensions_list_result_py3.py |   29 -
 .../models/virtual_machine_health_status.py   |   35 -
 .../virtual_machine_health_status_py3.py      |   35 -
 .../models/virtual_machine_identity.py        |   58 -
 .../models/virtual_machine_identity_py3.py    |   58 -
 .../models/virtual_machine_image.py           |   59 -
 .../models/virtual_machine_image_py3.py       |   59 -
 .../models/virtual_machine_image_resource.py  |   49 -
 .../virtual_machine_image_resource_py3.py     |   49 -
 .../models/virtual_machine_instance_view.py   |   85 -
 .../virtual_machine_instance_view_py3.py      |   85 -
 .../models/virtual_machine_paged.py           |   27 -
 .../v2018_04_01/models/virtual_machine_py3.py |  150 --
 .../models/virtual_machine_scale_set.py       |  116 --
 .../virtual_machine_scale_set_data_disk.py    |   70 -
 ...virtual_machine_scale_set_data_disk_py3.py |   70 -
 .../virtual_machine_scale_set_extension.py    |   80 -
 ...rtual_machine_scale_set_extension_paged.py |   27 -
 ...ual_machine_scale_set_extension_profile.py |   30 -
 ...machine_scale_set_extension_profile_py3.py |   30 -
 ...virtual_machine_scale_set_extension_py3.py |   80 -
 .../virtual_machine_scale_set_identity.py     |   60 -
 .../virtual_machine_scale_set_identity_py3.py |   60 -
 ...virtual_machine_scale_set_instance_view.py |   48 -
 ...ual_machine_scale_set_instance_view_py3.py |   48 -
 ...cale_set_instance_view_statuses_summary.py |   37 -
 ..._set_instance_view_statuses_summary_py3.py |   37 -
 ...tual_machine_scale_set_ip_configuration.py |   83 -
 ..._machine_scale_set_ip_configuration_py3.py |   83 -
 ...chine_scale_set_managed_disk_parameters.py |   31 -
 ...e_scale_set_managed_disk_parameters_py3.py |   31 -
 ...machine_scale_set_network_configuration.py |   70 -
 ..._set_network_configuration_dns_settings.py |   29 -
 ..._network_configuration_dns_settings_py3.py |   29 -
 ...ine_scale_set_network_configuration_py3.py |   70 -
 ...rtual_machine_scale_set_network_profile.py |   38 -
 ...l_machine_scale_set_network_profile_py3.py |   38 -
 .../virtual_machine_scale_set_os_disk.py      |   80 -
 .../virtual_machine_scale_set_os_disk_py3.py  |   80 -
 .../virtual_machine_scale_set_os_profile.py   |   97 -
 ...irtual_machine_scale_set_os_profile_py3.py |   97 -
 .../models/virtual_machine_scale_set_paged.py |   27 -
 ...ale_set_public_ip_address_configuration.py |   45 -
 ...c_ip_address_configuration_dns_settings.py |   37 -
 ..._address_configuration_dns_settings_py3.py |   37 -
 ...set_public_ip_address_configuration_py3.py |   45 -
 .../models/virtual_machine_scale_set_py3.py   |  116 --
 .../models/virtual_machine_scale_set_sku.py   |   46 -
 .../virtual_machine_scale_set_sku_capacity.py |   52 -
 ...tual_machine_scale_set_sku_capacity_py3.py |   52 -
 .../virtual_machine_scale_set_sku_paged.py    |   27 -
 .../virtual_machine_scale_set_sku_py3.py      |   46 -
 ...rtual_machine_scale_set_storage_profile.py |   49 -
 ...l_machine_scale_set_storage_profile_py3.py |   49 -
 .../virtual_machine_scale_set_update.py       |   61 -
 ...chine_scale_set_update_ip_configuration.py |   71 -
 ...e_scale_set_update_ip_configuration_py3.py |   71 -
 ..._scale_set_update_network_configuration.py |   61 -
 ...le_set_update_network_configuration_py3.py |   61 -
 ...achine_scale_set_update_network_profile.py |   30 -
 ...ne_scale_set_update_network_profile_py3.py |   30 -
 ...irtual_machine_scale_set_update_os_disk.py |   50 -
 ...al_machine_scale_set_update_os_disk_py3.py |   50 -
 ...ual_machine_scale_set_update_os_profile.py |   43 -
 ...machine_scale_set_update_os_profile_py3.py |   43 -
 ..._update_public_ip_address_configuration.py |   39 -
 ...ate_public_ip_address_configuration_py3.py |   39 -
 .../virtual_machine_scale_set_update_py3.py   |   61 -
 ...achine_scale_set_update_storage_profile.py |   39 -
 ...ne_scale_set_update_storage_profile_py3.py |   39 -
 ...ual_machine_scale_set_update_vm_profile.py |   55 -
 ...machine_scale_set_update_vm_profile_py3.py |   55 -
 .../models/virtual_machine_scale_set_vm.py    |  155 --
 ...machine_scale_set_vm_extensions_summary.py |   41 -
 ...ine_scale_set_vm_extensions_summary_py3.py |   41 -
 ...rtual_machine_scale_set_vm_instance_ids.py |   30 -
 ...l_machine_scale_set_vm_instance_ids_py3.py |   30 -
 ...hine_scale_set_vm_instance_required_ids.py |   34 -
 ..._scale_set_vm_instance_required_ids_py3.py |   34 -
 ...tual_machine_scale_set_vm_instance_view.py |   87 -
 ..._machine_scale_set_vm_instance_view_py3.py |   87 -
 .../virtual_machine_scale_set_vm_paged.py     |   27 -
 .../virtual_machine_scale_set_vm_profile.py   |   80 -
 ...irtual_machine_scale_set_vm_profile_py3.py |   80 -
 .../virtual_machine_scale_set_vm_py3.py       |  155 --
 .../models/virtual_machine_size.py            |   53 -
 .../models/virtual_machine_size_paged.py      |   27 -
 .../models/virtual_machine_size_py3.py        |   53 -
 .../virtual_machine_status_code_count.py      |   41 -
 .../virtual_machine_status_code_count_py3.py  |   41 -
 .../models/virtual_machine_update.py          |  126 --
 .../models/virtual_machine_update_py3.py      |  126 --
 .../models/win_rm_configuration.py            |   29 -
 .../models/win_rm_configuration_py3.py        |   29 -
 .../v2018_04_01/models/win_rm_listener.py     |   42 -
 .../v2018_04_01/models/win_rm_listener_py3.py |   42 -
 .../models/windows_configuration.py           |   54 -
 .../models/windows_configuration_py3.py       |   54 -
 .../v2018_04_01/operations/__init__.py        |   30 -
 .../availability_sets_operations.py           |  434 ----
 .../operations/images_operations.py           |  525 -----
 .../operations/log_analytics_operations.py    |  242 ---
 .../v2018_04_01/operations/operations.py      |   99 -
 .../operations/usage_operations.py            |  108 -
 ...ual_machine_extension_images_operations.py |  248 ---
 .../virtual_machine_extensions_operations.py  |  411 ----
 .../virtual_machine_images_operations.py      |  383 ----
 ...virtual_machine_run_commands_operations.py |  168 --
 ...machine_scale_set_extensions_operations.py |  379 ----
 ...e_scale_set_rolling_upgrades_operations.py |  267 ---
 ...irtual_machine_scale_set_vms_operations.py | 1131 -----------
 .../virtual_machine_scale_sets_operations.py  | 1762 -----------------
 .../virtual_machine_sizes_operations.py       |  108 -
 .../operations/virtual_machines_operations.py | 1563 ---------------
 292 files changed, 99 insertions(+), 22252 deletions(-)
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/additional_unattend_content.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/additional_unattend_content_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_entity_reference.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_entity_reference_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/auto_os_upgrade_policy.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/auto_os_upgrade_policy_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_paged.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_update.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_update_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_instance_view.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_instance_view_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value_paged.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_image.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_image_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/diagnostics_profile.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/diagnostics_profile_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_encryption_settings.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_encryption_settings_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_instance_view.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_instance_view_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/hardware_profile.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/hardware_profile_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_paged.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_reference.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_reference_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_storage_profile.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_storage_profile_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_update.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_update_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/instance_view_status.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/instance_view_status_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_key_reference.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_key_reference_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_secret_reference.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_secret_reference_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/linux_configuration.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/linux_configuration_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_input_base.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_input_base_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_operation_result.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_operation_result_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_output.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_output_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/maintenance_redeploy_status.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/maintenance_redeploy_status_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_interface_reference.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_interface_reference_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_profile.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_profile_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_image.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_image_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_profile.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_profile_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/plan.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/plan_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/purchase_plan.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/purchase_plan_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/recovery_walk_response.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/recovery_walk_response_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/request_rate_by_interval_input.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/request_rate_by_interval_input_py3.py
 rename azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/{update_resource.py => resource_update.py} (71%)
 rename azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/{update_resource_py3.py => resource_update_py3.py} (67%)
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rollback_status_info.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rollback_status_info_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_policy.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_policy_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_progress_info.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_progress_info_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_running_status.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_running_status_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_status_info.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_status_info_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base_paged.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_parameter.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_parameter_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_parameter_definition.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_parameter_definition_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sku.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sku_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_configuration.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_configuration_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_public_key.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_public_key_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/storage_profile.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/storage_profile_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_read_only.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_read_only_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/throttled_requests_input.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/throttled_requests_input_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_paged.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_properties.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_properties_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_history_status.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_history_status_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_policy.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_policy_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_name.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_name_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_paged.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_certificate.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_certificate_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_secret_group.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_secret_group_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_hard_disk.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_hard_disk_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_agent_instance_view.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_agent_instance_view_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_parameters.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_parameters_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_result.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_result_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_handler_instance_view.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_handler_instance_view_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_image.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_image_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_instance_view.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_instance_view_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_update.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_update_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extensions_list_result.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extensions_list_result_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_health_status.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_health_status_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_identity.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_identity_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_resource.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_resource_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_instance_view.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_instance_view_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_paged.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_data_disk.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_data_disk_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_paged.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_profile.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_profile_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_identity.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_identity_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_statuses_summary.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_statuses_summary_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_configuration.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_configuration_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_dns_settings.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_dns_settings_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_profile.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_profile_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_disk.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_disk_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_profile.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_profile_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_paged.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_capacity.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_capacity_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_paged.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_storage_profile.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_storage_profile_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_ip_configuration.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_ip_configuration_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_configuration.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_configuration_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_profile.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_profile_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_disk.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_disk_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_profile.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_profile_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_public_ip_address_configuration.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_public_ip_address_configuration_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_storage_profile.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_storage_profile_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_vm_profile.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_vm_profile_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_extensions_summary.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_extensions_summary_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_ids.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_ids_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_required_ids.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_required_ids_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_view.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_view_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_paged.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_profile.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_profile_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size_paged.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_status_code_count.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_status_code_count_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_update.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_update_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_configuration.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_configuration_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_listener.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_listener_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/windows_configuration.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/windows_configuration_py3.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/images_operations.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/log_analytics_operations.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/operations.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/usage_operations.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extension_images_operations.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extensions_operations.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_images_operations.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_run_commands_operations.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_extensions_operations.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_rolling_upgrades_operations.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_vms_operations.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_sets_operations.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_sizes_operations.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machines_operations.py

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 f12ba0766a1e..6c6f04ec9351 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py
@@ -158,7 +158,6 @@ def availability_sets(self):
            * 2016-04-30-preview: :class:`AvailabilitySetsOperations<azure.mgmt.compute.v2016_04_30_preview.operations.AvailabilitySetsOperations>`
            * 2017-03-30: :class:`AvailabilitySetsOperations<azure.mgmt.compute.v2017_03_30.operations.AvailabilitySetsOperations>`
            * 2017-12-01: :class:`AvailabilitySetsOperations<azure.mgmt.compute.v2017_12_01.operations.AvailabilitySetsOperations>`
-           * 2018-04-01: :class:`AvailabilitySetsOperations<azure.mgmt.compute.v2018_04_01.operations.AvailabilitySetsOperations>`
         """
         api_version = self._get_api_version('availability_sets')
         if api_version == '2015-06-15':
@@ -171,8 +170,6 @@ def availability_sets(self):
             from .v2017_03_30.operations import AvailabilitySetsOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import AvailabilitySetsOperations as OperationClass
-        elif api_version == '2018-04-01':
-            from .v2018_04_01.operations import AvailabilitySetsOperations 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)))
@@ -242,7 +239,6 @@ def images(self):
            * 2016-04-30-preview: :class:`ImagesOperations<azure.mgmt.compute.v2016_04_30_preview.operations.ImagesOperations>`
            * 2017-03-30: :class:`ImagesOperations<azure.mgmt.compute.v2017_03_30.operations.ImagesOperations>`
            * 2017-12-01: :class:`ImagesOperations<azure.mgmt.compute.v2017_12_01.operations.ImagesOperations>`
-           * 2018-04-01: :class:`ImagesOperations<azure.mgmt.compute.v2018_04_01.operations.ImagesOperations>`
         """
         api_version = self._get_api_version('images')
         if api_version == '2016-04-30-preview':
@@ -251,8 +247,6 @@ def images(self):
             from .v2017_03_30.operations import ImagesOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import ImagesOperations as OperationClass
-        elif api_version == '2018-04-01':
-            from .v2018_04_01.operations import ImagesOperations 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)))
@@ -262,13 +256,10 @@ def log_analytics(self):
         """Instance depends on the API version:
 
            * 2017-12-01: :class:`LogAnalyticsOperations<azure.mgmt.compute.v2017_12_01.operations.LogAnalyticsOperations>`
-           * 2018-04-01: :class:`LogAnalyticsOperations<azure.mgmt.compute.v2018_04_01.operations.LogAnalyticsOperations>`
         """
         api_version = self._get_api_version('log_analytics')
         if api_version == '2017-12-01':
             from .v2017_12_01.operations import LogAnalyticsOperations as OperationClass
-        elif api_version == '2018-04-01':
-            from .v2018_04_01.operations import LogAnalyticsOperations 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)))
@@ -278,13 +269,10 @@ def operations(self):
         """Instance depends on the API version:
 
            * 2017-12-01: :class:`Operations<azure.mgmt.compute.v2017_12_01.operations.Operations>`
-           * 2018-04-01: :class:`Operations<azure.mgmt.compute.v2018_04_01.operations.Operations>`
         """
         api_version = self._get_api_version('operations')
         if api_version == '2017-12-01':
             from .v2017_12_01.operations import Operations as OperationClass
-        elif api_version == '2018-04-01':
-            from .v2018_04_01.operations import Operations 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)))
@@ -333,7 +321,6 @@ def usage(self):
            * 2016-04-30-preview: :class:`UsageOperations<azure.mgmt.compute.v2016_04_30_preview.operations.UsageOperations>`
            * 2017-03-30: :class:`UsageOperations<azure.mgmt.compute.v2017_03_30.operations.UsageOperations>`
            * 2017-12-01: :class:`UsageOperations<azure.mgmt.compute.v2017_12_01.operations.UsageOperations>`
-           * 2018-04-01: :class:`UsageOperations<azure.mgmt.compute.v2018_04_01.operations.UsageOperations>`
         """
         api_version = self._get_api_version('usage')
         if api_version == '2015-06-15':
@@ -346,8 +333,6 @@ def usage(self):
             from .v2017_03_30.operations import UsageOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import UsageOperations as OperationClass
-        elif api_version == '2018-04-01':
-            from .v2018_04_01.operations import UsageOperations 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)))
@@ -361,7 +346,6 @@ def virtual_machine_extension_images(self):
            * 2016-04-30-preview: :class:`VirtualMachineExtensionImagesOperations<azure.mgmt.compute.v2016_04_30_preview.operations.VirtualMachineExtensionImagesOperations>`
            * 2017-03-30: :class:`VirtualMachineExtensionImagesOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineExtensionImagesOperations>`
            * 2017-12-01: :class:`VirtualMachineExtensionImagesOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineExtensionImagesOperations>`
-           * 2018-04-01: :class:`VirtualMachineExtensionImagesOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineExtensionImagesOperations>`
         """
         api_version = self._get_api_version('virtual_machine_extension_images')
         if api_version == '2015-06-15':
@@ -374,8 +358,6 @@ def virtual_machine_extension_images(self):
             from .v2017_03_30.operations import VirtualMachineExtensionImagesOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachineExtensionImagesOperations as OperationClass
-        elif api_version == '2018-04-01':
-            from .v2018_04_01.operations import VirtualMachineExtensionImagesOperations 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)))
@@ -389,7 +371,6 @@ def virtual_machine_extensions(self):
            * 2016-04-30-preview: :class:`VirtualMachineExtensionsOperations<azure.mgmt.compute.v2016_04_30_preview.operations.VirtualMachineExtensionsOperations>`
            * 2017-03-30: :class:`VirtualMachineExtensionsOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineExtensionsOperations>`
            * 2017-12-01: :class:`VirtualMachineExtensionsOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineExtensionsOperations>`
-           * 2018-04-01: :class:`VirtualMachineExtensionsOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineExtensionsOperations>`
         """
         api_version = self._get_api_version('virtual_machine_extensions')
         if api_version == '2015-06-15':
@@ -402,8 +383,6 @@ def virtual_machine_extensions(self):
             from .v2017_03_30.operations import VirtualMachineExtensionsOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachineExtensionsOperations as OperationClass
-        elif api_version == '2018-04-01':
-            from .v2018_04_01.operations import VirtualMachineExtensionsOperations 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)))
@@ -417,7 +396,6 @@ def virtual_machine_images(self):
            * 2016-04-30-preview: :class:`VirtualMachineImagesOperations<azure.mgmt.compute.v2016_04_30_preview.operations.VirtualMachineImagesOperations>`
            * 2017-03-30: :class:`VirtualMachineImagesOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineImagesOperations>`
            * 2017-12-01: :class:`VirtualMachineImagesOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineImagesOperations>`
-           * 2018-04-01: :class:`VirtualMachineImagesOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineImagesOperations>`
         """
         api_version = self._get_api_version('virtual_machine_images')
         if api_version == '2015-06-15':
@@ -430,8 +408,6 @@ def virtual_machine_images(self):
             from .v2017_03_30.operations import VirtualMachineImagesOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachineImagesOperations as OperationClass
-        elif api_version == '2018-04-01':
-            from .v2018_04_01.operations import VirtualMachineImagesOperations 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)))
@@ -442,15 +418,12 @@ def virtual_machine_run_commands(self):
 
            * 2017-03-30: :class:`VirtualMachineRunCommandsOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineRunCommandsOperations>`
            * 2017-12-01: :class:`VirtualMachineRunCommandsOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineRunCommandsOperations>`
-           * 2018-04-01: :class:`VirtualMachineRunCommandsOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineRunCommandsOperations>`
         """
         api_version = self._get_api_version('virtual_machine_run_commands')
         if api_version == '2017-03-30':
             from .v2017_03_30.operations import VirtualMachineRunCommandsOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachineRunCommandsOperations as OperationClass
-        elif api_version == '2018-04-01':
-            from .v2018_04_01.operations import VirtualMachineRunCommandsOperations 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)))
@@ -461,15 +434,12 @@ def virtual_machine_scale_set_extensions(self):
 
            * 2017-03-30: :class:`VirtualMachineScaleSetExtensionsOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineScaleSetExtensionsOperations>`
            * 2017-12-01: :class:`VirtualMachineScaleSetExtensionsOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineScaleSetExtensionsOperations>`
-           * 2018-04-01: :class:`VirtualMachineScaleSetExtensionsOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineScaleSetExtensionsOperations>`
         """
         api_version = self._get_api_version('virtual_machine_scale_set_extensions')
         if api_version == '2017-03-30':
             from .v2017_03_30.operations import VirtualMachineScaleSetExtensionsOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachineScaleSetExtensionsOperations as OperationClass
-        elif api_version == '2018-04-01':
-            from .v2018_04_01.operations import VirtualMachineScaleSetExtensionsOperations 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)))
@@ -480,15 +450,12 @@ def virtual_machine_scale_set_rolling_upgrades(self):
 
            * 2017-03-30: :class:`VirtualMachineScaleSetRollingUpgradesOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineScaleSetRollingUpgradesOperations>`
            * 2017-12-01: :class:`VirtualMachineScaleSetRollingUpgradesOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineScaleSetRollingUpgradesOperations>`
-           * 2018-04-01: :class:`VirtualMachineScaleSetRollingUpgradesOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineScaleSetRollingUpgradesOperations>`
         """
         api_version = self._get_api_version('virtual_machine_scale_set_rolling_upgrades')
         if api_version == '2017-03-30':
             from .v2017_03_30.operations import VirtualMachineScaleSetRollingUpgradesOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachineScaleSetRollingUpgradesOperations as OperationClass
-        elif api_version == '2018-04-01':
-            from .v2018_04_01.operations import VirtualMachineScaleSetRollingUpgradesOperations 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)))
@@ -502,7 +469,6 @@ def virtual_machine_scale_set_vms(self):
            * 2016-04-30-preview: :class:`VirtualMachineScaleSetVMsOperations<azure.mgmt.compute.v2016_04_30_preview.operations.VirtualMachineScaleSetVMsOperations>`
            * 2017-03-30: :class:`VirtualMachineScaleSetVMsOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineScaleSetVMsOperations>`
            * 2017-12-01: :class:`VirtualMachineScaleSetVMsOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineScaleSetVMsOperations>`
-           * 2018-04-01: :class:`VirtualMachineScaleSetVMsOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineScaleSetVMsOperations>`
         """
         api_version = self._get_api_version('virtual_machine_scale_set_vms')
         if api_version == '2015-06-15':
@@ -515,8 +481,6 @@ def virtual_machine_scale_set_vms(self):
             from .v2017_03_30.operations import VirtualMachineScaleSetVMsOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachineScaleSetVMsOperations as OperationClass
-        elif api_version == '2018-04-01':
-            from .v2018_04_01.operations import VirtualMachineScaleSetVMsOperations 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)))
@@ -530,7 +494,6 @@ def virtual_machine_scale_sets(self):
            * 2016-04-30-preview: :class:`VirtualMachineScaleSetsOperations<azure.mgmt.compute.v2016_04_30_preview.operations.VirtualMachineScaleSetsOperations>`
            * 2017-03-30: :class:`VirtualMachineScaleSetsOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineScaleSetsOperations>`
            * 2017-12-01: :class:`VirtualMachineScaleSetsOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineScaleSetsOperations>`
-           * 2018-04-01: :class:`VirtualMachineScaleSetsOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineScaleSetsOperations>`
         """
         api_version = self._get_api_version('virtual_machine_scale_sets')
         if api_version == '2015-06-15':
@@ -543,8 +506,6 @@ def virtual_machine_scale_sets(self):
             from .v2017_03_30.operations import VirtualMachineScaleSetsOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachineScaleSetsOperations as OperationClass
-        elif api_version == '2018-04-01':
-            from .v2018_04_01.operations import VirtualMachineScaleSetsOperations 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)))
@@ -558,7 +519,6 @@ def virtual_machine_sizes(self):
            * 2016-04-30-preview: :class:`VirtualMachineSizesOperations<azure.mgmt.compute.v2016_04_30_preview.operations.VirtualMachineSizesOperations>`
            * 2017-03-30: :class:`VirtualMachineSizesOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineSizesOperations>`
            * 2017-12-01: :class:`VirtualMachineSizesOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineSizesOperations>`
-           * 2018-04-01: :class:`VirtualMachineSizesOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineSizesOperations>`
         """
         api_version = self._get_api_version('virtual_machine_sizes')
         if api_version == '2015-06-15':
@@ -571,8 +531,6 @@ def virtual_machine_sizes(self):
             from .v2017_03_30.operations import VirtualMachineSizesOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachineSizesOperations as OperationClass
-        elif api_version == '2018-04-01':
-            from .v2018_04_01.operations import VirtualMachineSizesOperations 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)))
@@ -586,7 +544,6 @@ def virtual_machines(self):
            * 2016-04-30-preview: :class:`VirtualMachinesOperations<azure.mgmt.compute.v2016_04_30_preview.operations.VirtualMachinesOperations>`
            * 2017-03-30: :class:`VirtualMachinesOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachinesOperations>`
            * 2017-12-01: :class:`VirtualMachinesOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachinesOperations>`
-           * 2018-04-01: :class:`VirtualMachinesOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachinesOperations>`
         """
         api_version = self._get_api_version('virtual_machines')
         if api_version == '2015-06-15':
@@ -599,8 +556,6 @@ def virtual_machines(self):
             from .v2017_03_30.operations import VirtualMachinesOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachinesOperations as OperationClass
-        elif api_version == '2018-04-01':
-            from .v2018_04_01.operations import VirtualMachinesOperations 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/v2017_12_01/models/data_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/data_disk.py
index 654ccf054d19..41e260cdca7e 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
@@ -39,13 +39,13 @@ class DataDisk(Model):
      should be enabled or disabled on the disk.
     :type write_accelerator_enabled: bool
     :param create_option: Required. Specifies how the virtual machine should
-     be created.<br><br> Possible values are:<br><br> **Attach**  This value is
-     used when you are using a specialized disk to create the virtual
-     machine.<br><br> **FromImage**  This value is used when you are using an
-     image to create the virtual machine. If you are using a platform image,
-     you also use the imageReference element described above. If you are using
-     a marketplace image, you  also use the plan element previously described.
-     Possible values include: 'FromImage', 'Empty', 'Attach'
+     be created.<br><br> Possible values are:<br><br> **Attach** \\u2013 This
+     value is used when you are using a specialized disk to create the virtual
+     machine.<br><br> **FromImage** \\u2013 This value is used when you are
+     using an image to create the virtual machine. If you are using a platform
+     image, you also use the imageReference element described above. If you are
+     using a marketplace image, you  also use the plan element previously
+     described. Possible values include: 'FromImage', 'Empty', 'Attach'
     :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
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 575decdd5860..b638a05f74a0 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
@@ -39,13 +39,13 @@ class DataDisk(Model):
      should be enabled or disabled on the disk.
     :type write_accelerator_enabled: bool
     :param create_option: Required. Specifies how the virtual machine should
-     be created.<br><br> Possible values are:<br><br> **Attach**  This value is
-     used when you are using a specialized disk to create the virtual
-     machine.<br><br> **FromImage**  This value is used when you are using an
-     image to create the virtual machine. If you are using a platform image,
-     you also use the imageReference element described above. If you are using
-     a marketplace image, you  also use the plan element previously described.
-     Possible values include: 'FromImage', 'Empty', 'Attach'
+     be created.<br><br> Possible values are:<br><br> **Attach** \\u2013 This
+     value is used when you are using a specialized disk to create the virtual
+     machine.<br><br> **FromImage** \\u2013 This value is used when you are
+     using an image to create the virtual machine. If you are using a platform
+     image, you also use the imageReference element described above. If you are
+     using a marketplace image, you  also use the plan element previously
+     described. Possible values include: 'FromImage', 'Empty', 'Attach'
     :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
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 a265f209401b..a81c8e1fec5e 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
@@ -48,13 +48,13 @@ class OSDisk(Model):
      should be enabled or disabled on the disk.
     :type write_accelerator_enabled: bool
     :param create_option: Required. Specifies how the virtual machine should
-     be created.<br><br> Possible values are:<br><br> **Attach**  This value is
-     used when you are using a specialized disk to create the virtual
-     machine.<br><br> **FromImage**  This value is used when you are using an
-     image to create the virtual machine. If you are using a platform image,
-     you also use the imageReference element described above. If you are using
-     a marketplace image, you  also use the plan element previously described.
-     Possible values include: 'FromImage', 'Empty', 'Attach'
+     be created.<br><br> Possible values are:<br><br> **Attach** \\u2013 This
+     value is used when you are using a specialized disk to create the virtual
+     machine.<br><br> **FromImage** \\u2013 This value is used when you are
+     using an image to create the virtual machine. If you are using a platform
+     image, you also use the imageReference element described above. If you are
+     using a marketplace image, you  also use the plan element previously
+     described. Possible values include: 'FromImage', 'Empty', 'Attach'
     :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
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 00c3e7ec0b16..edfcc1b27230 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
@@ -48,13 +48,13 @@ class OSDisk(Model):
      should be enabled or disabled on the disk.
     :type write_accelerator_enabled: bool
     :param create_option: Required. Specifies how the virtual machine should
-     be created.<br><br> Possible values are:<br><br> **Attach**  This value is
-     used when you are using a specialized disk to create the virtual
-     machine.<br><br> **FromImage**  This value is used when you are using an
-     image to create the virtual machine. If you are using a platform image,
-     you also use the imageReference element described above. If you are using
-     a marketplace image, you  also use the plan element previously described.
-     Possible values include: 'FromImage', 'Empty', 'Attach'
+     be created.<br><br> Possible values are:<br><br> **Attach** \\u2013 This
+     value is used when you are using a specialized disk to create the virtual
+     machine.<br><br> **FromImage** \\u2013 This value is used when you are
+     using an image to create the virtual machine. If you are using a platform
+     image, you also use the imageReference element described above. If you are
+     using a marketplace image, you  also use the plan element previously
+     described. Possible values include: 'FromImage', 'Empty', 'Attach'
     :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
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/rollback_status_info.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/rollback_status_info.py
index 83b559715648..5f4ef5e06784 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/rollback_status_info.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/rollback_status_info.py
@@ -25,7 +25,7 @@ class RollbackStatusInfo(Model):
     :ivar failed_rolledback_instance_count: The number of instances which
      failed to rollback.
     :vartype failed_rolledback_instance_count: int
-    :ivar rollback_error: Error Details if OS rollback failed.
+    :ivar rollback_error: Error details if OS rollback failed.
     :vartype rollback_error: ~azure.mgmt.compute.v2017_12_01.models.ApiError
     """
 
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/rollback_status_info_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/rollback_status_info_py3.py
index 5edbb3f476d9..c3bab57af6c9 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/rollback_status_info_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/rollback_status_info_py3.py
@@ -25,7 +25,7 @@ class RollbackStatusInfo(Model):
     :ivar failed_rolledback_instance_count: The number of instances which
      failed to rollback.
     :vartype failed_rolledback_instance_count: int
-    :ivar rollback_error: Error Details if OS rollback failed.
+    :ivar rollback_error: Error details if OS rollback failed.
     :vartype rollback_error: ~azure.mgmt.compute.v2017_12_01.models.ApiError
     """
 
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_os_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_os_disk.py
index f4eadf1343cb..24fa8103eef7 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_os_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_os_disk.py
@@ -29,11 +29,11 @@ class VirtualMachineScaleSetOSDisk(Model):
     :type write_accelerator_enabled: bool
     :param create_option: Required. Specifies how the virtual machines in the
      scale set should be created.<br><br> The only allowed value is:
-     **FromImage**  This value is used when you are using an image to create
-     the virtual machine. If you are using a platform image, you also use the
-     imageReference element described above. If you are using a marketplace
-     image, you  also use the plan element previously described. Possible
-     values include: 'FromImage', 'Empty', 'Attach'
+     **FromImage** \\u2013 This value is used when you are using an image to
+     create the virtual machine. If you are using a platform image, you also
+     use the imageReference element described above. If you are using a
+     marketplace image, you  also use the plan element previously described.
+     Possible values include: 'FromImage', 'Empty', 'Attach'
     :type create_option: str or
      ~azure.mgmt.compute.v2017_12_01.models.DiskCreateOptionTypes
     :param os_type: This property allows you to specify the type of the OS
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_os_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_os_disk_py3.py
index a660b60652b4..cd6f8e0254fd 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_os_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_os_disk_py3.py
@@ -29,11 +29,11 @@ class VirtualMachineScaleSetOSDisk(Model):
     :type write_accelerator_enabled: bool
     :param create_option: Required. Specifies how the virtual machines in the
      scale set should be created.<br><br> The only allowed value is:
-     **FromImage**  This value is used when you are using an image to create
-     the virtual machine. If you are using a platform image, you also use the
-     imageReference element described above. If you are using a marketplace
-     image, you  also use the plan element previously described. Possible
-     values include: 'FromImage', 'Empty', 'Attach'
+     **FromImage** \\u2013 This value is used when you are using an image to
+     create the virtual machine. If you are using a platform image, you also
+     use the imageReference element described above. If you are using a
+     marketplace image, you  also use the plan element previously described.
+     Possible values include: 'FromImage', 'Empty', 'Attach'
     :type create_option: str or
      ~azure.mgmt.compute.v2017_12_01.models.DiskCreateOptionTypes
     :param os_type: This property allows you to specify the type of the OS
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/compute_management_client.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/compute_management_client.py
index d56329fa3201..d815c08ac257 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/compute_management_client.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/compute_management_client.py
@@ -13,21 +13,6 @@
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
-from .operations.operations import Operations
-from .operations.availability_sets_operations import AvailabilitySetsOperations
-from .operations.virtual_machine_extension_images_operations import VirtualMachineExtensionImagesOperations
-from .operations.virtual_machine_extensions_operations import VirtualMachineExtensionsOperations
-from .operations.virtual_machines_operations import VirtualMachinesOperations
-from .operations.virtual_machine_images_operations import VirtualMachineImagesOperations
-from .operations.usage_operations import UsageOperations
-from .operations.virtual_machine_sizes_operations import VirtualMachineSizesOperations
-from .operations.images_operations import ImagesOperations
-from .operations.virtual_machine_scale_sets_operations import VirtualMachineScaleSetsOperations
-from .operations.virtual_machine_scale_set_extensions_operations import VirtualMachineScaleSetExtensionsOperations
-from .operations.virtual_machine_scale_set_rolling_upgrades_operations import VirtualMachineScaleSetRollingUpgradesOperations
-from .operations.virtual_machine_scale_set_vms_operations import VirtualMachineScaleSetVMsOperations
-from .operations.log_analytics_operations import LogAnalyticsOperations
-from .operations.virtual_machine_run_commands_operations import VirtualMachineRunCommandsOperations
 from .operations.disks_operations import DisksOperations
 from .operations.snapshots_operations import SnapshotsOperations
 from . import models
@@ -73,36 +58,6 @@ class ComputeManagementClient(SDKClient):
     :ivar config: Configuration for client.
     :vartype config: ComputeManagementClientConfiguration
 
-    :ivar operations: Operations operations
-    :vartype operations: azure.mgmt.compute.v2018_04_01.operations.Operations
-    :ivar availability_sets: AvailabilitySets operations
-    :vartype availability_sets: azure.mgmt.compute.v2018_04_01.operations.AvailabilitySetsOperations
-    :ivar virtual_machine_extension_images: VirtualMachineExtensionImages operations
-    :vartype virtual_machine_extension_images: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineExtensionImagesOperations
-    :ivar virtual_machine_extensions: VirtualMachineExtensions operations
-    :vartype virtual_machine_extensions: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineExtensionsOperations
-    :ivar virtual_machines: VirtualMachines operations
-    :vartype virtual_machines: azure.mgmt.compute.v2018_04_01.operations.VirtualMachinesOperations
-    :ivar virtual_machine_images: VirtualMachineImages operations
-    :vartype virtual_machine_images: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineImagesOperations
-    :ivar usage: Usage operations
-    :vartype usage: azure.mgmt.compute.v2018_04_01.operations.UsageOperations
-    :ivar virtual_machine_sizes: VirtualMachineSizes operations
-    :vartype virtual_machine_sizes: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineSizesOperations
-    :ivar images: Images operations
-    :vartype images: azure.mgmt.compute.v2018_04_01.operations.ImagesOperations
-    :ivar virtual_machine_scale_sets: VirtualMachineScaleSets operations
-    :vartype virtual_machine_scale_sets: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineScaleSetsOperations
-    :ivar virtual_machine_scale_set_extensions: VirtualMachineScaleSetExtensions operations
-    :vartype virtual_machine_scale_set_extensions: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineScaleSetExtensionsOperations
-    :ivar virtual_machine_scale_set_rolling_upgrades: VirtualMachineScaleSetRollingUpgrades operations
-    :vartype virtual_machine_scale_set_rolling_upgrades: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineScaleSetRollingUpgradesOperations
-    :ivar virtual_machine_scale_set_vms: VirtualMachineScaleSetVMs operations
-    :vartype virtual_machine_scale_set_vms: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineScaleSetVMsOperations
-    :ivar log_analytics: LogAnalytics operations
-    :vartype log_analytics: azure.mgmt.compute.v2018_04_01.operations.LogAnalyticsOperations
-    :ivar virtual_machine_run_commands: VirtualMachineRunCommands operations
-    :vartype virtual_machine_run_commands: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineRunCommandsOperations
     :ivar disks: Disks operations
     :vartype disks: azure.mgmt.compute.v2018_04_01.operations.DisksOperations
     :ivar snapshots: Snapshots operations
@@ -129,36 +84,6 @@ def __init__(
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
-        self.operations = Operations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.availability_sets = AvailabilitySetsOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.virtual_machine_extension_images = VirtualMachineExtensionImagesOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.virtual_machine_extensions = VirtualMachineExtensionsOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.virtual_machines = VirtualMachinesOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.virtual_machine_images = VirtualMachineImagesOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.usage = UsageOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.virtual_machine_sizes = VirtualMachineSizesOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.images = ImagesOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.virtual_machine_scale_sets = VirtualMachineScaleSetsOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.virtual_machine_scale_set_extensions = VirtualMachineScaleSetExtensionsOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.virtual_machine_scale_set_rolling_upgrades = VirtualMachineScaleSetRollingUpgradesOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.virtual_machine_scale_set_vms = VirtualMachineScaleSetVMsOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.log_analytics = LogAnalyticsOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.virtual_machine_run_commands = VirtualMachineRunCommandsOperations(
-            self._client, self.config, self._serialize, self._deserialize)
         self.disks = DisksOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.snapshots = SnapshotsOperations(
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/__init__.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/__init__.py
index c186e402a241..a9b68bd118f4 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/__init__.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/__init__.py
@@ -10,132 +10,9 @@
 # --------------------------------------------------------------------------
 
 try:
-    from .compute_operation_value_py3 import ComputeOperationValue
-    from .instance_view_status_py3 import InstanceViewStatus
-    from .sub_resource_py3 import SubResource
-    from .sku_py3 import Sku
-    from .availability_set_py3 import AvailabilitySet
-    from .availability_set_update_py3 import AvailabilitySetUpdate
-    from .virtual_machine_size_py3 import VirtualMachineSize
-    from .virtual_machine_extension_image_py3 import VirtualMachineExtensionImage
-    from .virtual_machine_image_resource_py3 import VirtualMachineImageResource
-    from .virtual_machine_extension_instance_view_py3 import VirtualMachineExtensionInstanceView
-    from .virtual_machine_extension_py3 import VirtualMachineExtension
-    from .virtual_machine_extension_update_py3 import VirtualMachineExtensionUpdate
-    from .virtual_machine_extensions_list_result_py3 import VirtualMachineExtensionsListResult
-    from .purchase_plan_py3 import PurchasePlan
-    from .os_disk_image_py3 import OSDiskImage
-    from .data_disk_image_py3 import DataDiskImage
-    from .virtual_machine_image_py3 import VirtualMachineImage
-    from .usage_name_py3 import UsageName
-    from .usage_py3 import Usage
-    from .virtual_machine_capture_parameters_py3 import VirtualMachineCaptureParameters
-    from .virtual_machine_capture_result_py3 import VirtualMachineCaptureResult
-    from .plan_py3 import Plan
-    from .hardware_profile_py3 import HardwareProfile
-    from .image_reference_py3 import ImageReference
-    from .key_vault_secret_reference_py3 import KeyVaultSecretReference
-    from .key_vault_key_reference_py3 import KeyVaultKeyReference
-    from .disk_encryption_settings_py3 import DiskEncryptionSettings
-    from .virtual_hard_disk_py3 import VirtualHardDisk
-    from .managed_disk_parameters_py3 import ManagedDiskParameters
-    from .os_disk_py3 import OSDisk
-    from .data_disk_py3 import DataDisk
-    from .storage_profile_py3 import StorageProfile
-    from .additional_unattend_content_py3 import AdditionalUnattendContent
-    from .win_rm_listener_py3 import WinRMListener
-    from .win_rm_configuration_py3 import WinRMConfiguration
-    from .windows_configuration_py3 import WindowsConfiguration
-    from .ssh_public_key_py3 import SshPublicKey
-    from .ssh_configuration_py3 import SshConfiguration
-    from .linux_configuration_py3 import LinuxConfiguration
-    from .vault_certificate_py3 import VaultCertificate
-    from .vault_secret_group_py3 import VaultSecretGroup
-    from .os_profile_py3 import OSProfile
-    from .network_interface_reference_py3 import NetworkInterfaceReference
-    from .network_profile_py3 import NetworkProfile
-    from .boot_diagnostics_py3 import BootDiagnostics
-    from .diagnostics_profile_py3 import DiagnosticsProfile
-    from .virtual_machine_extension_handler_instance_view_py3 import VirtualMachineExtensionHandlerInstanceView
-    from .virtual_machine_agent_instance_view_py3 import VirtualMachineAgentInstanceView
-    from .disk_instance_view_py3 import DiskInstanceView
-    from .boot_diagnostics_instance_view_py3 import BootDiagnosticsInstanceView
-    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_py3 import VirtualMachine
-    from .virtual_machine_update_py3 import VirtualMachineUpdate
-    from .auto_os_upgrade_policy_py3 import AutoOSUpgradePolicy
-    from .rolling_upgrade_policy_py3 import RollingUpgradePolicy
-    from .upgrade_policy_py3 import UpgradePolicy
-    from .image_os_disk_py3 import ImageOSDisk
-    from .image_data_disk_py3 import ImageDataDisk
-    from .image_storage_profile_py3 import ImageStorageProfile
-    from .image_py3 import Image
-    from .image_update_py3 import ImageUpdate
-    from .virtual_machine_scale_set_identity_py3 import VirtualMachineScaleSetIdentity
-    from .virtual_machine_scale_set_os_profile_py3 import VirtualMachineScaleSetOSProfile
-    from .virtual_machine_scale_set_update_os_profile_py3 import VirtualMachineScaleSetUpdateOSProfile
-    from .virtual_machine_scale_set_managed_disk_parameters_py3 import VirtualMachineScaleSetManagedDiskParameters
-    from .virtual_machine_scale_set_os_disk_py3 import VirtualMachineScaleSetOSDisk
-    from .virtual_machine_scale_set_update_os_disk_py3 import VirtualMachineScaleSetUpdateOSDisk
-    from .virtual_machine_scale_set_data_disk_py3 import VirtualMachineScaleSetDataDisk
-    from .virtual_machine_scale_set_storage_profile_py3 import VirtualMachineScaleSetStorageProfile
-    from .virtual_machine_scale_set_update_storage_profile_py3 import VirtualMachineScaleSetUpdateStorageProfile
-    from .api_entity_reference_py3 import ApiEntityReference
-    from .virtual_machine_scale_set_public_ip_address_configuration_dns_settings_py3 import VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings
-    from .virtual_machine_scale_set_public_ip_address_configuration_py3 import VirtualMachineScaleSetPublicIPAddressConfiguration
-    from .virtual_machine_scale_set_update_public_ip_address_configuration_py3 import VirtualMachineScaleSetUpdatePublicIPAddressConfiguration
-    from .virtual_machine_scale_set_ip_configuration_py3 import VirtualMachineScaleSetIPConfiguration
-    from .virtual_machine_scale_set_update_ip_configuration_py3 import VirtualMachineScaleSetUpdateIPConfiguration
-    from .virtual_machine_scale_set_network_configuration_dns_settings_py3 import VirtualMachineScaleSetNetworkConfigurationDnsSettings
-    from .virtual_machine_scale_set_network_configuration_py3 import VirtualMachineScaleSetNetworkConfiguration
-    from .virtual_machine_scale_set_update_network_configuration_py3 import VirtualMachineScaleSetUpdateNetworkConfiguration
-    from .virtual_machine_scale_set_network_profile_py3 import VirtualMachineScaleSetNetworkProfile
-    from .virtual_machine_scale_set_update_network_profile_py3 import VirtualMachineScaleSetUpdateNetworkProfile
-    from .virtual_machine_scale_set_extension_py3 import VirtualMachineScaleSetExtension
-    from .virtual_machine_scale_set_extension_profile_py3 import VirtualMachineScaleSetExtensionProfile
-    from .virtual_machine_scale_set_vm_profile_py3 import VirtualMachineScaleSetVMProfile
-    from .virtual_machine_scale_set_update_vm_profile_py3 import VirtualMachineScaleSetUpdateVMProfile
-    from .virtual_machine_scale_set_py3 import VirtualMachineScaleSet
-    from .virtual_machine_scale_set_update_py3 import VirtualMachineScaleSetUpdate
-    from .virtual_machine_scale_set_vm_instance_ids_py3 import VirtualMachineScaleSetVMInstanceIDs
-    from .virtual_machine_scale_set_vm_instance_required_ids_py3 import VirtualMachineScaleSetVMInstanceRequiredIDs
-    from .virtual_machine_status_code_count_py3 import VirtualMachineStatusCodeCount
-    from .virtual_machine_scale_set_instance_view_statuses_summary_py3 import VirtualMachineScaleSetInstanceViewStatusesSummary
-    from .virtual_machine_scale_set_vm_extensions_summary_py3 import VirtualMachineScaleSetVMExtensionsSummary
-    from .virtual_machine_scale_set_instance_view_py3 import VirtualMachineScaleSetInstanceView
-    from .virtual_machine_scale_set_sku_capacity_py3 import VirtualMachineScaleSetSkuCapacity
-    from .virtual_machine_scale_set_sku_py3 import VirtualMachineScaleSetSku
-    from .api_error_base_py3 import ApiErrorBase
-    from .inner_error_py3 import InnerError
-    from .api_error_py3 import ApiError
-    from .rollback_status_info_py3 import RollbackStatusInfo
-    from .upgrade_operation_history_status_py3 import UpgradeOperationHistoryStatus
-    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_scale_set_vm_py3 import VirtualMachineScaleSetVM
-    from .virtual_machine_health_status_py3 import VirtualMachineHealthStatus
-    from .virtual_machine_scale_set_vm_instance_view_py3 import VirtualMachineScaleSetVMInstanceView
-    from .rolling_upgrade_running_status_py3 import RollingUpgradeRunningStatus
-    from .rolling_upgrade_status_info_py3 import RollingUpgradeStatusInfo
     from .resource_py3 import Resource
-    from .update_resource_py3 import UpdateResource
-    from .sub_resource_read_only_py3 import SubResourceReadOnly
-    from .recovery_walk_response_py3 import RecoveryWalkResponse
-    from .request_rate_by_interval_input_py3 import RequestRateByIntervalInput
-    from .throttled_requests_input_py3 import ThrottledRequestsInput
-    from .log_analytics_input_base_py3 import LogAnalyticsInputBase
-    from .log_analytics_output_py3 import LogAnalyticsOutput
-    from .log_analytics_operation_result_py3 import LogAnalyticsOperationResult
-    from .run_command_input_parameter_py3 import RunCommandInputParameter
-    from .run_command_input_py3 import RunCommandInput
-    from .run_command_parameter_definition_py3 import RunCommandParameterDefinition
-    from .run_command_document_base_py3 import RunCommandDocumentBase
-    from .run_command_document_py3 import RunCommandDocument
-    from .run_command_result_py3 import RunCommandResult
     from .disk_sku_py3 import DiskSku
+    from .resource_update_py3 import ResourceUpdate
     from .image_disk_reference_py3 import ImageDiskReference
     from .creation_data_py3 import CreationData
     from .source_vault_py3 import SourceVault
@@ -150,132 +27,9 @@
     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
-    from .sub_resource import SubResource
-    from .sku import Sku
-    from .availability_set import AvailabilitySet
-    from .availability_set_update import AvailabilitySetUpdate
-    from .virtual_machine_size import VirtualMachineSize
-    from .virtual_machine_extension_image import VirtualMachineExtensionImage
-    from .virtual_machine_image_resource import VirtualMachineImageResource
-    from .virtual_machine_extension_instance_view import VirtualMachineExtensionInstanceView
-    from .virtual_machine_extension import VirtualMachineExtension
-    from .virtual_machine_extension_update import VirtualMachineExtensionUpdate
-    from .virtual_machine_extensions_list_result import VirtualMachineExtensionsListResult
-    from .purchase_plan import PurchasePlan
-    from .os_disk_image import OSDiskImage
-    from .data_disk_image import DataDiskImage
-    from .virtual_machine_image import VirtualMachineImage
-    from .usage_name import UsageName
-    from .usage import Usage
-    from .virtual_machine_capture_parameters import VirtualMachineCaptureParameters
-    from .virtual_machine_capture_result import VirtualMachineCaptureResult
-    from .plan import Plan
-    from .hardware_profile import HardwareProfile
-    from .image_reference import ImageReference
-    from .key_vault_secret_reference import KeyVaultSecretReference
-    from .key_vault_key_reference import KeyVaultKeyReference
-    from .disk_encryption_settings import DiskEncryptionSettings
-    from .virtual_hard_disk import VirtualHardDisk
-    from .managed_disk_parameters import ManagedDiskParameters
-    from .os_disk import OSDisk
-    from .data_disk import DataDisk
-    from .storage_profile import StorageProfile
-    from .additional_unattend_content import AdditionalUnattendContent
-    from .win_rm_listener import WinRMListener
-    from .win_rm_configuration import WinRMConfiguration
-    from .windows_configuration import WindowsConfiguration
-    from .ssh_public_key import SshPublicKey
-    from .ssh_configuration import SshConfiguration
-    from .linux_configuration import LinuxConfiguration
-    from .vault_certificate import VaultCertificate
-    from .vault_secret_group import VaultSecretGroup
-    from .os_profile import OSProfile
-    from .network_interface_reference import NetworkInterfaceReference
-    from .network_profile import NetworkProfile
-    from .boot_diagnostics import BootDiagnostics
-    from .diagnostics_profile import DiagnosticsProfile
-    from .virtual_machine_extension_handler_instance_view import VirtualMachineExtensionHandlerInstanceView
-    from .virtual_machine_agent_instance_view import VirtualMachineAgentInstanceView
-    from .disk_instance_view import DiskInstanceView
-    from .boot_diagnostics_instance_view import BootDiagnosticsInstanceView
-    from .virtual_machine_identity import VirtualMachineIdentity
-    from .maintenance_redeploy_status import MaintenanceRedeployStatus
-    from .virtual_machine_instance_view import VirtualMachineInstanceView
-    from .virtual_machine import VirtualMachine
-    from .virtual_machine_update import VirtualMachineUpdate
-    from .auto_os_upgrade_policy import AutoOSUpgradePolicy
-    from .rolling_upgrade_policy import RollingUpgradePolicy
-    from .upgrade_policy import UpgradePolicy
-    from .image_os_disk import ImageOSDisk
-    from .image_data_disk import ImageDataDisk
-    from .image_storage_profile import ImageStorageProfile
-    from .image import Image
-    from .image_update import ImageUpdate
-    from .virtual_machine_scale_set_identity import VirtualMachineScaleSetIdentity
-    from .virtual_machine_scale_set_os_profile import VirtualMachineScaleSetOSProfile
-    from .virtual_machine_scale_set_update_os_profile import VirtualMachineScaleSetUpdateOSProfile
-    from .virtual_machine_scale_set_managed_disk_parameters import VirtualMachineScaleSetManagedDiskParameters
-    from .virtual_machine_scale_set_os_disk import VirtualMachineScaleSetOSDisk
-    from .virtual_machine_scale_set_update_os_disk import VirtualMachineScaleSetUpdateOSDisk
-    from .virtual_machine_scale_set_data_disk import VirtualMachineScaleSetDataDisk
-    from .virtual_machine_scale_set_storage_profile import VirtualMachineScaleSetStorageProfile
-    from .virtual_machine_scale_set_update_storage_profile import VirtualMachineScaleSetUpdateStorageProfile
-    from .api_entity_reference import ApiEntityReference
-    from .virtual_machine_scale_set_public_ip_address_configuration_dns_settings import VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings
-    from .virtual_machine_scale_set_public_ip_address_configuration import VirtualMachineScaleSetPublicIPAddressConfiguration
-    from .virtual_machine_scale_set_update_public_ip_address_configuration import VirtualMachineScaleSetUpdatePublicIPAddressConfiguration
-    from .virtual_machine_scale_set_ip_configuration import VirtualMachineScaleSetIPConfiguration
-    from .virtual_machine_scale_set_update_ip_configuration import VirtualMachineScaleSetUpdateIPConfiguration
-    from .virtual_machine_scale_set_network_configuration_dns_settings import VirtualMachineScaleSetNetworkConfigurationDnsSettings
-    from .virtual_machine_scale_set_network_configuration import VirtualMachineScaleSetNetworkConfiguration
-    from .virtual_machine_scale_set_update_network_configuration import VirtualMachineScaleSetUpdateNetworkConfiguration
-    from .virtual_machine_scale_set_network_profile import VirtualMachineScaleSetNetworkProfile
-    from .virtual_machine_scale_set_update_network_profile import VirtualMachineScaleSetUpdateNetworkProfile
-    from .virtual_machine_scale_set_extension import VirtualMachineScaleSetExtension
-    from .virtual_machine_scale_set_extension_profile import VirtualMachineScaleSetExtensionProfile
-    from .virtual_machine_scale_set_vm_profile import VirtualMachineScaleSetVMProfile
-    from .virtual_machine_scale_set_update_vm_profile import VirtualMachineScaleSetUpdateVMProfile
-    from .virtual_machine_scale_set import VirtualMachineScaleSet
-    from .virtual_machine_scale_set_update import VirtualMachineScaleSetUpdate
-    from .virtual_machine_scale_set_vm_instance_ids import VirtualMachineScaleSetVMInstanceIDs
-    from .virtual_machine_scale_set_vm_instance_required_ids import VirtualMachineScaleSetVMInstanceRequiredIDs
-    from .virtual_machine_status_code_count import VirtualMachineStatusCodeCount
-    from .virtual_machine_scale_set_instance_view_statuses_summary import VirtualMachineScaleSetInstanceViewStatusesSummary
-    from .virtual_machine_scale_set_vm_extensions_summary import VirtualMachineScaleSetVMExtensionsSummary
-    from .virtual_machine_scale_set_instance_view import VirtualMachineScaleSetInstanceView
-    from .virtual_machine_scale_set_sku_capacity import VirtualMachineScaleSetSkuCapacity
-    from .virtual_machine_scale_set_sku import VirtualMachineScaleSetSku
-    from .api_error_base import ApiErrorBase
-    from .inner_error import InnerError
-    from .api_error import ApiError
-    from .rollback_status_info import RollbackStatusInfo
-    from .upgrade_operation_history_status import UpgradeOperationHistoryStatus
-    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_scale_set_vm import VirtualMachineScaleSetVM
-    from .virtual_machine_health_status import VirtualMachineHealthStatus
-    from .virtual_machine_scale_set_vm_instance_view import VirtualMachineScaleSetVMInstanceView
-    from .rolling_upgrade_running_status import RollingUpgradeRunningStatus
-    from .rolling_upgrade_status_info import RollingUpgradeStatusInfo
     from .resource import Resource
-    from .update_resource import UpdateResource
-    from .sub_resource_read_only import SubResourceReadOnly
-    from .recovery_walk_response import RecoveryWalkResponse
-    from .request_rate_by_interval_input import RequestRateByIntervalInput
-    from .throttled_requests_input import ThrottledRequestsInput
-    from .log_analytics_input_base import LogAnalyticsInputBase
-    from .log_analytics_output import LogAnalyticsOutput
-    from .log_analytics_operation_result import LogAnalyticsOperationResult
-    from .run_command_input_parameter import RunCommandInputParameter
-    from .run_command_input import RunCommandInput
-    from .run_command_parameter_definition import RunCommandParameterDefinition
-    from .run_command_document_base import RunCommandDocumentBase
-    from .run_command_document import RunCommandDocument
-    from .run_command_result import RunCommandResult
     from .disk_sku import DiskSku
+    from .resource_update import ResourceUpdate
     from .image_disk_reference import ImageDiskReference
     from .creation_data import CreationData
     from .source_vault import SourceVault
@@ -289,177 +43,20 @@
     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
-from .virtual_machine_paged import VirtualMachinePaged
-from .usage_paged import UsagePaged
-from .image_paged import ImagePaged
-from .virtual_machine_scale_set_paged import VirtualMachineScaleSetPaged
-from .virtual_machine_scale_set_sku_paged import VirtualMachineScaleSetSkuPaged
-from .upgrade_operation_historical_status_info_paged import UpgradeOperationHistoricalStatusInfoPaged
-from .virtual_machine_scale_set_extension_paged import VirtualMachineScaleSetExtensionPaged
-from .virtual_machine_scale_set_vm_paged import VirtualMachineScaleSetVMPaged
-from .run_command_document_base_paged import RunCommandDocumentBasePaged
 from .disk_paged import DiskPaged
 from .snapshot_paged import SnapshotPaged
 from .compute_management_client_enums import (
-    StatusLevelTypes,
-    OperatingSystemTypes,
-    VirtualMachineSizeTypes,
-    CachingTypes,
-    DiskCreateOptionTypes,
     StorageAccountTypes,
-    PassNames,
-    ComponentNames,
-    SettingNames,
-    ProtocolTypes,
-    ResourceIdentityType,
-    MaintenanceOperationResultCodeTypes,
-    UpgradeMode,
-    OperatingSystemStateTypes,
-    IPVersion,
-    VirtualMachinePriorityTypes,
-    VirtualMachineEvictionPolicyTypes,
-    VirtualMachineScaleSetSkuScaleType,
-    UpgradeState,
-    UpgradeOperationInvoker,
-    RollingUpgradeStatusCode,
-    RollingUpgradeActionType,
-    IntervalInMins,
+    OperatingSystemTypes,
     DiskCreateOption,
     SnapshotStorageAccountTypes,
     AccessLevel,
-    InstanceViewTypes,
 )
 
 __all__ = [
-    'ComputeOperationValue',
-    'InstanceViewStatus',
-    'SubResource',
-    'Sku',
-    'AvailabilitySet',
-    'AvailabilitySetUpdate',
-    'VirtualMachineSize',
-    'VirtualMachineExtensionImage',
-    'VirtualMachineImageResource',
-    'VirtualMachineExtensionInstanceView',
-    'VirtualMachineExtension',
-    'VirtualMachineExtensionUpdate',
-    'VirtualMachineExtensionsListResult',
-    'PurchasePlan',
-    'OSDiskImage',
-    'DataDiskImage',
-    'VirtualMachineImage',
-    'UsageName',
-    'Usage',
-    'VirtualMachineCaptureParameters',
-    'VirtualMachineCaptureResult',
-    'Plan',
-    'HardwareProfile',
-    'ImageReference',
-    'KeyVaultSecretReference',
-    'KeyVaultKeyReference',
-    'DiskEncryptionSettings',
-    'VirtualHardDisk',
-    'ManagedDiskParameters',
-    'OSDisk',
-    'DataDisk',
-    'StorageProfile',
-    'AdditionalUnattendContent',
-    'WinRMListener',
-    'WinRMConfiguration',
-    'WindowsConfiguration',
-    'SshPublicKey',
-    'SshConfiguration',
-    'LinuxConfiguration',
-    'VaultCertificate',
-    'VaultSecretGroup',
-    'OSProfile',
-    'NetworkInterfaceReference',
-    'NetworkProfile',
-    'BootDiagnostics',
-    'DiagnosticsProfile',
-    'VirtualMachineExtensionHandlerInstanceView',
-    'VirtualMachineAgentInstanceView',
-    'DiskInstanceView',
-    'BootDiagnosticsInstanceView',
-    'VirtualMachineIdentity',
-    'MaintenanceRedeployStatus',
-    'VirtualMachineInstanceView',
-    'VirtualMachine',
-    'VirtualMachineUpdate',
-    'AutoOSUpgradePolicy',
-    'RollingUpgradePolicy',
-    'UpgradePolicy',
-    'ImageOSDisk',
-    'ImageDataDisk',
-    'ImageStorageProfile',
-    'Image',
-    'ImageUpdate',
-    'VirtualMachineScaleSetIdentity',
-    'VirtualMachineScaleSetOSProfile',
-    'VirtualMachineScaleSetUpdateOSProfile',
-    'VirtualMachineScaleSetManagedDiskParameters',
-    'VirtualMachineScaleSetOSDisk',
-    'VirtualMachineScaleSetUpdateOSDisk',
-    'VirtualMachineScaleSetDataDisk',
-    'VirtualMachineScaleSetStorageProfile',
-    'VirtualMachineScaleSetUpdateStorageProfile',
-    'ApiEntityReference',
-    'VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings',
-    'VirtualMachineScaleSetPublicIPAddressConfiguration',
-    'VirtualMachineScaleSetUpdatePublicIPAddressConfiguration',
-    'VirtualMachineScaleSetIPConfiguration',
-    'VirtualMachineScaleSetUpdateIPConfiguration',
-    'VirtualMachineScaleSetNetworkConfigurationDnsSettings',
-    'VirtualMachineScaleSetNetworkConfiguration',
-    'VirtualMachineScaleSetUpdateNetworkConfiguration',
-    'VirtualMachineScaleSetNetworkProfile',
-    'VirtualMachineScaleSetUpdateNetworkProfile',
-    'VirtualMachineScaleSetExtension',
-    'VirtualMachineScaleSetExtensionProfile',
-    'VirtualMachineScaleSetVMProfile',
-    'VirtualMachineScaleSetUpdateVMProfile',
-    'VirtualMachineScaleSet',
-    'VirtualMachineScaleSetUpdate',
-    'VirtualMachineScaleSetVMInstanceIDs',
-    'VirtualMachineScaleSetVMInstanceRequiredIDs',
-    'VirtualMachineStatusCodeCount',
-    'VirtualMachineScaleSetInstanceViewStatusesSummary',
-    'VirtualMachineScaleSetVMExtensionsSummary',
-    'VirtualMachineScaleSetInstanceView',
-    'VirtualMachineScaleSetSkuCapacity',
-    'VirtualMachineScaleSetSku',
-    'ApiErrorBase',
-    'InnerError',
-    'ApiError',
-    'RollbackStatusInfo',
-    'UpgradeOperationHistoryStatus',
-    'RollingUpgradeProgressInfo',
-    'UpgradeOperationHistoricalStatusInfoProperties',
-    'UpgradeOperationHistoricalStatusInfo',
-    'VirtualMachineScaleSetVM',
-    'VirtualMachineHealthStatus',
-    'VirtualMachineScaleSetVMInstanceView',
-    'RollingUpgradeRunningStatus',
-    'RollingUpgradeStatusInfo',
     'Resource',
-    'UpdateResource',
-    'SubResourceReadOnly',
-    'RecoveryWalkResponse',
-    'RequestRateByIntervalInput',
-    'ThrottledRequestsInput',
-    'LogAnalyticsInputBase',
-    'LogAnalyticsOutput',
-    'LogAnalyticsOperationResult',
-    'RunCommandInputParameter',
-    'RunCommandInput',
-    'RunCommandParameterDefinition',
-    'RunCommandDocumentBase',
-    'RunCommandDocument',
-    'RunCommandResult',
     'DiskSku',
+    'ResourceUpdate',
     'ImageDiskReference',
     'CreationData',
     'SourceVault',
@@ -473,45 +70,11 @@
     'AccessUri',
     'Snapshot',
     'SnapshotUpdate',
-    'ComputeOperationValuePaged',
-    'AvailabilitySetPaged',
-    'VirtualMachineSizePaged',
-    'VirtualMachinePaged',
-    'UsagePaged',
-    'ImagePaged',
-    'VirtualMachineScaleSetPaged',
-    'VirtualMachineScaleSetSkuPaged',
-    'UpgradeOperationHistoricalStatusInfoPaged',
-    'VirtualMachineScaleSetExtensionPaged',
-    'VirtualMachineScaleSetVMPaged',
-    'RunCommandDocumentBasePaged',
     'DiskPaged',
     'SnapshotPaged',
-    'StatusLevelTypes',
-    'OperatingSystemTypes',
-    'VirtualMachineSizeTypes',
-    'CachingTypes',
-    'DiskCreateOptionTypes',
     'StorageAccountTypes',
-    'PassNames',
-    'ComponentNames',
-    'SettingNames',
-    'ProtocolTypes',
-    'ResourceIdentityType',
-    'MaintenanceOperationResultCodeTypes',
-    'UpgradeMode',
-    'OperatingSystemStateTypes',
-    'IPVersion',
-    'VirtualMachinePriorityTypes',
-    'VirtualMachineEvictionPolicyTypes',
-    'VirtualMachineScaleSetSkuScaleType',
-    'UpgradeState',
-    'UpgradeOperationInvoker',
-    'RollingUpgradeStatusCode',
-    'RollingUpgradeActionType',
-    'IntervalInMins',
+    'OperatingSystemTypes',
     'DiskCreateOption',
     'SnapshotStorageAccountTypes',
     'AccessLevel',
-    'InstanceViewTypes',
 ]
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/additional_unattend_content.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/additional_unattend_content.py
deleted file mode 100644
index c8262b8dc95f..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/additional_unattend_content.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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 AdditionalUnattendContent(Model):
-    """Specifies additional XML formatted information that can be included in the
-    Unattend.xml file, which is used by Windows Setup. Contents are defined by
-    setting name, component name, and the pass in which the content is applied.
-
-    :param pass_name: The pass name. Currently, the only allowable value is
-     OobeSystem. Possible values include: 'OobeSystem'
-    :type pass_name: str or ~azure.mgmt.compute.v2018_04_01.models.PassNames
-    :param component_name: The component name. Currently, the only allowable
-     value is Microsoft-Windows-Shell-Setup. Possible values include:
-     'Microsoft-Windows-Shell-Setup'
-    :type component_name: str or
-     ~azure.mgmt.compute.v2018_04_01.models.ComponentNames
-    :param setting_name: Specifies the name of the setting to which the
-     content applies. Possible values are: FirstLogonCommands and AutoLogon.
-     Possible values include: 'AutoLogon', 'FirstLogonCommands'
-    :type setting_name: str or
-     ~azure.mgmt.compute.v2018_04_01.models.SettingNames
-    :param content: Specifies the XML formatted content that is added to the
-     unattend.xml file for the specified path and component. The XML must be
-     less than 4KB and must include the root element for the setting or feature
-     that is being inserted.
-    :type content: str
-    """
-
-    _attribute_map = {
-        'pass_name': {'key': 'passName', 'type': 'PassNames'},
-        'component_name': {'key': 'componentName', 'type': 'ComponentNames'},
-        'setting_name': {'key': 'settingName', 'type': 'SettingNames'},
-        'content': {'key': 'content', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(AdditionalUnattendContent, self).__init__(**kwargs)
-        self.pass_name = kwargs.get('pass_name', None)
-        self.component_name = kwargs.get('component_name', None)
-        self.setting_name = kwargs.get('setting_name', None)
-        self.content = kwargs.get('content', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/additional_unattend_content_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/additional_unattend_content_py3.py
deleted file mode 100644
index 17c0266fe4b0..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/additional_unattend_content_py3.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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 AdditionalUnattendContent(Model):
-    """Specifies additional XML formatted information that can be included in the
-    Unattend.xml file, which is used by Windows Setup. Contents are defined by
-    setting name, component name, and the pass in which the content is applied.
-
-    :param pass_name: The pass name. Currently, the only allowable value is
-     OobeSystem. Possible values include: 'OobeSystem'
-    :type pass_name: str or ~azure.mgmt.compute.v2018_04_01.models.PassNames
-    :param component_name: The component name. Currently, the only allowable
-     value is Microsoft-Windows-Shell-Setup. Possible values include:
-     'Microsoft-Windows-Shell-Setup'
-    :type component_name: str or
-     ~azure.mgmt.compute.v2018_04_01.models.ComponentNames
-    :param setting_name: Specifies the name of the setting to which the
-     content applies. Possible values are: FirstLogonCommands and AutoLogon.
-     Possible values include: 'AutoLogon', 'FirstLogonCommands'
-    :type setting_name: str or
-     ~azure.mgmt.compute.v2018_04_01.models.SettingNames
-    :param content: Specifies the XML formatted content that is added to the
-     unattend.xml file for the specified path and component. The XML must be
-     less than 4KB and must include the root element for the setting or feature
-     that is being inserted.
-    :type content: str
-    """
-
-    _attribute_map = {
-        'pass_name': {'key': 'passName', 'type': 'PassNames'},
-        'component_name': {'key': 'componentName', 'type': 'ComponentNames'},
-        'setting_name': {'key': 'settingName', 'type': 'SettingNames'},
-        'content': {'key': 'content', 'type': 'str'},
-    }
-
-    def __init__(self, *, pass_name=None, component_name=None, setting_name=None, content: str=None, **kwargs) -> None:
-        super(AdditionalUnattendContent, self).__init__(**kwargs)
-        self.pass_name = pass_name
-        self.component_name = component_name
-        self.setting_name = setting_name
-        self.content = content
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_entity_reference.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_entity_reference.py
deleted file mode 100644
index d1bf572e916d..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_entity_reference.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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 ApiEntityReference(Model):
-    """The API entity reference.
-
-    :param id: The ARM resource id in the form of
-     /subscriptions/{SubcriptionId}/resourceGroups/{ResourceGroupName}/...
-    :type id: str
-    """
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(ApiEntityReference, self).__init__(**kwargs)
-        self.id = kwargs.get('id', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_entity_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_entity_reference_py3.py
deleted file mode 100644
index da3e07082381..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_entity_reference_py3.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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 ApiEntityReference(Model):
-    """The API entity reference.
-
-    :param id: The ARM resource id in the form of
-     /subscriptions/{SubcriptionId}/resourceGroups/{ResourceGroupName}/...
-    :type id: str
-    """
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-    }
-
-    def __init__(self, *, id: str=None, **kwargs) -> None:
-        super(ApiEntityReference, self).__init__(**kwargs)
-        self.id = id
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error.py
deleted file mode 100644
index 6c3ce23571f7..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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 ApiError(Model):
-    """Api error.
-
-    :param details: The Api error details
-    :type details: list[~azure.mgmt.compute.v2018_04_01.models.ApiErrorBase]
-    :param innererror: The Api inner error
-    :type innererror: ~azure.mgmt.compute.v2018_04_01.models.InnerError
-    :param code: The error code.
-    :type code: str
-    :param target: The target of the particular error.
-    :type target: str
-    :param message: The error message.
-    :type message: str
-    """
-
-    _attribute_map = {
-        'details': {'key': 'details', 'type': '[ApiErrorBase]'},
-        'innererror': {'key': 'innererror', 'type': 'InnerError'},
-        'code': {'key': 'code', 'type': 'str'},
-        'target': {'key': 'target', 'type': 'str'},
-        'message': {'key': 'message', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(ApiError, self).__init__(**kwargs)
-        self.details = kwargs.get('details', None)
-        self.innererror = kwargs.get('innererror', None)
-        self.code = kwargs.get('code', None)
-        self.target = kwargs.get('target', None)
-        self.message = kwargs.get('message', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base.py
deleted file mode 100644
index 655c08638905..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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 ApiErrorBase(Model):
-    """Api error base.
-
-    :param code: The error code.
-    :type code: str
-    :param target: The target of the particular error.
-    :type target: str
-    :param message: The error message.
-    :type message: str
-    """
-
-    _attribute_map = {
-        'code': {'key': 'code', 'type': 'str'},
-        'target': {'key': 'target', 'type': 'str'},
-        'message': {'key': 'message', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(ApiErrorBase, self).__init__(**kwargs)
-        self.code = kwargs.get('code', None)
-        self.target = kwargs.get('target', None)
-        self.message = kwargs.get('message', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base_py3.py
deleted file mode 100644
index 5ba95aa0283e..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base_py3.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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 ApiErrorBase(Model):
-    """Api error base.
-
-    :param code: The error code.
-    :type code: str
-    :param target: The target of the particular error.
-    :type target: str
-    :param message: The error message.
-    :type message: str
-    """
-
-    _attribute_map = {
-        'code': {'key': 'code', 'type': 'str'},
-        'target': {'key': 'target', 'type': 'str'},
-        'message': {'key': 'message', 'type': 'str'},
-    }
-
-    def __init__(self, *, code: str=None, target: str=None, message: str=None, **kwargs) -> None:
-        super(ApiErrorBase, self).__init__(**kwargs)
-        self.code = code
-        self.target = target
-        self.message = message
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_py3.py
deleted file mode 100644
index ad665ba38599..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_py3.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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 ApiError(Model):
-    """Api error.
-
-    :param details: The Api error details
-    :type details: list[~azure.mgmt.compute.v2018_04_01.models.ApiErrorBase]
-    :param innererror: The Api inner error
-    :type innererror: ~azure.mgmt.compute.v2018_04_01.models.InnerError
-    :param code: The error code.
-    :type code: str
-    :param target: The target of the particular error.
-    :type target: str
-    :param message: The error message.
-    :type message: str
-    """
-
-    _attribute_map = {
-        'details': {'key': 'details', 'type': '[ApiErrorBase]'},
-        'innererror': {'key': 'innererror', 'type': 'InnerError'},
-        'code': {'key': 'code', 'type': 'str'},
-        'target': {'key': 'target', 'type': 'str'},
-        'message': {'key': 'message', 'type': 'str'},
-    }
-
-    def __init__(self, *, details=None, innererror=None, code: str=None, target: str=None, message: str=None, **kwargs) -> None:
-        super(ApiError, self).__init__(**kwargs)
-        self.details = details
-        self.innererror = innererror
-        self.code = code
-        self.target = target
-        self.message = message
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/auto_os_upgrade_policy.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/auto_os_upgrade_policy.py
deleted file mode 100644
index 2c74af408892..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/auto_os_upgrade_policy.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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 AutoOSUpgradePolicy(Model):
-    """The configuration parameters used for performing automatic OS upgrade.
-
-    :param disable_auto_rollback: Whether OS image rollback feature should be
-     disabled. Default value is false.
-    :type disable_auto_rollback: bool
-    """
-
-    _attribute_map = {
-        'disable_auto_rollback': {'key': 'disableAutoRollback', 'type': 'bool'},
-    }
-
-    def __init__(self, **kwargs):
-        super(AutoOSUpgradePolicy, self).__init__(**kwargs)
-        self.disable_auto_rollback = kwargs.get('disable_auto_rollback', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/auto_os_upgrade_policy_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/auto_os_upgrade_policy_py3.py
deleted file mode 100644
index 3e3e751838a8..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/auto_os_upgrade_policy_py3.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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 AutoOSUpgradePolicy(Model):
-    """The configuration parameters used for performing automatic OS upgrade.
-
-    :param disable_auto_rollback: Whether OS image rollback feature should be
-     disabled. Default value is false.
-    :type disable_auto_rollback: bool
-    """
-
-    _attribute_map = {
-        'disable_auto_rollback': {'key': 'disableAutoRollback', 'type': 'bool'},
-    }
-
-    def __init__(self, *, disable_auto_rollback: bool=None, **kwargs) -> None:
-        super(AutoOSUpgradePolicy, self).__init__(**kwargs)
-        self.disable_auto_rollback = disable_auto_rollback
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set.py
deleted file mode 100644
index 9221a6ce1278..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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 AvailabilitySet(Resource):
-    """Specifies information about the availability set that the virtual machine
-    should be assigned to. Virtual machines specified in the same availability
-    set are allocated to different nodes to maximize availability. For more
-    information about availability sets, see [Manage the availability of
-    virtual
-    machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
-    <br><br> For more information on Azure planned maintainance, see [Planned
-    maintenance for virtual machines in
-    Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
-    <br><br> Currently, a VM can only be added to availability set at creation
-    time. An existing VM cannot be added to an availability set.
-
-    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]
-    :param platform_update_domain_count: Update Domain count.
-    :type platform_update_domain_count: int
-    :param platform_fault_domain_count: Fault Domain count.
-    :type platform_fault_domain_count: int
-    :param virtual_machines: A list of references to all virtual machines in
-     the availability set.
-    :type virtual_machines:
-     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
-    :ivar statuses: The resource status information.
-    :vartype statuses:
-     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
-    :param sku: Sku of the availability set
-    :type sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
-    """
-
-    _validation = {
-        'id': {'readonly': True},
-        'name': {'readonly': True},
-        'type': {'readonly': True},
-        'location': {'required': True},
-        'statuses': {'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}'},
-        'platform_update_domain_count': {'key': 'properties.platformUpdateDomainCount', 'type': 'int'},
-        'platform_fault_domain_count': {'key': 'properties.platformFaultDomainCount', 'type': 'int'},
-        'virtual_machines': {'key': 'properties.virtualMachines', 'type': '[SubResource]'},
-        'statuses': {'key': 'properties.statuses', 'type': '[InstanceViewStatus]'},
-        'sku': {'key': 'sku', 'type': 'Sku'},
-    }
-
-    def __init__(self, **kwargs):
-        super(AvailabilitySet, self).__init__(**kwargs)
-        self.platform_update_domain_count = kwargs.get('platform_update_domain_count', None)
-        self.platform_fault_domain_count = kwargs.get('platform_fault_domain_count', None)
-        self.virtual_machines = kwargs.get('virtual_machines', None)
-        self.statuses = None
-        self.sku = kwargs.get('sku', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_paged.py
deleted file mode 100644
index d3f242bb4d7d..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_paged.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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 AvailabilitySetPaged(Paged):
-    """
-    A paging container for iterating over a list of :class:`AvailabilitySet <azure.mgmt.compute.v2018_04_01.models.AvailabilitySet>` object
-    """
-
-    _attribute_map = {
-        'next_link': {'key': 'nextLink', 'type': 'str'},
-        'current_page': {'key': 'value', 'type': '[AvailabilitySet]'}
-    }
-
-    def __init__(self, *args, **kwargs):
-
-        super(AvailabilitySetPaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_py3.py
deleted file mode 100644
index 65c743257697..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_py3.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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 AvailabilitySet(Resource):
-    """Specifies information about the availability set that the virtual machine
-    should be assigned to. Virtual machines specified in the same availability
-    set are allocated to different nodes to maximize availability. For more
-    information about availability sets, see [Manage the availability of
-    virtual
-    machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
-    <br><br> For more information on Azure planned maintainance, see [Planned
-    maintenance for virtual machines in
-    Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
-    <br><br> Currently, a VM can only be added to availability set at creation
-    time. An existing VM cannot be added to an availability set.
-
-    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]
-    :param platform_update_domain_count: Update Domain count.
-    :type platform_update_domain_count: int
-    :param platform_fault_domain_count: Fault Domain count.
-    :type platform_fault_domain_count: int
-    :param virtual_machines: A list of references to all virtual machines in
-     the availability set.
-    :type virtual_machines:
-     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
-    :ivar statuses: The resource status information.
-    :vartype statuses:
-     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
-    :param sku: Sku of the availability set
-    :type sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
-    """
-
-    _validation = {
-        'id': {'readonly': True},
-        'name': {'readonly': True},
-        'type': {'readonly': True},
-        'location': {'required': True},
-        'statuses': {'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}'},
-        'platform_update_domain_count': {'key': 'properties.platformUpdateDomainCount', 'type': 'int'},
-        'platform_fault_domain_count': {'key': 'properties.platformFaultDomainCount', 'type': 'int'},
-        'virtual_machines': {'key': 'properties.virtualMachines', 'type': '[SubResource]'},
-        'statuses': {'key': 'properties.statuses', 'type': '[InstanceViewStatus]'},
-        'sku': {'key': 'sku', 'type': 'Sku'},
-    }
-
-    def __init__(self, *, location: str, tags=None, platform_update_domain_count: int=None, platform_fault_domain_count: int=None, virtual_machines=None, sku=None, **kwargs) -> None:
-        super(AvailabilitySet, self).__init__(location=location, tags=tags, **kwargs)
-        self.platform_update_domain_count = platform_update_domain_count
-        self.platform_fault_domain_count = platform_fault_domain_count
-        self.virtual_machines = virtual_machines
-        self.statuses = None
-        self.sku = sku
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_update.py
deleted file mode 100644
index 749c2d03a3e1..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_update.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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 .update_resource import UpdateResource
-
-
-class AvailabilitySetUpdate(UpdateResource):
-    """Specifies information about the availability set that the virtual machine
-    should be assigned to. Only tags may be updated.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :param tags: Resource tags
-    :type tags: dict[str, str]
-    :param platform_update_domain_count: Update Domain count.
-    :type platform_update_domain_count: int
-    :param platform_fault_domain_count: Fault Domain count.
-    :type platform_fault_domain_count: int
-    :param virtual_machines: A list of references to all virtual machines in
-     the availability set.
-    :type virtual_machines:
-     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
-    :ivar statuses: The resource status information.
-    :vartype statuses:
-     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
-    :param sku: Sku of the availability set
-    :type sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
-    """
-
-    _validation = {
-        'statuses': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'tags': {'key': 'tags', 'type': '{str}'},
-        'platform_update_domain_count': {'key': 'properties.platformUpdateDomainCount', 'type': 'int'},
-        'platform_fault_domain_count': {'key': 'properties.platformFaultDomainCount', 'type': 'int'},
-        'virtual_machines': {'key': 'properties.virtualMachines', 'type': '[SubResource]'},
-        'statuses': {'key': 'properties.statuses', 'type': '[InstanceViewStatus]'},
-        'sku': {'key': 'sku', 'type': 'Sku'},
-    }
-
-    def __init__(self, **kwargs):
-        super(AvailabilitySetUpdate, self).__init__(**kwargs)
-        self.platform_update_domain_count = kwargs.get('platform_update_domain_count', None)
-        self.platform_fault_domain_count = kwargs.get('platform_fault_domain_count', None)
-        self.virtual_machines = kwargs.get('virtual_machines', None)
-        self.statuses = None
-        self.sku = kwargs.get('sku', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_update_py3.py
deleted file mode 100644
index 099479e29c04..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_update_py3.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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 .update_resource_py3 import UpdateResource
-
-
-class AvailabilitySetUpdate(UpdateResource):
-    """Specifies information about the availability set that the virtual machine
-    should be assigned to. Only tags may be updated.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :param tags: Resource tags
-    :type tags: dict[str, str]
-    :param platform_update_domain_count: Update Domain count.
-    :type platform_update_domain_count: int
-    :param platform_fault_domain_count: Fault Domain count.
-    :type platform_fault_domain_count: int
-    :param virtual_machines: A list of references to all virtual machines in
-     the availability set.
-    :type virtual_machines:
-     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
-    :ivar statuses: The resource status information.
-    :vartype statuses:
-     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
-    :param sku: Sku of the availability set
-    :type sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
-    """
-
-    _validation = {
-        'statuses': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'tags': {'key': 'tags', 'type': '{str}'},
-        'platform_update_domain_count': {'key': 'properties.platformUpdateDomainCount', 'type': 'int'},
-        'platform_fault_domain_count': {'key': 'properties.platformFaultDomainCount', 'type': 'int'},
-        'virtual_machines': {'key': 'properties.virtualMachines', 'type': '[SubResource]'},
-        'statuses': {'key': 'properties.statuses', 'type': '[InstanceViewStatus]'},
-        'sku': {'key': 'sku', 'type': 'Sku'},
-    }
-
-    def __init__(self, *, tags=None, platform_update_domain_count: int=None, platform_fault_domain_count: int=None, virtual_machines=None, sku=None, **kwargs) -> None:
-        super(AvailabilitySetUpdate, self).__init__(tags=tags, **kwargs)
-        self.platform_update_domain_count = platform_update_domain_count
-        self.platform_fault_domain_count = platform_fault_domain_count
-        self.virtual_machines = virtual_machines
-        self.statuses = None
-        self.sku = sku
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics.py
deleted file mode 100644
index ca3dbdd4f23c..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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 BootDiagnostics(Model):
-    """Boot Diagnostics is a debugging feature which allows you to view Console
-    Output and Screenshot to diagnose VM status. <br><br> For Linux Virtual
-    Machines, you can easily view the output of your console log. <br><br> For
-    both Windows and Linux virtual machines, Azure also enables you to see a
-    screenshot of the VM from the hypervisor.
-
-    :param enabled: Whether boot diagnostics should be enabled on the Virtual
-     Machine.
-    :type enabled: bool
-    :param storage_uri: Uri of the storage account to use for placing the
-     console output and screenshot.
-    :type storage_uri: str
-    """
-
-    _attribute_map = {
-        'enabled': {'key': 'enabled', 'type': 'bool'},
-        'storage_uri': {'key': 'storageUri', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(BootDiagnostics, self).__init__(**kwargs)
-        self.enabled = kwargs.get('enabled', None)
-        self.storage_uri = kwargs.get('storage_uri', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_instance_view.py
deleted file mode 100644
index 6fe1f84a3910..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_instance_view.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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 BootDiagnosticsInstanceView(Model):
-    """The instance view of a virtual machine boot diagnostics.
-
-    :param console_screenshot_blob_uri: The console screenshot blob URI.
-    :type console_screenshot_blob_uri: str
-    :param serial_console_log_blob_uri: The Linux serial console log blob Uri.
-    :type serial_console_log_blob_uri: str
-    """
-
-    _attribute_map = {
-        'console_screenshot_blob_uri': {'key': 'consoleScreenshotBlobUri', 'type': 'str'},
-        'serial_console_log_blob_uri': {'key': 'serialConsoleLogBlobUri', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(BootDiagnosticsInstanceView, self).__init__(**kwargs)
-        self.console_screenshot_blob_uri = kwargs.get('console_screenshot_blob_uri', None)
-        self.serial_console_log_blob_uri = kwargs.get('serial_console_log_blob_uri', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_instance_view_py3.py
deleted file mode 100644
index d85b51981ab9..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_instance_view_py3.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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 BootDiagnosticsInstanceView(Model):
-    """The instance view of a virtual machine boot diagnostics.
-
-    :param console_screenshot_blob_uri: The console screenshot blob URI.
-    :type console_screenshot_blob_uri: str
-    :param serial_console_log_blob_uri: The Linux serial console log blob Uri.
-    :type serial_console_log_blob_uri: str
-    """
-
-    _attribute_map = {
-        'console_screenshot_blob_uri': {'key': 'consoleScreenshotBlobUri', 'type': 'str'},
-        'serial_console_log_blob_uri': {'key': 'serialConsoleLogBlobUri', 'type': 'str'},
-    }
-
-    def __init__(self, *, console_screenshot_blob_uri: str=None, serial_console_log_blob_uri: str=None, **kwargs) -> None:
-        super(BootDiagnosticsInstanceView, self).__init__(**kwargs)
-        self.console_screenshot_blob_uri = console_screenshot_blob_uri
-        self.serial_console_log_blob_uri = serial_console_log_blob_uri
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_py3.py
deleted file mode 100644
index b0a756ea4fa0..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_py3.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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 BootDiagnostics(Model):
-    """Boot Diagnostics is a debugging feature which allows you to view Console
-    Output and Screenshot to diagnose VM status. <br><br> For Linux Virtual
-    Machines, you can easily view the output of your console log. <br><br> For
-    both Windows and Linux virtual machines, Azure also enables you to see a
-    screenshot of the VM from the hypervisor.
-
-    :param enabled: Whether boot diagnostics should be enabled on the Virtual
-     Machine.
-    :type enabled: bool
-    :param storage_uri: Uri of the storage account to use for placing the
-     console output and screenshot.
-    :type storage_uri: str
-    """
-
-    _attribute_map = {
-        'enabled': {'key': 'enabled', 'type': 'bool'},
-        'storage_uri': {'key': 'storageUri', 'type': 'str'},
-    }
-
-    def __init__(self, *, enabled: bool=None, storage_uri: str=None, **kwargs) -> None:
-        super(BootDiagnostics, self).__init__(**kwargs)
-        self.enabled = enabled
-        self.storage_uri = storage_uri
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py
index b66be29c4cf4..94796a92c793 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py
@@ -12,319 +12,16 @@
 from enum import Enum
 
 
-class StatusLevelTypes(str, Enum):
-
-    info = "Info"
-    warning = "Warning"
-    error = "Error"
-
-
-class OperatingSystemTypes(str, Enum):
-
-    windows = "Windows"
-    linux = "Linux"
-
-
-class VirtualMachineSizeTypes(str, Enum):
-
-    basic_a0 = "Basic_A0"
-    basic_a1 = "Basic_A1"
-    basic_a2 = "Basic_A2"
-    basic_a3 = "Basic_A3"
-    basic_a4 = "Basic_A4"
-    standard_a0 = "Standard_A0"
-    standard_a1 = "Standard_A1"
-    standard_a2 = "Standard_A2"
-    standard_a3 = "Standard_A3"
-    standard_a4 = "Standard_A4"
-    standard_a5 = "Standard_A5"
-    standard_a6 = "Standard_A6"
-    standard_a7 = "Standard_A7"
-    standard_a8 = "Standard_A8"
-    standard_a9 = "Standard_A9"
-    standard_a10 = "Standard_A10"
-    standard_a11 = "Standard_A11"
-    standard_a1_v2 = "Standard_A1_v2"
-    standard_a2_v2 = "Standard_A2_v2"
-    standard_a4_v2 = "Standard_A4_v2"
-    standard_a8_v2 = "Standard_A8_v2"
-    standard_a2m_v2 = "Standard_A2m_v2"
-    standard_a4m_v2 = "Standard_A4m_v2"
-    standard_a8m_v2 = "Standard_A8m_v2"
-    standard_b1s = "Standard_B1s"
-    standard_b1ms = "Standard_B1ms"
-    standard_b2s = "Standard_B2s"
-    standard_b2ms = "Standard_B2ms"
-    standard_b4ms = "Standard_B4ms"
-    standard_b8ms = "Standard_B8ms"
-    standard_d1 = "Standard_D1"
-    standard_d2 = "Standard_D2"
-    standard_d3 = "Standard_D3"
-    standard_d4 = "Standard_D4"
-    standard_d11 = "Standard_D11"
-    standard_d12 = "Standard_D12"
-    standard_d13 = "Standard_D13"
-    standard_d14 = "Standard_D14"
-    standard_d1_v2 = "Standard_D1_v2"
-    standard_d2_v2 = "Standard_D2_v2"
-    standard_d3_v2 = "Standard_D3_v2"
-    standard_d4_v2 = "Standard_D4_v2"
-    standard_d5_v2 = "Standard_D5_v2"
-    standard_d2_v3 = "Standard_D2_v3"
-    standard_d4_v3 = "Standard_D4_v3"
-    standard_d8_v3 = "Standard_D8_v3"
-    standard_d16_v3 = "Standard_D16_v3"
-    standard_d32_v3 = "Standard_D32_v3"
-    standard_d64_v3 = "Standard_D64_v3"
-    standard_d2s_v3 = "Standard_D2s_v3"
-    standard_d4s_v3 = "Standard_D4s_v3"
-    standard_d8s_v3 = "Standard_D8s_v3"
-    standard_d16s_v3 = "Standard_D16s_v3"
-    standard_d32s_v3 = "Standard_D32s_v3"
-    standard_d64s_v3 = "Standard_D64s_v3"
-    standard_d11_v2 = "Standard_D11_v2"
-    standard_d12_v2 = "Standard_D12_v2"
-    standard_d13_v2 = "Standard_D13_v2"
-    standard_d14_v2 = "Standard_D14_v2"
-    standard_d15_v2 = "Standard_D15_v2"
-    standard_ds1 = "Standard_DS1"
-    standard_ds2 = "Standard_DS2"
-    standard_ds3 = "Standard_DS3"
-    standard_ds4 = "Standard_DS4"
-    standard_ds11 = "Standard_DS11"
-    standard_ds12 = "Standard_DS12"
-    standard_ds13 = "Standard_DS13"
-    standard_ds14 = "Standard_DS14"
-    standard_ds1_v2 = "Standard_DS1_v2"
-    standard_ds2_v2 = "Standard_DS2_v2"
-    standard_ds3_v2 = "Standard_DS3_v2"
-    standard_ds4_v2 = "Standard_DS4_v2"
-    standard_ds5_v2 = "Standard_DS5_v2"
-    standard_ds11_v2 = "Standard_DS11_v2"
-    standard_ds12_v2 = "Standard_DS12_v2"
-    standard_ds13_v2 = "Standard_DS13_v2"
-    standard_ds14_v2 = "Standard_DS14_v2"
-    standard_ds15_v2 = "Standard_DS15_v2"
-    standard_ds13_4_v2 = "Standard_DS13-4_v2"
-    standard_ds13_2_v2 = "Standard_DS13-2_v2"
-    standard_ds14_8_v2 = "Standard_DS14-8_v2"
-    standard_ds14_4_v2 = "Standard_DS14-4_v2"
-    standard_e2_v3 = "Standard_E2_v3"
-    standard_e4_v3 = "Standard_E4_v3"
-    standard_e8_v3 = "Standard_E8_v3"
-    standard_e16_v3 = "Standard_E16_v3"
-    standard_e32_v3 = "Standard_E32_v3"
-    standard_e64_v3 = "Standard_E64_v3"
-    standard_e2s_v3 = "Standard_E2s_v3"
-    standard_e4s_v3 = "Standard_E4s_v3"
-    standard_e8s_v3 = "Standard_E8s_v3"
-    standard_e16s_v3 = "Standard_E16s_v3"
-    standard_e32s_v3 = "Standard_E32s_v3"
-    standard_e64s_v3 = "Standard_E64s_v3"
-    standard_e32_16_v3 = "Standard_E32-16_v3"
-    standard_e32_8s_v3 = "Standard_E32-8s_v3"
-    standard_e64_32s_v3 = "Standard_E64-32s_v3"
-    standard_e64_16s_v3 = "Standard_E64-16s_v3"
-    standard_f1 = "Standard_F1"
-    standard_f2 = "Standard_F2"
-    standard_f4 = "Standard_F4"
-    standard_f8 = "Standard_F8"
-    standard_f16 = "Standard_F16"
-    standard_f1s = "Standard_F1s"
-    standard_f2s = "Standard_F2s"
-    standard_f4s = "Standard_F4s"
-    standard_f8s = "Standard_F8s"
-    standard_f16s = "Standard_F16s"
-    standard_f2s_v2 = "Standard_F2s_v2"
-    standard_f4s_v2 = "Standard_F4s_v2"
-    standard_f8s_v2 = "Standard_F8s_v2"
-    standard_f16s_v2 = "Standard_F16s_v2"
-    standard_f32s_v2 = "Standard_F32s_v2"
-    standard_f64s_v2 = "Standard_F64s_v2"
-    standard_f72s_v2 = "Standard_F72s_v2"
-    standard_g1 = "Standard_G1"
-    standard_g2 = "Standard_G2"
-    standard_g3 = "Standard_G3"
-    standard_g4 = "Standard_G4"
-    standard_g5 = "Standard_G5"
-    standard_gs1 = "Standard_GS1"
-    standard_gs2 = "Standard_GS2"
-    standard_gs3 = "Standard_GS3"
-    standard_gs4 = "Standard_GS4"
-    standard_gs5 = "Standard_GS5"
-    standard_gs4_8 = "Standard_GS4-8"
-    standard_gs4_4 = "Standard_GS4-4"
-    standard_gs5_16 = "Standard_GS5-16"
-    standard_gs5_8 = "Standard_GS5-8"
-    standard_h8 = "Standard_H8"
-    standard_h16 = "Standard_H16"
-    standard_h8m = "Standard_H8m"
-    standard_h16m = "Standard_H16m"
-    standard_h16r = "Standard_H16r"
-    standard_h16mr = "Standard_H16mr"
-    standard_l4s = "Standard_L4s"
-    standard_l8s = "Standard_L8s"
-    standard_l16s = "Standard_L16s"
-    standard_l32s = "Standard_L32s"
-    standard_m64s = "Standard_M64s"
-    standard_m64ms = "Standard_M64ms"
-    standard_m128s = "Standard_M128s"
-    standard_m128ms = "Standard_M128ms"
-    standard_m64_32ms = "Standard_M64-32ms"
-    standard_m64_16ms = "Standard_M64-16ms"
-    standard_m128_64ms = "Standard_M128-64ms"
-    standard_m128_32ms = "Standard_M128-32ms"
-    standard_nc6 = "Standard_NC6"
-    standard_nc12 = "Standard_NC12"
-    standard_nc24 = "Standard_NC24"
-    standard_nc24r = "Standard_NC24r"
-    standard_nc6s_v2 = "Standard_NC6s_v2"
-    standard_nc12s_v2 = "Standard_NC12s_v2"
-    standard_nc24s_v2 = "Standard_NC24s_v2"
-    standard_nc24rs_v2 = "Standard_NC24rs_v2"
-    standard_nc6s_v3 = "Standard_NC6s_v3"
-    standard_nc12s_v3 = "Standard_NC12s_v3"
-    standard_nc24s_v3 = "Standard_NC24s_v3"
-    standard_nc24rs_v3 = "Standard_NC24rs_v3"
-    standard_nd6s = "Standard_ND6s"
-    standard_nd12s = "Standard_ND12s"
-    standard_nd24s = "Standard_ND24s"
-    standard_nd24rs = "Standard_ND24rs"
-    standard_nv6 = "Standard_NV6"
-    standard_nv12 = "Standard_NV12"
-    standard_nv24 = "Standard_NV24"
-
-
-class CachingTypes(str, Enum):
-
-    none = "None"
-    read_only = "ReadOnly"
-    read_write = "ReadWrite"
-
-
-class DiskCreateOptionTypes(str, Enum):
-
-    from_image = "FromImage"
-    empty = "Empty"
-    attach = "Attach"
-
-
 class StorageAccountTypes(str, Enum):
 
     standard_lrs = "Standard_LRS"
     premium_lrs = "Premium_LRS"
 
 
-class PassNames(str, Enum):
-
-    oobe_system = "OobeSystem"
-
-
-class ComponentNames(str, Enum):
-
-    microsoft_windows_shell_setup = "Microsoft-Windows-Shell-Setup"
-
-
-class SettingNames(str, Enum):
-
-    auto_logon = "AutoLogon"
-    first_logon_commands = "FirstLogonCommands"
-
-
-class ProtocolTypes(str, Enum):
-
-    http = "Http"
-    https = "Https"
-
-
-class ResourceIdentityType(str, Enum):
-
-    system_assigned = "SystemAssigned"
-    user_assigned = "UserAssigned"
-    system_assigned_user_assigned = "SystemAssigned, UserAssigned"
-    none = "None"
-
-
-class MaintenanceOperationResultCodeTypes(str, Enum):
-
-    none = "None"
-    retry_later = "RetryLater"
-    maintenance_aborted = "MaintenanceAborted"
-    maintenance_completed = "MaintenanceCompleted"
-
-
-class UpgradeMode(str, Enum):
-
-    automatic = "Automatic"
-    manual = "Manual"
-    rolling = "Rolling"
-
-
-class OperatingSystemStateTypes(str, Enum):
-
-    generalized = "Generalized"
-    specialized = "Specialized"
-
-
-class IPVersion(str, Enum):
-
-    ipv4 = "IPv4"
-    ipv6 = "IPv6"
-
-
-class VirtualMachinePriorityTypes(str, Enum):
-
-    regular = "Regular"
-    low = "Low"
-
-
-class VirtualMachineEvictionPolicyTypes(str, Enum):
-
-    deallocate = "Deallocate"
-    delete = "Delete"
-
-
-class VirtualMachineScaleSetSkuScaleType(str, Enum):
-
-    automatic = "Automatic"
-    none = "None"
-
-
-class UpgradeState(str, Enum):
-
-    rolling_forward = "RollingForward"
-    cancelled = "Cancelled"
-    completed = "Completed"
-    faulted = "Faulted"
-
-
-class UpgradeOperationInvoker(str, Enum):
-
-    unknown = "Unknown"
-    user = "User"
-    platform = "Platform"
-
-
-class RollingUpgradeStatusCode(str, Enum):
-
-    rolling_forward = "RollingForward"
-    cancelled = "Cancelled"
-    completed = "Completed"
-    faulted = "Faulted"
-
-
-class RollingUpgradeActionType(str, Enum):
-
-    start = "Start"
-    cancel = "Cancel"
-
-
-class IntervalInMins(str, Enum):
+class OperatingSystemTypes(str, Enum):
 
-    three_mins = "ThreeMins"
-    five_mins = "FiveMins"
-    thirty_mins = "ThirtyMins"
-    sixty_mins = "SixtyMins"
+    windows = "Windows"
+    linux = "Linux"
 
 
 class DiskCreateOption(str, Enum):
@@ -348,8 +45,3 @@ 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_04_01/models/compute_operation_value.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value.py
deleted file mode 100644
index 525ef3bbb69a..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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 ComputeOperationValue(Model):
-    """Describes the properties of a Compute Operation value.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar origin: The origin of the compute operation.
-    :vartype origin: str
-    :ivar name: The name of the compute operation.
-    :vartype name: str
-    :ivar operation: The display name of the compute operation.
-    :vartype operation: str
-    :ivar resource: The display name of the resource the operation applies to.
-    :vartype resource: str
-    :ivar description: The description of the operation.
-    :vartype description: str
-    :ivar provider: The resource provider for the operation.
-    :vartype provider: str
-    """
-
-    _validation = {
-        'origin': {'readonly': True},
-        'name': {'readonly': True},
-        'operation': {'readonly': True},
-        'resource': {'readonly': True},
-        'description': {'readonly': True},
-        'provider': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'origin': {'key': 'origin', 'type': 'str'},
-        'name': {'key': 'name', 'type': 'str'},
-        'operation': {'key': 'display.operation', 'type': 'str'},
-        'resource': {'key': 'display.resource', 'type': 'str'},
-        'description': {'key': 'display.description', 'type': 'str'},
-        'provider': {'key': 'display.provider', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(ComputeOperationValue, self).__init__(**kwargs)
-        self.origin = None
-        self.name = None
-        self.operation = None
-        self.resource = None
-        self.description = None
-        self.provider = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value_paged.py
deleted file mode 100644
index 0735c0107487..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value_paged.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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 ComputeOperationValuePaged(Paged):
-    """
-    A paging container for iterating over a list of :class:`ComputeOperationValue <azure.mgmt.compute.v2018_04_01.models.ComputeOperationValue>` object
-    """
-
-    _attribute_map = {
-        'next_link': {'key': 'nextLink', 'type': 'str'},
-        'current_page': {'key': 'value', 'type': '[ComputeOperationValue]'}
-    }
-
-    def __init__(self, *args, **kwargs):
-
-        super(ComputeOperationValuePaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value_py3.py
deleted file mode 100644
index 3c4388f312b9..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value_py3.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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 ComputeOperationValue(Model):
-    """Describes the properties of a Compute Operation value.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar origin: The origin of the compute operation.
-    :vartype origin: str
-    :ivar name: The name of the compute operation.
-    :vartype name: str
-    :ivar operation: The display name of the compute operation.
-    :vartype operation: str
-    :ivar resource: The display name of the resource the operation applies to.
-    :vartype resource: str
-    :ivar description: The description of the operation.
-    :vartype description: str
-    :ivar provider: The resource provider for the operation.
-    :vartype provider: str
-    """
-
-    _validation = {
-        'origin': {'readonly': True},
-        'name': {'readonly': True},
-        'operation': {'readonly': True},
-        'resource': {'readonly': True},
-        'description': {'readonly': True},
-        'provider': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'origin': {'key': 'origin', 'type': 'str'},
-        'name': {'key': 'name', 'type': 'str'},
-        'operation': {'key': 'display.operation', 'type': 'str'},
-        'resource': {'key': 'display.resource', 'type': 'str'},
-        'description': {'key': 'display.description', 'type': 'str'},
-        'provider': {'key': 'display.provider', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs) -> None:
-        super(ComputeOperationValue, self).__init__(**kwargs)
-        self.origin = None
-        self.name = None
-        self.operation = None
-        self.resource = None
-        self.description = None
-        self.provider = 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
deleted file mode 100644
index b72af03bf155..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk.py
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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 DataDisk(Model):
-    """Describes a data disk.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param lun: Required. Specifies the logical unit number of the data disk.
-     This value is used to identify data disks within the VM and therefore must
-     be unique for each data disk attached to a VM.
-    :type lun: int
-    :param name: The disk name.
-    :type name: str
-    :param vhd: The virtual hard disk.
-    :type vhd: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
-    :param image: The source user image virtual hard disk. The virtual hard
-     disk will be copied before being attached to the virtual machine. If
-     SourceImage is provided, the destination virtual hard drive must not
-     exist.
-    :type image: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
-    :param caching: Specifies the caching requirements. <br><br> Possible
-     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
-     <br><br> Default: **None for Standard storage. ReadOnly for Premium
-     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
-    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
-    :param write_accelerator_enabled: Specifies whether writeAccelerator
-     should be enabled or disabled on the disk.
-    :type write_accelerator_enabled: bool
-    :param create_option: Required. Specifies how the virtual machine should
-     be created.<br><br> Possible values are:<br><br> **Attach** \\u2013 This
-     value is used when you are using a specialized disk to create the virtual
-     machine.<br><br> **FromImage** \\u2013 This value is used when you are
-     using an image to create the virtual machine. If you are using a platform
-     image, you also use the imageReference element described above. If you are
-     using a marketplace image, you  also use the plan element previously
-     described. Possible values include: 'FromImage', 'Empty', 'Attach'
-    :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
-     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.
-    :type managed_disk:
-     ~azure.mgmt.compute.v2018_04_01.models.ManagedDiskParameters
-    """
-
-    _validation = {
-        'lun': {'required': True},
-        'create_option': {'required': True},
-    }
-
-    _attribute_map = {
-        'lun': {'key': 'lun', 'type': 'int'},
-        'name': {'key': 'name', 'type': 'str'},
-        'vhd': {'key': 'vhd', 'type': 'VirtualHardDisk'},
-        'image': {'key': 'image', 'type': 'VirtualHardDisk'},
-        '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'},
-        'managed_disk': {'key': 'managedDisk', 'type': 'ManagedDiskParameters'},
-    }
-
-    def __init__(self, **kwargs):
-        super(DataDisk, self).__init__(**kwargs)
-        self.lun = kwargs.get('lun', None)
-        self.name = kwargs.get('name', None)
-        self.vhd = kwargs.get('vhd', None)
-        self.image = kwargs.get('image', None)
-        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.managed_disk = kwargs.get('managed_disk', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_image.py
deleted file mode 100644
index b5dbfcefb472..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_image.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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 DataDiskImage(Model):
-    """Contains the data disk images information.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar lun: Specifies the logical unit number of the data disk. This value
-     is used to identify data disks within the VM and therefore must be unique
-     for each data disk attached to a VM.
-    :vartype lun: int
-    """
-
-    _validation = {
-        'lun': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'lun': {'key': 'lun', 'type': 'int'},
-    }
-
-    def __init__(self, **kwargs):
-        super(DataDiskImage, self).__init__(**kwargs)
-        self.lun = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_image_py3.py
deleted file mode 100644
index 8431a3988502..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_image_py3.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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 DataDiskImage(Model):
-    """Contains the data disk images information.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar lun: Specifies the logical unit number of the data disk. This value
-     is used to identify data disks within the VM and therefore must be unique
-     for each data disk attached to a VM.
-    :vartype lun: int
-    """
-
-    _validation = {
-        'lun': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'lun': {'key': 'lun', 'type': 'int'},
-    }
-
-    def __init__(self, **kwargs) -> None:
-        super(DataDiskImage, self).__init__(**kwargs)
-        self.lun = None
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
deleted file mode 100644
index 9a75b455ed11..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_py3.py
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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 DataDisk(Model):
-    """Describes a data disk.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param lun: Required. Specifies the logical unit number of the data disk.
-     This value is used to identify data disks within the VM and therefore must
-     be unique for each data disk attached to a VM.
-    :type lun: int
-    :param name: The disk name.
-    :type name: str
-    :param vhd: The virtual hard disk.
-    :type vhd: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
-    :param image: The source user image virtual hard disk. The virtual hard
-     disk will be copied before being attached to the virtual machine. If
-     SourceImage is provided, the destination virtual hard drive must not
-     exist.
-    :type image: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
-    :param caching: Specifies the caching requirements. <br><br> Possible
-     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
-     <br><br> Default: **None for Standard storage. ReadOnly for Premium
-     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
-    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
-    :param write_accelerator_enabled: Specifies whether writeAccelerator
-     should be enabled or disabled on the disk.
-    :type write_accelerator_enabled: bool
-    :param create_option: Required. Specifies how the virtual machine should
-     be created.<br><br> Possible values are:<br><br> **Attach** \\u2013 This
-     value is used when you are using a specialized disk to create the virtual
-     machine.<br><br> **FromImage** \\u2013 This value is used when you are
-     using an image to create the virtual machine. If you are using a platform
-     image, you also use the imageReference element described above. If you are
-     using a marketplace image, you  also use the plan element previously
-     described. Possible values include: 'FromImage', 'Empty', 'Attach'
-    :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
-     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.
-    :type managed_disk:
-     ~azure.mgmt.compute.v2018_04_01.models.ManagedDiskParameters
-    """
-
-    _validation = {
-        'lun': {'required': True},
-        'create_option': {'required': True},
-    }
-
-    _attribute_map = {
-        'lun': {'key': 'lun', 'type': 'int'},
-        'name': {'key': 'name', 'type': 'str'},
-        'vhd': {'key': 'vhd', 'type': 'VirtualHardDisk'},
-        'image': {'key': 'image', 'type': 'VirtualHardDisk'},
-        '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'},
-        'managed_disk': {'key': 'managedDisk', 'type': 'ManagedDiskParameters'},
-    }
-
-    def __init__(self, *, lun: int, create_option, name: str=None, vhd=None, image=None, caching=None, write_accelerator_enabled: bool=None, disk_size_gb: int=None, managed_disk=None, **kwargs) -> None:
-        super(DataDisk, self).__init__(**kwargs)
-        self.lun = lun
-        self.name = name
-        self.vhd = vhd
-        self.image = image
-        self.caching = caching
-        self.write_accelerator_enabled = write_accelerator_enabled
-        self.create_option = create_option
-        self.disk_size_gb = disk_size_gb
-        self.managed_disk = managed_disk
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/diagnostics_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/diagnostics_profile.py
deleted file mode 100644
index c809544d655e..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/diagnostics_profile.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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 DiagnosticsProfile(Model):
-    """Specifies the boot diagnostic settings state. <br><br>Minimum api-version:
-    2015-06-15.
-
-    :param boot_diagnostics: Boot Diagnostics is a debugging feature which
-     allows you to view Console Output and Screenshot to diagnose VM status.
-     <br><br> For Linux Virtual Machines, you can easily view the output of
-     your console log. <br><br> For both Windows and Linux virtual machines,
-     Azure also enables you to see a screenshot of the VM from the hypervisor.
-    :type boot_diagnostics:
-     ~azure.mgmt.compute.v2018_04_01.models.BootDiagnostics
-    """
-
-    _attribute_map = {
-        'boot_diagnostics': {'key': 'bootDiagnostics', 'type': 'BootDiagnostics'},
-    }
-
-    def __init__(self, **kwargs):
-        super(DiagnosticsProfile, self).__init__(**kwargs)
-        self.boot_diagnostics = kwargs.get('boot_diagnostics', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/diagnostics_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/diagnostics_profile_py3.py
deleted file mode 100644
index 0193402fe61f..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/diagnostics_profile_py3.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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 DiagnosticsProfile(Model):
-    """Specifies the boot diagnostic settings state. <br><br>Minimum api-version:
-    2015-06-15.
-
-    :param boot_diagnostics: Boot Diagnostics is a debugging feature which
-     allows you to view Console Output and Screenshot to diagnose VM status.
-     <br><br> For Linux Virtual Machines, you can easily view the output of
-     your console log. <br><br> For both Windows and Linux virtual machines,
-     Azure also enables you to see a screenshot of the VM from the hypervisor.
-    :type boot_diagnostics:
-     ~azure.mgmt.compute.v2018_04_01.models.BootDiagnostics
-    """
-
-    _attribute_map = {
-        'boot_diagnostics': {'key': 'bootDiagnostics', 'type': 'BootDiagnostics'},
-    }
-
-    def __init__(self, *, boot_diagnostics=None, **kwargs) -> None:
-        super(DiagnosticsProfile, self).__init__(**kwargs)
-        self.boot_diagnostics = boot_diagnostics
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_encryption_settings.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_encryption_settings.py
deleted file mode 100644
index 7fd550357d75..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_encryption_settings.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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 DiskEncryptionSettings(Model):
-    """Describes a Encryption Settings for a Disk.
-
-    :param disk_encryption_key: Specifies the location of the disk encryption
-     key, which is a Key Vault Secret.
-    :type disk_encryption_key:
-     ~azure.mgmt.compute.v2018_04_01.models.KeyVaultSecretReference
-    :param key_encryption_key: Specifies the location of the key encryption
-     key in Key Vault.
-    :type key_encryption_key:
-     ~azure.mgmt.compute.v2018_04_01.models.KeyVaultKeyReference
-    :param enabled: Specifies whether disk encryption should be enabled on the
-     virtual machine.
-    :type enabled: bool
-    """
-
-    _attribute_map = {
-        'disk_encryption_key': {'key': 'diskEncryptionKey', 'type': 'KeyVaultSecretReference'},
-        'key_encryption_key': {'key': 'keyEncryptionKey', 'type': 'KeyVaultKeyReference'},
-        'enabled': {'key': 'enabled', 'type': 'bool'},
-    }
-
-    def __init__(self, **kwargs):
-        super(DiskEncryptionSettings, self).__init__(**kwargs)
-        self.disk_encryption_key = kwargs.get('disk_encryption_key', None)
-        self.key_encryption_key = kwargs.get('key_encryption_key', None)
-        self.enabled = kwargs.get('enabled', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_encryption_settings_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_encryption_settings_py3.py
deleted file mode 100644
index 380a0b7f1176..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_encryption_settings_py3.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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 DiskEncryptionSettings(Model):
-    """Describes a Encryption Settings for a Disk.
-
-    :param disk_encryption_key: Specifies the location of the disk encryption
-     key, which is a Key Vault Secret.
-    :type disk_encryption_key:
-     ~azure.mgmt.compute.v2018_04_01.models.KeyVaultSecretReference
-    :param key_encryption_key: Specifies the location of the key encryption
-     key in Key Vault.
-    :type key_encryption_key:
-     ~azure.mgmt.compute.v2018_04_01.models.KeyVaultKeyReference
-    :param enabled: Specifies whether disk encryption should be enabled on the
-     virtual machine.
-    :type enabled: bool
-    """
-
-    _attribute_map = {
-        'disk_encryption_key': {'key': 'diskEncryptionKey', 'type': 'KeyVaultSecretReference'},
-        'key_encryption_key': {'key': 'keyEncryptionKey', 'type': 'KeyVaultKeyReference'},
-        'enabled': {'key': 'enabled', 'type': 'bool'},
-    }
-
-    def __init__(self, *, disk_encryption_key=None, key_encryption_key=None, enabled: bool=None, **kwargs) -> None:
-        super(DiskEncryptionSettings, self).__init__(**kwargs)
-        self.disk_encryption_key = disk_encryption_key
-        self.key_encryption_key = key_encryption_key
-        self.enabled = enabled
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_instance_view.py
deleted file mode 100644
index 9a040fd5739b..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_instance_view.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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 DiskInstanceView(Model):
-    """The instance view of the disk.
-
-    :param name: The disk name.
-    :type name: str
-    :param encryption_settings: Specifies the encryption settings for the OS
-     Disk. <br><br> Minimum api-version: 2015-06-15
-    :type encryption_settings:
-     list[~azure.mgmt.compute.v2018_04_01.models.DiskEncryptionSettings]
-    :param statuses: The resource status information.
-    :type statuses:
-     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
-    """
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'encryption_settings': {'key': 'encryptionSettings', 'type': '[DiskEncryptionSettings]'},
-        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(DiskInstanceView, self).__init__(**kwargs)
-        self.name = kwargs.get('name', None)
-        self.encryption_settings = kwargs.get('encryption_settings', None)
-        self.statuses = kwargs.get('statuses', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_instance_view_py3.py
deleted file mode 100644
index b9583371ba8b..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_instance_view_py3.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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 DiskInstanceView(Model):
-    """The instance view of the disk.
-
-    :param name: The disk name.
-    :type name: str
-    :param encryption_settings: Specifies the encryption settings for the OS
-     Disk. <br><br> Minimum api-version: 2015-06-15
-    :type encryption_settings:
-     list[~azure.mgmt.compute.v2018_04_01.models.DiskEncryptionSettings]
-    :param statuses: The resource status information.
-    :type statuses:
-     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
-    """
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'encryption_settings': {'key': 'encryptionSettings', 'type': '[DiskEncryptionSettings]'},
-        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
-    }
-
-    def __init__(self, *, name: str=None, encryption_settings=None, statuses=None, **kwargs) -> None:
-        super(DiskInstanceView, self).__init__(**kwargs)
-        self.name = name
-        self.encryption_settings = encryption_settings
-        self.statuses = statuses
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update.py
index 3ca75fec3871..7364769892bf 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update.py
@@ -9,12 +9,16 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.serialization import Model
+from .resource_update import ResourceUpdate
 
 
-class DiskUpdate(Model):
+class DiskUpdate(ResourceUpdate):
     """Disk update resource.
 
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param sku:
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
     :param os_type: the Operating System type. Possible values include:
      'Windows', 'Linux'
     :type os_type: str or
@@ -28,18 +32,14 @@ class DiskUpdate(Model):
     :param encryption_settings: Encryption settings for disk or snapshot
     :type encryption_settings:
      ~azure.mgmt.compute.v2018_04_01.models.EncryptionSettings
-    :param tags: Resource tags
-    :type tags: dict[str, str]
-    :param sku:
-    :type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
     """
 
     _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'sku': {'key': 'sku', 'type': 'DiskSku'},
         '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': 'DiskSku'},
     }
 
     def __init__(self, **kwargs):
@@ -47,5 +47,3 @@ def __init__(self, **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_04_01/models/disk_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update_py3.py
index 407d553cff9e..b2445fda4cc9 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update_py3.py
@@ -9,12 +9,16 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.serialization import Model
+from .resource_update_py3 import ResourceUpdate
 
 
-class DiskUpdate(Model):
+class DiskUpdate(ResourceUpdate):
     """Disk update resource.
 
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param sku:
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
     :param os_type: the Operating System type. Possible values include:
      'Windows', 'Linux'
     :type os_type: str or
@@ -28,24 +32,18 @@ class DiskUpdate(Model):
     :param encryption_settings: Encryption settings for disk or snapshot
     :type encryption_settings:
      ~azure.mgmt.compute.v2018_04_01.models.EncryptionSettings
-    :param tags: Resource tags
-    :type tags: dict[str, str]
-    :param sku:
-    :type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
     """
 
     _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'sku': {'key': 'sku', 'type': 'DiskSku'},
         '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': 'DiskSku'},
     }
 
-    def __init__(self, *, os_type=None, disk_size_gb: int=None, encryption_settings=None, tags=None, sku=None, **kwargs) -> None:
-        super(DiskUpdate, self).__init__(**kwargs)
+    def __init__(self, *, tags=None, sku=None, os_type=None, disk_size_gb: int=None, encryption_settings=None, **kwargs) -> None:
+        super(DiskUpdate, self).__init__(tags=tags, sku=sku, **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_04_01/models/hardware_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/hardware_profile.py
deleted file mode 100644
index c9f1db70f257..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/hardware_profile.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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 HardwareProfile(Model):
-    """Specifies the hardware settings for the virtual machine.
-
-    :param vm_size: Specifies the size of the virtual machine. For more
-     information about virtual machine sizes, see [Sizes for virtual
-     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-sizes?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
-     <br><br> The available VM sizes depend on region and availability set. For
-     a list of available sizes use these APIs:  <br><br> [List all available
-     virtual machine sizes in an availability
-     set](https://docs.microsoft.com/rest/api/compute/availabilitysets/listavailablesizes)
-     <br><br> [List all available virtual machine sizes in a
-     region](https://docs.microsoft.com/rest/api/compute/virtualmachinesizes/list)
-     <br><br> [List all available virtual machine sizes for
-     resizing](https://docs.microsoft.com/rest/api/compute/virtualmachines/listavailablesizes).
-     Possible values include: 'Basic_A0', 'Basic_A1', 'Basic_A2', 'Basic_A3',
-     'Basic_A4', 'Standard_A0', 'Standard_A1', 'Standard_A2', 'Standard_A3',
-     'Standard_A4', 'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8',
-     'Standard_A9', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2',
-     'Standard_A2_v2', 'Standard_A4_v2', 'Standard_A8_v2', 'Standard_A2m_v2',
-     'Standard_A4m_v2', 'Standard_A8m_v2', 'Standard_B1s', 'Standard_B1ms',
-     'Standard_B2s', 'Standard_B2ms', 'Standard_B4ms', 'Standard_B8ms',
-     'Standard_D1', 'Standard_D2', 'Standard_D3', 'Standard_D4',
-     'Standard_D11', 'Standard_D12', 'Standard_D13', 'Standard_D14',
-     'Standard_D1_v2', 'Standard_D2_v2', 'Standard_D3_v2', 'Standard_D4_v2',
-     'Standard_D5_v2', 'Standard_D2_v3', 'Standard_D4_v3', 'Standard_D8_v3',
-     'Standard_D16_v3', 'Standard_D32_v3', 'Standard_D64_v3',
-     'Standard_D2s_v3', 'Standard_D4s_v3', 'Standard_D8s_v3',
-     'Standard_D16s_v3', 'Standard_D32s_v3', 'Standard_D64s_v3',
-     'Standard_D11_v2', 'Standard_D12_v2', 'Standard_D13_v2',
-     'Standard_D14_v2', 'Standard_D15_v2', 'Standard_DS1', 'Standard_DS2',
-     'Standard_DS3', 'Standard_DS4', 'Standard_DS11', 'Standard_DS12',
-     'Standard_DS13', 'Standard_DS14', 'Standard_DS1_v2', 'Standard_DS2_v2',
-     'Standard_DS3_v2', 'Standard_DS4_v2', 'Standard_DS5_v2',
-     'Standard_DS11_v2', 'Standard_DS12_v2', 'Standard_DS13_v2',
-     'Standard_DS14_v2', 'Standard_DS15_v2', 'Standard_DS13-4_v2',
-     'Standard_DS13-2_v2', 'Standard_DS14-8_v2', 'Standard_DS14-4_v2',
-     'Standard_E2_v3', 'Standard_E4_v3', 'Standard_E8_v3', 'Standard_E16_v3',
-     'Standard_E32_v3', 'Standard_E64_v3', 'Standard_E2s_v3',
-     'Standard_E4s_v3', 'Standard_E8s_v3', 'Standard_E16s_v3',
-     'Standard_E32s_v3', 'Standard_E64s_v3', 'Standard_E32-16_v3',
-     'Standard_E32-8s_v3', 'Standard_E64-32s_v3', 'Standard_E64-16s_v3',
-     'Standard_F1', 'Standard_F2', 'Standard_F4', 'Standard_F8',
-     'Standard_F16', 'Standard_F1s', 'Standard_F2s', 'Standard_F4s',
-     'Standard_F8s', 'Standard_F16s', 'Standard_F2s_v2', 'Standard_F4s_v2',
-     'Standard_F8s_v2', 'Standard_F16s_v2', 'Standard_F32s_v2',
-     'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_G1', 'Standard_G2',
-     'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1',
-     'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS5',
-     'Standard_GS4-8', 'Standard_GS4-4', 'Standard_GS5-16', 'Standard_GS5-8',
-     'Standard_H8', 'Standard_H16', 'Standard_H8m', 'Standard_H16m',
-     'Standard_H16r', 'Standard_H16mr', 'Standard_L4s', 'Standard_L8s',
-     'Standard_L16s', 'Standard_L32s', 'Standard_M64s', 'Standard_M64ms',
-     'Standard_M128s', 'Standard_M128ms', 'Standard_M64-32ms',
-     'Standard_M64-16ms', 'Standard_M128-64ms', 'Standard_M128-32ms',
-     'Standard_NC6', 'Standard_NC12', 'Standard_NC24', 'Standard_NC24r',
-     'Standard_NC6s_v2', 'Standard_NC12s_v2', 'Standard_NC24s_v2',
-     'Standard_NC24rs_v2', 'Standard_NC6s_v3', 'Standard_NC12s_v3',
-     'Standard_NC24s_v3', 'Standard_NC24rs_v3', 'Standard_ND6s',
-     'Standard_ND12s', 'Standard_ND24s', 'Standard_ND24rs', 'Standard_NV6',
-     'Standard_NV12', 'Standard_NV24'
-    :type vm_size: str or
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineSizeTypes
-    """
-
-    _attribute_map = {
-        'vm_size': {'key': 'vmSize', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(HardwareProfile, self).__init__(**kwargs)
-        self.vm_size = kwargs.get('vm_size', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/hardware_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/hardware_profile_py3.py
deleted file mode 100644
index a9f8ba14df0e..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/hardware_profile_py3.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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 HardwareProfile(Model):
-    """Specifies the hardware settings for the virtual machine.
-
-    :param vm_size: Specifies the size of the virtual machine. For more
-     information about virtual machine sizes, see [Sizes for virtual
-     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-sizes?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
-     <br><br> The available VM sizes depend on region and availability set. For
-     a list of available sizes use these APIs:  <br><br> [List all available
-     virtual machine sizes in an availability
-     set](https://docs.microsoft.com/rest/api/compute/availabilitysets/listavailablesizes)
-     <br><br> [List all available virtual machine sizes in a
-     region](https://docs.microsoft.com/rest/api/compute/virtualmachinesizes/list)
-     <br><br> [List all available virtual machine sizes for
-     resizing](https://docs.microsoft.com/rest/api/compute/virtualmachines/listavailablesizes).
-     Possible values include: 'Basic_A0', 'Basic_A1', 'Basic_A2', 'Basic_A3',
-     'Basic_A4', 'Standard_A0', 'Standard_A1', 'Standard_A2', 'Standard_A3',
-     'Standard_A4', 'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8',
-     'Standard_A9', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2',
-     'Standard_A2_v2', 'Standard_A4_v2', 'Standard_A8_v2', 'Standard_A2m_v2',
-     'Standard_A4m_v2', 'Standard_A8m_v2', 'Standard_B1s', 'Standard_B1ms',
-     'Standard_B2s', 'Standard_B2ms', 'Standard_B4ms', 'Standard_B8ms',
-     'Standard_D1', 'Standard_D2', 'Standard_D3', 'Standard_D4',
-     'Standard_D11', 'Standard_D12', 'Standard_D13', 'Standard_D14',
-     'Standard_D1_v2', 'Standard_D2_v2', 'Standard_D3_v2', 'Standard_D4_v2',
-     'Standard_D5_v2', 'Standard_D2_v3', 'Standard_D4_v3', 'Standard_D8_v3',
-     'Standard_D16_v3', 'Standard_D32_v3', 'Standard_D64_v3',
-     'Standard_D2s_v3', 'Standard_D4s_v3', 'Standard_D8s_v3',
-     'Standard_D16s_v3', 'Standard_D32s_v3', 'Standard_D64s_v3',
-     'Standard_D11_v2', 'Standard_D12_v2', 'Standard_D13_v2',
-     'Standard_D14_v2', 'Standard_D15_v2', 'Standard_DS1', 'Standard_DS2',
-     'Standard_DS3', 'Standard_DS4', 'Standard_DS11', 'Standard_DS12',
-     'Standard_DS13', 'Standard_DS14', 'Standard_DS1_v2', 'Standard_DS2_v2',
-     'Standard_DS3_v2', 'Standard_DS4_v2', 'Standard_DS5_v2',
-     'Standard_DS11_v2', 'Standard_DS12_v2', 'Standard_DS13_v2',
-     'Standard_DS14_v2', 'Standard_DS15_v2', 'Standard_DS13-4_v2',
-     'Standard_DS13-2_v2', 'Standard_DS14-8_v2', 'Standard_DS14-4_v2',
-     'Standard_E2_v3', 'Standard_E4_v3', 'Standard_E8_v3', 'Standard_E16_v3',
-     'Standard_E32_v3', 'Standard_E64_v3', 'Standard_E2s_v3',
-     'Standard_E4s_v3', 'Standard_E8s_v3', 'Standard_E16s_v3',
-     'Standard_E32s_v3', 'Standard_E64s_v3', 'Standard_E32-16_v3',
-     'Standard_E32-8s_v3', 'Standard_E64-32s_v3', 'Standard_E64-16s_v3',
-     'Standard_F1', 'Standard_F2', 'Standard_F4', 'Standard_F8',
-     'Standard_F16', 'Standard_F1s', 'Standard_F2s', 'Standard_F4s',
-     'Standard_F8s', 'Standard_F16s', 'Standard_F2s_v2', 'Standard_F4s_v2',
-     'Standard_F8s_v2', 'Standard_F16s_v2', 'Standard_F32s_v2',
-     'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_G1', 'Standard_G2',
-     'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1',
-     'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS5',
-     'Standard_GS4-8', 'Standard_GS4-4', 'Standard_GS5-16', 'Standard_GS5-8',
-     'Standard_H8', 'Standard_H16', 'Standard_H8m', 'Standard_H16m',
-     'Standard_H16r', 'Standard_H16mr', 'Standard_L4s', 'Standard_L8s',
-     'Standard_L16s', 'Standard_L32s', 'Standard_M64s', 'Standard_M64ms',
-     'Standard_M128s', 'Standard_M128ms', 'Standard_M64-32ms',
-     'Standard_M64-16ms', 'Standard_M128-64ms', 'Standard_M128-32ms',
-     'Standard_NC6', 'Standard_NC12', 'Standard_NC24', 'Standard_NC24r',
-     'Standard_NC6s_v2', 'Standard_NC12s_v2', 'Standard_NC24s_v2',
-     'Standard_NC24rs_v2', 'Standard_NC6s_v3', 'Standard_NC12s_v3',
-     'Standard_NC24s_v3', 'Standard_NC24rs_v3', 'Standard_ND6s',
-     'Standard_ND12s', 'Standard_ND24s', 'Standard_ND24rs', 'Standard_NV6',
-     'Standard_NV12', 'Standard_NV24'
-    :type vm_size: str or
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineSizeTypes
-    """
-
-    _attribute_map = {
-        'vm_size': {'key': 'vmSize', 'type': 'str'},
-    }
-
-    def __init__(self, *, vm_size=None, **kwargs) -> None:
-        super(HardwareProfile, self).__init__(**kwargs)
-        self.vm_size = vm_size
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image.py
deleted file mode 100644
index d3a1f84f255c..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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 Image(Resource):
-    """The source user image virtual hard disk. The virtual hard disk will be
-    copied before being attached to the virtual machine. If SourceImage is
-    provided, the destination virtual hard drive must not exist.
-
-    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]
-    :param source_virtual_machine: The source virtual machine from which Image
-     is created.
-    :type source_virtual_machine:
-     ~azure.mgmt.compute.v2018_04_01.models.SubResource
-    :param storage_profile: Specifies the storage settings for the virtual
-     machine disks.
-    :type storage_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.ImageStorageProfile
-    :ivar provisioning_state: The provisioning state.
-    :vartype provisioning_state: str
-    """
-
-    _validation = {
-        'id': {'readonly': True},
-        'name': {'readonly': True},
-        'type': {'readonly': True},
-        'location': {'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}'},
-        'source_virtual_machine': {'key': 'properties.sourceVirtualMachine', 'type': 'SubResource'},
-        'storage_profile': {'key': 'properties.storageProfile', 'type': 'ImageStorageProfile'},
-        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(Image, self).__init__(**kwargs)
-        self.source_virtual_machine = kwargs.get('source_virtual_machine', None)
-        self.storage_profile = kwargs.get('storage_profile', None)
-        self.provisioning_state = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py
deleted file mode 100644
index ae905adba8c4..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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 ImageDataDisk(Model):
-    """Describes a data disk.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param lun: Required. Specifies the logical unit number of the data disk.
-     This value is used to identify data disks within the VM and therefore must
-     be unique for each data disk attached to a VM.
-    :type lun: int
-    :param snapshot: The snapshot.
-    :type snapshot: ~azure.mgmt.compute.v2018_04_01.models.SubResource
-    :param managed_disk: The managedDisk.
-    :type managed_disk: ~azure.mgmt.compute.v2018_04_01.models.SubResource
-    :param blob_uri: The Virtual Hard Disk.
-    :type blob_uri: str
-    :param caching: Specifies the caching requirements. <br><br> Possible
-     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
-     <br><br> Default: **None for Standard storage. ReadOnly for Premium
-     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
-    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
-    :param disk_size_gb: Specifies the size of empty data disks in gigabytes.
-     This element can be used to overwrite the name of the disk in a virtual
-     machine image. <br><br> This value cannot be larger than 1023 GB
-    :type disk_size_gb: int
-    :param storage_account_type: Specifies the storage account type for the
-     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
-    :type storage_account_type: str or
-     ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
-    """
-
-    _validation = {
-        'lun': {'required': True},
-    }
-
-    _attribute_map = {
-        'lun': {'key': 'lun', 'type': 'int'},
-        'snapshot': {'key': 'snapshot', 'type': 'SubResource'},
-        'managed_disk': {'key': 'managedDisk', 'type': 'SubResource'},
-        'blob_uri': {'key': 'blobUri', 'type': 'str'},
-        'caching': {'key': 'caching', 'type': 'CachingTypes'},
-        'disk_size_gb': {'key': 'diskSizeGB', 'type': 'int'},
-        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(ImageDataDisk, self).__init__(**kwargs)
-        self.lun = kwargs.get('lun', None)
-        self.snapshot = kwargs.get('snapshot', None)
-        self.managed_disk = kwargs.get('managed_disk', None)
-        self.blob_uri = kwargs.get('blob_uri', None)
-        self.caching = kwargs.get('caching', None)
-        self.disk_size_gb = kwargs.get('disk_size_gb', None)
-        self.storage_account_type = kwargs.get('storage_account_type', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py
deleted file mode 100644
index 7112f92f78c0..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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 ImageDataDisk(Model):
-    """Describes a data disk.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param lun: Required. Specifies the logical unit number of the data disk.
-     This value is used to identify data disks within the VM and therefore must
-     be unique for each data disk attached to a VM.
-    :type lun: int
-    :param snapshot: The snapshot.
-    :type snapshot: ~azure.mgmt.compute.v2018_04_01.models.SubResource
-    :param managed_disk: The managedDisk.
-    :type managed_disk: ~azure.mgmt.compute.v2018_04_01.models.SubResource
-    :param blob_uri: The Virtual Hard Disk.
-    :type blob_uri: str
-    :param caching: Specifies the caching requirements. <br><br> Possible
-     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
-     <br><br> Default: **None for Standard storage. ReadOnly for Premium
-     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
-    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
-    :param disk_size_gb: Specifies the size of empty data disks in gigabytes.
-     This element can be used to overwrite the name of the disk in a virtual
-     machine image. <br><br> This value cannot be larger than 1023 GB
-    :type disk_size_gb: int
-    :param storage_account_type: Specifies the storage account type for the
-     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
-    :type storage_account_type: str or
-     ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
-    """
-
-    _validation = {
-        'lun': {'required': True},
-    }
-
-    _attribute_map = {
-        'lun': {'key': 'lun', 'type': 'int'},
-        'snapshot': {'key': 'snapshot', 'type': 'SubResource'},
-        'managed_disk': {'key': 'managedDisk', 'type': 'SubResource'},
-        'blob_uri': {'key': 'blobUri', 'type': 'str'},
-        'caching': {'key': 'caching', 'type': 'CachingTypes'},
-        'disk_size_gb': {'key': 'diskSizeGB', 'type': 'int'},
-        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
-    }
-
-    def __init__(self, *, lun: int, snapshot=None, managed_disk=None, blob_uri: str=None, caching=None, disk_size_gb: int=None, storage_account_type=None, **kwargs) -> None:
-        super(ImageDataDisk, self).__init__(**kwargs)
-        self.lun = lun
-        self.snapshot = snapshot
-        self.managed_disk = managed_disk
-        self.blob_uri = blob_uri
-        self.caching = caching
-        self.disk_size_gb = disk_size_gb
-        self.storage_account_type = storage_account_type
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py
deleted file mode 100644
index 3ef3a0cd4414..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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 ImageOSDisk(Model):
-    """Describes an Operating System disk.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :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 a custom image.
-     <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_04_01.models.OperatingSystemTypes
-    :param os_state: Required. The OS State. Possible values include:
-     'Generalized', 'Specialized'
-    :type os_state: str or
-     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemStateTypes
-    :param snapshot: The snapshot.
-    :type snapshot: ~azure.mgmt.compute.v2018_04_01.models.SubResource
-    :param managed_disk: The managedDisk.
-    :type managed_disk: ~azure.mgmt.compute.v2018_04_01.models.SubResource
-    :param blob_uri: The Virtual Hard Disk.
-    :type blob_uri: str
-    :param caching: Specifies the caching requirements. <br><br> Possible
-     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
-     <br><br> Default: **None for Standard storage. ReadOnly for Premium
-     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
-    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
-    :param disk_size_gb: Specifies the size of empty data disks in gigabytes.
-     This element can be used to overwrite the name of the disk in a virtual
-     machine image. <br><br> This value cannot be larger than 1023 GB
-    :type disk_size_gb: int
-    :param storage_account_type: Specifies the storage account type for the
-     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
-    :type storage_account_type: str or
-     ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
-    """
-
-    _validation = {
-        'os_type': {'required': True},
-        'os_state': {'required': True},
-    }
-
-    _attribute_map = {
-        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
-        'os_state': {'key': 'osState', 'type': 'OperatingSystemStateTypes'},
-        'snapshot': {'key': 'snapshot', 'type': 'SubResource'},
-        'managed_disk': {'key': 'managedDisk', 'type': 'SubResource'},
-        'blob_uri': {'key': 'blobUri', 'type': 'str'},
-        'caching': {'key': 'caching', 'type': 'CachingTypes'},
-        'disk_size_gb': {'key': 'diskSizeGB', 'type': 'int'},
-        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(ImageOSDisk, self).__init__(**kwargs)
-        self.os_type = kwargs.get('os_type', None)
-        self.os_state = kwargs.get('os_state', None)
-        self.snapshot = kwargs.get('snapshot', None)
-        self.managed_disk = kwargs.get('managed_disk', None)
-        self.blob_uri = kwargs.get('blob_uri', None)
-        self.caching = kwargs.get('caching', None)
-        self.disk_size_gb = kwargs.get('disk_size_gb', None)
-        self.storage_account_type = kwargs.get('storage_account_type', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py
deleted file mode 100644
index 59c61abd3f0f..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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 ImageOSDisk(Model):
-    """Describes an Operating System disk.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :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 a custom image.
-     <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_04_01.models.OperatingSystemTypes
-    :param os_state: Required. The OS State. Possible values include:
-     'Generalized', 'Specialized'
-    :type os_state: str or
-     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemStateTypes
-    :param snapshot: The snapshot.
-    :type snapshot: ~azure.mgmt.compute.v2018_04_01.models.SubResource
-    :param managed_disk: The managedDisk.
-    :type managed_disk: ~azure.mgmt.compute.v2018_04_01.models.SubResource
-    :param blob_uri: The Virtual Hard Disk.
-    :type blob_uri: str
-    :param caching: Specifies the caching requirements. <br><br> Possible
-     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
-     <br><br> Default: **None for Standard storage. ReadOnly for Premium
-     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
-    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
-    :param disk_size_gb: Specifies the size of empty data disks in gigabytes.
-     This element can be used to overwrite the name of the disk in a virtual
-     machine image. <br><br> This value cannot be larger than 1023 GB
-    :type disk_size_gb: int
-    :param storage_account_type: Specifies the storage account type for the
-     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
-    :type storage_account_type: str or
-     ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
-    """
-
-    _validation = {
-        'os_type': {'required': True},
-        'os_state': {'required': True},
-    }
-
-    _attribute_map = {
-        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
-        'os_state': {'key': 'osState', 'type': 'OperatingSystemStateTypes'},
-        'snapshot': {'key': 'snapshot', 'type': 'SubResource'},
-        'managed_disk': {'key': 'managedDisk', 'type': 'SubResource'},
-        'blob_uri': {'key': 'blobUri', 'type': 'str'},
-        'caching': {'key': 'caching', 'type': 'CachingTypes'},
-        'disk_size_gb': {'key': 'diskSizeGB', 'type': 'int'},
-        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
-    }
-
-    def __init__(self, *, os_type, os_state, snapshot=None, managed_disk=None, blob_uri: str=None, caching=None, disk_size_gb: int=None, storage_account_type=None, **kwargs) -> None:
-        super(ImageOSDisk, self).__init__(**kwargs)
-        self.os_type = os_type
-        self.os_state = os_state
-        self.snapshot = snapshot
-        self.managed_disk = managed_disk
-        self.blob_uri = blob_uri
-        self.caching = caching
-        self.disk_size_gb = disk_size_gb
-        self.storage_account_type = storage_account_type
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_paged.py
deleted file mode 100644
index de04f8efc49c..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_paged.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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 ImagePaged(Paged):
-    """
-    A paging container for iterating over a list of :class:`Image <azure.mgmt.compute.v2018_04_01.models.Image>` object
-    """
-
-    _attribute_map = {
-        'next_link': {'key': 'nextLink', 'type': 'str'},
-        'current_page': {'key': 'value', 'type': '[Image]'}
-    }
-
-    def __init__(self, *args, **kwargs):
-
-        super(ImagePaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_py3.py
deleted file mode 100644
index 916f2df5e511..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_py3.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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 Image(Resource):
-    """The source user image virtual hard disk. The virtual hard disk will be
-    copied before being attached to the virtual machine. If SourceImage is
-    provided, the destination virtual hard drive must not exist.
-
-    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]
-    :param source_virtual_machine: The source virtual machine from which Image
-     is created.
-    :type source_virtual_machine:
-     ~azure.mgmt.compute.v2018_04_01.models.SubResource
-    :param storage_profile: Specifies the storage settings for the virtual
-     machine disks.
-    :type storage_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.ImageStorageProfile
-    :ivar provisioning_state: The provisioning state.
-    :vartype provisioning_state: str
-    """
-
-    _validation = {
-        'id': {'readonly': True},
-        'name': {'readonly': True},
-        'type': {'readonly': True},
-        'location': {'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}'},
-        'source_virtual_machine': {'key': 'properties.sourceVirtualMachine', 'type': 'SubResource'},
-        'storage_profile': {'key': 'properties.storageProfile', 'type': 'ImageStorageProfile'},
-        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
-    }
-
-    def __init__(self, *, location: str, tags=None, source_virtual_machine=None, storage_profile=None, **kwargs) -> None:
-        super(Image, self).__init__(location=location, tags=tags, **kwargs)
-        self.source_virtual_machine = source_virtual_machine
-        self.storage_profile = storage_profile
-        self.provisioning_state = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_reference.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_reference.py
deleted file mode 100644
index b8f929f4ad70..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_reference.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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 .sub_resource import SubResource
-
-
-class ImageReference(SubResource):
-    """Specifies information about the image to use. You can specify information
-    about platform images, marketplace images, or virtual machine images. This
-    element is required when you want to use a platform image, marketplace
-    image, or virtual machine image, but is not used in other creation
-    operations.
-
-    :param id: Resource Id
-    :type id: str
-    :param publisher: The image publisher.
-    :type publisher: str
-    :param offer: Specifies the offer of the platform image or marketplace
-     image used to create the virtual machine.
-    :type offer: str
-    :param sku: The image SKU.
-    :type sku: str
-    :param version: Specifies the version of the platform image or marketplace
-     image used to create the virtual machine. The allowed formats are
-     Major.Minor.Build or 'latest'. Major, Minor, and Build are decimal
-     numbers. Specify 'latest' to use the latest version of an image available
-     at deploy time. Even if you use 'latest', the VM image will not
-     automatically update after deploy time even if a new version becomes
-     available.
-    :type version: str
-    """
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'publisher': {'key': 'publisher', 'type': 'str'},
-        'offer': {'key': 'offer', 'type': 'str'},
-        'sku': {'key': 'sku', 'type': 'str'},
-        'version': {'key': 'version', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(ImageReference, self).__init__(**kwargs)
-        self.publisher = kwargs.get('publisher', None)
-        self.offer = kwargs.get('offer', None)
-        self.sku = kwargs.get('sku', None)
-        self.version = kwargs.get('version', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_reference_py3.py
deleted file mode 100644
index 1d7eefe5ac65..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_reference_py3.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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 .sub_resource_py3 import SubResource
-
-
-class ImageReference(SubResource):
-    """Specifies information about the image to use. You can specify information
-    about platform images, marketplace images, or virtual machine images. This
-    element is required when you want to use a platform image, marketplace
-    image, or virtual machine image, but is not used in other creation
-    operations.
-
-    :param id: Resource Id
-    :type id: str
-    :param publisher: The image publisher.
-    :type publisher: str
-    :param offer: Specifies the offer of the platform image or marketplace
-     image used to create the virtual machine.
-    :type offer: str
-    :param sku: The image SKU.
-    :type sku: str
-    :param version: Specifies the version of the platform image or marketplace
-     image used to create the virtual machine. The allowed formats are
-     Major.Minor.Build or 'latest'. Major, Minor, and Build are decimal
-     numbers. Specify 'latest' to use the latest version of an image available
-     at deploy time. Even if you use 'latest', the VM image will not
-     automatically update after deploy time even if a new version becomes
-     available.
-    :type version: str
-    """
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'publisher': {'key': 'publisher', 'type': 'str'},
-        'offer': {'key': 'offer', 'type': 'str'},
-        'sku': {'key': 'sku', 'type': 'str'},
-        'version': {'key': 'version', 'type': 'str'},
-    }
-
-    def __init__(self, *, id: str=None, publisher: str=None, offer: str=None, sku: str=None, version: str=None, **kwargs) -> None:
-        super(ImageReference, self).__init__(id=id, **kwargs)
-        self.publisher = publisher
-        self.offer = offer
-        self.sku = sku
-        self.version = version
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_storage_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_storage_profile.py
deleted file mode 100644
index 2cd188cf28f9..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_storage_profile.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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 ImageStorageProfile(Model):
-    """Describes a storage profile.
-
-    :param os_disk: Specifies information about the operating system disk used
-     by the virtual machine. <br><br> For more information about disks, see
-     [About disks and VHDs for Azure virtual
-     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
-    :type os_disk: ~azure.mgmt.compute.v2018_04_01.models.ImageOSDisk
-    :param data_disks: Specifies the parameters that are used to add a data
-     disk to a virtual machine. <br><br> For more information about disks, see
-     [About disks and VHDs for Azure virtual
-     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
-    :type data_disks:
-     list[~azure.mgmt.compute.v2018_04_01.models.ImageDataDisk]
-    :param zone_resilient: Specifies whether an image is zone resilient or
-     not. Default is false. Zone resilient images can be created only in
-     regions that provide Zone Redundant Storage (ZRS).
-    :type zone_resilient: bool
-    """
-
-    _attribute_map = {
-        'os_disk': {'key': 'osDisk', 'type': 'ImageOSDisk'},
-        'data_disks': {'key': 'dataDisks', 'type': '[ImageDataDisk]'},
-        'zone_resilient': {'key': 'zoneResilient', 'type': 'bool'},
-    }
-
-    def __init__(self, **kwargs):
-        super(ImageStorageProfile, self).__init__(**kwargs)
-        self.os_disk = kwargs.get('os_disk', None)
-        self.data_disks = kwargs.get('data_disks', None)
-        self.zone_resilient = kwargs.get('zone_resilient', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_storage_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_storage_profile_py3.py
deleted file mode 100644
index 359c87789cc3..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_storage_profile_py3.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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 ImageStorageProfile(Model):
-    """Describes a storage profile.
-
-    :param os_disk: Specifies information about the operating system disk used
-     by the virtual machine. <br><br> For more information about disks, see
-     [About disks and VHDs for Azure virtual
-     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
-    :type os_disk: ~azure.mgmt.compute.v2018_04_01.models.ImageOSDisk
-    :param data_disks: Specifies the parameters that are used to add a data
-     disk to a virtual machine. <br><br> For more information about disks, see
-     [About disks and VHDs for Azure virtual
-     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
-    :type data_disks:
-     list[~azure.mgmt.compute.v2018_04_01.models.ImageDataDisk]
-    :param zone_resilient: Specifies whether an image is zone resilient or
-     not. Default is false. Zone resilient images can be created only in
-     regions that provide Zone Redundant Storage (ZRS).
-    :type zone_resilient: bool
-    """
-
-    _attribute_map = {
-        'os_disk': {'key': 'osDisk', 'type': 'ImageOSDisk'},
-        'data_disks': {'key': 'dataDisks', 'type': '[ImageDataDisk]'},
-        'zone_resilient': {'key': 'zoneResilient', 'type': 'bool'},
-    }
-
-    def __init__(self, *, os_disk=None, data_disks=None, zone_resilient: bool=None, **kwargs) -> None:
-        super(ImageStorageProfile, self).__init__(**kwargs)
-        self.os_disk = os_disk
-        self.data_disks = data_disks
-        self.zone_resilient = zone_resilient
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_update.py
deleted file mode 100644
index 56f1f29d62d6..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_update.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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 .update_resource import UpdateResource
-
-
-class ImageUpdate(UpdateResource):
-    """The source user image virtual hard disk. Only tags may be updated.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :param tags: Resource tags
-    :type tags: dict[str, str]
-    :param source_virtual_machine: The source virtual machine from which Image
-     is created.
-    :type source_virtual_machine:
-     ~azure.mgmt.compute.v2018_04_01.models.SubResource
-    :param storage_profile: Specifies the storage settings for the virtual
-     machine disks.
-    :type storage_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.ImageStorageProfile
-    :ivar provisioning_state: The provisioning state.
-    :vartype provisioning_state: str
-    """
-
-    _validation = {
-        'provisioning_state': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'tags': {'key': 'tags', 'type': '{str}'},
-        'source_virtual_machine': {'key': 'properties.sourceVirtualMachine', 'type': 'SubResource'},
-        'storage_profile': {'key': 'properties.storageProfile', 'type': 'ImageStorageProfile'},
-        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(ImageUpdate, self).__init__(**kwargs)
-        self.source_virtual_machine = kwargs.get('source_virtual_machine', None)
-        self.storage_profile = kwargs.get('storage_profile', None)
-        self.provisioning_state = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_update_py3.py
deleted file mode 100644
index 47658e7217f1..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_update_py3.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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 .update_resource_py3 import UpdateResource
-
-
-class ImageUpdate(UpdateResource):
-    """The source user image virtual hard disk. Only tags may be updated.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :param tags: Resource tags
-    :type tags: dict[str, str]
-    :param source_virtual_machine: The source virtual machine from which Image
-     is created.
-    :type source_virtual_machine:
-     ~azure.mgmt.compute.v2018_04_01.models.SubResource
-    :param storage_profile: Specifies the storage settings for the virtual
-     machine disks.
-    :type storage_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.ImageStorageProfile
-    :ivar provisioning_state: The provisioning state.
-    :vartype provisioning_state: str
-    """
-
-    _validation = {
-        'provisioning_state': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'tags': {'key': 'tags', 'type': '{str}'},
-        'source_virtual_machine': {'key': 'properties.sourceVirtualMachine', 'type': 'SubResource'},
-        'storage_profile': {'key': 'properties.storageProfile', 'type': 'ImageStorageProfile'},
-        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
-    }
-
-    def __init__(self, *, tags=None, source_virtual_machine=None, storage_profile=None, **kwargs) -> None:
-        super(ImageUpdate, self).__init__(tags=tags, **kwargs)
-        self.source_virtual_machine = source_virtual_machine
-        self.storage_profile = storage_profile
-        self.provisioning_state = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error.py
deleted file mode 100644
index 6324249d7c19..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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 InnerError(Model):
-    """Inner error details.
-
-    :param exceptiontype: The exception type.
-    :type exceptiontype: str
-    :param errordetail: The internal error message or exception dump.
-    :type errordetail: str
-    """
-
-    _attribute_map = {
-        'exceptiontype': {'key': 'exceptiontype', 'type': 'str'},
-        'errordetail': {'key': 'errordetail', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(InnerError, self).__init__(**kwargs)
-        self.exceptiontype = kwargs.get('exceptiontype', None)
-        self.errordetail = kwargs.get('errordetail', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error_py3.py
deleted file mode 100644
index ccec30d7b53f..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error_py3.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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 InnerError(Model):
-    """Inner error details.
-
-    :param exceptiontype: The exception type.
-    :type exceptiontype: str
-    :param errordetail: The internal error message or exception dump.
-    :type errordetail: str
-    """
-
-    _attribute_map = {
-        'exceptiontype': {'key': 'exceptiontype', 'type': 'str'},
-        'errordetail': {'key': 'errordetail', 'type': 'str'},
-    }
-
-    def __init__(self, *, exceptiontype: str=None, errordetail: str=None, **kwargs) -> None:
-        super(InnerError, self).__init__(**kwargs)
-        self.exceptiontype = exceptiontype
-        self.errordetail = errordetail
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/instance_view_status.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/instance_view_status.py
deleted file mode 100644
index fb7e1d99269e..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/instance_view_status.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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 InstanceViewStatus(Model):
-    """Instance view status.
-
-    :param code: The status code.
-    :type code: str
-    :param level: The level code. Possible values include: 'Info', 'Warning',
-     'Error'
-    :type level: str or
-     ~azure.mgmt.compute.v2018_04_01.models.StatusLevelTypes
-    :param display_status: The short localizable label for the status.
-    :type display_status: str
-    :param message: The detailed status message, including for alerts and
-     error messages.
-    :type message: str
-    :param time: The time of the status.
-    :type time: datetime
-    """
-
-    _attribute_map = {
-        'code': {'key': 'code', 'type': 'str'},
-        'level': {'key': 'level', 'type': 'StatusLevelTypes'},
-        'display_status': {'key': 'displayStatus', 'type': 'str'},
-        'message': {'key': 'message', 'type': 'str'},
-        'time': {'key': 'time', 'type': 'iso-8601'},
-    }
-
-    def __init__(self, **kwargs):
-        super(InstanceViewStatus, self).__init__(**kwargs)
-        self.code = kwargs.get('code', None)
-        self.level = kwargs.get('level', None)
-        self.display_status = kwargs.get('display_status', None)
-        self.message = kwargs.get('message', None)
-        self.time = kwargs.get('time', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/instance_view_status_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/instance_view_status_py3.py
deleted file mode 100644
index b3cf969f8cae..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/instance_view_status_py3.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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 InstanceViewStatus(Model):
-    """Instance view status.
-
-    :param code: The status code.
-    :type code: str
-    :param level: The level code. Possible values include: 'Info', 'Warning',
-     'Error'
-    :type level: str or
-     ~azure.mgmt.compute.v2018_04_01.models.StatusLevelTypes
-    :param display_status: The short localizable label for the status.
-    :type display_status: str
-    :param message: The detailed status message, including for alerts and
-     error messages.
-    :type message: str
-    :param time: The time of the status.
-    :type time: datetime
-    """
-
-    _attribute_map = {
-        'code': {'key': 'code', 'type': 'str'},
-        'level': {'key': 'level', 'type': 'StatusLevelTypes'},
-        'display_status': {'key': 'displayStatus', 'type': 'str'},
-        'message': {'key': 'message', 'type': 'str'},
-        'time': {'key': 'time', 'type': 'iso-8601'},
-    }
-
-    def __init__(self, *, code: str=None, level=None, display_status: str=None, message: str=None, time=None, **kwargs) -> None:
-        super(InstanceViewStatus, self).__init__(**kwargs)
-        self.code = code
-        self.level = level
-        self.display_status = display_status
-        self.message = message
-        self.time = time
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_key_reference.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_key_reference.py
deleted file mode 100644
index f1eb6d6c120a..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_key_reference.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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 KeyVaultKeyReference(Model):
-    """Describes a reference to Key Vault Key.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param key_url: Required. The URL referencing a key encryption key in Key
-     Vault.
-    :type key_url: str
-    :param source_vault: Required. The relative URL of the Key Vault
-     containing the key.
-    :type source_vault: ~azure.mgmt.compute.v2018_04_01.models.SubResource
-    """
-
-    _validation = {
-        'key_url': {'required': True},
-        'source_vault': {'required': True},
-    }
-
-    _attribute_map = {
-        'key_url': {'key': 'keyUrl', 'type': 'str'},
-        'source_vault': {'key': 'sourceVault', 'type': 'SubResource'},
-    }
-
-    def __init__(self, **kwargs):
-        super(KeyVaultKeyReference, self).__init__(**kwargs)
-        self.key_url = kwargs.get('key_url', None)
-        self.source_vault = kwargs.get('source_vault', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_key_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_key_reference_py3.py
deleted file mode 100644
index 378de235d684..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_key_reference_py3.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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 KeyVaultKeyReference(Model):
-    """Describes a reference to Key Vault Key.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param key_url: Required. The URL referencing a key encryption key in Key
-     Vault.
-    :type key_url: str
-    :param source_vault: Required. The relative URL of the Key Vault
-     containing the key.
-    :type source_vault: ~azure.mgmt.compute.v2018_04_01.models.SubResource
-    """
-
-    _validation = {
-        'key_url': {'required': True},
-        'source_vault': {'required': True},
-    }
-
-    _attribute_map = {
-        'key_url': {'key': 'keyUrl', 'type': 'str'},
-        'source_vault': {'key': 'sourceVault', 'type': 'SubResource'},
-    }
-
-    def __init__(self, *, key_url: str, source_vault, **kwargs) -> None:
-        super(KeyVaultKeyReference, self).__init__(**kwargs)
-        self.key_url = key_url
-        self.source_vault = source_vault
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_secret_reference.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_secret_reference.py
deleted file mode 100644
index 082199bce901..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_secret_reference.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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 KeyVaultSecretReference(Model):
-    """Describes a reference to Key Vault Secret.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param secret_url: Required. The URL referencing a secret in a Key Vault.
-    :type secret_url: str
-    :param source_vault: Required. The relative URL of the Key Vault
-     containing the secret.
-    :type source_vault: ~azure.mgmt.compute.v2018_04_01.models.SubResource
-    """
-
-    _validation = {
-        'secret_url': {'required': True},
-        'source_vault': {'required': True},
-    }
-
-    _attribute_map = {
-        'secret_url': {'key': 'secretUrl', 'type': 'str'},
-        'source_vault': {'key': 'sourceVault', 'type': 'SubResource'},
-    }
-
-    def __init__(self, **kwargs):
-        super(KeyVaultSecretReference, self).__init__(**kwargs)
-        self.secret_url = kwargs.get('secret_url', None)
-        self.source_vault = kwargs.get('source_vault', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_secret_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_secret_reference_py3.py
deleted file mode 100644
index 8d938cbf5e89..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_secret_reference_py3.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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 KeyVaultSecretReference(Model):
-    """Describes a reference to Key Vault Secret.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param secret_url: Required. The URL referencing a secret in a Key Vault.
-    :type secret_url: str
-    :param source_vault: Required. The relative URL of the Key Vault
-     containing the secret.
-    :type source_vault: ~azure.mgmt.compute.v2018_04_01.models.SubResource
-    """
-
-    _validation = {
-        'secret_url': {'required': True},
-        'source_vault': {'required': True},
-    }
-
-    _attribute_map = {
-        'secret_url': {'key': 'secretUrl', 'type': 'str'},
-        'source_vault': {'key': 'sourceVault', 'type': 'SubResource'},
-    }
-
-    def __init__(self, *, secret_url: str, source_vault, **kwargs) -> None:
-        super(KeyVaultSecretReference, self).__init__(**kwargs)
-        self.secret_url = secret_url
-        self.source_vault = source_vault
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/linux_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/linux_configuration.py
deleted file mode 100644
index 3dc5246c35d7..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/linux_configuration.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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 LinuxConfiguration(Model):
-    """Specifies the Linux operating system settings on the virtual machine.
-    <br><br>For a list of supported Linux distributions, see [Linux on
-    Azure-Endorsed
-    Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
-    <br><br> For running non-endorsed distributions, see [Information for
-    Non-Endorsed
-    Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
-
-    :param disable_password_authentication: Specifies whether password
-     authentication should be disabled.
-    :type disable_password_authentication: bool
-    :param ssh: Specifies the ssh key configuration for a Linux OS.
-    :type ssh: ~azure.mgmt.compute.v2018_04_01.models.SshConfiguration
-    """
-
-    _attribute_map = {
-        'disable_password_authentication': {'key': 'disablePasswordAuthentication', 'type': 'bool'},
-        'ssh': {'key': 'ssh', 'type': 'SshConfiguration'},
-    }
-
-    def __init__(self, **kwargs):
-        super(LinuxConfiguration, self).__init__(**kwargs)
-        self.disable_password_authentication = kwargs.get('disable_password_authentication', None)
-        self.ssh = kwargs.get('ssh', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/linux_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/linux_configuration_py3.py
deleted file mode 100644
index 45614597db33..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/linux_configuration_py3.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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 LinuxConfiguration(Model):
-    """Specifies the Linux operating system settings on the virtual machine.
-    <br><br>For a list of supported Linux distributions, see [Linux on
-    Azure-Endorsed
-    Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
-    <br><br> For running non-endorsed distributions, see [Information for
-    Non-Endorsed
-    Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
-
-    :param disable_password_authentication: Specifies whether password
-     authentication should be disabled.
-    :type disable_password_authentication: bool
-    :param ssh: Specifies the ssh key configuration for a Linux OS.
-    :type ssh: ~azure.mgmt.compute.v2018_04_01.models.SshConfiguration
-    """
-
-    _attribute_map = {
-        'disable_password_authentication': {'key': 'disablePasswordAuthentication', 'type': 'bool'},
-        'ssh': {'key': 'ssh', 'type': 'SshConfiguration'},
-    }
-
-    def __init__(self, *, disable_password_authentication: bool=None, ssh=None, **kwargs) -> None:
-        super(LinuxConfiguration, self).__init__(**kwargs)
-        self.disable_password_authentication = disable_password_authentication
-        self.ssh = ssh
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_input_base.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_input_base.py
deleted file mode 100644
index 843b739a0328..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_input_base.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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 LogAnalyticsInputBase(Model):
-    """Api input base class for LogAnalytics Api.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param blob_container_sas_uri: Required. SAS Uri of the logging blob
-     container to which LogAnalytics Api writes output logs to.
-    :type blob_container_sas_uri: str
-    :param from_time: Required. From time of the query
-    :type from_time: datetime
-    :param to_time: Required. To time of the query
-    :type to_time: datetime
-    :param group_by_throttle_policy: Group query result by Throttle Policy
-     applied.
-    :type group_by_throttle_policy: bool
-    :param group_by_operation_name: Group query result by  by Operation Name.
-    :type group_by_operation_name: bool
-    :param group_by_resource_name: Group query result by Resource Name.
-    :type group_by_resource_name: bool
-    """
-
-    _validation = {
-        'blob_container_sas_uri': {'required': True},
-        'from_time': {'required': True},
-        'to_time': {'required': True},
-    }
-
-    _attribute_map = {
-        'blob_container_sas_uri': {'key': 'blobContainerSasUri', 'type': 'str'},
-        'from_time': {'key': 'fromTime', 'type': 'iso-8601'},
-        'to_time': {'key': 'toTime', 'type': 'iso-8601'},
-        'group_by_throttle_policy': {'key': 'groupByThrottlePolicy', 'type': 'bool'},
-        'group_by_operation_name': {'key': 'groupByOperationName', 'type': 'bool'},
-        'group_by_resource_name': {'key': 'groupByResourceName', 'type': 'bool'},
-    }
-
-    def __init__(self, **kwargs):
-        super(LogAnalyticsInputBase, self).__init__(**kwargs)
-        self.blob_container_sas_uri = kwargs.get('blob_container_sas_uri', None)
-        self.from_time = kwargs.get('from_time', None)
-        self.to_time = kwargs.get('to_time', None)
-        self.group_by_throttle_policy = kwargs.get('group_by_throttle_policy', None)
-        self.group_by_operation_name = kwargs.get('group_by_operation_name', None)
-        self.group_by_resource_name = kwargs.get('group_by_resource_name', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_input_base_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_input_base_py3.py
deleted file mode 100644
index b9420117a8ca..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_input_base_py3.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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 LogAnalyticsInputBase(Model):
-    """Api input base class for LogAnalytics Api.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param blob_container_sas_uri: Required. SAS Uri of the logging blob
-     container to which LogAnalytics Api writes output logs to.
-    :type blob_container_sas_uri: str
-    :param from_time: Required. From time of the query
-    :type from_time: datetime
-    :param to_time: Required. To time of the query
-    :type to_time: datetime
-    :param group_by_throttle_policy: Group query result by Throttle Policy
-     applied.
-    :type group_by_throttle_policy: bool
-    :param group_by_operation_name: Group query result by  by Operation Name.
-    :type group_by_operation_name: bool
-    :param group_by_resource_name: Group query result by Resource Name.
-    :type group_by_resource_name: bool
-    """
-
-    _validation = {
-        'blob_container_sas_uri': {'required': True},
-        'from_time': {'required': True},
-        'to_time': {'required': True},
-    }
-
-    _attribute_map = {
-        'blob_container_sas_uri': {'key': 'blobContainerSasUri', 'type': 'str'},
-        'from_time': {'key': 'fromTime', 'type': 'iso-8601'},
-        'to_time': {'key': 'toTime', 'type': 'iso-8601'},
-        'group_by_throttle_policy': {'key': 'groupByThrottlePolicy', 'type': 'bool'},
-        'group_by_operation_name': {'key': 'groupByOperationName', 'type': 'bool'},
-        'group_by_resource_name': {'key': 'groupByResourceName', 'type': 'bool'},
-    }
-
-    def __init__(self, *, blob_container_sas_uri: str, from_time, to_time, group_by_throttle_policy: bool=None, group_by_operation_name: bool=None, group_by_resource_name: bool=None, **kwargs) -> None:
-        super(LogAnalyticsInputBase, self).__init__(**kwargs)
-        self.blob_container_sas_uri = blob_container_sas_uri
-        self.from_time = from_time
-        self.to_time = to_time
-        self.group_by_throttle_policy = group_by_throttle_policy
-        self.group_by_operation_name = group_by_operation_name
-        self.group_by_resource_name = group_by_resource_name
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_operation_result.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_operation_result.py
deleted file mode 100644
index ebb7a1177049..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_operation_result.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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 LogAnalyticsOperationResult(Model):
-    """LogAnalytics operation status response.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar properties: LogAnalyticsOutput
-    :vartype properties:
-     ~azure.mgmt.compute.v2018_04_01.models.LogAnalyticsOutput
-    """
-
-    _validation = {
-        'properties': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'properties': {'key': 'properties', 'type': 'LogAnalyticsOutput'},
-    }
-
-    def __init__(self, **kwargs):
-        super(LogAnalyticsOperationResult, self).__init__(**kwargs)
-        self.properties = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_operation_result_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_operation_result_py3.py
deleted file mode 100644
index dfeceeb58cf4..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_operation_result_py3.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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 LogAnalyticsOperationResult(Model):
-    """LogAnalytics operation status response.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar properties: LogAnalyticsOutput
-    :vartype properties:
-     ~azure.mgmt.compute.v2018_04_01.models.LogAnalyticsOutput
-    """
-
-    _validation = {
-        'properties': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'properties': {'key': 'properties', 'type': 'LogAnalyticsOutput'},
-    }
-
-    def __init__(self, **kwargs) -> None:
-        super(LogAnalyticsOperationResult, self).__init__(**kwargs)
-        self.properties = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_output.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_output.py
deleted file mode 100644
index 5ea1615011c3..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_output.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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 LogAnalyticsOutput(Model):
-    """LogAnalytics output properties.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar output: Output file Uri path to blob container.
-    :vartype output: str
-    """
-
-    _validation = {
-        'output': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'output': {'key': 'output', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(LogAnalyticsOutput, self).__init__(**kwargs)
-        self.output = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_output_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_output_py3.py
deleted file mode 100644
index 71a428a8e49a..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_output_py3.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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 LogAnalyticsOutput(Model):
-    """LogAnalytics output properties.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar output: Output file Uri path to blob container.
-    :vartype output: str
-    """
-
-    _validation = {
-        'output': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'output': {'key': 'output', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs) -> None:
-        super(LogAnalyticsOutput, self).__init__(**kwargs)
-        self.output = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/maintenance_redeploy_status.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/maintenance_redeploy_status.py
deleted file mode 100644
index 6c22c904d185..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/maintenance_redeploy_status.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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 MaintenanceRedeployStatus(Model):
-    """Maintenance Operation Status.
-
-    :param is_customer_initiated_maintenance_allowed: True, if customer is
-     allowed to perform Maintenance.
-    :type is_customer_initiated_maintenance_allowed: bool
-    :param pre_maintenance_window_start_time: Start Time for the Pre
-     Maintenance Window.
-    :type pre_maintenance_window_start_time: datetime
-    :param pre_maintenance_window_end_time: End Time for the Pre Maintenance
-     Window.
-    :type pre_maintenance_window_end_time: datetime
-    :param maintenance_window_start_time: Start Time for the Maintenance
-     Window.
-    :type maintenance_window_start_time: datetime
-    :param maintenance_window_end_time: End Time for the Maintenance Window.
-    :type maintenance_window_end_time: datetime
-    :param last_operation_result_code: The Last Maintenance Operation Result
-     Code. Possible values include: 'None', 'RetryLater', 'MaintenanceAborted',
-     'MaintenanceCompleted'
-    :type last_operation_result_code: str or
-     ~azure.mgmt.compute.v2018_04_01.models.MaintenanceOperationResultCodeTypes
-    :param last_operation_message: Message returned for the last Maintenance
-     Operation.
-    :type last_operation_message: str
-    """
-
-    _attribute_map = {
-        'is_customer_initiated_maintenance_allowed': {'key': 'isCustomerInitiatedMaintenanceAllowed', 'type': 'bool'},
-        'pre_maintenance_window_start_time': {'key': 'preMaintenanceWindowStartTime', 'type': 'iso-8601'},
-        'pre_maintenance_window_end_time': {'key': 'preMaintenanceWindowEndTime', 'type': 'iso-8601'},
-        'maintenance_window_start_time': {'key': 'maintenanceWindowStartTime', 'type': 'iso-8601'},
-        'maintenance_window_end_time': {'key': 'maintenanceWindowEndTime', 'type': 'iso-8601'},
-        'last_operation_result_code': {'key': 'lastOperationResultCode', 'type': 'MaintenanceOperationResultCodeTypes'},
-        'last_operation_message': {'key': 'lastOperationMessage', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(MaintenanceRedeployStatus, self).__init__(**kwargs)
-        self.is_customer_initiated_maintenance_allowed = kwargs.get('is_customer_initiated_maintenance_allowed', None)
-        self.pre_maintenance_window_start_time = kwargs.get('pre_maintenance_window_start_time', None)
-        self.pre_maintenance_window_end_time = kwargs.get('pre_maintenance_window_end_time', None)
-        self.maintenance_window_start_time = kwargs.get('maintenance_window_start_time', None)
-        self.maintenance_window_end_time = kwargs.get('maintenance_window_end_time', None)
-        self.last_operation_result_code = kwargs.get('last_operation_result_code', None)
-        self.last_operation_message = kwargs.get('last_operation_message', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/maintenance_redeploy_status_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/maintenance_redeploy_status_py3.py
deleted file mode 100644
index f2e8bbf807df..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/maintenance_redeploy_status_py3.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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 MaintenanceRedeployStatus(Model):
-    """Maintenance Operation Status.
-
-    :param is_customer_initiated_maintenance_allowed: True, if customer is
-     allowed to perform Maintenance.
-    :type is_customer_initiated_maintenance_allowed: bool
-    :param pre_maintenance_window_start_time: Start Time for the Pre
-     Maintenance Window.
-    :type pre_maintenance_window_start_time: datetime
-    :param pre_maintenance_window_end_time: End Time for the Pre Maintenance
-     Window.
-    :type pre_maintenance_window_end_time: datetime
-    :param maintenance_window_start_time: Start Time for the Maintenance
-     Window.
-    :type maintenance_window_start_time: datetime
-    :param maintenance_window_end_time: End Time for the Maintenance Window.
-    :type maintenance_window_end_time: datetime
-    :param last_operation_result_code: The Last Maintenance Operation Result
-     Code. Possible values include: 'None', 'RetryLater', 'MaintenanceAborted',
-     'MaintenanceCompleted'
-    :type last_operation_result_code: str or
-     ~azure.mgmt.compute.v2018_04_01.models.MaintenanceOperationResultCodeTypes
-    :param last_operation_message: Message returned for the last Maintenance
-     Operation.
-    :type last_operation_message: str
-    """
-
-    _attribute_map = {
-        'is_customer_initiated_maintenance_allowed': {'key': 'isCustomerInitiatedMaintenanceAllowed', 'type': 'bool'},
-        'pre_maintenance_window_start_time': {'key': 'preMaintenanceWindowStartTime', 'type': 'iso-8601'},
-        'pre_maintenance_window_end_time': {'key': 'preMaintenanceWindowEndTime', 'type': 'iso-8601'},
-        'maintenance_window_start_time': {'key': 'maintenanceWindowStartTime', 'type': 'iso-8601'},
-        'maintenance_window_end_time': {'key': 'maintenanceWindowEndTime', 'type': 'iso-8601'},
-        'last_operation_result_code': {'key': 'lastOperationResultCode', 'type': 'MaintenanceOperationResultCodeTypes'},
-        'last_operation_message': {'key': 'lastOperationMessage', 'type': 'str'},
-    }
-
-    def __init__(self, *, is_customer_initiated_maintenance_allowed: bool=None, pre_maintenance_window_start_time=None, pre_maintenance_window_end_time=None, maintenance_window_start_time=None, maintenance_window_end_time=None, last_operation_result_code=None, last_operation_message: str=None, **kwargs) -> None:
-        super(MaintenanceRedeployStatus, self).__init__(**kwargs)
-        self.is_customer_initiated_maintenance_allowed = is_customer_initiated_maintenance_allowed
-        self.pre_maintenance_window_start_time = pre_maintenance_window_start_time
-        self.pre_maintenance_window_end_time = pre_maintenance_window_end_time
-        self.maintenance_window_start_time = maintenance_window_start_time
-        self.maintenance_window_end_time = maintenance_window_end_time
-        self.last_operation_result_code = last_operation_result_code
-        self.last_operation_message = last_operation_message
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py
deleted file mode 100644
index a16aed3bbcbf..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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 .sub_resource import SubResource
-
-
-class ManagedDiskParameters(SubResource):
-    """The parameters of a managed disk.
-
-    :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 or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
-    :type storage_account_type: str or
-     ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
-    """
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(ManagedDiskParameters, self).__init__(**kwargs)
-        self.storage_account_type = kwargs.get('storage_account_type', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py
deleted file mode 100644
index 50b8a76181d6..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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 .sub_resource_py3 import SubResource
-
-
-class ManagedDiskParameters(SubResource):
-    """The parameters of a managed disk.
-
-    :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 or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
-    :type storage_account_type: str or
-     ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
-    """
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
-    }
-
-    def __init__(self, *, id: str=None, storage_account_type=None, **kwargs) -> None:
-        super(ManagedDiskParameters, self).__init__(id=id, **kwargs)
-        self.storage_account_type = storage_account_type
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_interface_reference.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_interface_reference.py
deleted file mode 100644
index b86e305e3f74..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_interface_reference.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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 .sub_resource import SubResource
-
-
-class NetworkInterfaceReference(SubResource):
-    """Describes a network interface reference.
-
-    :param id: Resource Id
-    :type id: str
-    :param primary: Specifies the primary network interface in case the
-     virtual machine has more than 1 network interface.
-    :type primary: bool
-    """
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'primary': {'key': 'properties.primary', 'type': 'bool'},
-    }
-
-    def __init__(self, **kwargs):
-        super(NetworkInterfaceReference, self).__init__(**kwargs)
-        self.primary = kwargs.get('primary', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_interface_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_interface_reference_py3.py
deleted file mode 100644
index 47da29278832..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_interface_reference_py3.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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 .sub_resource_py3 import SubResource
-
-
-class NetworkInterfaceReference(SubResource):
-    """Describes a network interface reference.
-
-    :param id: Resource Id
-    :type id: str
-    :param primary: Specifies the primary network interface in case the
-     virtual machine has more than 1 network interface.
-    :type primary: bool
-    """
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'primary': {'key': 'properties.primary', 'type': 'bool'},
-    }
-
-    def __init__(self, *, id: str=None, primary: bool=None, **kwargs) -> None:
-        super(NetworkInterfaceReference, self).__init__(id=id, **kwargs)
-        self.primary = primary
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_profile.py
deleted file mode 100644
index b547518c8397..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_profile.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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 NetworkProfile(Model):
-    """Specifies the network interfaces of the virtual machine.
-
-    :param network_interfaces: Specifies the list of resource Ids for the
-     network interfaces associated with the virtual machine.
-    :type network_interfaces:
-     list[~azure.mgmt.compute.v2018_04_01.models.NetworkInterfaceReference]
-    """
-
-    _attribute_map = {
-        'network_interfaces': {'key': 'networkInterfaces', 'type': '[NetworkInterfaceReference]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(NetworkProfile, self).__init__(**kwargs)
-        self.network_interfaces = kwargs.get('network_interfaces', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_profile_py3.py
deleted file mode 100644
index 63e37d139e29..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_profile_py3.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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 NetworkProfile(Model):
-    """Specifies the network interfaces of the virtual machine.
-
-    :param network_interfaces: Specifies the list of resource Ids for the
-     network interfaces associated with the virtual machine.
-    :type network_interfaces:
-     list[~azure.mgmt.compute.v2018_04_01.models.NetworkInterfaceReference]
-    """
-
-    _attribute_map = {
-        'network_interfaces': {'key': 'networkInterfaces', 'type': '[NetworkInterfaceReference]'},
-    }
-
-    def __init__(self, *, network_interfaces=None, **kwargs) -> None:
-        super(NetworkProfile, self).__init__(**kwargs)
-        self.network_interfaces = network_interfaces
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
deleted file mode 100644
index e82f77c2447c..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk.py
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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 OSDisk(Model):
-    """Specifies information about the operating system disk used by the virtual
-    machine. <br><br> For more information about disks, see [About disks and
-    VHDs for Azure virtual
-    machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
-
-    All required parameters must be populated in order to send to Azure.
-
-    :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**
-     <br><br> **Linux**. Possible values include: 'Windows', 'Linux'
-    :type os_type: str or
-     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
-    :param encryption_settings: Specifies the encryption settings for the OS
-     Disk. <br><br> Minimum api-version: 2015-06-15
-    :type encryption_settings:
-     ~azure.mgmt.compute.v2018_04_01.models.DiskEncryptionSettings
-    :param name: The disk name.
-    :type name: str
-    :param vhd: The virtual hard disk.
-    :type vhd: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
-    :param image: The source user image virtual hard disk. The virtual hard
-     disk will be copied before being attached to the virtual machine. If
-     SourceImage is provided, the destination virtual hard drive must not
-     exist.
-    :type image: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
-    :param caching: Specifies the caching requirements. <br><br> Possible
-     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
-     <br><br> Default: **None for Standard storage. ReadOnly for Premium
-     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
-    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
-    :param write_accelerator_enabled: Specifies whether writeAccelerator
-     should be enabled or disabled on the disk.
-    :type write_accelerator_enabled: bool
-    :param create_option: Required. Specifies how the virtual machine should
-     be created.<br><br> Possible values are:<br><br> **Attach** \\u2013 This
-     value is used when you are using a specialized disk to create the virtual
-     machine.<br><br> **FromImage** \\u2013 This value is used when you are
-     using an image to create the virtual machine. If you are using a platform
-     image, you also use the imageReference element described above. If you are
-     using a marketplace image, you  also use the plan element previously
-     described. Possible values include: 'FromImage', 'Empty', 'Attach'
-    :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
-     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.
-    :type managed_disk:
-     ~azure.mgmt.compute.v2018_04_01.models.ManagedDiskParameters
-    """
-
-    _validation = {
-        'create_option': {'required': True},
-    }
-
-    _attribute_map = {
-        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
-        'encryption_settings': {'key': 'encryptionSettings', 'type': 'DiskEncryptionSettings'},
-        'name': {'key': 'name', 'type': 'str'},
-        'vhd': {'key': 'vhd', 'type': 'VirtualHardDisk'},
-        'image': {'key': 'image', 'type': 'VirtualHardDisk'},
-        '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'},
-        'managed_disk': {'key': 'managedDisk', 'type': 'ManagedDiskParameters'},
-    }
-
-    def __init__(self, **kwargs):
-        super(OSDisk, self).__init__(**kwargs)
-        self.os_type = kwargs.get('os_type', None)
-        self.encryption_settings = kwargs.get('encryption_settings', None)
-        self.name = kwargs.get('name', None)
-        self.vhd = kwargs.get('vhd', None)
-        self.image = kwargs.get('image', None)
-        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.managed_disk = kwargs.get('managed_disk', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_image.py
deleted file mode 100644
index ad439c7ab470..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_image.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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 OSDiskImage(Model):
-    """Contains the os disk image information.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param operating_system: Required. The operating system of the
-     osDiskImage. Possible values include: 'Windows', 'Linux'
-    :type operating_system: str or
-     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
-    """
-
-    _validation = {
-        'operating_system': {'required': True},
-    }
-
-    _attribute_map = {
-        'operating_system': {'key': 'operatingSystem', 'type': 'OperatingSystemTypes'},
-    }
-
-    def __init__(self, **kwargs):
-        super(OSDiskImage, self).__init__(**kwargs)
-        self.operating_system = kwargs.get('operating_system', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_image_py3.py
deleted file mode 100644
index 1d9c6e45d677..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_image_py3.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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 OSDiskImage(Model):
-    """Contains the os disk image information.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param operating_system: Required. The operating system of the
-     osDiskImage. Possible values include: 'Windows', 'Linux'
-    :type operating_system: str or
-     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
-    """
-
-    _validation = {
-        'operating_system': {'required': True},
-    }
-
-    _attribute_map = {
-        'operating_system': {'key': 'operatingSystem', 'type': 'OperatingSystemTypes'},
-    }
-
-    def __init__(self, *, operating_system, **kwargs) -> None:
-        super(OSDiskImage, self).__init__(**kwargs)
-        self.operating_system = operating_system
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
deleted file mode 100644
index e45324c5df9c..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_py3.py
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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 OSDisk(Model):
-    """Specifies information about the operating system disk used by the virtual
-    machine. <br><br> For more information about disks, see [About disks and
-    VHDs for Azure virtual
-    machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
-
-    All required parameters must be populated in order to send to Azure.
-
-    :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**
-     <br><br> **Linux**. Possible values include: 'Windows', 'Linux'
-    :type os_type: str or
-     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
-    :param encryption_settings: Specifies the encryption settings for the OS
-     Disk. <br><br> Minimum api-version: 2015-06-15
-    :type encryption_settings:
-     ~azure.mgmt.compute.v2018_04_01.models.DiskEncryptionSettings
-    :param name: The disk name.
-    :type name: str
-    :param vhd: The virtual hard disk.
-    :type vhd: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
-    :param image: The source user image virtual hard disk. The virtual hard
-     disk will be copied before being attached to the virtual machine. If
-     SourceImage is provided, the destination virtual hard drive must not
-     exist.
-    :type image: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
-    :param caching: Specifies the caching requirements. <br><br> Possible
-     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
-     <br><br> Default: **None for Standard storage. ReadOnly for Premium
-     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
-    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
-    :param write_accelerator_enabled: Specifies whether writeAccelerator
-     should be enabled or disabled on the disk.
-    :type write_accelerator_enabled: bool
-    :param create_option: Required. Specifies how the virtual machine should
-     be created.<br><br> Possible values are:<br><br> **Attach** \\u2013 This
-     value is used when you are using a specialized disk to create the virtual
-     machine.<br><br> **FromImage** \\u2013 This value is used when you are
-     using an image to create the virtual machine. If you are using a platform
-     image, you also use the imageReference element described above. If you are
-     using a marketplace image, you  also use the plan element previously
-     described. Possible values include: 'FromImage', 'Empty', 'Attach'
-    :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
-     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.
-    :type managed_disk:
-     ~azure.mgmt.compute.v2018_04_01.models.ManagedDiskParameters
-    """
-
-    _validation = {
-        'create_option': {'required': True},
-    }
-
-    _attribute_map = {
-        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
-        'encryption_settings': {'key': 'encryptionSettings', 'type': 'DiskEncryptionSettings'},
-        'name': {'key': 'name', 'type': 'str'},
-        'vhd': {'key': 'vhd', 'type': 'VirtualHardDisk'},
-        'image': {'key': 'image', 'type': 'VirtualHardDisk'},
-        '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'},
-        'managed_disk': {'key': 'managedDisk', 'type': 'ManagedDiskParameters'},
-    }
-
-    def __init__(self, *, create_option, os_type=None, encryption_settings=None, name: str=None, vhd=None, image=None, caching=None, write_accelerator_enabled: bool=None, disk_size_gb: int=None, managed_disk=None, **kwargs) -> None:
-        super(OSDisk, self).__init__(**kwargs)
-        self.os_type = os_type
-        self.encryption_settings = encryption_settings
-        self.name = name
-        self.vhd = vhd
-        self.image = image
-        self.caching = caching
-        self.write_accelerator_enabled = write_accelerator_enabled
-        self.create_option = create_option
-        self.disk_size_gb = disk_size_gb
-        self.managed_disk = managed_disk
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_profile.py
deleted file mode 100644
index 3197bdb4b81f..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_profile.py
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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 OSProfile(Model):
-    """Specifies the operating system settings for the virtual machine.
-
-    :param computer_name: Specifies the host OS name of the virtual machine.
-     <br><br> **Max-length (Windows):** 15 characters <br><br> **Max-length
-     (Linux):** 64 characters. <br><br> For naming conventions and restrictions
-     see [Azure infrastructure services implementation
-     guidelines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-infrastructure-subscription-accounts-guidelines?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#1-naming-conventions).
-    :type computer_name: str
-    :param admin_username: Specifies the name of the administrator account.
-     <br><br> **Windows-only restriction:** Cannot end in "." <br><br>
-     **Disallowed values:** "administrator", "admin", "user", "user1", "test",
-     "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm",
-     "admin2", "aspnet", "backup", "console", "david", "guest", "john",
-     "owner", "root", "server", "sql", "support", "support_388945a0", "sys",
-     "test2", "test3", "user4", "user5". <br><br> **Minimum-length (Linux):** 1
-     character <br><br> **Max-length (Linux):** 64 characters <br><br>
-     **Max-length (Windows):** 20 characters  <br><br><li> For root access to
-     the Linux VM, see [Using root privileges on Linux virtual machines in
-     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-use-root-privileges?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)<br><li>
-     For a list of built-in system users on Linux that should not be used in
-     this field, see [Selecting User Names for Linux on
-     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-usernames?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
-    :type admin_username: str
-    :param admin_password: Specifies the password of the administrator
-     account. <br><br> **Minimum-length (Windows):** 8 characters <br><br>
-     **Minimum-length (Linux):** 6 characters <br><br> **Max-length
-     (Windows):** 123 characters <br><br> **Max-length (Linux):** 72 characters
-     <br><br> **Complexity requirements:** 3 out of 4 conditions below need to
-     be fulfilled <br> Has lower characters <br>Has upper characters <br> Has a
-     digit <br> Has a special character (Regex match [\\W_]) <br><br>
-     **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123",
-     "Pa$$word", "pass@word1", "Password!", "Password1", "Password22",
-     "iloveyou!" <br><br> For resetting the password, see [How to reset the
-     Remote Desktop service or its login password in a Windows
-     VM](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-reset-rdp?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
-     <br><br> For resetting root password, see [Manage users, SSH, and check or
-     repair disks on Azure Linux VMs using the VMAccess
-     Extension](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-vmaccess-extension?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#reset-root-password)
-    :type admin_password: str
-    :param custom_data: Specifies a base-64 encoded string of custom data. The
-     base-64 encoded string is decoded to a binary array that is saved as a
-     file on the Virtual Machine. The maximum length of the binary array is
-     65535 bytes. <br><br> For using cloud-init for your VM, see [Using
-     cloud-init to customize a Linux VM during
-     creation](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-cloud-init?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
-    :type custom_data: str
-    :param windows_configuration: Specifies Windows operating system settings
-     on the virtual machine.
-    :type windows_configuration:
-     ~azure.mgmt.compute.v2018_04_01.models.WindowsConfiguration
-    :param linux_configuration: Specifies the Linux operating system settings
-     on the virtual machine. <br><br>For a list of supported Linux
-     distributions, see [Linux on Azure-Endorsed
-     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
-     <br><br> For running non-endorsed distributions, see [Information for
-     Non-Endorsed
-     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
-    :type linux_configuration:
-     ~azure.mgmt.compute.v2018_04_01.models.LinuxConfiguration
-    :param secrets: Specifies set of certificates that should be installed
-     onto the virtual machine.
-    :type secrets:
-     list[~azure.mgmt.compute.v2018_04_01.models.VaultSecretGroup]
-    """
-
-    _attribute_map = {
-        'computer_name': {'key': 'computerName', 'type': 'str'},
-        'admin_username': {'key': 'adminUsername', 'type': 'str'},
-        'admin_password': {'key': 'adminPassword', 'type': 'str'},
-        'custom_data': {'key': 'customData', 'type': 'str'},
-        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'WindowsConfiguration'},
-        'linux_configuration': {'key': 'linuxConfiguration', 'type': 'LinuxConfiguration'},
-        'secrets': {'key': 'secrets', 'type': '[VaultSecretGroup]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(OSProfile, self).__init__(**kwargs)
-        self.computer_name = kwargs.get('computer_name', None)
-        self.admin_username = kwargs.get('admin_username', None)
-        self.admin_password = kwargs.get('admin_password', None)
-        self.custom_data = kwargs.get('custom_data', None)
-        self.windows_configuration = kwargs.get('windows_configuration', None)
-        self.linux_configuration = kwargs.get('linux_configuration', None)
-        self.secrets = kwargs.get('secrets', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_profile_py3.py
deleted file mode 100644
index eaef9a9ff6a0..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_profile_py3.py
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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 OSProfile(Model):
-    """Specifies the operating system settings for the virtual machine.
-
-    :param computer_name: Specifies the host OS name of the virtual machine.
-     <br><br> **Max-length (Windows):** 15 characters <br><br> **Max-length
-     (Linux):** 64 characters. <br><br> For naming conventions and restrictions
-     see [Azure infrastructure services implementation
-     guidelines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-infrastructure-subscription-accounts-guidelines?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#1-naming-conventions).
-    :type computer_name: str
-    :param admin_username: Specifies the name of the administrator account.
-     <br><br> **Windows-only restriction:** Cannot end in "." <br><br>
-     **Disallowed values:** "administrator", "admin", "user", "user1", "test",
-     "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm",
-     "admin2", "aspnet", "backup", "console", "david", "guest", "john",
-     "owner", "root", "server", "sql", "support", "support_388945a0", "sys",
-     "test2", "test3", "user4", "user5". <br><br> **Minimum-length (Linux):** 1
-     character <br><br> **Max-length (Linux):** 64 characters <br><br>
-     **Max-length (Windows):** 20 characters  <br><br><li> For root access to
-     the Linux VM, see [Using root privileges on Linux virtual machines in
-     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-use-root-privileges?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)<br><li>
-     For a list of built-in system users on Linux that should not be used in
-     this field, see [Selecting User Names for Linux on
-     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-usernames?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
-    :type admin_username: str
-    :param admin_password: Specifies the password of the administrator
-     account. <br><br> **Minimum-length (Windows):** 8 characters <br><br>
-     **Minimum-length (Linux):** 6 characters <br><br> **Max-length
-     (Windows):** 123 characters <br><br> **Max-length (Linux):** 72 characters
-     <br><br> **Complexity requirements:** 3 out of 4 conditions below need to
-     be fulfilled <br> Has lower characters <br>Has upper characters <br> Has a
-     digit <br> Has a special character (Regex match [\\W_]) <br><br>
-     **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123",
-     "Pa$$word", "pass@word1", "Password!", "Password1", "Password22",
-     "iloveyou!" <br><br> For resetting the password, see [How to reset the
-     Remote Desktop service or its login password in a Windows
-     VM](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-reset-rdp?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
-     <br><br> For resetting root password, see [Manage users, SSH, and check or
-     repair disks on Azure Linux VMs using the VMAccess
-     Extension](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-vmaccess-extension?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#reset-root-password)
-    :type admin_password: str
-    :param custom_data: Specifies a base-64 encoded string of custom data. The
-     base-64 encoded string is decoded to a binary array that is saved as a
-     file on the Virtual Machine. The maximum length of the binary array is
-     65535 bytes. <br><br> For using cloud-init for your VM, see [Using
-     cloud-init to customize a Linux VM during
-     creation](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-cloud-init?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
-    :type custom_data: str
-    :param windows_configuration: Specifies Windows operating system settings
-     on the virtual machine.
-    :type windows_configuration:
-     ~azure.mgmt.compute.v2018_04_01.models.WindowsConfiguration
-    :param linux_configuration: Specifies the Linux operating system settings
-     on the virtual machine. <br><br>For a list of supported Linux
-     distributions, see [Linux on Azure-Endorsed
-     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
-     <br><br> For running non-endorsed distributions, see [Information for
-     Non-Endorsed
-     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
-    :type linux_configuration:
-     ~azure.mgmt.compute.v2018_04_01.models.LinuxConfiguration
-    :param secrets: Specifies set of certificates that should be installed
-     onto the virtual machine.
-    :type secrets:
-     list[~azure.mgmt.compute.v2018_04_01.models.VaultSecretGroup]
-    """
-
-    _attribute_map = {
-        'computer_name': {'key': 'computerName', 'type': 'str'},
-        'admin_username': {'key': 'adminUsername', 'type': 'str'},
-        'admin_password': {'key': 'adminPassword', 'type': 'str'},
-        'custom_data': {'key': 'customData', 'type': 'str'},
-        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'WindowsConfiguration'},
-        'linux_configuration': {'key': 'linuxConfiguration', 'type': 'LinuxConfiguration'},
-        'secrets': {'key': 'secrets', 'type': '[VaultSecretGroup]'},
-    }
-
-    def __init__(self, *, computer_name: str=None, admin_username: str=None, admin_password: str=None, custom_data: str=None, windows_configuration=None, linux_configuration=None, secrets=None, **kwargs) -> None:
-        super(OSProfile, self).__init__(**kwargs)
-        self.computer_name = computer_name
-        self.admin_username = admin_username
-        self.admin_password = admin_password
-        self.custom_data = custom_data
-        self.windows_configuration = windows_configuration
-        self.linux_configuration = linux_configuration
-        self.secrets = secrets
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/plan.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/plan.py
deleted file mode 100644
index d42b6b32cfac..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/plan.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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 Plan(Model):
-    """Specifies information about the marketplace image used to create the
-    virtual machine. This element is only used for marketplace images. Before
-    you can use a marketplace image from an API, you must enable the image for
-    programmatic use.  In the Azure portal, find the marketplace image that you
-    want to use and then click **Want to deploy programmatically, Get Started
-    ->**. Enter any required information and then click **Save**.
-
-    :param name: The plan ID.
-    :type name: str
-    :param publisher: The publisher ID.
-    :type publisher: str
-    :param product: Specifies the product of the image from the marketplace.
-     This is the same value as Offer under the imageReference element.
-    :type product: str
-    :param promotion_code: The promotion code.
-    :type promotion_code: str
-    """
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'publisher': {'key': 'publisher', 'type': 'str'},
-        'product': {'key': 'product', 'type': 'str'},
-        'promotion_code': {'key': 'promotionCode', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(Plan, self).__init__(**kwargs)
-        self.name = kwargs.get('name', None)
-        self.publisher = kwargs.get('publisher', None)
-        self.product = kwargs.get('product', None)
-        self.promotion_code = kwargs.get('promotion_code', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/plan_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/plan_py3.py
deleted file mode 100644
index 9cca2c78a123..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/plan_py3.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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 Plan(Model):
-    """Specifies information about the marketplace image used to create the
-    virtual machine. This element is only used for marketplace images. Before
-    you can use a marketplace image from an API, you must enable the image for
-    programmatic use.  In the Azure portal, find the marketplace image that you
-    want to use and then click **Want to deploy programmatically, Get Started
-    ->**. Enter any required information and then click **Save**.
-
-    :param name: The plan ID.
-    :type name: str
-    :param publisher: The publisher ID.
-    :type publisher: str
-    :param product: Specifies the product of the image from the marketplace.
-     This is the same value as Offer under the imageReference element.
-    :type product: str
-    :param promotion_code: The promotion code.
-    :type promotion_code: str
-    """
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'publisher': {'key': 'publisher', 'type': 'str'},
-        'product': {'key': 'product', 'type': 'str'},
-        'promotion_code': {'key': 'promotionCode', 'type': 'str'},
-    }
-
-    def __init__(self, *, name: str=None, publisher: str=None, product: str=None, promotion_code: str=None, **kwargs) -> None:
-        super(Plan, self).__init__(**kwargs)
-        self.name = name
-        self.publisher = publisher
-        self.product = product
-        self.promotion_code = promotion_code
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/purchase_plan.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/purchase_plan.py
deleted file mode 100644
index 2e1509addca6..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/purchase_plan.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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 PurchasePlan(Model):
-    """Used for establishing the purchase context of any 3rd Party artifact
-    through MarketPlace.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param publisher: Required. The publisher ID.
-    :type publisher: str
-    :param name: Required. The plan ID.
-    :type name: str
-    :param product: Required. Specifies the product of the image from the
-     marketplace. This is the same value as Offer under the imageReference
-     element.
-    :type product: str
-    """
-
-    _validation = {
-        'publisher': {'required': True},
-        'name': {'required': True},
-        'product': {'required': True},
-    }
-
-    _attribute_map = {
-        'publisher': {'key': 'publisher', 'type': 'str'},
-        'name': {'key': 'name', 'type': 'str'},
-        'product': {'key': 'product', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(PurchasePlan, self).__init__(**kwargs)
-        self.publisher = kwargs.get('publisher', None)
-        self.name = kwargs.get('name', None)
-        self.product = kwargs.get('product', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/purchase_plan_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/purchase_plan_py3.py
deleted file mode 100644
index 26f7996f1633..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/purchase_plan_py3.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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 PurchasePlan(Model):
-    """Used for establishing the purchase context of any 3rd Party artifact
-    through MarketPlace.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param publisher: Required. The publisher ID.
-    :type publisher: str
-    :param name: Required. The plan ID.
-    :type name: str
-    :param product: Required. Specifies the product of the image from the
-     marketplace. This is the same value as Offer under the imageReference
-     element.
-    :type product: str
-    """
-
-    _validation = {
-        'publisher': {'required': True},
-        'name': {'required': True},
-        'product': {'required': True},
-    }
-
-    _attribute_map = {
-        'publisher': {'key': 'publisher', 'type': 'str'},
-        'name': {'key': 'name', 'type': 'str'},
-        'product': {'key': 'product', 'type': 'str'},
-    }
-
-    def __init__(self, *, publisher: str, name: str, product: str, **kwargs) -> None:
-        super(PurchasePlan, self).__init__(**kwargs)
-        self.publisher = publisher
-        self.name = name
-        self.product = product
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/recovery_walk_response.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/recovery_walk_response.py
deleted file mode 100644
index 8dcbca604c7e..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/recovery_walk_response.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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 RecoveryWalkResponse(Model):
-    """Response after calling a manual recovery walk.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar walk_performed: Whether the recovery walk was performed
-    :vartype walk_performed: bool
-    :ivar next_platform_update_domain: The next update domain that needs to be
-     walked. Null means walk spanning all update domains has been completed
-    :vartype next_platform_update_domain: int
-    """
-
-    _validation = {
-        'walk_performed': {'readonly': True},
-        'next_platform_update_domain': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'walk_performed': {'key': 'walkPerformed', 'type': 'bool'},
-        'next_platform_update_domain': {'key': 'nextPlatformUpdateDomain', 'type': 'int'},
-    }
-
-    def __init__(self, **kwargs):
-        super(RecoveryWalkResponse, self).__init__(**kwargs)
-        self.walk_performed = None
-        self.next_platform_update_domain = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/recovery_walk_response_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/recovery_walk_response_py3.py
deleted file mode 100644
index 5b24a0ed9b7a..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/recovery_walk_response_py3.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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 RecoveryWalkResponse(Model):
-    """Response after calling a manual recovery walk.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar walk_performed: Whether the recovery walk was performed
-    :vartype walk_performed: bool
-    :ivar next_platform_update_domain: The next update domain that needs to be
-     walked. Null means walk spanning all update domains has been completed
-    :vartype next_platform_update_domain: int
-    """
-
-    _validation = {
-        'walk_performed': {'readonly': True},
-        'next_platform_update_domain': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'walk_performed': {'key': 'walkPerformed', 'type': 'bool'},
-        'next_platform_update_domain': {'key': 'nextPlatformUpdateDomain', 'type': 'int'},
-    }
-
-    def __init__(self, **kwargs) -> None:
-        super(RecoveryWalkResponse, self).__init__(**kwargs)
-        self.walk_performed = None
-        self.next_platform_update_domain = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/request_rate_by_interval_input.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/request_rate_by_interval_input.py
deleted file mode 100644
index 8712882e54db..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/request_rate_by_interval_input.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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 .log_analytics_input_base import LogAnalyticsInputBase
-
-
-class RequestRateByIntervalInput(LogAnalyticsInputBase):
-    """Api request input for LogAnalytics getRequestRateByInterval Api.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param blob_container_sas_uri: Required. SAS Uri of the logging blob
-     container to which LogAnalytics Api writes output logs to.
-    :type blob_container_sas_uri: str
-    :param from_time: Required. From time of the query
-    :type from_time: datetime
-    :param to_time: Required. To time of the query
-    :type to_time: datetime
-    :param group_by_throttle_policy: Group query result by Throttle Policy
-     applied.
-    :type group_by_throttle_policy: bool
-    :param group_by_operation_name: Group query result by  by Operation Name.
-    :type group_by_operation_name: bool
-    :param group_by_resource_name: Group query result by Resource Name.
-    :type group_by_resource_name: bool
-    :param interval_length: Required. Interval value in minutes used to create
-     LogAnalytics call rate logs. Possible values include: 'ThreeMins',
-     'FiveMins', 'ThirtyMins', 'SixtyMins'
-    :type interval_length: str or
-     ~azure.mgmt.compute.v2018_04_01.models.IntervalInMins
-    """
-
-    _validation = {
-        'blob_container_sas_uri': {'required': True},
-        'from_time': {'required': True},
-        'to_time': {'required': True},
-        'interval_length': {'required': True},
-    }
-
-    _attribute_map = {
-        'blob_container_sas_uri': {'key': 'blobContainerSasUri', 'type': 'str'},
-        'from_time': {'key': 'fromTime', 'type': 'iso-8601'},
-        'to_time': {'key': 'toTime', 'type': 'iso-8601'},
-        'group_by_throttle_policy': {'key': 'groupByThrottlePolicy', 'type': 'bool'},
-        'group_by_operation_name': {'key': 'groupByOperationName', 'type': 'bool'},
-        'group_by_resource_name': {'key': 'groupByResourceName', 'type': 'bool'},
-        'interval_length': {'key': 'intervalLength', 'type': 'IntervalInMins'},
-    }
-
-    def __init__(self, **kwargs):
-        super(RequestRateByIntervalInput, self).__init__(**kwargs)
-        self.interval_length = kwargs.get('interval_length', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/request_rate_by_interval_input_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/request_rate_by_interval_input_py3.py
deleted file mode 100644
index c073513f5d59..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/request_rate_by_interval_input_py3.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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 .log_analytics_input_base_py3 import LogAnalyticsInputBase
-
-
-class RequestRateByIntervalInput(LogAnalyticsInputBase):
-    """Api request input for LogAnalytics getRequestRateByInterval Api.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param blob_container_sas_uri: Required. SAS Uri of the logging blob
-     container to which LogAnalytics Api writes output logs to.
-    :type blob_container_sas_uri: str
-    :param from_time: Required. From time of the query
-    :type from_time: datetime
-    :param to_time: Required. To time of the query
-    :type to_time: datetime
-    :param group_by_throttle_policy: Group query result by Throttle Policy
-     applied.
-    :type group_by_throttle_policy: bool
-    :param group_by_operation_name: Group query result by  by Operation Name.
-    :type group_by_operation_name: bool
-    :param group_by_resource_name: Group query result by Resource Name.
-    :type group_by_resource_name: bool
-    :param interval_length: Required. Interval value in minutes used to create
-     LogAnalytics call rate logs. Possible values include: 'ThreeMins',
-     'FiveMins', 'ThirtyMins', 'SixtyMins'
-    :type interval_length: str or
-     ~azure.mgmt.compute.v2018_04_01.models.IntervalInMins
-    """
-
-    _validation = {
-        'blob_container_sas_uri': {'required': True},
-        'from_time': {'required': True},
-        'to_time': {'required': True},
-        'interval_length': {'required': True},
-    }
-
-    _attribute_map = {
-        'blob_container_sas_uri': {'key': 'blobContainerSasUri', 'type': 'str'},
-        'from_time': {'key': 'fromTime', 'type': 'iso-8601'},
-        'to_time': {'key': 'toTime', 'type': 'iso-8601'},
-        'group_by_throttle_policy': {'key': 'groupByThrottlePolicy', 'type': 'bool'},
-        'group_by_operation_name': {'key': 'groupByOperationName', 'type': 'bool'},
-        'group_by_resource_name': {'key': 'groupByResourceName', 'type': 'bool'},
-        'interval_length': {'key': 'intervalLength', 'type': 'IntervalInMins'},
-    }
-
-    def __init__(self, *, blob_container_sas_uri: str, from_time, to_time, interval_length, group_by_throttle_policy: bool=None, group_by_operation_name: bool=None, group_by_resource_name: bool=None, **kwargs) -> None:
-        super(RequestRateByIntervalInput, self).__init__(blob_container_sas_uri=blob_container_sas_uri, from_time=from_time, to_time=to_time, group_by_throttle_policy=group_by_throttle_policy, group_by_operation_name=group_by_operation_name, group_by_resource_name=group_by_resource_name, **kwargs)
-        self.interval_length = interval_length
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/update_resource.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/resource_update.py
similarity index 71%
rename from azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/update_resource.py
rename to azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/resource_update.py
index b1d2898ff082..1ab6fb273f49 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/update_resource.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/resource_update.py
@@ -12,17 +12,21 @@
 from msrest.serialization import Model
 
 
-class UpdateResource(Model):
-    """The Update Resource model definition.
+class ResourceUpdate(Model):
+    """The Resource model definition.
 
     :param tags: Resource tags
     :type tags: dict[str, str]
+    :param sku:
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
     """
 
     _attribute_map = {
         'tags': {'key': 'tags', 'type': '{str}'},
+        'sku': {'key': 'sku', 'type': 'DiskSku'},
     }
 
     def __init__(self, **kwargs):
-        super(UpdateResource, self).__init__(**kwargs)
+        super(ResourceUpdate, self).__init__(**kwargs)
         self.tags = kwargs.get('tags', None)
+        self.sku = kwargs.get('sku', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/update_resource_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/resource_update_py3.py
similarity index 67%
rename from azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/update_resource_py3.py
rename to azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/resource_update_py3.py
index c06c17c124d9..1074982f9341 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/update_resource_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/resource_update_py3.py
@@ -12,17 +12,21 @@
 from msrest.serialization import Model
 
 
-class UpdateResource(Model):
-    """The Update Resource model definition.
+class ResourceUpdate(Model):
+    """The Resource model definition.
 
     :param tags: Resource tags
     :type tags: dict[str, str]
+    :param sku:
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
     """
 
     _attribute_map = {
         'tags': {'key': 'tags', 'type': '{str}'},
+        'sku': {'key': 'sku', 'type': 'DiskSku'},
     }
 
-    def __init__(self, *, tags=None, **kwargs) -> None:
-        super(UpdateResource, self).__init__(**kwargs)
+    def __init__(self, *, tags=None, sku=None, **kwargs) -> None:
+        super(ResourceUpdate, self).__init__(**kwargs)
         self.tags = tags
+        self.sku = sku
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rollback_status_info.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rollback_status_info.py
deleted file mode 100644
index db43528801fa..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rollback_status_info.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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 RollbackStatusInfo(Model):
-    """Information about rollback on failed VM instances after a OS Upgrade
-    operation.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar successfully_rolledback_instance_count: The number of instances
-     which have been successfully rolled back.
-    :vartype successfully_rolledback_instance_count: int
-    :ivar failed_rolledback_instance_count: The number of instances which
-     failed to rollback.
-    :vartype failed_rolledback_instance_count: int
-    :ivar rollback_error: Error Details if OS rollback failed.
-    :vartype rollback_error: ~azure.mgmt.compute.v2018_04_01.models.ApiError
-    """
-
-    _validation = {
-        'successfully_rolledback_instance_count': {'readonly': True},
-        'failed_rolledback_instance_count': {'readonly': True},
-        'rollback_error': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'successfully_rolledback_instance_count': {'key': 'successfullyRolledbackInstanceCount', 'type': 'int'},
-        'failed_rolledback_instance_count': {'key': 'failedRolledbackInstanceCount', 'type': 'int'},
-        'rollback_error': {'key': 'rollbackError', 'type': 'ApiError'},
-    }
-
-    def __init__(self, **kwargs):
-        super(RollbackStatusInfo, self).__init__(**kwargs)
-        self.successfully_rolledback_instance_count = None
-        self.failed_rolledback_instance_count = None
-        self.rollback_error = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rollback_status_info_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rollback_status_info_py3.py
deleted file mode 100644
index 37ebb8516470..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rollback_status_info_py3.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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 RollbackStatusInfo(Model):
-    """Information about rollback on failed VM instances after a OS Upgrade
-    operation.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar successfully_rolledback_instance_count: The number of instances
-     which have been successfully rolled back.
-    :vartype successfully_rolledback_instance_count: int
-    :ivar failed_rolledback_instance_count: The number of instances which
-     failed to rollback.
-    :vartype failed_rolledback_instance_count: int
-    :ivar rollback_error: Error Details if OS rollback failed.
-    :vartype rollback_error: ~azure.mgmt.compute.v2018_04_01.models.ApiError
-    """
-
-    _validation = {
-        'successfully_rolledback_instance_count': {'readonly': True},
-        'failed_rolledback_instance_count': {'readonly': True},
-        'rollback_error': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'successfully_rolledback_instance_count': {'key': 'successfullyRolledbackInstanceCount', 'type': 'int'},
-        'failed_rolledback_instance_count': {'key': 'failedRolledbackInstanceCount', 'type': 'int'},
-        'rollback_error': {'key': 'rollbackError', 'type': 'ApiError'},
-    }
-
-    def __init__(self, **kwargs) -> None:
-        super(RollbackStatusInfo, self).__init__(**kwargs)
-        self.successfully_rolledback_instance_count = None
-        self.failed_rolledback_instance_count = None
-        self.rollback_error = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_policy.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_policy.py
deleted file mode 100644
index 1eecaa5e2e65..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_policy.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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 RollingUpgradePolicy(Model):
-    """The configuration parameters used while performing a rolling upgrade.
-
-    :param max_batch_instance_percent: The maximum percent of total virtual
-     machine instances that will be upgraded simultaneously by the rolling
-     upgrade in one batch. As this is a maximum, unhealthy instances in
-     previous or future batches can cause the percentage of instances in a
-     batch to decrease to ensure higher reliability. The default value for this
-     parameter is 20%.
-    :type max_batch_instance_percent: int
-    :param max_unhealthy_instance_percent: The maximum percentage of the total
-     virtual machine instances in the scale set that can be simultaneously
-     unhealthy, either as a result of being upgraded, or by being found in an
-     unhealthy state by the virtual machine health checks before the rolling
-     upgrade aborts. This constraint will be checked prior to starting any
-     batch. The default value for this parameter is 20%.
-    :type max_unhealthy_instance_percent: int
-    :param max_unhealthy_upgraded_instance_percent: The maximum percentage of
-     upgraded virtual machine instances that can be found to be in an unhealthy
-     state. This check will happen after each batch is upgraded. If this
-     percentage is ever exceeded, the rolling update aborts. The default value
-     for this parameter is 20%.
-    :type max_unhealthy_upgraded_instance_percent: int
-    :param pause_time_between_batches: The wait time between completing the
-     update for all virtual machines in one batch and starting the next batch.
-     The time duration should be specified in ISO 8601 format. The default
-     value is 0 seconds (PT0S).
-    :type pause_time_between_batches: str
-    """
-
-    _validation = {
-        'max_batch_instance_percent': {'maximum': 100, 'minimum': 5},
-        'max_unhealthy_instance_percent': {'maximum': 100, 'minimum': 5},
-        'max_unhealthy_upgraded_instance_percent': {'maximum': 100, 'minimum': 0},
-    }
-
-    _attribute_map = {
-        'max_batch_instance_percent': {'key': 'maxBatchInstancePercent', 'type': 'int'},
-        'max_unhealthy_instance_percent': {'key': 'maxUnhealthyInstancePercent', 'type': 'int'},
-        'max_unhealthy_upgraded_instance_percent': {'key': 'maxUnhealthyUpgradedInstancePercent', 'type': 'int'},
-        'pause_time_between_batches': {'key': 'pauseTimeBetweenBatches', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(RollingUpgradePolicy, self).__init__(**kwargs)
-        self.max_batch_instance_percent = kwargs.get('max_batch_instance_percent', None)
-        self.max_unhealthy_instance_percent = kwargs.get('max_unhealthy_instance_percent', None)
-        self.max_unhealthy_upgraded_instance_percent = kwargs.get('max_unhealthy_upgraded_instance_percent', None)
-        self.pause_time_between_batches = kwargs.get('pause_time_between_batches', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_policy_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_policy_py3.py
deleted file mode 100644
index e698a382f112..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_policy_py3.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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 RollingUpgradePolicy(Model):
-    """The configuration parameters used while performing a rolling upgrade.
-
-    :param max_batch_instance_percent: The maximum percent of total virtual
-     machine instances that will be upgraded simultaneously by the rolling
-     upgrade in one batch. As this is a maximum, unhealthy instances in
-     previous or future batches can cause the percentage of instances in a
-     batch to decrease to ensure higher reliability. The default value for this
-     parameter is 20%.
-    :type max_batch_instance_percent: int
-    :param max_unhealthy_instance_percent: The maximum percentage of the total
-     virtual machine instances in the scale set that can be simultaneously
-     unhealthy, either as a result of being upgraded, or by being found in an
-     unhealthy state by the virtual machine health checks before the rolling
-     upgrade aborts. This constraint will be checked prior to starting any
-     batch. The default value for this parameter is 20%.
-    :type max_unhealthy_instance_percent: int
-    :param max_unhealthy_upgraded_instance_percent: The maximum percentage of
-     upgraded virtual machine instances that can be found to be in an unhealthy
-     state. This check will happen after each batch is upgraded. If this
-     percentage is ever exceeded, the rolling update aborts. The default value
-     for this parameter is 20%.
-    :type max_unhealthy_upgraded_instance_percent: int
-    :param pause_time_between_batches: The wait time between completing the
-     update for all virtual machines in one batch and starting the next batch.
-     The time duration should be specified in ISO 8601 format. The default
-     value is 0 seconds (PT0S).
-    :type pause_time_between_batches: str
-    """
-
-    _validation = {
-        'max_batch_instance_percent': {'maximum': 100, 'minimum': 5},
-        'max_unhealthy_instance_percent': {'maximum': 100, 'minimum': 5},
-        'max_unhealthy_upgraded_instance_percent': {'maximum': 100, 'minimum': 0},
-    }
-
-    _attribute_map = {
-        'max_batch_instance_percent': {'key': 'maxBatchInstancePercent', 'type': 'int'},
-        'max_unhealthy_instance_percent': {'key': 'maxUnhealthyInstancePercent', 'type': 'int'},
-        'max_unhealthy_upgraded_instance_percent': {'key': 'maxUnhealthyUpgradedInstancePercent', 'type': 'int'},
-        'pause_time_between_batches': {'key': 'pauseTimeBetweenBatches', 'type': 'str'},
-    }
-
-    def __init__(self, *, max_batch_instance_percent: int=None, max_unhealthy_instance_percent: int=None, max_unhealthy_upgraded_instance_percent: int=None, pause_time_between_batches: str=None, **kwargs) -> None:
-        super(RollingUpgradePolicy, self).__init__(**kwargs)
-        self.max_batch_instance_percent = max_batch_instance_percent
-        self.max_unhealthy_instance_percent = max_unhealthy_instance_percent
-        self.max_unhealthy_upgraded_instance_percent = max_unhealthy_upgraded_instance_percent
-        self.pause_time_between_batches = pause_time_between_batches
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_progress_info.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_progress_info.py
deleted file mode 100644
index 87e40590e275..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_progress_info.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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 RollingUpgradeProgressInfo(Model):
-    """Information about the number of virtual machine instances in each upgrade
-    state.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar successful_instance_count: The number of instances that have been
-     successfully upgraded.
-    :vartype successful_instance_count: int
-    :ivar failed_instance_count: The number of instances that have failed to
-     be upgraded successfully.
-    :vartype failed_instance_count: int
-    :ivar in_progress_instance_count: The number of instances that are
-     currently being upgraded.
-    :vartype in_progress_instance_count: int
-    :ivar pending_instance_count: The number of instances that have not yet
-     begun to be upgraded.
-    :vartype pending_instance_count: int
-    """
-
-    _validation = {
-        'successful_instance_count': {'readonly': True},
-        'failed_instance_count': {'readonly': True},
-        'in_progress_instance_count': {'readonly': True},
-        'pending_instance_count': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'successful_instance_count': {'key': 'successfulInstanceCount', 'type': 'int'},
-        'failed_instance_count': {'key': 'failedInstanceCount', 'type': 'int'},
-        'in_progress_instance_count': {'key': 'inProgressInstanceCount', 'type': 'int'},
-        'pending_instance_count': {'key': 'pendingInstanceCount', 'type': 'int'},
-    }
-
-    def __init__(self, **kwargs):
-        super(RollingUpgradeProgressInfo, self).__init__(**kwargs)
-        self.successful_instance_count = None
-        self.failed_instance_count = None
-        self.in_progress_instance_count = None
-        self.pending_instance_count = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_progress_info_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_progress_info_py3.py
deleted file mode 100644
index 060abc3063b4..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_progress_info_py3.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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 RollingUpgradeProgressInfo(Model):
-    """Information about the number of virtual machine instances in each upgrade
-    state.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar successful_instance_count: The number of instances that have been
-     successfully upgraded.
-    :vartype successful_instance_count: int
-    :ivar failed_instance_count: The number of instances that have failed to
-     be upgraded successfully.
-    :vartype failed_instance_count: int
-    :ivar in_progress_instance_count: The number of instances that are
-     currently being upgraded.
-    :vartype in_progress_instance_count: int
-    :ivar pending_instance_count: The number of instances that have not yet
-     begun to be upgraded.
-    :vartype pending_instance_count: int
-    """
-
-    _validation = {
-        'successful_instance_count': {'readonly': True},
-        'failed_instance_count': {'readonly': True},
-        'in_progress_instance_count': {'readonly': True},
-        'pending_instance_count': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'successful_instance_count': {'key': 'successfulInstanceCount', 'type': 'int'},
-        'failed_instance_count': {'key': 'failedInstanceCount', 'type': 'int'},
-        'in_progress_instance_count': {'key': 'inProgressInstanceCount', 'type': 'int'},
-        'pending_instance_count': {'key': 'pendingInstanceCount', 'type': 'int'},
-    }
-
-    def __init__(self, **kwargs) -> None:
-        super(RollingUpgradeProgressInfo, self).__init__(**kwargs)
-        self.successful_instance_count = None
-        self.failed_instance_count = None
-        self.in_progress_instance_count = None
-        self.pending_instance_count = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_running_status.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_running_status.py
deleted file mode 100644
index 0fc6dadaaac9..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_running_status.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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 RollingUpgradeRunningStatus(Model):
-    """Information about the current running state of the overall upgrade.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar code: Code indicating the current status of the upgrade. Possible
-     values include: 'RollingForward', 'Cancelled', 'Completed', 'Faulted'
-    :vartype code: str or
-     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeStatusCode
-    :ivar start_time: Start time of the upgrade.
-    :vartype start_time: datetime
-    :ivar last_action: The last action performed on the rolling upgrade.
-     Possible values include: 'Start', 'Cancel'
-    :vartype last_action: str or
-     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeActionType
-    :ivar last_action_time: Last action time of the upgrade.
-    :vartype last_action_time: datetime
-    """
-
-    _validation = {
-        'code': {'readonly': True},
-        'start_time': {'readonly': True},
-        'last_action': {'readonly': True},
-        'last_action_time': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'code': {'key': 'code', 'type': 'RollingUpgradeStatusCode'},
-        'start_time': {'key': 'startTime', 'type': 'iso-8601'},
-        'last_action': {'key': 'lastAction', 'type': 'RollingUpgradeActionType'},
-        'last_action_time': {'key': 'lastActionTime', 'type': 'iso-8601'},
-    }
-
-    def __init__(self, **kwargs):
-        super(RollingUpgradeRunningStatus, self).__init__(**kwargs)
-        self.code = None
-        self.start_time = None
-        self.last_action = None
-        self.last_action_time = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_running_status_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_running_status_py3.py
deleted file mode 100644
index 013502d02229..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_running_status_py3.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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 RollingUpgradeRunningStatus(Model):
-    """Information about the current running state of the overall upgrade.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar code: Code indicating the current status of the upgrade. Possible
-     values include: 'RollingForward', 'Cancelled', 'Completed', 'Faulted'
-    :vartype code: str or
-     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeStatusCode
-    :ivar start_time: Start time of the upgrade.
-    :vartype start_time: datetime
-    :ivar last_action: The last action performed on the rolling upgrade.
-     Possible values include: 'Start', 'Cancel'
-    :vartype last_action: str or
-     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeActionType
-    :ivar last_action_time: Last action time of the upgrade.
-    :vartype last_action_time: datetime
-    """
-
-    _validation = {
-        'code': {'readonly': True},
-        'start_time': {'readonly': True},
-        'last_action': {'readonly': True},
-        'last_action_time': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'code': {'key': 'code', 'type': 'RollingUpgradeStatusCode'},
-        'start_time': {'key': 'startTime', 'type': 'iso-8601'},
-        'last_action': {'key': 'lastAction', 'type': 'RollingUpgradeActionType'},
-        'last_action_time': {'key': 'lastActionTime', 'type': 'iso-8601'},
-    }
-
-    def __init__(self, **kwargs) -> None:
-        super(RollingUpgradeRunningStatus, self).__init__(**kwargs)
-        self.code = None
-        self.start_time = None
-        self.last_action = None
-        self.last_action_time = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_status_info.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_status_info.py
deleted file mode 100644
index eb679db28958..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_status_info.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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 RollingUpgradeStatusInfo(Resource):
-    """The status of the latest virtual machine scale set rolling upgrade.
-
-    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 policy: The rolling upgrade policies applied for this upgrade.
-    :vartype policy:
-     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradePolicy
-    :ivar running_status: Information about the current running state of the
-     overall upgrade.
-    :vartype running_status:
-     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeRunningStatus
-    :ivar progress: Information about the number of virtual machine instances
-     in each upgrade state.
-    :vartype progress:
-     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeProgressInfo
-    :ivar error: Error details for this upgrade, if there are any.
-    :vartype error: ~azure.mgmt.compute.v2018_04_01.models.ApiError
-    """
-
-    _validation = {
-        'id': {'readonly': True},
-        'name': {'readonly': True},
-        'type': {'readonly': True},
-        'location': {'required': True},
-        'policy': {'readonly': True},
-        'running_status': {'readonly': True},
-        'progress': {'readonly': True},
-        'error': {'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}'},
-        'policy': {'key': 'properties.policy', 'type': 'RollingUpgradePolicy'},
-        'running_status': {'key': 'properties.runningStatus', 'type': 'RollingUpgradeRunningStatus'},
-        'progress': {'key': 'properties.progress', 'type': 'RollingUpgradeProgressInfo'},
-        'error': {'key': 'properties.error', 'type': 'ApiError'},
-    }
-
-    def __init__(self, **kwargs):
-        super(RollingUpgradeStatusInfo, self).__init__(**kwargs)
-        self.policy = None
-        self.running_status = None
-        self.progress = None
-        self.error = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_status_info_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_status_info_py3.py
deleted file mode 100644
index 8baa5b20df04..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_status_info_py3.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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 RollingUpgradeStatusInfo(Resource):
-    """The status of the latest virtual machine scale set rolling upgrade.
-
-    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 policy: The rolling upgrade policies applied for this upgrade.
-    :vartype policy:
-     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradePolicy
-    :ivar running_status: Information about the current running state of the
-     overall upgrade.
-    :vartype running_status:
-     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeRunningStatus
-    :ivar progress: Information about the number of virtual machine instances
-     in each upgrade state.
-    :vartype progress:
-     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeProgressInfo
-    :ivar error: Error details for this upgrade, if there are any.
-    :vartype error: ~azure.mgmt.compute.v2018_04_01.models.ApiError
-    """
-
-    _validation = {
-        'id': {'readonly': True},
-        'name': {'readonly': True},
-        'type': {'readonly': True},
-        'location': {'required': True},
-        'policy': {'readonly': True},
-        'running_status': {'readonly': True},
-        'progress': {'readonly': True},
-        'error': {'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}'},
-        'policy': {'key': 'properties.policy', 'type': 'RollingUpgradePolicy'},
-        'running_status': {'key': 'properties.runningStatus', 'type': 'RollingUpgradeRunningStatus'},
-        'progress': {'key': 'properties.progress', 'type': 'RollingUpgradeProgressInfo'},
-        'error': {'key': 'properties.error', 'type': 'ApiError'},
-    }
-
-    def __init__(self, *, location: str, tags=None, **kwargs) -> None:
-        super(RollingUpgradeStatusInfo, self).__init__(location=location, tags=tags, **kwargs)
-        self.policy = None
-        self.running_status = None
-        self.progress = None
-        self.error = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document.py
deleted file mode 100644
index fb511a45281d..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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 .run_command_document_base import RunCommandDocumentBase
-
-
-class RunCommandDocument(RunCommandDocumentBase):
-    """Describes the properties of a Run Command.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param schema: Required. The VM run command schema.
-    :type schema: str
-    :param id: Required. The VM run command id.
-    :type id: str
-    :param os_type: Required. The Operating System type. Possible values
-     include: 'Windows', 'Linux'
-    :type os_type: str or
-     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
-    :param label: Required. The VM run command label.
-    :type label: str
-    :param description: Required. The VM run command description.
-    :type description: str
-    :param script: Required. The script to be executed.
-    :type script: list[str]
-    :param parameters: The parameters used by the script.
-    :type parameters:
-     list[~azure.mgmt.compute.v2018_04_01.models.RunCommandParameterDefinition]
-    """
-
-    _validation = {
-        'schema': {'required': True},
-        'id': {'required': True},
-        'os_type': {'required': True},
-        'label': {'required': True},
-        'description': {'required': True},
-        'script': {'required': True},
-    }
-
-    _attribute_map = {
-        'schema': {'key': '$schema', 'type': 'str'},
-        'id': {'key': 'id', 'type': 'str'},
-        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
-        'label': {'key': 'label', 'type': 'str'},
-        'description': {'key': 'description', 'type': 'str'},
-        'script': {'key': 'script', 'type': '[str]'},
-        'parameters': {'key': 'parameters', 'type': '[RunCommandParameterDefinition]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(RunCommandDocument, self).__init__(**kwargs)
-        self.script = kwargs.get('script', None)
-        self.parameters = kwargs.get('parameters', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base.py
deleted file mode 100644
index 2ae3371b83e7..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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 RunCommandDocumentBase(Model):
-    """Describes the properties of a Run Command metadata.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param schema: Required. The VM run command schema.
-    :type schema: str
-    :param id: Required. The VM run command id.
-    :type id: str
-    :param os_type: Required. The Operating System type. Possible values
-     include: 'Windows', 'Linux'
-    :type os_type: str or
-     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
-    :param label: Required. The VM run command label.
-    :type label: str
-    :param description: Required. The VM run command description.
-    :type description: str
-    """
-
-    _validation = {
-        'schema': {'required': True},
-        'id': {'required': True},
-        'os_type': {'required': True},
-        'label': {'required': True},
-        'description': {'required': True},
-    }
-
-    _attribute_map = {
-        'schema': {'key': '$schema', 'type': 'str'},
-        'id': {'key': 'id', 'type': 'str'},
-        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
-        'label': {'key': 'label', 'type': 'str'},
-        'description': {'key': 'description', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(RunCommandDocumentBase, self).__init__(**kwargs)
-        self.schema = kwargs.get('schema', None)
-        self.id = kwargs.get('id', None)
-        self.os_type = kwargs.get('os_type', None)
-        self.label = kwargs.get('label', None)
-        self.description = kwargs.get('description', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base_paged.py
deleted file mode 100644
index 1ac583338364..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base_paged.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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 RunCommandDocumentBasePaged(Paged):
-    """
-    A paging container for iterating over a list of :class:`RunCommandDocumentBase <azure.mgmt.compute.v2018_04_01.models.RunCommandDocumentBase>` object
-    """
-
-    _attribute_map = {
-        'next_link': {'key': 'nextLink', 'type': 'str'},
-        'current_page': {'key': 'value', 'type': '[RunCommandDocumentBase]'}
-    }
-
-    def __init__(self, *args, **kwargs):
-
-        super(RunCommandDocumentBasePaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base_py3.py
deleted file mode 100644
index 45919bf4d325..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base_py3.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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 RunCommandDocumentBase(Model):
-    """Describes the properties of a Run Command metadata.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param schema: Required. The VM run command schema.
-    :type schema: str
-    :param id: Required. The VM run command id.
-    :type id: str
-    :param os_type: Required. The Operating System type. Possible values
-     include: 'Windows', 'Linux'
-    :type os_type: str or
-     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
-    :param label: Required. The VM run command label.
-    :type label: str
-    :param description: Required. The VM run command description.
-    :type description: str
-    """
-
-    _validation = {
-        'schema': {'required': True},
-        'id': {'required': True},
-        'os_type': {'required': True},
-        'label': {'required': True},
-        'description': {'required': True},
-    }
-
-    _attribute_map = {
-        'schema': {'key': '$schema', 'type': 'str'},
-        'id': {'key': 'id', 'type': 'str'},
-        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
-        'label': {'key': 'label', 'type': 'str'},
-        'description': {'key': 'description', 'type': 'str'},
-    }
-
-    def __init__(self, *, schema: str, id: str, os_type, label: str, description: str, **kwargs) -> None:
-        super(RunCommandDocumentBase, self).__init__(**kwargs)
-        self.schema = schema
-        self.id = id
-        self.os_type = os_type
-        self.label = label
-        self.description = description
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_py3.py
deleted file mode 100644
index 3543a6d45ef5..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_py3.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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 .run_command_document_base_py3 import RunCommandDocumentBase
-
-
-class RunCommandDocument(RunCommandDocumentBase):
-    """Describes the properties of a Run Command.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param schema: Required. The VM run command schema.
-    :type schema: str
-    :param id: Required. The VM run command id.
-    :type id: str
-    :param os_type: Required. The Operating System type. Possible values
-     include: 'Windows', 'Linux'
-    :type os_type: str or
-     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
-    :param label: Required. The VM run command label.
-    :type label: str
-    :param description: Required. The VM run command description.
-    :type description: str
-    :param script: Required. The script to be executed.
-    :type script: list[str]
-    :param parameters: The parameters used by the script.
-    :type parameters:
-     list[~azure.mgmt.compute.v2018_04_01.models.RunCommandParameterDefinition]
-    """
-
-    _validation = {
-        'schema': {'required': True},
-        'id': {'required': True},
-        'os_type': {'required': True},
-        'label': {'required': True},
-        'description': {'required': True},
-        'script': {'required': True},
-    }
-
-    _attribute_map = {
-        'schema': {'key': '$schema', 'type': 'str'},
-        'id': {'key': 'id', 'type': 'str'},
-        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
-        'label': {'key': 'label', 'type': 'str'},
-        'description': {'key': 'description', 'type': 'str'},
-        'script': {'key': 'script', 'type': '[str]'},
-        'parameters': {'key': 'parameters', 'type': '[RunCommandParameterDefinition]'},
-    }
-
-    def __init__(self, *, schema: str, id: str, os_type, label: str, description: str, script, parameters=None, **kwargs) -> None:
-        super(RunCommandDocument, self).__init__(schema=schema, id=id, os_type=os_type, label=label, description=description, **kwargs)
-        self.script = script
-        self.parameters = parameters
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input.py
deleted file mode 100644
index 25b53a1f0336..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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 RunCommandInput(Model):
-    """Capture Virtual Machine parameters.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param command_id: Required. The run command id.
-    :type command_id: str
-    :param script: Optional. The script to be executed.  When this value is
-     given, the given script will override the default script of the command.
-    :type script: list[str]
-    :param parameters: The run command parameters.
-    :type parameters:
-     list[~azure.mgmt.compute.v2018_04_01.models.RunCommandInputParameter]
-    """
-
-    _validation = {
-        'command_id': {'required': True},
-    }
-
-    _attribute_map = {
-        'command_id': {'key': 'commandId', 'type': 'str'},
-        'script': {'key': 'script', 'type': '[str]'},
-        'parameters': {'key': 'parameters', 'type': '[RunCommandInputParameter]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(RunCommandInput, self).__init__(**kwargs)
-        self.command_id = kwargs.get('command_id', None)
-        self.script = kwargs.get('script', None)
-        self.parameters = kwargs.get('parameters', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_parameter.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_parameter.py
deleted file mode 100644
index cd76ad81bfa2..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_parameter.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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 RunCommandInputParameter(Model):
-    """Describes the properties of a run command parameter.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param name: Required. The run command parameter name.
-    :type name: str
-    :param value: Required. The run command parameter value.
-    :type value: str
-    """
-
-    _validation = {
-        'name': {'required': True},
-        'value': {'required': True},
-    }
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'value': {'key': 'value', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(RunCommandInputParameter, self).__init__(**kwargs)
-        self.name = kwargs.get('name', None)
-        self.value = kwargs.get('value', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_parameter_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_parameter_py3.py
deleted file mode 100644
index 6013f038a1c3..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_parameter_py3.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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 RunCommandInputParameter(Model):
-    """Describes the properties of a run command parameter.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param name: Required. The run command parameter name.
-    :type name: str
-    :param value: Required. The run command parameter value.
-    :type value: str
-    """
-
-    _validation = {
-        'name': {'required': True},
-        'value': {'required': True},
-    }
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'value': {'key': 'value', 'type': 'str'},
-    }
-
-    def __init__(self, *, name: str, value: str, **kwargs) -> None:
-        super(RunCommandInputParameter, self).__init__(**kwargs)
-        self.name = name
-        self.value = value
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_py3.py
deleted file mode 100644
index ae2a3588c64d..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_py3.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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 RunCommandInput(Model):
-    """Capture Virtual Machine parameters.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param command_id: Required. The run command id.
-    :type command_id: str
-    :param script: Optional. The script to be executed.  When this value is
-     given, the given script will override the default script of the command.
-    :type script: list[str]
-    :param parameters: The run command parameters.
-    :type parameters:
-     list[~azure.mgmt.compute.v2018_04_01.models.RunCommandInputParameter]
-    """
-
-    _validation = {
-        'command_id': {'required': True},
-    }
-
-    _attribute_map = {
-        'command_id': {'key': 'commandId', 'type': 'str'},
-        'script': {'key': 'script', 'type': '[str]'},
-        'parameters': {'key': 'parameters', 'type': '[RunCommandInputParameter]'},
-    }
-
-    def __init__(self, *, command_id: str, script=None, parameters=None, **kwargs) -> None:
-        super(RunCommandInput, self).__init__(**kwargs)
-        self.command_id = command_id
-        self.script = script
-        self.parameters = parameters
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_parameter_definition.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_parameter_definition.py
deleted file mode 100644
index e09f774d8241..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_parameter_definition.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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 RunCommandParameterDefinition(Model):
-    """Describes the properties of a run command parameter.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param name: Required. The run command parameter name.
-    :type name: str
-    :param type: Required. The run command parameter type.
-    :type type: str
-    :param default_value: The run command parameter default value.
-    :type default_value: str
-    :param required: The run command parameter required. Default value: False
-     .
-    :type required: bool
-    """
-
-    _validation = {
-        'name': {'required': True},
-        'type': {'required': True},
-    }
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'type': {'key': 'type', 'type': 'str'},
-        'default_value': {'key': 'defaultValue', 'type': 'str'},
-        'required': {'key': 'required', 'type': 'bool'},
-    }
-
-    def __init__(self, **kwargs):
-        super(RunCommandParameterDefinition, self).__init__(**kwargs)
-        self.name = kwargs.get('name', None)
-        self.type = kwargs.get('type', None)
-        self.default_value = kwargs.get('default_value', None)
-        self.required = kwargs.get('required', False)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_parameter_definition_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_parameter_definition_py3.py
deleted file mode 100644
index e5fbc708f965..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_parameter_definition_py3.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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 RunCommandParameterDefinition(Model):
-    """Describes the properties of a run command parameter.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param name: Required. The run command parameter name.
-    :type name: str
-    :param type: Required. The run command parameter type.
-    :type type: str
-    :param default_value: The run command parameter default value.
-    :type default_value: str
-    :param required: The run command parameter required. Default value: False
-     .
-    :type required: bool
-    """
-
-    _validation = {
-        'name': {'required': True},
-        'type': {'required': True},
-    }
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'type': {'key': 'type', 'type': 'str'},
-        'default_value': {'key': 'defaultValue', 'type': 'str'},
-        'required': {'key': 'required', 'type': 'bool'},
-    }
-
-    def __init__(self, *, name: str, type: str, default_value: str=None, required: bool=False, **kwargs) -> None:
-        super(RunCommandParameterDefinition, self).__init__(**kwargs)
-        self.name = name
-        self.type = type
-        self.default_value = default_value
-        self.required = required
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result.py
deleted file mode 100644
index 8fafc31dd548..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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 RunCommandResult(Model):
-    """Run command operation response.
-
-    :param output: Operation output data (raw JSON)
-    :type output: object
-    """
-
-    _attribute_map = {
-        'output': {'key': 'properties.output', 'type': 'object'},
-    }
-
-    def __init__(self, **kwargs):
-        super(RunCommandResult, self).__init__(**kwargs)
-        self.output = kwargs.get('output', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result_py3.py
deleted file mode 100644
index 852c2895dcee..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result_py3.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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 RunCommandResult(Model):
-    """Run command operation response.
-
-    :param output: Operation output data (raw JSON)
-    :type output: object
-    """
-
-    _attribute_map = {
-        'output': {'key': 'properties.output', 'type': 'object'},
-    }
-
-    def __init__(self, *, output=None, **kwargs) -> None:
-        super(RunCommandResult, self).__init__(**kwargs)
-        self.output = output
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sku.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sku.py
deleted file mode 100644
index 5c07709435e0..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sku.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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 Sku(Model):
-    """Describes a virtual machine scale set sku.
-
-    :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**
-    :type tier: str
-    :param capacity: Specifies the number of virtual machines in the scale
-     set.
-    :type capacity: long
-    """
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'tier': {'key': 'tier', 'type': 'str'},
-        'capacity': {'key': 'capacity', 'type': 'long'},
-    }
-
-    def __init__(self, **kwargs):
-        super(Sku, self).__init__(**kwargs)
-        self.name = kwargs.get('name', None)
-        self.tier = kwargs.get('tier', None)
-        self.capacity = kwargs.get('capacity', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sku_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sku_py3.py
deleted file mode 100644
index f6bc74afaadc..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sku_py3.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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 Sku(Model):
-    """Describes a virtual machine scale set sku.
-
-    :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**
-    :type tier: str
-    :param capacity: Specifies the number of virtual machines in the scale
-     set.
-    :type capacity: long
-    """
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'tier': {'key': 'tier', 'type': 'str'},
-        'capacity': {'key': 'capacity', 'type': 'long'},
-    }
-
-    def __init__(self, *, name: str=None, tier: str=None, capacity: int=None, **kwargs) -> None:
-        super(Sku, self).__init__(**kwargs)
-        self.name = name
-        self.tier = tier
-        self.capacity = capacity
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update.py
index 119c6f05bc49..6483ca6dd981 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update.py
@@ -9,12 +9,16 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.serialization import Model
+from .resource_update import ResourceUpdate
 
 
-class SnapshotUpdate(Model):
+class SnapshotUpdate(ResourceUpdate):
     """Snapshot update resource.
 
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param sku:
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
     :param os_type: the Operating System type. Possible values include:
      'Windows', 'Linux'
     :type os_type: str or
@@ -28,18 +32,14 @@ class SnapshotUpdate(Model):
     :param encryption_settings: Encryption settings for disk or snapshot
     :type encryption_settings:
      ~azure.mgmt.compute.v2018_04_01.models.EncryptionSettings
-    :param tags: Resource tags
-    :type tags: dict[str, str]
-    :param sku:
-    :type sku: ~azure.mgmt.compute.v2018_04_01.models.SnapshotSku
     """
 
     _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'sku': {'key': 'sku', 'type': 'DiskSku'},
         '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):
@@ -47,5 +47,3 @@ def __init__(self, **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_04_01/models/snapshot_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update_py3.py
index 54e05426ce8e..c1a7cec5da8c 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update_py3.py
@@ -9,12 +9,16 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.serialization import Model
+from .resource_update_py3 import ResourceUpdate
 
 
-class SnapshotUpdate(Model):
+class SnapshotUpdate(ResourceUpdate):
     """Snapshot update resource.
 
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param sku:
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
     :param os_type: the Operating System type. Possible values include:
      'Windows', 'Linux'
     :type os_type: str or
@@ -28,24 +32,18 @@ class SnapshotUpdate(Model):
     :param encryption_settings: Encryption settings for disk or snapshot
     :type encryption_settings:
      ~azure.mgmt.compute.v2018_04_01.models.EncryptionSettings
-    :param tags: Resource tags
-    :type tags: dict[str, str]
-    :param sku:
-    :type sku: ~azure.mgmt.compute.v2018_04_01.models.SnapshotSku
     """
 
     _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'sku': {'key': 'sku', 'type': 'DiskSku'},
         '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)
+    def __init__(self, *, tags=None, sku=None, os_type=None, disk_size_gb: int=None, encryption_settings=None, **kwargs) -> None:
+        super(SnapshotUpdate, self).__init__(tags=tags, sku=sku, **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_04_01/models/ssh_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_configuration.py
deleted file mode 100644
index ff92fd1a9376..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_configuration.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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 SshConfiguration(Model):
-    """SSH configuration for Linux based VMs running on Azure.
-
-    :param public_keys: The list of SSH public keys used to authenticate with
-     linux based VMs.
-    :type public_keys:
-     list[~azure.mgmt.compute.v2018_04_01.models.SshPublicKey]
-    """
-
-    _attribute_map = {
-        'public_keys': {'key': 'publicKeys', 'type': '[SshPublicKey]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(SshConfiguration, self).__init__(**kwargs)
-        self.public_keys = kwargs.get('public_keys', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_configuration_py3.py
deleted file mode 100644
index e81ca2f47af3..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_configuration_py3.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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 SshConfiguration(Model):
-    """SSH configuration for Linux based VMs running on Azure.
-
-    :param public_keys: The list of SSH public keys used to authenticate with
-     linux based VMs.
-    :type public_keys:
-     list[~azure.mgmt.compute.v2018_04_01.models.SshPublicKey]
-    """
-
-    _attribute_map = {
-        'public_keys': {'key': 'publicKeys', 'type': '[SshPublicKey]'},
-    }
-
-    def __init__(self, *, public_keys=None, **kwargs) -> None:
-        super(SshConfiguration, self).__init__(**kwargs)
-        self.public_keys = public_keys
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_public_key.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_public_key.py
deleted file mode 100644
index 122e0d3b9fdd..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_public_key.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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 SshPublicKey(Model):
-    """Contains information about SSH certificate public key and the path on the
-    Linux VM where the public key is placed.
-
-    :param path: Specifies the full path on the created VM where ssh public
-     key is stored. If the file already exists, the specified key is appended
-     to the file. Example: /home/user/.ssh/authorized_keys
-    :type path: str
-    :param key_data: SSH public key certificate used to authenticate with the
-     VM through ssh. The key needs to be at least 2048-bit and in ssh-rsa
-     format. <br><br> For creating ssh keys, see [Create SSH keys on Linux and
-     Mac for Linux VMs in
-     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-mac-create-ssh-keys?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
-    :type key_data: str
-    """
-
-    _attribute_map = {
-        'path': {'key': 'path', 'type': 'str'},
-        'key_data': {'key': 'keyData', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(SshPublicKey, self).__init__(**kwargs)
-        self.path = kwargs.get('path', None)
-        self.key_data = kwargs.get('key_data', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_public_key_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_public_key_py3.py
deleted file mode 100644
index b16ee085b36b..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_public_key_py3.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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 SshPublicKey(Model):
-    """Contains information about SSH certificate public key and the path on the
-    Linux VM where the public key is placed.
-
-    :param path: Specifies the full path on the created VM where ssh public
-     key is stored. If the file already exists, the specified key is appended
-     to the file. Example: /home/user/.ssh/authorized_keys
-    :type path: str
-    :param key_data: SSH public key certificate used to authenticate with the
-     VM through ssh. The key needs to be at least 2048-bit and in ssh-rsa
-     format. <br><br> For creating ssh keys, see [Create SSH keys on Linux and
-     Mac for Linux VMs in
-     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-mac-create-ssh-keys?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
-    :type key_data: str
-    """
-
-    _attribute_map = {
-        'path': {'key': 'path', 'type': 'str'},
-        'key_data': {'key': 'keyData', 'type': 'str'},
-    }
-
-    def __init__(self, *, path: str=None, key_data: str=None, **kwargs) -> None:
-        super(SshPublicKey, self).__init__(**kwargs)
-        self.path = path
-        self.key_data = key_data
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/storage_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/storage_profile.py
deleted file mode 100644
index da1fef243048..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/storage_profile.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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 StorageProfile(Model):
-    """Specifies the storage settings for the virtual machine disks.
-
-    :param image_reference: Specifies information about the image to use. You
-     can specify information about platform images, marketplace images, or
-     virtual machine images. This element is required when you want to use a
-     platform image, marketplace image, or virtual machine image, but is not
-     used in other creation operations.
-    :type image_reference:
-     ~azure.mgmt.compute.v2018_04_01.models.ImageReference
-    :param os_disk: Specifies information about the operating system disk used
-     by the virtual machine. <br><br> For more information about disks, see
-     [About disks and VHDs for Azure virtual
-     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
-    :type os_disk: ~azure.mgmt.compute.v2018_04_01.models.OSDisk
-    :param data_disks: Specifies the parameters that are used to add a data
-     disk to a virtual machine. <br><br> For more information about disks, see
-     [About disks and VHDs for Azure virtual
-     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
-    :type data_disks: list[~azure.mgmt.compute.v2018_04_01.models.DataDisk]
-    """
-
-    _attribute_map = {
-        'image_reference': {'key': 'imageReference', 'type': 'ImageReference'},
-        'os_disk': {'key': 'osDisk', 'type': 'OSDisk'},
-        'data_disks': {'key': 'dataDisks', 'type': '[DataDisk]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(StorageProfile, self).__init__(**kwargs)
-        self.image_reference = kwargs.get('image_reference', None)
-        self.os_disk = kwargs.get('os_disk', None)
-        self.data_disks = kwargs.get('data_disks', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/storage_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/storage_profile_py3.py
deleted file mode 100644
index 62cb9eb9b38e..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/storage_profile_py3.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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 StorageProfile(Model):
-    """Specifies the storage settings for the virtual machine disks.
-
-    :param image_reference: Specifies information about the image to use. You
-     can specify information about platform images, marketplace images, or
-     virtual machine images. This element is required when you want to use a
-     platform image, marketplace image, or virtual machine image, but is not
-     used in other creation operations.
-    :type image_reference:
-     ~azure.mgmt.compute.v2018_04_01.models.ImageReference
-    :param os_disk: Specifies information about the operating system disk used
-     by the virtual machine. <br><br> For more information about disks, see
-     [About disks and VHDs for Azure virtual
-     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
-    :type os_disk: ~azure.mgmt.compute.v2018_04_01.models.OSDisk
-    :param data_disks: Specifies the parameters that are used to add a data
-     disk to a virtual machine. <br><br> For more information about disks, see
-     [About disks and VHDs for Azure virtual
-     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
-    :type data_disks: list[~azure.mgmt.compute.v2018_04_01.models.DataDisk]
-    """
-
-    _attribute_map = {
-        'image_reference': {'key': 'imageReference', 'type': 'ImageReference'},
-        'os_disk': {'key': 'osDisk', 'type': 'OSDisk'},
-        'data_disks': {'key': 'dataDisks', 'type': '[DataDisk]'},
-    }
-
-    def __init__(self, *, image_reference=None, os_disk=None, data_disks=None, **kwargs) -> None:
-        super(StorageProfile, self).__init__(**kwargs)
-        self.image_reference = image_reference
-        self.os_disk = os_disk
-        self.data_disks = data_disks
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource.py
deleted file mode 100644
index 11e092cc6ff5..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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 SubResource(Model):
-    """SubResource.
-
-    :param id: Resource Id
-    :type id: str
-    """
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(SubResource, self).__init__(**kwargs)
-        self.id = kwargs.get('id', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_py3.py
deleted file mode 100644
index 29e5afee38f9..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_py3.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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 SubResource(Model):
-    """SubResource.
-
-    :param id: Resource Id
-    :type id: str
-    """
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-    }
-
-    def __init__(self, *, id: str=None, **kwargs) -> None:
-        super(SubResource, self).__init__(**kwargs)
-        self.id = id
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_read_only.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_read_only.py
deleted file mode 100644
index 4a0ec466c0d4..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_read_only.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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 SubResourceReadOnly(Model):
-    """SubResourceReadOnly.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar id: Resource Id
-    :vartype id: str
-    """
-
-    _validation = {
-        'id': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(SubResourceReadOnly, self).__init__(**kwargs)
-        self.id = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_read_only_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_read_only_py3.py
deleted file mode 100644
index cb918e9a2ac6..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_read_only_py3.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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 SubResourceReadOnly(Model):
-    """SubResourceReadOnly.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar id: Resource Id
-    :vartype id: str
-    """
-
-    _validation = {
-        'id': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs) -> None:
-        super(SubResourceReadOnly, self).__init__(**kwargs)
-        self.id = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/throttled_requests_input.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/throttled_requests_input.py
deleted file mode 100644
index 5eac2a5540ac..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/throttled_requests_input.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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 .log_analytics_input_base import LogAnalyticsInputBase
-
-
-class ThrottledRequestsInput(LogAnalyticsInputBase):
-    """Api request input for LogAnalytics getThrottledRequests Api.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param blob_container_sas_uri: Required. SAS Uri of the logging blob
-     container to which LogAnalytics Api writes output logs to.
-    :type blob_container_sas_uri: str
-    :param from_time: Required. From time of the query
-    :type from_time: datetime
-    :param to_time: Required. To time of the query
-    :type to_time: datetime
-    :param group_by_throttle_policy: Group query result by Throttle Policy
-     applied.
-    :type group_by_throttle_policy: bool
-    :param group_by_operation_name: Group query result by  by Operation Name.
-    :type group_by_operation_name: bool
-    :param group_by_resource_name: Group query result by Resource Name.
-    :type group_by_resource_name: bool
-    """
-
-    _validation = {
-        'blob_container_sas_uri': {'required': True},
-        'from_time': {'required': True},
-        'to_time': {'required': True},
-    }
-
-    _attribute_map = {
-        'blob_container_sas_uri': {'key': 'blobContainerSasUri', 'type': 'str'},
-        'from_time': {'key': 'fromTime', 'type': 'iso-8601'},
-        'to_time': {'key': 'toTime', 'type': 'iso-8601'},
-        'group_by_throttle_policy': {'key': 'groupByThrottlePolicy', 'type': 'bool'},
-        'group_by_operation_name': {'key': 'groupByOperationName', 'type': 'bool'},
-        'group_by_resource_name': {'key': 'groupByResourceName', 'type': 'bool'},
-    }
-
-    def __init__(self, **kwargs):
-        super(ThrottledRequestsInput, self).__init__(**kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/throttled_requests_input_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/throttled_requests_input_py3.py
deleted file mode 100644
index 025900705375..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/throttled_requests_input_py3.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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 .log_analytics_input_base_py3 import LogAnalyticsInputBase
-
-
-class ThrottledRequestsInput(LogAnalyticsInputBase):
-    """Api request input for LogAnalytics getThrottledRequests Api.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param blob_container_sas_uri: Required. SAS Uri of the logging blob
-     container to which LogAnalytics Api writes output logs to.
-    :type blob_container_sas_uri: str
-    :param from_time: Required. From time of the query
-    :type from_time: datetime
-    :param to_time: Required. To time of the query
-    :type to_time: datetime
-    :param group_by_throttle_policy: Group query result by Throttle Policy
-     applied.
-    :type group_by_throttle_policy: bool
-    :param group_by_operation_name: Group query result by  by Operation Name.
-    :type group_by_operation_name: bool
-    :param group_by_resource_name: Group query result by Resource Name.
-    :type group_by_resource_name: bool
-    """
-
-    _validation = {
-        'blob_container_sas_uri': {'required': True},
-        'from_time': {'required': True},
-        'to_time': {'required': True},
-    }
-
-    _attribute_map = {
-        'blob_container_sas_uri': {'key': 'blobContainerSasUri', 'type': 'str'},
-        'from_time': {'key': 'fromTime', 'type': 'iso-8601'},
-        'to_time': {'key': 'toTime', 'type': 'iso-8601'},
-        'group_by_throttle_policy': {'key': 'groupByThrottlePolicy', 'type': 'bool'},
-        'group_by_operation_name': {'key': 'groupByOperationName', 'type': 'bool'},
-        'group_by_resource_name': {'key': 'groupByResourceName', 'type': 'bool'},
-    }
-
-    def __init__(self, *, blob_container_sas_uri: str, from_time, to_time, group_by_throttle_policy: bool=None, group_by_operation_name: bool=None, group_by_resource_name: bool=None, **kwargs) -> None:
-        super(ThrottledRequestsInput, self).__init__(blob_container_sas_uri=blob_container_sas_uri, from_time=from_time, to_time=to_time, group_by_throttle_policy=group_by_throttle_policy, group_by_operation_name=group_by_operation_name, group_by_resource_name=group_by_resource_name, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info.py
deleted file mode 100644
index d243b61b2e80..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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 UpgradeOperationHistoricalStatusInfo(Model):
-    """Virtual Machine Scale Set OS Upgrade History operation response.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar properties: Information about the properties of the upgrade
-     operation.
-    :vartype properties:
-     ~azure.mgmt.compute.v2018_04_01.models.UpgradeOperationHistoricalStatusInfoProperties
-    :ivar type: Resource type
-    :vartype type: str
-    :ivar location: Resource location
-    :vartype location: str
-    """
-
-    _validation = {
-        'properties': {'readonly': True},
-        'type': {'readonly': True},
-        'location': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'properties': {'key': 'properties', 'type': 'UpgradeOperationHistoricalStatusInfoProperties'},
-        'type': {'key': 'type', 'type': 'str'},
-        'location': {'key': 'location', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(UpgradeOperationHistoricalStatusInfo, self).__init__(**kwargs)
-        self.properties = None
-        self.type = None
-        self.location = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_paged.py
deleted file mode 100644
index b7296a3dedb1..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_paged.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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 UpgradeOperationHistoricalStatusInfoPaged(Paged):
-    """
-    A paging container for iterating over a list of :class:`UpgradeOperationHistoricalStatusInfo <azure.mgmt.compute.v2018_04_01.models.UpgradeOperationHistoricalStatusInfo>` object
-    """
-
-    _attribute_map = {
-        'next_link': {'key': 'nextLink', 'type': 'str'},
-        'current_page': {'key': 'value', 'type': '[UpgradeOperationHistoricalStatusInfo]'}
-    }
-
-    def __init__(self, *args, **kwargs):
-
-        super(UpgradeOperationHistoricalStatusInfoPaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_properties.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_properties.py
deleted file mode 100644
index 45437a8f2f76..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_properties.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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 UpgradeOperationHistoricalStatusInfoProperties(Model):
-    """Describes each OS upgrade on the Virtual Machine Scale Set.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar running_status: Information about the overall status of the upgrade
-     operation.
-    :vartype running_status:
-     ~azure.mgmt.compute.v2018_04_01.models.UpgradeOperationHistoryStatus
-    :ivar progress: Counts of the VM's in each state.
-    :vartype progress:
-     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeProgressInfo
-    :ivar error: Error Details for this upgrade if there are any.
-    :vartype error: ~azure.mgmt.compute.v2018_04_01.models.ApiError
-    :ivar started_by: Invoker of the Upgrade Operation. Possible values
-     include: 'Unknown', 'User', 'Platform'
-    :vartype started_by: str or
-     ~azure.mgmt.compute.v2018_04_01.models.UpgradeOperationInvoker
-    :ivar target_image_reference: Image Reference details
-    :vartype target_image_reference:
-     ~azure.mgmt.compute.v2018_04_01.models.ImageReference
-    :ivar rollback_info: Information about OS rollback if performed
-    :vartype rollback_info:
-     ~azure.mgmt.compute.v2018_04_01.models.RollbackStatusInfo
-    """
-
-    _validation = {
-        'running_status': {'readonly': True},
-        'progress': {'readonly': True},
-        'error': {'readonly': True},
-        'started_by': {'readonly': True},
-        'target_image_reference': {'readonly': True},
-        'rollback_info': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'running_status': {'key': 'runningStatus', 'type': 'UpgradeOperationHistoryStatus'},
-        'progress': {'key': 'progress', 'type': 'RollingUpgradeProgressInfo'},
-        'error': {'key': 'error', 'type': 'ApiError'},
-        'started_by': {'key': 'startedBy', 'type': 'UpgradeOperationInvoker'},
-        'target_image_reference': {'key': 'targetImageReference', 'type': 'ImageReference'},
-        'rollback_info': {'key': 'rollbackInfo', 'type': 'RollbackStatusInfo'},
-    }
-
-    def __init__(self, **kwargs):
-        super(UpgradeOperationHistoricalStatusInfoProperties, self).__init__(**kwargs)
-        self.running_status = None
-        self.progress = None
-        self.error = None
-        self.started_by = None
-        self.target_image_reference = None
-        self.rollback_info = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_properties_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_properties_py3.py
deleted file mode 100644
index b06dcb8a034a..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_properties_py3.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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 UpgradeOperationHistoricalStatusInfoProperties(Model):
-    """Describes each OS upgrade on the Virtual Machine Scale Set.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar running_status: Information about the overall status of the upgrade
-     operation.
-    :vartype running_status:
-     ~azure.mgmt.compute.v2018_04_01.models.UpgradeOperationHistoryStatus
-    :ivar progress: Counts of the VM's in each state.
-    :vartype progress:
-     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeProgressInfo
-    :ivar error: Error Details for this upgrade if there are any.
-    :vartype error: ~azure.mgmt.compute.v2018_04_01.models.ApiError
-    :ivar started_by: Invoker of the Upgrade Operation. Possible values
-     include: 'Unknown', 'User', 'Platform'
-    :vartype started_by: str or
-     ~azure.mgmt.compute.v2018_04_01.models.UpgradeOperationInvoker
-    :ivar target_image_reference: Image Reference details
-    :vartype target_image_reference:
-     ~azure.mgmt.compute.v2018_04_01.models.ImageReference
-    :ivar rollback_info: Information about OS rollback if performed
-    :vartype rollback_info:
-     ~azure.mgmt.compute.v2018_04_01.models.RollbackStatusInfo
-    """
-
-    _validation = {
-        'running_status': {'readonly': True},
-        'progress': {'readonly': True},
-        'error': {'readonly': True},
-        'started_by': {'readonly': True},
-        'target_image_reference': {'readonly': True},
-        'rollback_info': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'running_status': {'key': 'runningStatus', 'type': 'UpgradeOperationHistoryStatus'},
-        'progress': {'key': 'progress', 'type': 'RollingUpgradeProgressInfo'},
-        'error': {'key': 'error', 'type': 'ApiError'},
-        'started_by': {'key': 'startedBy', 'type': 'UpgradeOperationInvoker'},
-        'target_image_reference': {'key': 'targetImageReference', 'type': 'ImageReference'},
-        'rollback_info': {'key': 'rollbackInfo', 'type': 'RollbackStatusInfo'},
-    }
-
-    def __init__(self, **kwargs) -> None:
-        super(UpgradeOperationHistoricalStatusInfoProperties, self).__init__(**kwargs)
-        self.running_status = None
-        self.progress = None
-        self.error = None
-        self.started_by = None
-        self.target_image_reference = None
-        self.rollback_info = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_py3.py
deleted file mode 100644
index 9e967e04a07d..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_py3.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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 UpgradeOperationHistoricalStatusInfo(Model):
-    """Virtual Machine Scale Set OS Upgrade History operation response.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar properties: Information about the properties of the upgrade
-     operation.
-    :vartype properties:
-     ~azure.mgmt.compute.v2018_04_01.models.UpgradeOperationHistoricalStatusInfoProperties
-    :ivar type: Resource type
-    :vartype type: str
-    :ivar location: Resource location
-    :vartype location: str
-    """
-
-    _validation = {
-        'properties': {'readonly': True},
-        'type': {'readonly': True},
-        'location': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'properties': {'key': 'properties', 'type': 'UpgradeOperationHistoricalStatusInfoProperties'},
-        'type': {'key': 'type', 'type': 'str'},
-        'location': {'key': 'location', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs) -> None:
-        super(UpgradeOperationHistoricalStatusInfo, self).__init__(**kwargs)
-        self.properties = None
-        self.type = None
-        self.location = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_history_status.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_history_status.py
deleted file mode 100644
index e0d6390aeeb5..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_history_status.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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 UpgradeOperationHistoryStatus(Model):
-    """Information about the current running state of the overall upgrade.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar code: Code indicating the current status of the upgrade. Possible
-     values include: 'RollingForward', 'Cancelled', 'Completed', 'Faulted'
-    :vartype code: str or ~azure.mgmt.compute.v2018_04_01.models.UpgradeState
-    :ivar start_time: Start time of the upgrade.
-    :vartype start_time: datetime
-    :ivar end_time: End time of the upgrade.
-    :vartype end_time: datetime
-    """
-
-    _validation = {
-        'code': {'readonly': True},
-        'start_time': {'readonly': True},
-        'end_time': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'code': {'key': 'code', 'type': 'UpgradeState'},
-        'start_time': {'key': 'startTime', 'type': 'iso-8601'},
-        'end_time': {'key': 'endTime', 'type': 'iso-8601'},
-    }
-
-    def __init__(self, **kwargs):
-        super(UpgradeOperationHistoryStatus, self).__init__(**kwargs)
-        self.code = None
-        self.start_time = None
-        self.end_time = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_history_status_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_history_status_py3.py
deleted file mode 100644
index a7e9eaa62a69..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_history_status_py3.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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 UpgradeOperationHistoryStatus(Model):
-    """Information about the current running state of the overall upgrade.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar code: Code indicating the current status of the upgrade. Possible
-     values include: 'RollingForward', 'Cancelled', 'Completed', 'Faulted'
-    :vartype code: str or ~azure.mgmt.compute.v2018_04_01.models.UpgradeState
-    :ivar start_time: Start time of the upgrade.
-    :vartype start_time: datetime
-    :ivar end_time: End time of the upgrade.
-    :vartype end_time: datetime
-    """
-
-    _validation = {
-        'code': {'readonly': True},
-        'start_time': {'readonly': True},
-        'end_time': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'code': {'key': 'code', 'type': 'UpgradeState'},
-        'start_time': {'key': 'startTime', 'type': 'iso-8601'},
-        'end_time': {'key': 'endTime', 'type': 'iso-8601'},
-    }
-
-    def __init__(self, **kwargs) -> None:
-        super(UpgradeOperationHistoryStatus, self).__init__(**kwargs)
-        self.code = None
-        self.start_time = None
-        self.end_time = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_policy.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_policy.py
deleted file mode 100644
index 4335909afd81..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_policy.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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 UpgradePolicy(Model):
-    """Describes an upgrade policy - automatic, manual, or rolling.
-
-    :param mode: Specifies the mode of an upgrade to virtual machines in the
-     scale set.<br /><br /> Possible values are:<br /><br /> **Manual** - You
-     control the application of updates to virtual machines in the scale set.
-     You do this by using the manualUpgrade action.<br /><br /> **Automatic** -
-     All virtual machines in the scale set are  automatically updated at the
-     same time. Possible values include: 'Automatic', 'Manual', 'Rolling'
-    :type mode: str or ~azure.mgmt.compute.v2018_04_01.models.UpgradeMode
-    :param rolling_upgrade_policy: The configuration parameters used while
-     performing a rolling upgrade.
-    :type rolling_upgrade_policy:
-     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradePolicy
-    :param automatic_os_upgrade: Whether OS upgrades should automatically be
-     applied to scale set instances in a rolling fashion when a newer version
-     of the image becomes available.
-    :type automatic_os_upgrade: bool
-    :param auto_os_upgrade_policy: Configuration parameters used for
-     performing automatic OS Upgrade.
-    :type auto_os_upgrade_policy:
-     ~azure.mgmt.compute.v2018_04_01.models.AutoOSUpgradePolicy
-    """
-
-    _attribute_map = {
-        'mode': {'key': 'mode', 'type': 'UpgradeMode'},
-        'rolling_upgrade_policy': {'key': 'rollingUpgradePolicy', 'type': 'RollingUpgradePolicy'},
-        'automatic_os_upgrade': {'key': 'automaticOSUpgrade', 'type': 'bool'},
-        'auto_os_upgrade_policy': {'key': 'autoOSUpgradePolicy', 'type': 'AutoOSUpgradePolicy'},
-    }
-
-    def __init__(self, **kwargs):
-        super(UpgradePolicy, self).__init__(**kwargs)
-        self.mode = kwargs.get('mode', None)
-        self.rolling_upgrade_policy = kwargs.get('rolling_upgrade_policy', None)
-        self.automatic_os_upgrade = kwargs.get('automatic_os_upgrade', None)
-        self.auto_os_upgrade_policy = kwargs.get('auto_os_upgrade_policy', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_policy_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_policy_py3.py
deleted file mode 100644
index 526357dfaf1c..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_policy_py3.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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 UpgradePolicy(Model):
-    """Describes an upgrade policy - automatic, manual, or rolling.
-
-    :param mode: Specifies the mode of an upgrade to virtual machines in the
-     scale set.<br /><br /> Possible values are:<br /><br /> **Manual** - You
-     control the application of updates to virtual machines in the scale set.
-     You do this by using the manualUpgrade action.<br /><br /> **Automatic** -
-     All virtual machines in the scale set are  automatically updated at the
-     same time. Possible values include: 'Automatic', 'Manual', 'Rolling'
-    :type mode: str or ~azure.mgmt.compute.v2018_04_01.models.UpgradeMode
-    :param rolling_upgrade_policy: The configuration parameters used while
-     performing a rolling upgrade.
-    :type rolling_upgrade_policy:
-     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradePolicy
-    :param automatic_os_upgrade: Whether OS upgrades should automatically be
-     applied to scale set instances in a rolling fashion when a newer version
-     of the image becomes available.
-    :type automatic_os_upgrade: bool
-    :param auto_os_upgrade_policy: Configuration parameters used for
-     performing automatic OS Upgrade.
-    :type auto_os_upgrade_policy:
-     ~azure.mgmt.compute.v2018_04_01.models.AutoOSUpgradePolicy
-    """
-
-    _attribute_map = {
-        'mode': {'key': 'mode', 'type': 'UpgradeMode'},
-        'rolling_upgrade_policy': {'key': 'rollingUpgradePolicy', 'type': 'RollingUpgradePolicy'},
-        'automatic_os_upgrade': {'key': 'automaticOSUpgrade', 'type': 'bool'},
-        'auto_os_upgrade_policy': {'key': 'autoOSUpgradePolicy', 'type': 'AutoOSUpgradePolicy'},
-    }
-
-    def __init__(self, *, mode=None, rolling_upgrade_policy=None, automatic_os_upgrade: bool=None, auto_os_upgrade_policy=None, **kwargs) -> None:
-        super(UpgradePolicy, self).__init__(**kwargs)
-        self.mode = mode
-        self.rolling_upgrade_policy = rolling_upgrade_policy
-        self.automatic_os_upgrade = automatic_os_upgrade
-        self.auto_os_upgrade_policy = auto_os_upgrade_policy
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage.py
deleted file mode 100644
index eae36ebf0dc2..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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 Usage(Model):
-    """Describes Compute Resource Usage.
-
-    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 unit: Required. An enum describing the unit of usage measurement.
-     Default value: "Count" .
-    :vartype unit: str
-    :param current_value: Required. The current usage of the resource.
-    :type current_value: int
-    :param limit: Required. The maximum permitted usage of the resource.
-    :type limit: long
-    :param name: Required. The name of the type of usage.
-    :type name: ~azure.mgmt.compute.v2018_04_01.models.UsageName
-    """
-
-    _validation = {
-        'unit': {'required': True, 'constant': True},
-        'current_value': {'required': True},
-        'limit': {'required': True},
-        'name': {'required': True},
-    }
-
-    _attribute_map = {
-        'unit': {'key': 'unit', 'type': 'str'},
-        'current_value': {'key': 'currentValue', 'type': 'int'},
-        'limit': {'key': 'limit', 'type': 'long'},
-        'name': {'key': 'name', 'type': 'UsageName'},
-    }
-
-    unit = "Count"
-
-    def __init__(self, **kwargs):
-        super(Usage, self).__init__(**kwargs)
-        self.current_value = kwargs.get('current_value', None)
-        self.limit = kwargs.get('limit', None)
-        self.name = kwargs.get('name', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_name.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_name.py
deleted file mode 100644
index e2560936493e..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_name.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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 UsageName(Model):
-    """The Usage Names.
-
-    :param value: The name of the resource.
-    :type value: str
-    :param localized_value: The localized name of the resource.
-    :type localized_value: str
-    """
-
-    _attribute_map = {
-        'value': {'key': 'value', 'type': 'str'},
-        'localized_value': {'key': 'localizedValue', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(UsageName, self).__init__(**kwargs)
-        self.value = kwargs.get('value', None)
-        self.localized_value = kwargs.get('localized_value', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_name_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_name_py3.py
deleted file mode 100644
index ad0b77459f75..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_name_py3.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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 UsageName(Model):
-    """The Usage Names.
-
-    :param value: The name of the resource.
-    :type value: str
-    :param localized_value: The localized name of the resource.
-    :type localized_value: str
-    """
-
-    _attribute_map = {
-        'value': {'key': 'value', 'type': 'str'},
-        'localized_value': {'key': 'localizedValue', 'type': 'str'},
-    }
-
-    def __init__(self, *, value: str=None, localized_value: str=None, **kwargs) -> None:
-        super(UsageName, self).__init__(**kwargs)
-        self.value = value
-        self.localized_value = localized_value
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_paged.py
deleted file mode 100644
index d3533ab09848..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_paged.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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 UsagePaged(Paged):
-    """
-    A paging container for iterating over a list of :class:`Usage <azure.mgmt.compute.v2018_04_01.models.Usage>` object
-    """
-
-    _attribute_map = {
-        'next_link': {'key': 'nextLink', 'type': 'str'},
-        'current_page': {'key': 'value', 'type': '[Usage]'}
-    }
-
-    def __init__(self, *args, **kwargs):
-
-        super(UsagePaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_py3.py
deleted file mode 100644
index 7a2ae5cbd250..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_py3.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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 Usage(Model):
-    """Describes Compute Resource Usage.
-
-    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 unit: Required. An enum describing the unit of usage measurement.
-     Default value: "Count" .
-    :vartype unit: str
-    :param current_value: Required. The current usage of the resource.
-    :type current_value: int
-    :param limit: Required. The maximum permitted usage of the resource.
-    :type limit: long
-    :param name: Required. The name of the type of usage.
-    :type name: ~azure.mgmt.compute.v2018_04_01.models.UsageName
-    """
-
-    _validation = {
-        'unit': {'required': True, 'constant': True},
-        'current_value': {'required': True},
-        'limit': {'required': True},
-        'name': {'required': True},
-    }
-
-    _attribute_map = {
-        'unit': {'key': 'unit', 'type': 'str'},
-        'current_value': {'key': 'currentValue', 'type': 'int'},
-        'limit': {'key': 'limit', 'type': 'long'},
-        'name': {'key': 'name', 'type': 'UsageName'},
-    }
-
-    unit = "Count"
-
-    def __init__(self, *, current_value: int, limit: int, name, **kwargs) -> None:
-        super(Usage, self).__init__(**kwargs)
-        self.current_value = current_value
-        self.limit = limit
-        self.name = name
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_certificate.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_certificate.py
deleted file mode 100644
index b173def6f820..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_certificate.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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 VaultCertificate(Model):
-    """Describes a single certificate reference in a Key Vault, and where the
-    certificate should reside on the VM.
-
-    :param certificate_url: This is the URL of a certificate that has been
-     uploaded to Key Vault as a secret. For adding a secret to the Key Vault,
-     see [Add a key or secret to the key
-     vault](https://docs.microsoft.com/azure/key-vault/key-vault-get-started/#add).
-     In this case, your certificate needs to be It is the Base64 encoding of
-     the following JSON Object which is encoded in UTF-8: <br><br> {<br>
-     "data":"<Base64-encoded-certificate>",<br>  "dataType":"pfx",<br>
-     "password":"<pfx-file-password>"<br>}
-    :type certificate_url: str
-    :param certificate_store: For Windows VMs, specifies the certificate store
-     on the Virtual Machine to which the certificate should be added. The
-     specified certificate store is implicitly in the LocalMachine account.
-     <br><br>For Linux VMs, the certificate file is placed under the
-     /var/lib/waagent directory, with the file name <UppercaseThumbprint>.crt
-     for the X509 certificate file and <UppercaseThumbpring>.prv for private
-     key. Both of these files are .pem formatted.
-    :type certificate_store: str
-    """
-
-    _attribute_map = {
-        'certificate_url': {'key': 'certificateUrl', 'type': 'str'},
-        'certificate_store': {'key': 'certificateStore', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VaultCertificate, self).__init__(**kwargs)
-        self.certificate_url = kwargs.get('certificate_url', None)
-        self.certificate_store = kwargs.get('certificate_store', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_certificate_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_certificate_py3.py
deleted file mode 100644
index eda5ba1c3f1d..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_certificate_py3.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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 VaultCertificate(Model):
-    """Describes a single certificate reference in a Key Vault, and where the
-    certificate should reside on the VM.
-
-    :param certificate_url: This is the URL of a certificate that has been
-     uploaded to Key Vault as a secret. For adding a secret to the Key Vault,
-     see [Add a key or secret to the key
-     vault](https://docs.microsoft.com/azure/key-vault/key-vault-get-started/#add).
-     In this case, your certificate needs to be It is the Base64 encoding of
-     the following JSON Object which is encoded in UTF-8: <br><br> {<br>
-     "data":"<Base64-encoded-certificate>",<br>  "dataType":"pfx",<br>
-     "password":"<pfx-file-password>"<br>}
-    :type certificate_url: str
-    :param certificate_store: For Windows VMs, specifies the certificate store
-     on the Virtual Machine to which the certificate should be added. The
-     specified certificate store is implicitly in the LocalMachine account.
-     <br><br>For Linux VMs, the certificate file is placed under the
-     /var/lib/waagent directory, with the file name <UppercaseThumbprint>.crt
-     for the X509 certificate file and <UppercaseThumbpring>.prv for private
-     key. Both of these files are .pem formatted.
-    :type certificate_store: str
-    """
-
-    _attribute_map = {
-        'certificate_url': {'key': 'certificateUrl', 'type': 'str'},
-        'certificate_store': {'key': 'certificateStore', 'type': 'str'},
-    }
-
-    def __init__(self, *, certificate_url: str=None, certificate_store: str=None, **kwargs) -> None:
-        super(VaultCertificate, self).__init__(**kwargs)
-        self.certificate_url = certificate_url
-        self.certificate_store = certificate_store
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_secret_group.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_secret_group.py
deleted file mode 100644
index 182f200952fc..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_secret_group.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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 VaultSecretGroup(Model):
-    """Describes a set of certificates which are all in the same Key Vault.
-
-    :param source_vault: The relative URL of the Key Vault containing all of
-     the certificates in VaultCertificates.
-    :type source_vault: ~azure.mgmt.compute.v2018_04_01.models.SubResource
-    :param vault_certificates: The list of key vault references in SourceVault
-     which contain certificates.
-    :type vault_certificates:
-     list[~azure.mgmt.compute.v2018_04_01.models.VaultCertificate]
-    """
-
-    _attribute_map = {
-        'source_vault': {'key': 'sourceVault', 'type': 'SubResource'},
-        'vault_certificates': {'key': 'vaultCertificates', 'type': '[VaultCertificate]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VaultSecretGroup, self).__init__(**kwargs)
-        self.source_vault = kwargs.get('source_vault', None)
-        self.vault_certificates = kwargs.get('vault_certificates', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_secret_group_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_secret_group_py3.py
deleted file mode 100644
index c92697778df0..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_secret_group_py3.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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 VaultSecretGroup(Model):
-    """Describes a set of certificates which are all in the same Key Vault.
-
-    :param source_vault: The relative URL of the Key Vault containing all of
-     the certificates in VaultCertificates.
-    :type source_vault: ~azure.mgmt.compute.v2018_04_01.models.SubResource
-    :param vault_certificates: The list of key vault references in SourceVault
-     which contain certificates.
-    :type vault_certificates:
-     list[~azure.mgmt.compute.v2018_04_01.models.VaultCertificate]
-    """
-
-    _attribute_map = {
-        'source_vault': {'key': 'sourceVault', 'type': 'SubResource'},
-        'vault_certificates': {'key': 'vaultCertificates', 'type': '[VaultCertificate]'},
-    }
-
-    def __init__(self, *, source_vault=None, vault_certificates=None, **kwargs) -> None:
-        super(VaultSecretGroup, self).__init__(**kwargs)
-        self.source_vault = source_vault
-        self.vault_certificates = vault_certificates
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_hard_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_hard_disk.py
deleted file mode 100644
index 5e3ad9dea7d4..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_hard_disk.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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 VirtualHardDisk(Model):
-    """Describes the uri of a disk.
-
-    :param uri: Specifies the virtual hard disk's uri.
-    :type uri: str
-    """
-
-    _attribute_map = {
-        'uri': {'key': 'uri', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualHardDisk, self).__init__(**kwargs)
-        self.uri = kwargs.get('uri', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_hard_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_hard_disk_py3.py
deleted file mode 100644
index 9c069b95f084..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_hard_disk_py3.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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 VirtualHardDisk(Model):
-    """Describes the uri of a disk.
-
-    :param uri: Specifies the virtual hard disk's uri.
-    :type uri: str
-    """
-
-    _attribute_map = {
-        'uri': {'key': 'uri', 'type': 'str'},
-    }
-
-    def __init__(self, *, uri: str=None, **kwargs) -> None:
-        super(VirtualHardDisk, self).__init__(**kwargs)
-        self.uri = uri
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine.py
deleted file mode 100644
index 2a6eb930517d..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine.py
+++ /dev/null
@@ -1,150 +0,0 @@
-# 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 VirtualMachine(Resource):
-    """Describes a Virtual Machine.
-
-    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]
-    :param plan: Specifies information about the marketplace image used to
-     create the virtual machine. This element is only used for marketplace
-     images. Before you can use a marketplace image from an API, you must
-     enable the image for programmatic use.  In the Azure portal, find the
-     marketplace image that you want to use and then click **Want to deploy
-     programmatically, Get Started ->**. Enter any required information and
-     then click **Save**.
-    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
-    :param hardware_profile: Specifies the hardware settings for the virtual
-     machine.
-    :type hardware_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.HardwareProfile
-    :param storage_profile: Specifies the storage settings for the virtual
-     machine disks.
-    :type storage_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.StorageProfile
-    :param os_profile: Specifies the operating system settings for the virtual
-     machine.
-    :type os_profile: ~azure.mgmt.compute.v2018_04_01.models.OSProfile
-    :param network_profile: Specifies the network interfaces of the virtual
-     machine.
-    :type network_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.NetworkProfile
-    :param diagnostics_profile: Specifies the boot diagnostic settings state.
-     <br><br>Minimum api-version: 2015-06-15.
-    :type diagnostics_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
-    :param availability_set: Specifies information about the availability set
-     that the virtual machine should be assigned to. Virtual machines specified
-     in the same availability set are allocated to different nodes to maximize
-     availability. For more information about availability sets, see [Manage
-     the availability of virtual
-     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
-     <br><br> For more information on Azure planned maintainance, see [Planned
-     maintenance for virtual machines in
-     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
-     <br><br> Currently, a VM can only be added to availability set at creation
-     time. An existing VM cannot be added to an availability set.
-    :type availability_set: ~azure.mgmt.compute.v2018_04_01.models.SubResource
-    :ivar provisioning_state: The provisioning state, which only appears in
-     the response.
-    :vartype provisioning_state: str
-    :ivar instance_view: The virtual machine instance view.
-    :vartype instance_view:
-     ~azure.mgmt.compute.v2018_04_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:
-     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
-     is included in a request for an update, the value must match the initial
-     value. This value cannot be updated. <br><br> For more information, see
-     [Azure Hybrid Use Benefit for Windows
-     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
-     <br><br> Minimum api-version: 2015-06-15
-    :type license_type: str
-    :ivar vm_id: Specifies the VM unique ID which is a 128-bits identifier
-     that is encoded and stored in all Azure IaaS VMs SMBIOS and can be read
-     using platform BIOS commands.
-    :vartype vm_id: str
-    :ivar resources: The virtual machine child extension resources.
-    :vartype resources:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]
-    :param identity: The identity of the virtual machine, if configured.
-    :type identity:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineIdentity
-    :param zones: The virtual machine zones.
-    :type zones: list[str]
-    """
-
-    _validation = {
-        'id': {'readonly': True},
-        'name': {'readonly': True},
-        'type': {'readonly': True},
-        'location': {'required': True},
-        'provisioning_state': {'readonly': True},
-        'instance_view': {'readonly': True},
-        'vm_id': {'readonly': True},
-        'resources': {'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}'},
-        'plan': {'key': 'plan', 'type': 'Plan'},
-        'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
-        'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
-        'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
-        'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
-        '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': 'VirtualMachineInstanceView'},
-        'license_type': {'key': 'properties.licenseType', 'type': 'str'},
-        'vm_id': {'key': 'properties.vmId', 'type': 'str'},
-        'resources': {'key': 'resources', 'type': '[VirtualMachineExtension]'},
-        'identity': {'key': 'identity', 'type': 'VirtualMachineIdentity'},
-        'zones': {'key': 'zones', 'type': '[str]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachine, self).__init__(**kwargs)
-        self.plan = kwargs.get('plan', None)
-        self.hardware_profile = kwargs.get('hardware_profile', None)
-        self.storage_profile = kwargs.get('storage_profile', 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)
-        self.availability_set = kwargs.get('availability_set', None)
-        self.provisioning_state = None
-        self.instance_view = None
-        self.license_type = kwargs.get('license_type', None)
-        self.vm_id = None
-        self.resources = None
-        self.identity = kwargs.get('identity', None)
-        self.zones = kwargs.get('zones', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_agent_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_agent_instance_view.py
deleted file mode 100644
index a2ad4c4f8bc8..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_agent_instance_view.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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 VirtualMachineAgentInstanceView(Model):
-    """The instance view of the VM Agent running on the virtual machine.
-
-    :param vm_agent_version: The VM Agent full version.
-    :type vm_agent_version: str
-    :param extension_handlers: The virtual machine extension handler instance
-     view.
-    :type extension_handlers:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionHandlerInstanceView]
-    :param statuses: The resource status information.
-    :type statuses:
-     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
-    """
-
-    _attribute_map = {
-        'vm_agent_version': {'key': 'vmAgentVersion', 'type': 'str'},
-        'extension_handlers': {'key': 'extensionHandlers', 'type': '[VirtualMachineExtensionHandlerInstanceView]'},
-        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineAgentInstanceView, self).__init__(**kwargs)
-        self.vm_agent_version = kwargs.get('vm_agent_version', None)
-        self.extension_handlers = kwargs.get('extension_handlers', None)
-        self.statuses = kwargs.get('statuses', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_agent_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_agent_instance_view_py3.py
deleted file mode 100644
index dce8f0d40cc8..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_agent_instance_view_py3.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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 VirtualMachineAgentInstanceView(Model):
-    """The instance view of the VM Agent running on the virtual machine.
-
-    :param vm_agent_version: The VM Agent full version.
-    :type vm_agent_version: str
-    :param extension_handlers: The virtual machine extension handler instance
-     view.
-    :type extension_handlers:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionHandlerInstanceView]
-    :param statuses: The resource status information.
-    :type statuses:
-     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
-    """
-
-    _attribute_map = {
-        'vm_agent_version': {'key': 'vmAgentVersion', 'type': 'str'},
-        'extension_handlers': {'key': 'extensionHandlers', 'type': '[VirtualMachineExtensionHandlerInstanceView]'},
-        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
-    }
-
-    def __init__(self, *, vm_agent_version: str=None, extension_handlers=None, statuses=None, **kwargs) -> None:
-        super(VirtualMachineAgentInstanceView, self).__init__(**kwargs)
-        self.vm_agent_version = vm_agent_version
-        self.extension_handlers = extension_handlers
-        self.statuses = statuses
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_parameters.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_parameters.py
deleted file mode 100644
index 4e6ffbea7a4f..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_parameters.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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 VirtualMachineCaptureParameters(Model):
-    """Capture Virtual Machine parameters.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param vhd_prefix: Required. The captured virtual hard disk's name prefix.
-    :type vhd_prefix: str
-    :param destination_container_name: Required. The destination container
-     name.
-    :type destination_container_name: str
-    :param overwrite_vhds: Required. Specifies whether to overwrite the
-     destination virtual hard disk, in case of conflict.
-    :type overwrite_vhds: bool
-    """
-
-    _validation = {
-        'vhd_prefix': {'required': True},
-        'destination_container_name': {'required': True},
-        'overwrite_vhds': {'required': True},
-    }
-
-    _attribute_map = {
-        'vhd_prefix': {'key': 'vhdPrefix', 'type': 'str'},
-        'destination_container_name': {'key': 'destinationContainerName', 'type': 'str'},
-        'overwrite_vhds': {'key': 'overwriteVhds', 'type': 'bool'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineCaptureParameters, self).__init__(**kwargs)
-        self.vhd_prefix = kwargs.get('vhd_prefix', None)
-        self.destination_container_name = kwargs.get('destination_container_name', None)
-        self.overwrite_vhds = kwargs.get('overwrite_vhds', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_parameters_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_parameters_py3.py
deleted file mode 100644
index 1866cdc23300..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_parameters_py3.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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 VirtualMachineCaptureParameters(Model):
-    """Capture Virtual Machine parameters.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param vhd_prefix: Required. The captured virtual hard disk's name prefix.
-    :type vhd_prefix: str
-    :param destination_container_name: Required. The destination container
-     name.
-    :type destination_container_name: str
-    :param overwrite_vhds: Required. Specifies whether to overwrite the
-     destination virtual hard disk, in case of conflict.
-    :type overwrite_vhds: bool
-    """
-
-    _validation = {
-        'vhd_prefix': {'required': True},
-        'destination_container_name': {'required': True},
-        'overwrite_vhds': {'required': True},
-    }
-
-    _attribute_map = {
-        'vhd_prefix': {'key': 'vhdPrefix', 'type': 'str'},
-        'destination_container_name': {'key': 'destinationContainerName', 'type': 'str'},
-        'overwrite_vhds': {'key': 'overwriteVhds', 'type': 'bool'},
-    }
-
-    def __init__(self, *, vhd_prefix: str, destination_container_name: str, overwrite_vhds: bool, **kwargs) -> None:
-        super(VirtualMachineCaptureParameters, self).__init__(**kwargs)
-        self.vhd_prefix = vhd_prefix
-        self.destination_container_name = destination_container_name
-        self.overwrite_vhds = overwrite_vhds
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_result.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_result.py
deleted file mode 100644
index 2972e1f2fcda..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_result.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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 .sub_resource import SubResource
-
-
-class VirtualMachineCaptureResult(SubResource):
-    """Output of virtual machine capture operation.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :param id: Resource Id
-    :type id: str
-    :ivar schema: the schema of the captured virtual machine
-    :vartype schema: str
-    :ivar content_version: the version of the content
-    :vartype content_version: str
-    :ivar parameters: parameters of the captured virtual machine
-    :vartype parameters: object
-    :ivar resources: a list of resource items of the captured virtual machine
-    :vartype resources: list[object]
-    """
-
-    _validation = {
-        'schema': {'readonly': True},
-        'content_version': {'readonly': True},
-        'parameters': {'readonly': True},
-        'resources': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'schema': {'key': '$schema', 'type': 'str'},
-        'content_version': {'key': 'contentVersion', 'type': 'str'},
-        'parameters': {'key': 'parameters', 'type': 'object'},
-        'resources': {'key': 'resources', 'type': '[object]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineCaptureResult, self).__init__(**kwargs)
-        self.schema = None
-        self.content_version = None
-        self.parameters = None
-        self.resources = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_result_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_result_py3.py
deleted file mode 100644
index 09e8afde1591..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_result_py3.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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 .sub_resource_py3 import SubResource
-
-
-class VirtualMachineCaptureResult(SubResource):
-    """Output of virtual machine capture operation.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :param id: Resource Id
-    :type id: str
-    :ivar schema: the schema of the captured virtual machine
-    :vartype schema: str
-    :ivar content_version: the version of the content
-    :vartype content_version: str
-    :ivar parameters: parameters of the captured virtual machine
-    :vartype parameters: object
-    :ivar resources: a list of resource items of the captured virtual machine
-    :vartype resources: list[object]
-    """
-
-    _validation = {
-        'schema': {'readonly': True},
-        'content_version': {'readonly': True},
-        'parameters': {'readonly': True},
-        'resources': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'schema': {'key': '$schema', 'type': 'str'},
-        'content_version': {'key': 'contentVersion', 'type': 'str'},
-        'parameters': {'key': 'parameters', 'type': 'object'},
-        'resources': {'key': 'resources', 'type': '[object]'},
-    }
-
-    def __init__(self, *, id: str=None, **kwargs) -> None:
-        super(VirtualMachineCaptureResult, self).__init__(id=id, **kwargs)
-        self.schema = None
-        self.content_version = None
-        self.parameters = None
-        self.resources = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension.py
deleted file mode 100644
index 02db951458f4..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension.py
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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 VirtualMachineExtension(Resource):
-    """Describes a Virtual Machine Extension.
-
-    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]
-    :param force_update_tag: How the extension handler should be forced to
-     update even if the extension configuration has not changed.
-    :type force_update_tag: str
-    :param publisher: The name of the extension handler publisher.
-    :type publisher: str
-    :param virtual_machine_extension_type: Specifies the type of the
-     extension; an example is "CustomScriptExtension".
-    :type virtual_machine_extension_type: str
-    :param type_handler_version: Specifies the version of the script handler.
-    :type type_handler_version: str
-    :param auto_upgrade_minor_version: Indicates whether the extension should
-     use a newer minor version if one is available at deployment time. Once
-     deployed, however, the extension will not upgrade minor versions unless
-     redeployed, even with this property set to true.
-    :type auto_upgrade_minor_version: bool
-    :param settings: Json formatted public settings for the extension.
-    :type settings: object
-    :param protected_settings: The extension can contain either
-     protectedSettings or protectedSettingsFromKeyVault or no protected
-     settings at all.
-    :type protected_settings: object
-    :ivar provisioning_state: The provisioning state, which only appears in
-     the response.
-    :vartype provisioning_state: str
-    :param instance_view: The virtual machine extension instance view.
-    :type instance_view:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionInstanceView
-    """
-
-    _validation = {
-        'id': {'readonly': True},
-        'name': {'readonly': True},
-        'type': {'readonly': True},
-        'location': {'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}'},
-        'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'},
-        'publisher': {'key': 'properties.publisher', 'type': 'str'},
-        'virtual_machine_extension_type': {'key': 'properties.type', 'type': 'str'},
-        'type_handler_version': {'key': 'properties.typeHandlerVersion', 'type': 'str'},
-        'auto_upgrade_minor_version': {'key': 'properties.autoUpgradeMinorVersion', 'type': 'bool'},
-        'settings': {'key': 'properties.settings', 'type': 'object'},
-        'protected_settings': {'key': 'properties.protectedSettings', 'type': 'object'},
-        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
-        'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineExtensionInstanceView'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineExtension, self).__init__(**kwargs)
-        self.force_update_tag = kwargs.get('force_update_tag', None)
-        self.publisher = kwargs.get('publisher', None)
-        self.virtual_machine_extension_type = kwargs.get('virtual_machine_extension_type', None)
-        self.type_handler_version = kwargs.get('type_handler_version', None)
-        self.auto_upgrade_minor_version = kwargs.get('auto_upgrade_minor_version', None)
-        self.settings = kwargs.get('settings', None)
-        self.protected_settings = kwargs.get('protected_settings', None)
-        self.provisioning_state = None
-        self.instance_view = kwargs.get('instance_view', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_handler_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_handler_instance_view.py
deleted file mode 100644
index 2d7ec6ac6782..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_handler_instance_view.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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 VirtualMachineExtensionHandlerInstanceView(Model):
-    """The instance view of a virtual machine extension handler.
-
-    :param type: Specifies the type of the extension; an example is
-     "CustomScriptExtension".
-    :type type: str
-    :param type_handler_version: Specifies the version of the script handler.
-    :type type_handler_version: str
-    :param status: The extension handler status.
-    :type status: ~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus
-    """
-
-    _attribute_map = {
-        'type': {'key': 'type', 'type': 'str'},
-        'type_handler_version': {'key': 'typeHandlerVersion', 'type': 'str'},
-        'status': {'key': 'status', 'type': 'InstanceViewStatus'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineExtensionHandlerInstanceView, self).__init__(**kwargs)
-        self.type = kwargs.get('type', None)
-        self.type_handler_version = kwargs.get('type_handler_version', None)
-        self.status = kwargs.get('status', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_handler_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_handler_instance_view_py3.py
deleted file mode 100644
index ba82a5e876e4..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_handler_instance_view_py3.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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 VirtualMachineExtensionHandlerInstanceView(Model):
-    """The instance view of a virtual machine extension handler.
-
-    :param type: Specifies the type of the extension; an example is
-     "CustomScriptExtension".
-    :type type: str
-    :param type_handler_version: Specifies the version of the script handler.
-    :type type_handler_version: str
-    :param status: The extension handler status.
-    :type status: ~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus
-    """
-
-    _attribute_map = {
-        'type': {'key': 'type', 'type': 'str'},
-        'type_handler_version': {'key': 'typeHandlerVersion', 'type': 'str'},
-        'status': {'key': 'status', 'type': 'InstanceViewStatus'},
-    }
-
-    def __init__(self, *, type: str=None, type_handler_version: str=None, status=None, **kwargs) -> None:
-        super(VirtualMachineExtensionHandlerInstanceView, self).__init__(**kwargs)
-        self.type = type
-        self.type_handler_version = type_handler_version
-        self.status = status
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_image.py
deleted file mode 100644
index 7273e2b84754..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_image.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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 VirtualMachineExtensionImage(Resource):
-    """Describes a Virtual Machine Extension Image.
-
-    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]
-    :param operating_system: Required. The operating system this extension
-     supports.
-    :type operating_system: str
-    :param compute_role: Required. The type of role (IaaS or PaaS) this
-     extension supports.
-    :type compute_role: str
-    :param handler_schema: Required. The schema defined by publisher, where
-     extension consumers should provide settings in a matching schema.
-    :type handler_schema: str
-    :param vm_scale_set_enabled: Whether the extension can be used on xRP
-     VMScaleSets. By default existing extensions are usable on scalesets, but
-     there might be cases where a publisher wants to explicitly indicate the
-     extension is only enabled for CRP VMs but not VMSS.
-    :type vm_scale_set_enabled: bool
-    :param supports_multiple_extensions: Whether the handler can support
-     multiple extensions.
-    :type supports_multiple_extensions: bool
-    """
-
-    _validation = {
-        'id': {'readonly': True},
-        'name': {'readonly': True},
-        'type': {'readonly': True},
-        'location': {'required': True},
-        'operating_system': {'required': True},
-        'compute_role': {'required': True},
-        'handler_schema': {'required': 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}'},
-        'operating_system': {'key': 'properties.operatingSystem', 'type': 'str'},
-        'compute_role': {'key': 'properties.computeRole', 'type': 'str'},
-        'handler_schema': {'key': 'properties.handlerSchema', 'type': 'str'},
-        'vm_scale_set_enabled': {'key': 'properties.vmScaleSetEnabled', 'type': 'bool'},
-        'supports_multiple_extensions': {'key': 'properties.supportsMultipleExtensions', 'type': 'bool'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineExtensionImage, self).__init__(**kwargs)
-        self.operating_system = kwargs.get('operating_system', None)
-        self.compute_role = kwargs.get('compute_role', None)
-        self.handler_schema = kwargs.get('handler_schema', None)
-        self.vm_scale_set_enabled = kwargs.get('vm_scale_set_enabled', None)
-        self.supports_multiple_extensions = kwargs.get('supports_multiple_extensions', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_image_py3.py
deleted file mode 100644
index 3d48c3a87fb0..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_image_py3.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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 VirtualMachineExtensionImage(Resource):
-    """Describes a Virtual Machine Extension Image.
-
-    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]
-    :param operating_system: Required. The operating system this extension
-     supports.
-    :type operating_system: str
-    :param compute_role: Required. The type of role (IaaS or PaaS) this
-     extension supports.
-    :type compute_role: str
-    :param handler_schema: Required. The schema defined by publisher, where
-     extension consumers should provide settings in a matching schema.
-    :type handler_schema: str
-    :param vm_scale_set_enabled: Whether the extension can be used on xRP
-     VMScaleSets. By default existing extensions are usable on scalesets, but
-     there might be cases where a publisher wants to explicitly indicate the
-     extension is only enabled for CRP VMs but not VMSS.
-    :type vm_scale_set_enabled: bool
-    :param supports_multiple_extensions: Whether the handler can support
-     multiple extensions.
-    :type supports_multiple_extensions: bool
-    """
-
-    _validation = {
-        'id': {'readonly': True},
-        'name': {'readonly': True},
-        'type': {'readonly': True},
-        'location': {'required': True},
-        'operating_system': {'required': True},
-        'compute_role': {'required': True},
-        'handler_schema': {'required': 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}'},
-        'operating_system': {'key': 'properties.operatingSystem', 'type': 'str'},
-        'compute_role': {'key': 'properties.computeRole', 'type': 'str'},
-        'handler_schema': {'key': 'properties.handlerSchema', 'type': 'str'},
-        'vm_scale_set_enabled': {'key': 'properties.vmScaleSetEnabled', 'type': 'bool'},
-        'supports_multiple_extensions': {'key': 'properties.supportsMultipleExtensions', 'type': 'bool'},
-    }
-
-    def __init__(self, *, location: str, operating_system: str, compute_role: str, handler_schema: str, tags=None, vm_scale_set_enabled: bool=None, supports_multiple_extensions: bool=None, **kwargs) -> None:
-        super(VirtualMachineExtensionImage, self).__init__(location=location, tags=tags, **kwargs)
-        self.operating_system = operating_system
-        self.compute_role = compute_role
-        self.handler_schema = handler_schema
-        self.vm_scale_set_enabled = vm_scale_set_enabled
-        self.supports_multiple_extensions = supports_multiple_extensions
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_instance_view.py
deleted file mode 100644
index d79fad9754ac..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_instance_view.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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 VirtualMachineExtensionInstanceView(Model):
-    """The instance view of a virtual machine extension.
-
-    :param name: The virtual machine extension name.
-    :type name: str
-    :param type: Specifies the type of the extension; an example is
-     "CustomScriptExtension".
-    :type type: str
-    :param type_handler_version: Specifies the version of the script handler.
-    :type type_handler_version: str
-    :param substatuses: The resource status information.
-    :type substatuses:
-     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
-    :param statuses: The resource status information.
-    :type statuses:
-     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
-    """
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'type': {'key': 'type', 'type': 'str'},
-        'type_handler_version': {'key': 'typeHandlerVersion', 'type': 'str'},
-        'substatuses': {'key': 'substatuses', 'type': '[InstanceViewStatus]'},
-        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineExtensionInstanceView, self).__init__(**kwargs)
-        self.name = kwargs.get('name', None)
-        self.type = kwargs.get('type', None)
-        self.type_handler_version = kwargs.get('type_handler_version', None)
-        self.substatuses = kwargs.get('substatuses', None)
-        self.statuses = kwargs.get('statuses', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_instance_view_py3.py
deleted file mode 100644
index 4de254438718..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_instance_view_py3.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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 VirtualMachineExtensionInstanceView(Model):
-    """The instance view of a virtual machine extension.
-
-    :param name: The virtual machine extension name.
-    :type name: str
-    :param type: Specifies the type of the extension; an example is
-     "CustomScriptExtension".
-    :type type: str
-    :param type_handler_version: Specifies the version of the script handler.
-    :type type_handler_version: str
-    :param substatuses: The resource status information.
-    :type substatuses:
-     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
-    :param statuses: The resource status information.
-    :type statuses:
-     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
-    """
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'type': {'key': 'type', 'type': 'str'},
-        'type_handler_version': {'key': 'typeHandlerVersion', 'type': 'str'},
-        'substatuses': {'key': 'substatuses', 'type': '[InstanceViewStatus]'},
-        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
-    }
-
-    def __init__(self, *, name: str=None, type: str=None, type_handler_version: str=None, substatuses=None, statuses=None, **kwargs) -> None:
-        super(VirtualMachineExtensionInstanceView, self).__init__(**kwargs)
-        self.name = name
-        self.type = type
-        self.type_handler_version = type_handler_version
-        self.substatuses = substatuses
-        self.statuses = statuses
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_py3.py
deleted file mode 100644
index 8fa667369a33..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_py3.py
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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 VirtualMachineExtension(Resource):
-    """Describes a Virtual Machine Extension.
-
-    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]
-    :param force_update_tag: How the extension handler should be forced to
-     update even if the extension configuration has not changed.
-    :type force_update_tag: str
-    :param publisher: The name of the extension handler publisher.
-    :type publisher: str
-    :param virtual_machine_extension_type: Specifies the type of the
-     extension; an example is "CustomScriptExtension".
-    :type virtual_machine_extension_type: str
-    :param type_handler_version: Specifies the version of the script handler.
-    :type type_handler_version: str
-    :param auto_upgrade_minor_version: Indicates whether the extension should
-     use a newer minor version if one is available at deployment time. Once
-     deployed, however, the extension will not upgrade minor versions unless
-     redeployed, even with this property set to true.
-    :type auto_upgrade_minor_version: bool
-    :param settings: Json formatted public settings for the extension.
-    :type settings: object
-    :param protected_settings: The extension can contain either
-     protectedSettings or protectedSettingsFromKeyVault or no protected
-     settings at all.
-    :type protected_settings: object
-    :ivar provisioning_state: The provisioning state, which only appears in
-     the response.
-    :vartype provisioning_state: str
-    :param instance_view: The virtual machine extension instance view.
-    :type instance_view:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionInstanceView
-    """
-
-    _validation = {
-        'id': {'readonly': True},
-        'name': {'readonly': True},
-        'type': {'readonly': True},
-        'location': {'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}'},
-        'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'},
-        'publisher': {'key': 'properties.publisher', 'type': 'str'},
-        'virtual_machine_extension_type': {'key': 'properties.type', 'type': 'str'},
-        'type_handler_version': {'key': 'properties.typeHandlerVersion', 'type': 'str'},
-        'auto_upgrade_minor_version': {'key': 'properties.autoUpgradeMinorVersion', 'type': 'bool'},
-        'settings': {'key': 'properties.settings', 'type': 'object'},
-        'protected_settings': {'key': 'properties.protectedSettings', 'type': 'object'},
-        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
-        'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineExtensionInstanceView'},
-    }
-
-    def __init__(self, *, location: str, tags=None, force_update_tag: str=None, publisher: str=None, virtual_machine_extension_type: str=None, type_handler_version: str=None, auto_upgrade_minor_version: bool=None, settings=None, protected_settings=None, instance_view=None, **kwargs) -> None:
-        super(VirtualMachineExtension, self).__init__(location=location, tags=tags, **kwargs)
-        self.force_update_tag = force_update_tag
-        self.publisher = publisher
-        self.virtual_machine_extension_type = virtual_machine_extension_type
-        self.type_handler_version = type_handler_version
-        self.auto_upgrade_minor_version = auto_upgrade_minor_version
-        self.settings = settings
-        self.protected_settings = protected_settings
-        self.provisioning_state = None
-        self.instance_view = instance_view
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_update.py
deleted file mode 100644
index b920ff57ff96..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_update.py
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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 .update_resource import UpdateResource
-
-
-class VirtualMachineExtensionUpdate(UpdateResource):
-    """Describes a Virtual Machine Extension.
-
-    :param tags: Resource tags
-    :type tags: dict[str, str]
-    :param force_update_tag: How the extension handler should be forced to
-     update even if the extension configuration has not changed.
-    :type force_update_tag: str
-    :param publisher: The name of the extension handler publisher.
-    :type publisher: str
-    :param type: Specifies the type of the extension; an example is
-     "CustomScriptExtension".
-    :type type: str
-    :param type_handler_version: Specifies the version of the script handler.
-    :type type_handler_version: str
-    :param auto_upgrade_minor_version: Indicates whether the extension should
-     use a newer minor version if one is available at deployment time. Once
-     deployed, however, the extension will not upgrade minor versions unless
-     redeployed, even with this property set to true.
-    :type auto_upgrade_minor_version: bool
-    :param settings: Json formatted public settings for the extension.
-    :type settings: object
-    :param protected_settings: The extension can contain either
-     protectedSettings or protectedSettingsFromKeyVault or no protected
-     settings at all.
-    :type protected_settings: object
-    """
-
-    _attribute_map = {
-        'tags': {'key': 'tags', 'type': '{str}'},
-        'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'},
-        'publisher': {'key': 'properties.publisher', 'type': 'str'},
-        'type': {'key': 'properties.type', 'type': 'str'},
-        'type_handler_version': {'key': 'properties.typeHandlerVersion', 'type': 'str'},
-        'auto_upgrade_minor_version': {'key': 'properties.autoUpgradeMinorVersion', 'type': 'bool'},
-        'settings': {'key': 'properties.settings', 'type': 'object'},
-        'protected_settings': {'key': 'properties.protectedSettings', 'type': 'object'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineExtensionUpdate, self).__init__(**kwargs)
-        self.force_update_tag = kwargs.get('force_update_tag', None)
-        self.publisher = kwargs.get('publisher', None)
-        self.type = kwargs.get('type', None)
-        self.type_handler_version = kwargs.get('type_handler_version', None)
-        self.auto_upgrade_minor_version = kwargs.get('auto_upgrade_minor_version', None)
-        self.settings = kwargs.get('settings', None)
-        self.protected_settings = kwargs.get('protected_settings', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_update_py3.py
deleted file mode 100644
index c32c18d32759..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_update_py3.py
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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 .update_resource_py3 import UpdateResource
-
-
-class VirtualMachineExtensionUpdate(UpdateResource):
-    """Describes a Virtual Machine Extension.
-
-    :param tags: Resource tags
-    :type tags: dict[str, str]
-    :param force_update_tag: How the extension handler should be forced to
-     update even if the extension configuration has not changed.
-    :type force_update_tag: str
-    :param publisher: The name of the extension handler publisher.
-    :type publisher: str
-    :param type: Specifies the type of the extension; an example is
-     "CustomScriptExtension".
-    :type type: str
-    :param type_handler_version: Specifies the version of the script handler.
-    :type type_handler_version: str
-    :param auto_upgrade_minor_version: Indicates whether the extension should
-     use a newer minor version if one is available at deployment time. Once
-     deployed, however, the extension will not upgrade minor versions unless
-     redeployed, even with this property set to true.
-    :type auto_upgrade_minor_version: bool
-    :param settings: Json formatted public settings for the extension.
-    :type settings: object
-    :param protected_settings: The extension can contain either
-     protectedSettings or protectedSettingsFromKeyVault or no protected
-     settings at all.
-    :type protected_settings: object
-    """
-
-    _attribute_map = {
-        'tags': {'key': 'tags', 'type': '{str}'},
-        'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'},
-        'publisher': {'key': 'properties.publisher', 'type': 'str'},
-        'type': {'key': 'properties.type', 'type': 'str'},
-        'type_handler_version': {'key': 'properties.typeHandlerVersion', 'type': 'str'},
-        'auto_upgrade_minor_version': {'key': 'properties.autoUpgradeMinorVersion', 'type': 'bool'},
-        'settings': {'key': 'properties.settings', 'type': 'object'},
-        'protected_settings': {'key': 'properties.protectedSettings', 'type': 'object'},
-    }
-
-    def __init__(self, *, tags=None, force_update_tag: str=None, publisher: str=None, type: str=None, type_handler_version: str=None, auto_upgrade_minor_version: bool=None, settings=None, protected_settings=None, **kwargs) -> None:
-        super(VirtualMachineExtensionUpdate, self).__init__(tags=tags, **kwargs)
-        self.force_update_tag = force_update_tag
-        self.publisher = publisher
-        self.type = type
-        self.type_handler_version = type_handler_version
-        self.auto_upgrade_minor_version = auto_upgrade_minor_version
-        self.settings = settings
-        self.protected_settings = protected_settings
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extensions_list_result.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extensions_list_result.py
deleted file mode 100644
index a00529b436fb..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extensions_list_result.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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 VirtualMachineExtensionsListResult(Model):
-    """The List Extension operation response.
-
-    :param value: The list of extensions
-    :type value:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]
-    """
-
-    _attribute_map = {
-        'value': {'key': 'value', 'type': '[VirtualMachineExtension]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineExtensionsListResult, self).__init__(**kwargs)
-        self.value = kwargs.get('value', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extensions_list_result_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extensions_list_result_py3.py
deleted file mode 100644
index 0b64c0d2cd38..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extensions_list_result_py3.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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 VirtualMachineExtensionsListResult(Model):
-    """The List Extension operation response.
-
-    :param value: The list of extensions
-    :type value:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]
-    """
-
-    _attribute_map = {
-        'value': {'key': 'value', 'type': '[VirtualMachineExtension]'},
-    }
-
-    def __init__(self, *, value=None, **kwargs) -> None:
-        super(VirtualMachineExtensionsListResult, self).__init__(**kwargs)
-        self.value = value
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_health_status.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_health_status.py
deleted file mode 100644
index 28c49e91d1e1..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_health_status.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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 VirtualMachineHealthStatus(Model):
-    """The health status of the VM.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar status: The health status information for the VM.
-    :vartype status: ~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus
-    """
-
-    _validation = {
-        'status': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'status': {'key': 'status', 'type': 'InstanceViewStatus'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineHealthStatus, self).__init__(**kwargs)
-        self.status = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_health_status_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_health_status_py3.py
deleted file mode 100644
index b6311ea93d34..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_health_status_py3.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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 VirtualMachineHealthStatus(Model):
-    """The health status of the VM.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar status: The health status information for the VM.
-    :vartype status: ~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus
-    """
-
-    _validation = {
-        'status': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'status': {'key': 'status', 'type': 'InstanceViewStatus'},
-    }
-
-    def __init__(self, **kwargs) -> None:
-        super(VirtualMachineHealthStatus, self).__init__(**kwargs)
-        self.status = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_identity.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_identity.py
deleted file mode 100644
index 3c9fa46adfb9..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_identity.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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 VirtualMachineIdentity(Model):
-    """Identity for the virtual machine.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar principal_id: The principal id of virtual machine identity. This
-     property will only be provided for a system assigned identity.
-    :vartype principal_id: str
-    :ivar tenant_id: The tenant id associated with the virtual machine. This
-     property will only be provided for a system assigned identity.
-    :vartype tenant_id: str
-    :param type: The type of identity used for the virtual machine. The type
-     'SystemAssigned, UserAssigned' includes both an implicitly created
-     identity and a set of user assigned identities. The type 'None' will
-     remove any identities from the virtual machine. Possible values include:
-     'SystemAssigned', 'UserAssigned', 'SystemAssigned, UserAssigned', 'None'
-    :type type: str or
-     ~azure.mgmt.compute.v2018_04_01.models.ResourceIdentityType
-    :param identity_ids: The list of user identities associated with the
-     Virtual Machine. The user identity references will be ARM resource ids in
-     the form:
-     '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/identities/{identityName}'.
-    :type identity_ids: list[str]
-    """
-
-    _validation = {
-        'principal_id': {'readonly': True},
-        'tenant_id': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'principal_id': {'key': 'principalId', 'type': 'str'},
-        'tenant_id': {'key': 'tenantId', 'type': 'str'},
-        'type': {'key': 'type', 'type': 'ResourceIdentityType'},
-        'identity_ids': {'key': 'identityIds', 'type': '[str]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineIdentity, self).__init__(**kwargs)
-        self.principal_id = None
-        self.tenant_id = None
-        self.type = kwargs.get('type', None)
-        self.identity_ids = kwargs.get('identity_ids', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_identity_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_identity_py3.py
deleted file mode 100644
index 96d2849dfd9d..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_identity_py3.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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 VirtualMachineIdentity(Model):
-    """Identity for the virtual machine.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar principal_id: The principal id of virtual machine identity. This
-     property will only be provided for a system assigned identity.
-    :vartype principal_id: str
-    :ivar tenant_id: The tenant id associated with the virtual machine. This
-     property will only be provided for a system assigned identity.
-    :vartype tenant_id: str
-    :param type: The type of identity used for the virtual machine. The type
-     'SystemAssigned, UserAssigned' includes both an implicitly created
-     identity and a set of user assigned identities. The type 'None' will
-     remove any identities from the virtual machine. Possible values include:
-     'SystemAssigned', 'UserAssigned', 'SystemAssigned, UserAssigned', 'None'
-    :type type: str or
-     ~azure.mgmt.compute.v2018_04_01.models.ResourceIdentityType
-    :param identity_ids: The list of user identities associated with the
-     Virtual Machine. The user identity references will be ARM resource ids in
-     the form:
-     '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/identities/{identityName}'.
-    :type identity_ids: list[str]
-    """
-
-    _validation = {
-        'principal_id': {'readonly': True},
-        'tenant_id': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'principal_id': {'key': 'principalId', 'type': 'str'},
-        'tenant_id': {'key': 'tenantId', 'type': 'str'},
-        'type': {'key': 'type', 'type': 'ResourceIdentityType'},
-        'identity_ids': {'key': 'identityIds', 'type': '[str]'},
-    }
-
-    def __init__(self, *, type=None, identity_ids=None, **kwargs) -> None:
-        super(VirtualMachineIdentity, self).__init__(**kwargs)
-        self.principal_id = None
-        self.tenant_id = None
-        self.type = type
-        self.identity_ids = identity_ids
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image.py
deleted file mode 100644
index ea35eefb5ad4..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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 .virtual_machine_image_resource import VirtualMachineImageResource
-
-
-class VirtualMachineImage(VirtualMachineImageResource):
-    """Describes a Virtual Machine Image.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param id: Resource Id
-    :type id: str
-    :param name: Required. The name of the resource.
-    :type name: str
-    :param location: Required. The supported Azure location of the resource.
-    :type location: str
-    :param tags: Specifies the tags that are assigned to the virtual machine.
-     For more information about using tags, see [Using tags to organize your
-     Azure
-     resources](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-using-tags.md).
-    :type tags: dict[str, str]
-    :param plan:
-    :type plan: ~azure.mgmt.compute.v2018_04_01.models.PurchasePlan
-    :param os_disk_image:
-    :type os_disk_image: ~azure.mgmt.compute.v2018_04_01.models.OSDiskImage
-    :param data_disk_images:
-    :type data_disk_images:
-     list[~azure.mgmt.compute.v2018_04_01.models.DataDiskImage]
-    """
-
-    _validation = {
-        'name': {'required': True},
-        'location': {'required': True},
-    }
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'name': {'key': 'name', 'type': 'str'},
-        'location': {'key': 'location', 'type': 'str'},
-        'tags': {'key': 'tags', 'type': '{str}'},
-        'plan': {'key': 'properties.plan', 'type': 'PurchasePlan'},
-        'os_disk_image': {'key': 'properties.osDiskImage', 'type': 'OSDiskImage'},
-        'data_disk_images': {'key': 'properties.dataDiskImages', 'type': '[DataDiskImage]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineImage, self).__init__(**kwargs)
-        self.plan = kwargs.get('plan', None)
-        self.os_disk_image = kwargs.get('os_disk_image', None)
-        self.data_disk_images = kwargs.get('data_disk_images', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_py3.py
deleted file mode 100644
index 655c2909f7aa..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_py3.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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 .virtual_machine_image_resource_py3 import VirtualMachineImageResource
-
-
-class VirtualMachineImage(VirtualMachineImageResource):
-    """Describes a Virtual Machine Image.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param id: Resource Id
-    :type id: str
-    :param name: Required. The name of the resource.
-    :type name: str
-    :param location: Required. The supported Azure location of the resource.
-    :type location: str
-    :param tags: Specifies the tags that are assigned to the virtual machine.
-     For more information about using tags, see [Using tags to organize your
-     Azure
-     resources](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-using-tags.md).
-    :type tags: dict[str, str]
-    :param plan:
-    :type plan: ~azure.mgmt.compute.v2018_04_01.models.PurchasePlan
-    :param os_disk_image:
-    :type os_disk_image: ~azure.mgmt.compute.v2018_04_01.models.OSDiskImage
-    :param data_disk_images:
-    :type data_disk_images:
-     list[~azure.mgmt.compute.v2018_04_01.models.DataDiskImage]
-    """
-
-    _validation = {
-        'name': {'required': True},
-        'location': {'required': True},
-    }
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'name': {'key': 'name', 'type': 'str'},
-        'location': {'key': 'location', 'type': 'str'},
-        'tags': {'key': 'tags', 'type': '{str}'},
-        'plan': {'key': 'properties.plan', 'type': 'PurchasePlan'},
-        'os_disk_image': {'key': 'properties.osDiskImage', 'type': 'OSDiskImage'},
-        'data_disk_images': {'key': 'properties.dataDiskImages', 'type': '[DataDiskImage]'},
-    }
-
-    def __init__(self, *, name: str, location: str, id: str=None, tags=None, plan=None, os_disk_image=None, data_disk_images=None, **kwargs) -> None:
-        super(VirtualMachineImage, self).__init__(id=id, name=name, location=location, tags=tags, **kwargs)
-        self.plan = plan
-        self.os_disk_image = os_disk_image
-        self.data_disk_images = data_disk_images
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_resource.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_resource.py
deleted file mode 100644
index 8807cc8f391b..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_resource.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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 .sub_resource import SubResource
-
-
-class VirtualMachineImageResource(SubResource):
-    """Virtual machine image resource information.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param id: Resource Id
-    :type id: str
-    :param name: Required. The name of the resource.
-    :type name: str
-    :param location: Required. The supported Azure location of the resource.
-    :type location: str
-    :param tags: Specifies the tags that are assigned to the virtual machine.
-     For more information about using tags, see [Using tags to organize your
-     Azure
-     resources](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-using-tags.md).
-    :type tags: dict[str, str]
-    """
-
-    _validation = {
-        'name': {'required': True},
-        'location': {'required': True},
-    }
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'name': {'key': 'name', 'type': 'str'},
-        'location': {'key': 'location', 'type': 'str'},
-        'tags': {'key': 'tags', 'type': '{str}'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineImageResource, self).__init__(**kwargs)
-        self.name = kwargs.get('name', None)
-        self.location = kwargs.get('location', None)
-        self.tags = kwargs.get('tags', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_resource_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_resource_py3.py
deleted file mode 100644
index b9d63a8bc9e0..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_resource_py3.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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 .sub_resource_py3 import SubResource
-
-
-class VirtualMachineImageResource(SubResource):
-    """Virtual machine image resource information.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param id: Resource Id
-    :type id: str
-    :param name: Required. The name of the resource.
-    :type name: str
-    :param location: Required. The supported Azure location of the resource.
-    :type location: str
-    :param tags: Specifies the tags that are assigned to the virtual machine.
-     For more information about using tags, see [Using tags to organize your
-     Azure
-     resources](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-using-tags.md).
-    :type tags: dict[str, str]
-    """
-
-    _validation = {
-        'name': {'required': True},
-        'location': {'required': True},
-    }
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'name': {'key': 'name', 'type': 'str'},
-        'location': {'key': 'location', 'type': 'str'},
-        'tags': {'key': 'tags', 'type': '{str}'},
-    }
-
-    def __init__(self, *, name: str, location: str, id: str=None, tags=None, **kwargs) -> None:
-        super(VirtualMachineImageResource, self).__init__(id=id, **kwargs)
-        self.name = name
-        self.location = location
-        self.tags = tags
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_instance_view.py
deleted file mode 100644
index 8ba2eaf2f52a..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_instance_view.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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 VirtualMachineInstanceView(Model):
-    """The instance view of a virtual machine.
-
-    :param platform_update_domain: Specifies the update domain of the virtual
-     machine.
-    :type platform_update_domain: int
-    :param platform_fault_domain: Specifies the fault domain of the virtual
-     machine.
-    :type platform_fault_domain: int
-    :param computer_name: The computer name assigned to the virtual machine.
-    :type computer_name: str
-    :param os_name: The Operating System running on the virtual machine.
-    :type os_name: str
-    :param os_version: The version of Operating System running on the virtual
-     machine.
-    :type os_version: str
-    :param rdp_thumb_print: The Remote desktop certificate thumbprint.
-    :type rdp_thumb_print: str
-    :param vm_agent: The VM Agent running on the virtual machine.
-    :type vm_agent:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineAgentInstanceView
-    :param maintenance_redeploy_status: The Maintenance Operation status on
-     the virtual machine.
-    :type maintenance_redeploy_status:
-     ~azure.mgmt.compute.v2018_04_01.models.MaintenanceRedeployStatus
-    :param disks: The virtual machine disk information.
-    :type disks: list[~azure.mgmt.compute.v2018_04_01.models.DiskInstanceView]
-    :param extensions: The extensions information.
-    :type extensions:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionInstanceView]
-    :param boot_diagnostics: Boot Diagnostics is a debugging feature which
-     allows you to view Console Output and Screenshot to diagnose VM status.
-     <br><br> For Linux Virtual Machines, you can easily view the output of
-     your console log. <br><br> For both Windows and Linux virtual machines,
-     Azure also enables you to see a screenshot of the VM from the hypervisor.
-    :type boot_diagnostics:
-     ~azure.mgmt.compute.v2018_04_01.models.BootDiagnosticsInstanceView
-    :param statuses: The resource status information.
-    :type statuses:
-     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
-    """
-
-    _attribute_map = {
-        'platform_update_domain': {'key': 'platformUpdateDomain', 'type': 'int'},
-        'platform_fault_domain': {'key': 'platformFaultDomain', 'type': 'int'},
-        'computer_name': {'key': 'computerName', 'type': 'str'},
-        'os_name': {'key': 'osName', 'type': 'str'},
-        'os_version': {'key': 'osVersion', 'type': 'str'},
-        'rdp_thumb_print': {'key': 'rdpThumbPrint', 'type': 'str'},
-        'vm_agent': {'key': 'vmAgent', 'type': 'VirtualMachineAgentInstanceView'},
-        'maintenance_redeploy_status': {'key': 'maintenanceRedeployStatus', 'type': 'MaintenanceRedeployStatus'},
-        'disks': {'key': 'disks', 'type': '[DiskInstanceView]'},
-        'extensions': {'key': 'extensions', 'type': '[VirtualMachineExtensionInstanceView]'},
-        'boot_diagnostics': {'key': 'bootDiagnostics', 'type': 'BootDiagnosticsInstanceView'},
-        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineInstanceView, self).__init__(**kwargs)
-        self.platform_update_domain = kwargs.get('platform_update_domain', None)
-        self.platform_fault_domain = kwargs.get('platform_fault_domain', None)
-        self.computer_name = kwargs.get('computer_name', None)
-        self.os_name = kwargs.get('os_name', None)
-        self.os_version = kwargs.get('os_version', None)
-        self.rdp_thumb_print = kwargs.get('rdp_thumb_print', None)
-        self.vm_agent = kwargs.get('vm_agent', None)
-        self.maintenance_redeploy_status = kwargs.get('maintenance_redeploy_status', None)
-        self.disks = kwargs.get('disks', None)
-        self.extensions = kwargs.get('extensions', None)
-        self.boot_diagnostics = kwargs.get('boot_diagnostics', None)
-        self.statuses = kwargs.get('statuses', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_instance_view_py3.py
deleted file mode 100644
index 8c9fcff69f26..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_instance_view_py3.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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 VirtualMachineInstanceView(Model):
-    """The instance view of a virtual machine.
-
-    :param platform_update_domain: Specifies the update domain of the virtual
-     machine.
-    :type platform_update_domain: int
-    :param platform_fault_domain: Specifies the fault domain of the virtual
-     machine.
-    :type platform_fault_domain: int
-    :param computer_name: The computer name assigned to the virtual machine.
-    :type computer_name: str
-    :param os_name: The Operating System running on the virtual machine.
-    :type os_name: str
-    :param os_version: The version of Operating System running on the virtual
-     machine.
-    :type os_version: str
-    :param rdp_thumb_print: The Remote desktop certificate thumbprint.
-    :type rdp_thumb_print: str
-    :param vm_agent: The VM Agent running on the virtual machine.
-    :type vm_agent:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineAgentInstanceView
-    :param maintenance_redeploy_status: The Maintenance Operation status on
-     the virtual machine.
-    :type maintenance_redeploy_status:
-     ~azure.mgmt.compute.v2018_04_01.models.MaintenanceRedeployStatus
-    :param disks: The virtual machine disk information.
-    :type disks: list[~azure.mgmt.compute.v2018_04_01.models.DiskInstanceView]
-    :param extensions: The extensions information.
-    :type extensions:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionInstanceView]
-    :param boot_diagnostics: Boot Diagnostics is a debugging feature which
-     allows you to view Console Output and Screenshot to diagnose VM status.
-     <br><br> For Linux Virtual Machines, you can easily view the output of
-     your console log. <br><br> For both Windows and Linux virtual machines,
-     Azure also enables you to see a screenshot of the VM from the hypervisor.
-    :type boot_diagnostics:
-     ~azure.mgmt.compute.v2018_04_01.models.BootDiagnosticsInstanceView
-    :param statuses: The resource status information.
-    :type statuses:
-     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
-    """
-
-    _attribute_map = {
-        'platform_update_domain': {'key': 'platformUpdateDomain', 'type': 'int'},
-        'platform_fault_domain': {'key': 'platformFaultDomain', 'type': 'int'},
-        'computer_name': {'key': 'computerName', 'type': 'str'},
-        'os_name': {'key': 'osName', 'type': 'str'},
-        'os_version': {'key': 'osVersion', 'type': 'str'},
-        'rdp_thumb_print': {'key': 'rdpThumbPrint', 'type': 'str'},
-        'vm_agent': {'key': 'vmAgent', 'type': 'VirtualMachineAgentInstanceView'},
-        'maintenance_redeploy_status': {'key': 'maintenanceRedeployStatus', 'type': 'MaintenanceRedeployStatus'},
-        'disks': {'key': 'disks', 'type': '[DiskInstanceView]'},
-        'extensions': {'key': 'extensions', 'type': '[VirtualMachineExtensionInstanceView]'},
-        'boot_diagnostics': {'key': 'bootDiagnostics', 'type': 'BootDiagnosticsInstanceView'},
-        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
-    }
-
-    def __init__(self, *, platform_update_domain: int=None, platform_fault_domain: int=None, computer_name: str=None, os_name: str=None, os_version: str=None, rdp_thumb_print: str=None, vm_agent=None, maintenance_redeploy_status=None, disks=None, extensions=None, boot_diagnostics=None, statuses=None, **kwargs) -> None:
-        super(VirtualMachineInstanceView, self).__init__(**kwargs)
-        self.platform_update_domain = platform_update_domain
-        self.platform_fault_domain = platform_fault_domain
-        self.computer_name = computer_name
-        self.os_name = os_name
-        self.os_version = os_version
-        self.rdp_thumb_print = rdp_thumb_print
-        self.vm_agent = vm_agent
-        self.maintenance_redeploy_status = maintenance_redeploy_status
-        self.disks = disks
-        self.extensions = extensions
-        self.boot_diagnostics = boot_diagnostics
-        self.statuses = statuses
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_paged.py
deleted file mode 100644
index 387e4c3f253f..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_paged.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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 VirtualMachinePaged(Paged):
-    """
-    A paging container for iterating over a list of :class:`VirtualMachine <azure.mgmt.compute.v2018_04_01.models.VirtualMachine>` object
-    """
-
-    _attribute_map = {
-        'next_link': {'key': 'nextLink', 'type': 'str'},
-        'current_page': {'key': 'value', 'type': '[VirtualMachine]'}
-    }
-
-    def __init__(self, *args, **kwargs):
-
-        super(VirtualMachinePaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_py3.py
deleted file mode 100644
index 8b8bfcc1bcee..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_py3.py
+++ /dev/null
@@ -1,150 +0,0 @@
-# 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 VirtualMachine(Resource):
-    """Describes a Virtual Machine.
-
-    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]
-    :param plan: Specifies information about the marketplace image used to
-     create the virtual machine. This element is only used for marketplace
-     images. Before you can use a marketplace image from an API, you must
-     enable the image for programmatic use.  In the Azure portal, find the
-     marketplace image that you want to use and then click **Want to deploy
-     programmatically, Get Started ->**. Enter any required information and
-     then click **Save**.
-    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
-    :param hardware_profile: Specifies the hardware settings for the virtual
-     machine.
-    :type hardware_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.HardwareProfile
-    :param storage_profile: Specifies the storage settings for the virtual
-     machine disks.
-    :type storage_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.StorageProfile
-    :param os_profile: Specifies the operating system settings for the virtual
-     machine.
-    :type os_profile: ~azure.mgmt.compute.v2018_04_01.models.OSProfile
-    :param network_profile: Specifies the network interfaces of the virtual
-     machine.
-    :type network_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.NetworkProfile
-    :param diagnostics_profile: Specifies the boot diagnostic settings state.
-     <br><br>Minimum api-version: 2015-06-15.
-    :type diagnostics_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
-    :param availability_set: Specifies information about the availability set
-     that the virtual machine should be assigned to. Virtual machines specified
-     in the same availability set are allocated to different nodes to maximize
-     availability. For more information about availability sets, see [Manage
-     the availability of virtual
-     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
-     <br><br> For more information on Azure planned maintainance, see [Planned
-     maintenance for virtual machines in
-     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
-     <br><br> Currently, a VM can only be added to availability set at creation
-     time. An existing VM cannot be added to an availability set.
-    :type availability_set: ~azure.mgmt.compute.v2018_04_01.models.SubResource
-    :ivar provisioning_state: The provisioning state, which only appears in
-     the response.
-    :vartype provisioning_state: str
-    :ivar instance_view: The virtual machine instance view.
-    :vartype instance_view:
-     ~azure.mgmt.compute.v2018_04_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:
-     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
-     is included in a request for an update, the value must match the initial
-     value. This value cannot be updated. <br><br> For more information, see
-     [Azure Hybrid Use Benefit for Windows
-     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
-     <br><br> Minimum api-version: 2015-06-15
-    :type license_type: str
-    :ivar vm_id: Specifies the VM unique ID which is a 128-bits identifier
-     that is encoded and stored in all Azure IaaS VMs SMBIOS and can be read
-     using platform BIOS commands.
-    :vartype vm_id: str
-    :ivar resources: The virtual machine child extension resources.
-    :vartype resources:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]
-    :param identity: The identity of the virtual machine, if configured.
-    :type identity:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineIdentity
-    :param zones: The virtual machine zones.
-    :type zones: list[str]
-    """
-
-    _validation = {
-        'id': {'readonly': True},
-        'name': {'readonly': True},
-        'type': {'readonly': True},
-        'location': {'required': True},
-        'provisioning_state': {'readonly': True},
-        'instance_view': {'readonly': True},
-        'vm_id': {'readonly': True},
-        'resources': {'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}'},
-        'plan': {'key': 'plan', 'type': 'Plan'},
-        'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
-        'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
-        'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
-        'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
-        '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': 'VirtualMachineInstanceView'},
-        'license_type': {'key': 'properties.licenseType', 'type': 'str'},
-        'vm_id': {'key': 'properties.vmId', 'type': 'str'},
-        'resources': {'key': 'resources', 'type': '[VirtualMachineExtension]'},
-        'identity': {'key': 'identity', 'type': 'VirtualMachineIdentity'},
-        '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:
-        super(VirtualMachine, self).__init__(location=location, tags=tags, **kwargs)
-        self.plan = plan
-        self.hardware_profile = hardware_profile
-        self.storage_profile = storage_profile
-        self.os_profile = os_profile
-        self.network_profile = network_profile
-        self.diagnostics_profile = diagnostics_profile
-        self.availability_set = availability_set
-        self.provisioning_state = None
-        self.instance_view = None
-        self.license_type = license_type
-        self.vm_id = None
-        self.resources = None
-        self.identity = identity
-        self.zones = zones
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set.py
deleted file mode 100644
index 17f274dd926f..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set.py
+++ /dev/null
@@ -1,116 +0,0 @@
-# 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 VirtualMachineScaleSet(Resource):
-    """Describes a Virtual Machine Scale Set.
-
-    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]
-    :param sku: The virtual machine scale set sku.
-    :type sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
-    :param plan: Specifies information about the marketplace image used to
-     create the virtual machine. This element is only used for marketplace
-     images. Before you can use a marketplace image from an API, you must
-     enable the image for programmatic use.  In the Azure portal, find the
-     marketplace image that you want to use and then click **Want to deploy
-     programmatically, Get Started ->**. Enter any required information and
-     then click **Save**.
-    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
-    :param upgrade_policy: The upgrade policy.
-    :type upgrade_policy: ~azure.mgmt.compute.v2018_04_01.models.UpgradePolicy
-    :param virtual_machine_profile: The virtual machine profile.
-    :type virtual_machine_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVMProfile
-    :ivar provisioning_state: The provisioning state, which only appears in
-     the response.
-    :vartype provisioning_state: str
-    :param overprovision: Specifies whether the Virtual Machine Scale Set
-     should be overprovisioned.
-    :type overprovision: bool
-    :ivar unique_id: Specifies the ID which uniquely identifies a Virtual
-     Machine Scale Set.
-    :vartype unique_id: str
-    :param single_placement_group: When true this limits the scale set to a
-     single placement group, of max size 100 virtual machines.
-    :type single_placement_group: bool
-    :param zone_balance: Whether to force stictly even Virtual Machine
-     distribution cross x-zones in case there is zone outage.
-    :type zone_balance: bool
-    :param platform_fault_domain_count: Fault Domain count for each placement
-     group.
-    :type platform_fault_domain_count: int
-    :param identity: The identity of the virtual machine scale set, if
-     configured.
-    :type identity:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetIdentity
-    :param zones: The virtual machine scale set zones.
-    :type zones: list[str]
-    """
-
-    _validation = {
-        'id': {'readonly': True},
-        'name': {'readonly': True},
-        'type': {'readonly': True},
-        'location': {'required': True},
-        'provisioning_state': {'readonly': True},
-        'unique_id': {'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}'},
-        'sku': {'key': 'sku', 'type': 'Sku'},
-        'plan': {'key': 'plan', 'type': 'Plan'},
-        'upgrade_policy': {'key': 'properties.upgradePolicy', 'type': 'UpgradePolicy'},
-        'virtual_machine_profile': {'key': 'properties.virtualMachineProfile', 'type': 'VirtualMachineScaleSetVMProfile'},
-        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
-        'overprovision': {'key': 'properties.overprovision', 'type': 'bool'},
-        'unique_id': {'key': 'properties.uniqueId', 'type': 'str'},
-        'single_placement_group': {'key': 'properties.singlePlacementGroup', 'type': 'bool'},
-        'zone_balance': {'key': 'properties.zoneBalance', 'type': 'bool'},
-        'platform_fault_domain_count': {'key': 'properties.platformFaultDomainCount', 'type': 'int'},
-        'identity': {'key': 'identity', 'type': 'VirtualMachineScaleSetIdentity'},
-        'zones': {'key': 'zones', 'type': '[str]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSet, self).__init__(**kwargs)
-        self.sku = kwargs.get('sku', None)
-        self.plan = kwargs.get('plan', None)
-        self.upgrade_policy = kwargs.get('upgrade_policy', None)
-        self.virtual_machine_profile = kwargs.get('virtual_machine_profile', None)
-        self.provisioning_state = None
-        self.overprovision = kwargs.get('overprovision', None)
-        self.unique_id = None
-        self.single_placement_group = kwargs.get('single_placement_group', None)
-        self.zone_balance = kwargs.get('zone_balance', None)
-        self.platform_fault_domain_count = kwargs.get('platform_fault_domain_count', None)
-        self.identity = kwargs.get('identity', None)
-        self.zones = kwargs.get('zones', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_data_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_data_disk.py
deleted file mode 100644
index 945726144fd2..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_data_disk.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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 VirtualMachineScaleSetDataDisk(Model):
-    """Describes a virtual machine scale set data disk.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param name: The disk name.
-    :type name: str
-    :param lun: Required. Specifies the logical unit number of the data disk.
-     This value is used to identify data disks within the VM and therefore must
-     be unique for each data disk attached to a VM.
-    :type lun: int
-    :param caching: Specifies the caching requirements. <br><br> Possible
-     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
-     <br><br> Default: **None for Standard storage. ReadOnly for Premium
-     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
-    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
-    :param write_accelerator_enabled: Specifies whether writeAccelerator
-     should be enabled or disabled on the disk.
-    :type write_accelerator_enabled: bool
-    :param create_option: Required. The create option. Possible values
-     include: 'FromImage', 'Empty', 'Attach'
-    :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
-     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.
-    :type managed_disk:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetManagedDiskParameters
-    """
-
-    _validation = {
-        'lun': {'required': True},
-        'create_option': {'required': True},
-    }
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'lun': {'key': 'lun', 'type': 'int'},
-        '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'},
-        'managed_disk': {'key': 'managedDisk', 'type': 'VirtualMachineScaleSetManagedDiskParameters'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetDataDisk, self).__init__(**kwargs)
-        self.name = kwargs.get('name', None)
-        self.lun = kwargs.get('lun', None)
-        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.managed_disk = kwargs.get('managed_disk', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_data_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_data_disk_py3.py
deleted file mode 100644
index 8ff1b974e334..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_data_disk_py3.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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 VirtualMachineScaleSetDataDisk(Model):
-    """Describes a virtual machine scale set data disk.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param name: The disk name.
-    :type name: str
-    :param lun: Required. Specifies the logical unit number of the data disk.
-     This value is used to identify data disks within the VM and therefore must
-     be unique for each data disk attached to a VM.
-    :type lun: int
-    :param caching: Specifies the caching requirements. <br><br> Possible
-     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
-     <br><br> Default: **None for Standard storage. ReadOnly for Premium
-     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
-    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
-    :param write_accelerator_enabled: Specifies whether writeAccelerator
-     should be enabled or disabled on the disk.
-    :type write_accelerator_enabled: bool
-    :param create_option: Required. The create option. Possible values
-     include: 'FromImage', 'Empty', 'Attach'
-    :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
-     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.
-    :type managed_disk:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetManagedDiskParameters
-    """
-
-    _validation = {
-        'lun': {'required': True},
-        'create_option': {'required': True},
-    }
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'lun': {'key': 'lun', 'type': 'int'},
-        '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'},
-        'managed_disk': {'key': 'managedDisk', 'type': 'VirtualMachineScaleSetManagedDiskParameters'},
-    }
-
-    def __init__(self, *, lun: int, create_option, name: str=None, caching=None, write_accelerator_enabled: bool=None, disk_size_gb: int=None, managed_disk=None, **kwargs) -> None:
-        super(VirtualMachineScaleSetDataDisk, self).__init__(**kwargs)
-        self.name = name
-        self.lun = lun
-        self.caching = caching
-        self.write_accelerator_enabled = write_accelerator_enabled
-        self.create_option = create_option
-        self.disk_size_gb = disk_size_gb
-        self.managed_disk = managed_disk
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension.py
deleted file mode 100644
index 24a487547a2a..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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 .sub_resource_read_only import SubResourceReadOnly
-
-
-class VirtualMachineScaleSetExtension(SubResourceReadOnly):
-    """Describes a Virtual Machine Scale Set Extension.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar id: Resource Id
-    :vartype id: str
-    :param name: The name of the extension.
-    :type name: str
-    :param force_update_tag: If a value is provided and is different from the
-     previous value, the extension handler will be forced to update even if the
-     extension configuration has not changed.
-    :type force_update_tag: str
-    :param publisher: The name of the extension handler publisher.
-    :type publisher: str
-    :param type: Specifies the type of the extension; an example is
-     "CustomScriptExtension".
-    :type type: str
-    :param type_handler_version: Specifies the version of the script handler.
-    :type type_handler_version: str
-    :param auto_upgrade_minor_version: Indicates whether the extension should
-     use a newer minor version if one is available at deployment time. Once
-     deployed, however, the extension will not upgrade minor versions unless
-     redeployed, even with this property set to true.
-    :type auto_upgrade_minor_version: bool
-    :param settings: Json formatted public settings for the extension.
-    :type settings: object
-    :param protected_settings: The extension can contain either
-     protectedSettings or protectedSettingsFromKeyVault or no protected
-     settings at all.
-    :type protected_settings: object
-    :ivar provisioning_state: The provisioning state, which only appears in
-     the response.
-    :vartype provisioning_state: str
-    """
-
-    _validation = {
-        'id': {'readonly': True},
-        'provisioning_state': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'name': {'key': 'name', 'type': 'str'},
-        'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'},
-        'publisher': {'key': 'properties.publisher', 'type': 'str'},
-        'type': {'key': 'properties.type', 'type': 'str'},
-        'type_handler_version': {'key': 'properties.typeHandlerVersion', 'type': 'str'},
-        'auto_upgrade_minor_version': {'key': 'properties.autoUpgradeMinorVersion', 'type': 'bool'},
-        'settings': {'key': 'properties.settings', 'type': 'object'},
-        'protected_settings': {'key': 'properties.protectedSettings', 'type': 'object'},
-        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetExtension, self).__init__(**kwargs)
-        self.name = kwargs.get('name', None)
-        self.force_update_tag = kwargs.get('force_update_tag', None)
-        self.publisher = kwargs.get('publisher', None)
-        self.type = kwargs.get('type', None)
-        self.type_handler_version = kwargs.get('type_handler_version', None)
-        self.auto_upgrade_minor_version = kwargs.get('auto_upgrade_minor_version', None)
-        self.settings = kwargs.get('settings', None)
-        self.protected_settings = kwargs.get('protected_settings', None)
-        self.provisioning_state = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_paged.py
deleted file mode 100644
index 36a70d58d957..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_paged.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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 VirtualMachineScaleSetExtensionPaged(Paged):
-    """
-    A paging container for iterating over a list of :class:`VirtualMachineScaleSetExtension <azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtension>` object
-    """
-
-    _attribute_map = {
-        'next_link': {'key': 'nextLink', 'type': 'str'},
-        'current_page': {'key': 'value', 'type': '[VirtualMachineScaleSetExtension]'}
-    }
-
-    def __init__(self, *args, **kwargs):
-
-        super(VirtualMachineScaleSetExtensionPaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_profile.py
deleted file mode 100644
index 918951d9fe26..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_profile.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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 VirtualMachineScaleSetExtensionProfile(Model):
-    """Describes a virtual machine scale set extension profile.
-
-    :param extensions: The virtual machine scale set child extension
-     resources.
-    :type extensions:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtension]
-    """
-
-    _attribute_map = {
-        'extensions': {'key': 'extensions', 'type': '[VirtualMachineScaleSetExtension]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetExtensionProfile, self).__init__(**kwargs)
-        self.extensions = kwargs.get('extensions', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_profile_py3.py
deleted file mode 100644
index c00f190696d9..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_profile_py3.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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 VirtualMachineScaleSetExtensionProfile(Model):
-    """Describes a virtual machine scale set extension profile.
-
-    :param extensions: The virtual machine scale set child extension
-     resources.
-    :type extensions:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtension]
-    """
-
-    _attribute_map = {
-        'extensions': {'key': 'extensions', 'type': '[VirtualMachineScaleSetExtension]'},
-    }
-
-    def __init__(self, *, extensions=None, **kwargs) -> None:
-        super(VirtualMachineScaleSetExtensionProfile, self).__init__(**kwargs)
-        self.extensions = extensions
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_py3.py
deleted file mode 100644
index 27392a2de9fd..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_py3.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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 .sub_resource_read_only_py3 import SubResourceReadOnly
-
-
-class VirtualMachineScaleSetExtension(SubResourceReadOnly):
-    """Describes a Virtual Machine Scale Set Extension.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar id: Resource Id
-    :vartype id: str
-    :param name: The name of the extension.
-    :type name: str
-    :param force_update_tag: If a value is provided and is different from the
-     previous value, the extension handler will be forced to update even if the
-     extension configuration has not changed.
-    :type force_update_tag: str
-    :param publisher: The name of the extension handler publisher.
-    :type publisher: str
-    :param type: Specifies the type of the extension; an example is
-     "CustomScriptExtension".
-    :type type: str
-    :param type_handler_version: Specifies the version of the script handler.
-    :type type_handler_version: str
-    :param auto_upgrade_minor_version: Indicates whether the extension should
-     use a newer minor version if one is available at deployment time. Once
-     deployed, however, the extension will not upgrade minor versions unless
-     redeployed, even with this property set to true.
-    :type auto_upgrade_minor_version: bool
-    :param settings: Json formatted public settings for the extension.
-    :type settings: object
-    :param protected_settings: The extension can contain either
-     protectedSettings or protectedSettingsFromKeyVault or no protected
-     settings at all.
-    :type protected_settings: object
-    :ivar provisioning_state: The provisioning state, which only appears in
-     the response.
-    :vartype provisioning_state: str
-    """
-
-    _validation = {
-        'id': {'readonly': True},
-        'provisioning_state': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'name': {'key': 'name', 'type': 'str'},
-        'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'},
-        'publisher': {'key': 'properties.publisher', 'type': 'str'},
-        'type': {'key': 'properties.type', 'type': 'str'},
-        'type_handler_version': {'key': 'properties.typeHandlerVersion', 'type': 'str'},
-        'auto_upgrade_minor_version': {'key': 'properties.autoUpgradeMinorVersion', 'type': 'bool'},
-        'settings': {'key': 'properties.settings', 'type': 'object'},
-        'protected_settings': {'key': 'properties.protectedSettings', 'type': 'object'},
-        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
-    }
-
-    def __init__(self, *, name: str=None, force_update_tag: str=None, publisher: str=None, type: str=None, type_handler_version: str=None, auto_upgrade_minor_version: bool=None, settings=None, protected_settings=None, **kwargs) -> None:
-        super(VirtualMachineScaleSetExtension, self).__init__(**kwargs)
-        self.name = name
-        self.force_update_tag = force_update_tag
-        self.publisher = publisher
-        self.type = type
-        self.type_handler_version = type_handler_version
-        self.auto_upgrade_minor_version = auto_upgrade_minor_version
-        self.settings = settings
-        self.protected_settings = protected_settings
-        self.provisioning_state = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_identity.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_identity.py
deleted file mode 100644
index 0d3064e622d2..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_identity.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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 VirtualMachineScaleSetIdentity(Model):
-    """Identity for the virtual machine scale set.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar principal_id: The principal id of virtual machine scale set
-     identity. This property will only be provided for a system assigned
-     identity.
-    :vartype principal_id: str
-    :ivar tenant_id: The tenant id associated with the virtual machine scale
-     set. This property will only be provided for a system assigned identity.
-    :vartype tenant_id: str
-    :param type: The type of identity used for the virtual machine scale set.
-     The type 'SystemAssigned, UserAssigned' includes both an implicitly
-     created identity and a set of user assigned identities. The type 'None'
-     will remove any identities from the virtual machine scale set. Possible
-     values include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned,
-     UserAssigned', 'None'
-    :type type: str or
-     ~azure.mgmt.compute.v2018_04_01.models.ResourceIdentityType
-    :param identity_ids: The list of user identities associated with the
-     virtual machine scale set. The user identity references will be ARM
-     resource ids in the form:
-     '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/identities/{identityName}'.
-    :type identity_ids: list[str]
-    """
-
-    _validation = {
-        'principal_id': {'readonly': True},
-        'tenant_id': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'principal_id': {'key': 'principalId', 'type': 'str'},
-        'tenant_id': {'key': 'tenantId', 'type': 'str'},
-        'type': {'key': 'type', 'type': 'ResourceIdentityType'},
-        'identity_ids': {'key': 'identityIds', 'type': '[str]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetIdentity, self).__init__(**kwargs)
-        self.principal_id = None
-        self.tenant_id = None
-        self.type = kwargs.get('type', None)
-        self.identity_ids = kwargs.get('identity_ids', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_identity_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_identity_py3.py
deleted file mode 100644
index 0d4c71f5c2e4..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_identity_py3.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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 VirtualMachineScaleSetIdentity(Model):
-    """Identity for the virtual machine scale set.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar principal_id: The principal id of virtual machine scale set
-     identity. This property will only be provided for a system assigned
-     identity.
-    :vartype principal_id: str
-    :ivar tenant_id: The tenant id associated with the virtual machine scale
-     set. This property will only be provided for a system assigned identity.
-    :vartype tenant_id: str
-    :param type: The type of identity used for the virtual machine scale set.
-     The type 'SystemAssigned, UserAssigned' includes both an implicitly
-     created identity and a set of user assigned identities. The type 'None'
-     will remove any identities from the virtual machine scale set. Possible
-     values include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned,
-     UserAssigned', 'None'
-    :type type: str or
-     ~azure.mgmt.compute.v2018_04_01.models.ResourceIdentityType
-    :param identity_ids: The list of user identities associated with the
-     virtual machine scale set. The user identity references will be ARM
-     resource ids in the form:
-     '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/identities/{identityName}'.
-    :type identity_ids: list[str]
-    """
-
-    _validation = {
-        'principal_id': {'readonly': True},
-        'tenant_id': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'principal_id': {'key': 'principalId', 'type': 'str'},
-        'tenant_id': {'key': 'tenantId', 'type': 'str'},
-        'type': {'key': 'type', 'type': 'ResourceIdentityType'},
-        'identity_ids': {'key': 'identityIds', 'type': '[str]'},
-    }
-
-    def __init__(self, *, type=None, identity_ids=None, **kwargs) -> None:
-        super(VirtualMachineScaleSetIdentity, self).__init__(**kwargs)
-        self.principal_id = None
-        self.tenant_id = None
-        self.type = type
-        self.identity_ids = identity_ids
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view.py
deleted file mode 100644
index 1622490f7033..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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 VirtualMachineScaleSetInstanceView(Model):
-    """The instance view of a virtual machine scale set.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar virtual_machine: The instance view status summary for the virtual
-     machine scale set.
-    :vartype virtual_machine:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetInstanceViewStatusesSummary
-    :ivar extensions: The extensions information.
-    :vartype extensions:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVMExtensionsSummary]
-    :param statuses: The resource status information.
-    :type statuses:
-     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
-    """
-
-    _validation = {
-        'virtual_machine': {'readonly': True},
-        'extensions': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'virtual_machine': {'key': 'virtualMachine', 'type': 'VirtualMachineScaleSetInstanceViewStatusesSummary'},
-        'extensions': {'key': 'extensions', 'type': '[VirtualMachineScaleSetVMExtensionsSummary]'},
-        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetInstanceView, self).__init__(**kwargs)
-        self.virtual_machine = None
-        self.extensions = None
-        self.statuses = kwargs.get('statuses', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_py3.py
deleted file mode 100644
index b32213a53b1e..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_py3.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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 VirtualMachineScaleSetInstanceView(Model):
-    """The instance view of a virtual machine scale set.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar virtual_machine: The instance view status summary for the virtual
-     machine scale set.
-    :vartype virtual_machine:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetInstanceViewStatusesSummary
-    :ivar extensions: The extensions information.
-    :vartype extensions:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVMExtensionsSummary]
-    :param statuses: The resource status information.
-    :type statuses:
-     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
-    """
-
-    _validation = {
-        'virtual_machine': {'readonly': True},
-        'extensions': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'virtual_machine': {'key': 'virtualMachine', 'type': 'VirtualMachineScaleSetInstanceViewStatusesSummary'},
-        'extensions': {'key': 'extensions', 'type': '[VirtualMachineScaleSetVMExtensionsSummary]'},
-        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
-    }
-
-    def __init__(self, *, statuses=None, **kwargs) -> None:
-        super(VirtualMachineScaleSetInstanceView, self).__init__(**kwargs)
-        self.virtual_machine = None
-        self.extensions = None
-        self.statuses = statuses
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_statuses_summary.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_statuses_summary.py
deleted file mode 100644
index b0166ebb5800..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_statuses_summary.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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 VirtualMachineScaleSetInstanceViewStatusesSummary(Model):
-    """Instance view statuses summary for virtual machines of a virtual machine
-    scale set.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar statuses_summary: The extensions information.
-    :vartype statuses_summary:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineStatusCodeCount]
-    """
-
-    _validation = {
-        'statuses_summary': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'statuses_summary': {'key': 'statusesSummary', 'type': '[VirtualMachineStatusCodeCount]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetInstanceViewStatusesSummary, self).__init__(**kwargs)
-        self.statuses_summary = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_statuses_summary_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_statuses_summary_py3.py
deleted file mode 100644
index 40b07db6f65e..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_statuses_summary_py3.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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 VirtualMachineScaleSetInstanceViewStatusesSummary(Model):
-    """Instance view statuses summary for virtual machines of a virtual machine
-    scale set.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar statuses_summary: The extensions information.
-    :vartype statuses_summary:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineStatusCodeCount]
-    """
-
-    _validation = {
-        'statuses_summary': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'statuses_summary': {'key': 'statusesSummary', 'type': '[VirtualMachineStatusCodeCount]'},
-    }
-
-    def __init__(self, **kwargs) -> None:
-        super(VirtualMachineScaleSetInstanceViewStatusesSummary, self).__init__(**kwargs)
-        self.statuses_summary = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_configuration.py
deleted file mode 100644
index cab729ab5dba..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_configuration.py
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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 .sub_resource import SubResource
-
-
-class VirtualMachineScaleSetIPConfiguration(SubResource):
-    """Describes a virtual machine scale set network profile's IP configuration.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param id: Resource Id
-    :type id: str
-    :param name: Required. The IP configuration name.
-    :type name: str
-    :param subnet: Specifies the identifier of the subnet.
-    :type subnet: ~azure.mgmt.compute.v2018_04_01.models.ApiEntityReference
-    :param primary: Specifies the primary network interface in case the
-     virtual machine has more than 1 network interface.
-    :type primary: bool
-    :param public_ip_address_configuration: The publicIPAddressConfiguration.
-    :type public_ip_address_configuration:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetPublicIPAddressConfiguration
-    :param private_ip_address_version: Available from Api-Version 2017-03-30
-     onwards, it represents whether the specific ipconfiguration is IPv4 or
-     IPv6. Default is taken as IPv4.  Possible values are: 'IPv4' and 'IPv6'.
-     Possible values include: 'IPv4', 'IPv6'
-    :type private_ip_address_version: str or
-     ~azure.mgmt.compute.v2018_04_01.models.IPVersion
-    :param application_gateway_backend_address_pools: Specifies an array of
-     references to backend address pools of application gateways. A scale set
-     can reference backend address pools of multiple application gateways.
-     Multiple scale sets cannot use the same application gateway.
-    :type application_gateway_backend_address_pools:
-     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
-    :param load_balancer_backend_address_pools: Specifies an array of
-     references to backend address pools of load balancers. A scale set can
-     reference backend address pools of one public and one internal load
-     balancer. Multiple scale sets cannot use the same load balancer.
-    :type load_balancer_backend_address_pools:
-     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
-    :param load_balancer_inbound_nat_pools: Specifies an array of references
-     to inbound Nat pools of the load balancers. A scale set can reference
-     inbound nat pools of one public and one internal load balancer. Multiple
-     scale sets cannot use the same load balancer
-    :type load_balancer_inbound_nat_pools:
-     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
-    """
-
-    _validation = {
-        'name': {'required': True},
-    }
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'name': {'key': 'name', 'type': 'str'},
-        'subnet': {'key': 'properties.subnet', 'type': 'ApiEntityReference'},
-        'primary': {'key': 'properties.primary', 'type': 'bool'},
-        'public_ip_address_configuration': {'key': 'properties.publicIPAddressConfiguration', 'type': 'VirtualMachineScaleSetPublicIPAddressConfiguration'},
-        'private_ip_address_version': {'key': 'properties.privateIPAddressVersion', 'type': 'str'},
-        'application_gateway_backend_address_pools': {'key': 'properties.applicationGatewayBackendAddressPools', 'type': '[SubResource]'},
-        'load_balancer_backend_address_pools': {'key': 'properties.loadBalancerBackendAddressPools', 'type': '[SubResource]'},
-        'load_balancer_inbound_nat_pools': {'key': 'properties.loadBalancerInboundNatPools', 'type': '[SubResource]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetIPConfiguration, self).__init__(**kwargs)
-        self.name = kwargs.get('name', None)
-        self.subnet = kwargs.get('subnet', None)
-        self.primary = kwargs.get('primary', None)
-        self.public_ip_address_configuration = kwargs.get('public_ip_address_configuration', None)
-        self.private_ip_address_version = kwargs.get('private_ip_address_version', None)
-        self.application_gateway_backend_address_pools = kwargs.get('application_gateway_backend_address_pools', None)
-        self.load_balancer_backend_address_pools = kwargs.get('load_balancer_backend_address_pools', None)
-        self.load_balancer_inbound_nat_pools = kwargs.get('load_balancer_inbound_nat_pools', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_configuration_py3.py
deleted file mode 100644
index 1c73ea10f6fd..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_configuration_py3.py
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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 .sub_resource_py3 import SubResource
-
-
-class VirtualMachineScaleSetIPConfiguration(SubResource):
-    """Describes a virtual machine scale set network profile's IP configuration.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param id: Resource Id
-    :type id: str
-    :param name: Required. The IP configuration name.
-    :type name: str
-    :param subnet: Specifies the identifier of the subnet.
-    :type subnet: ~azure.mgmt.compute.v2018_04_01.models.ApiEntityReference
-    :param primary: Specifies the primary network interface in case the
-     virtual machine has more than 1 network interface.
-    :type primary: bool
-    :param public_ip_address_configuration: The publicIPAddressConfiguration.
-    :type public_ip_address_configuration:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetPublicIPAddressConfiguration
-    :param private_ip_address_version: Available from Api-Version 2017-03-30
-     onwards, it represents whether the specific ipconfiguration is IPv4 or
-     IPv6. Default is taken as IPv4.  Possible values are: 'IPv4' and 'IPv6'.
-     Possible values include: 'IPv4', 'IPv6'
-    :type private_ip_address_version: str or
-     ~azure.mgmt.compute.v2018_04_01.models.IPVersion
-    :param application_gateway_backend_address_pools: Specifies an array of
-     references to backend address pools of application gateways. A scale set
-     can reference backend address pools of multiple application gateways.
-     Multiple scale sets cannot use the same application gateway.
-    :type application_gateway_backend_address_pools:
-     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
-    :param load_balancer_backend_address_pools: Specifies an array of
-     references to backend address pools of load balancers. A scale set can
-     reference backend address pools of one public and one internal load
-     balancer. Multiple scale sets cannot use the same load balancer.
-    :type load_balancer_backend_address_pools:
-     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
-    :param load_balancer_inbound_nat_pools: Specifies an array of references
-     to inbound Nat pools of the load balancers. A scale set can reference
-     inbound nat pools of one public and one internal load balancer. Multiple
-     scale sets cannot use the same load balancer
-    :type load_balancer_inbound_nat_pools:
-     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
-    """
-
-    _validation = {
-        'name': {'required': True},
-    }
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'name': {'key': 'name', 'type': 'str'},
-        'subnet': {'key': 'properties.subnet', 'type': 'ApiEntityReference'},
-        'primary': {'key': 'properties.primary', 'type': 'bool'},
-        'public_ip_address_configuration': {'key': 'properties.publicIPAddressConfiguration', 'type': 'VirtualMachineScaleSetPublicIPAddressConfiguration'},
-        'private_ip_address_version': {'key': 'properties.privateIPAddressVersion', 'type': 'str'},
-        'application_gateway_backend_address_pools': {'key': 'properties.applicationGatewayBackendAddressPools', 'type': '[SubResource]'},
-        'load_balancer_backend_address_pools': {'key': 'properties.loadBalancerBackendAddressPools', 'type': '[SubResource]'},
-        'load_balancer_inbound_nat_pools': {'key': 'properties.loadBalancerInboundNatPools', 'type': '[SubResource]'},
-    }
-
-    def __init__(self, *, name: str, id: str=None, subnet=None, primary: bool=None, public_ip_address_configuration=None, private_ip_address_version=None, application_gateway_backend_address_pools=None, load_balancer_backend_address_pools=None, load_balancer_inbound_nat_pools=None, **kwargs) -> None:
-        super(VirtualMachineScaleSetIPConfiguration, self).__init__(id=id, **kwargs)
-        self.name = name
-        self.subnet = subnet
-        self.primary = primary
-        self.public_ip_address_configuration = public_ip_address_configuration
-        self.private_ip_address_version = private_ip_address_version
-        self.application_gateway_backend_address_pools = application_gateway_backend_address_pools
-        self.load_balancer_backend_address_pools = load_balancer_backend_address_pools
-        self.load_balancer_inbound_nat_pools = load_balancer_inbound_nat_pools
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py
deleted file mode 100644
index 495309b9b2cf..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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 VirtualMachineScaleSetManagedDiskParameters(Model):
-    """Describes the parameters of a ScaleSet managed disk.
-
-    :param storage_account_type: Specifies the storage account type for the
-     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
-    :type storage_account_type: str or
-     ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
-    """
-
-    _attribute_map = {
-        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetManagedDiskParameters, self).__init__(**kwargs)
-        self.storage_account_type = kwargs.get('storage_account_type', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py
deleted file mode 100644
index 68f66be2e34e..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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 VirtualMachineScaleSetManagedDiskParameters(Model):
-    """Describes the parameters of a ScaleSet managed disk.
-
-    :param storage_account_type: Specifies the storage account type for the
-     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
-    :type storage_account_type: str or
-     ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
-    """
-
-    _attribute_map = {
-        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
-    }
-
-    def __init__(self, *, storage_account_type=None, **kwargs) -> None:
-        super(VirtualMachineScaleSetManagedDiskParameters, self).__init__(**kwargs)
-        self.storage_account_type = storage_account_type
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration.py
deleted file mode 100644
index 232955519b0f..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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 .sub_resource import SubResource
-
-
-class VirtualMachineScaleSetNetworkConfiguration(SubResource):
-    """Describes a virtual machine scale set network profile's network
-    configurations.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param id: Resource Id
-    :type id: str
-    :param name: Required. The network configuration name.
-    :type name: str
-    :param primary: Specifies the primary network interface in case the
-     virtual machine has more than 1 network interface.
-    :type primary: bool
-    :param enable_accelerated_networking: Specifies whether the network
-     interface is accelerated networking-enabled.
-    :type enable_accelerated_networking: bool
-    :param network_security_group: The network security group.
-    :type network_security_group:
-     ~azure.mgmt.compute.v2018_04_01.models.SubResource
-    :param dns_settings: The dns settings to be applied on the network
-     interfaces.
-    :type dns_settings:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetNetworkConfigurationDnsSettings
-    :param ip_configurations: Required. Specifies the IP configurations of the
-     network interface.
-    :type ip_configurations:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetIPConfiguration]
-    :param enable_ip_forwarding: Whether IP forwarding enabled on this NIC.
-    :type enable_ip_forwarding: bool
-    """
-
-    _validation = {
-        'name': {'required': True},
-        'ip_configurations': {'required': True},
-    }
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'name': {'key': 'name', 'type': 'str'},
-        'primary': {'key': 'properties.primary', 'type': 'bool'},
-        'enable_accelerated_networking': {'key': 'properties.enableAcceleratedNetworking', 'type': 'bool'},
-        'network_security_group': {'key': 'properties.networkSecurityGroup', 'type': 'SubResource'},
-        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetNetworkConfigurationDnsSettings'},
-        'ip_configurations': {'key': 'properties.ipConfigurations', 'type': '[VirtualMachineScaleSetIPConfiguration]'},
-        'enable_ip_forwarding': {'key': 'properties.enableIPForwarding', 'type': 'bool'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetNetworkConfiguration, self).__init__(**kwargs)
-        self.name = kwargs.get('name', None)
-        self.primary = kwargs.get('primary', None)
-        self.enable_accelerated_networking = kwargs.get('enable_accelerated_networking', None)
-        self.network_security_group = kwargs.get('network_security_group', None)
-        self.dns_settings = kwargs.get('dns_settings', None)
-        self.ip_configurations = kwargs.get('ip_configurations', None)
-        self.enable_ip_forwarding = kwargs.get('enable_ip_forwarding', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_dns_settings.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_dns_settings.py
deleted file mode 100644
index 04e1c619383f..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_dns_settings.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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 VirtualMachineScaleSetNetworkConfigurationDnsSettings(Model):
-    """Describes a virtual machines scale sets network configuration's DNS
-    settings.
-
-    :param dns_servers: List of DNS servers IP addresses
-    :type dns_servers: list[str]
-    """
-
-    _attribute_map = {
-        'dns_servers': {'key': 'dnsServers', 'type': '[str]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetNetworkConfigurationDnsSettings, self).__init__(**kwargs)
-        self.dns_servers = kwargs.get('dns_servers', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_dns_settings_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_dns_settings_py3.py
deleted file mode 100644
index 5607f74d3c6a..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_dns_settings_py3.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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 VirtualMachineScaleSetNetworkConfigurationDnsSettings(Model):
-    """Describes a virtual machines scale sets network configuration's DNS
-    settings.
-
-    :param dns_servers: List of DNS servers IP addresses
-    :type dns_servers: list[str]
-    """
-
-    _attribute_map = {
-        'dns_servers': {'key': 'dnsServers', 'type': '[str]'},
-    }
-
-    def __init__(self, *, dns_servers=None, **kwargs) -> None:
-        super(VirtualMachineScaleSetNetworkConfigurationDnsSettings, self).__init__(**kwargs)
-        self.dns_servers = dns_servers
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_py3.py
deleted file mode 100644
index d8847da6356d..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_py3.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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 .sub_resource_py3 import SubResource
-
-
-class VirtualMachineScaleSetNetworkConfiguration(SubResource):
-    """Describes a virtual machine scale set network profile's network
-    configurations.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param id: Resource Id
-    :type id: str
-    :param name: Required. The network configuration name.
-    :type name: str
-    :param primary: Specifies the primary network interface in case the
-     virtual machine has more than 1 network interface.
-    :type primary: bool
-    :param enable_accelerated_networking: Specifies whether the network
-     interface is accelerated networking-enabled.
-    :type enable_accelerated_networking: bool
-    :param network_security_group: The network security group.
-    :type network_security_group:
-     ~azure.mgmt.compute.v2018_04_01.models.SubResource
-    :param dns_settings: The dns settings to be applied on the network
-     interfaces.
-    :type dns_settings:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetNetworkConfigurationDnsSettings
-    :param ip_configurations: Required. Specifies the IP configurations of the
-     network interface.
-    :type ip_configurations:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetIPConfiguration]
-    :param enable_ip_forwarding: Whether IP forwarding enabled on this NIC.
-    :type enable_ip_forwarding: bool
-    """
-
-    _validation = {
-        'name': {'required': True},
-        'ip_configurations': {'required': True},
-    }
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'name': {'key': 'name', 'type': 'str'},
-        'primary': {'key': 'properties.primary', 'type': 'bool'},
-        'enable_accelerated_networking': {'key': 'properties.enableAcceleratedNetworking', 'type': 'bool'},
-        'network_security_group': {'key': 'properties.networkSecurityGroup', 'type': 'SubResource'},
-        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetNetworkConfigurationDnsSettings'},
-        'ip_configurations': {'key': 'properties.ipConfigurations', 'type': '[VirtualMachineScaleSetIPConfiguration]'},
-        'enable_ip_forwarding': {'key': 'properties.enableIPForwarding', 'type': 'bool'},
-    }
-
-    def __init__(self, *, name: str, ip_configurations, id: str=None, primary: bool=None, enable_accelerated_networking: bool=None, network_security_group=None, dns_settings=None, enable_ip_forwarding: bool=None, **kwargs) -> None:
-        super(VirtualMachineScaleSetNetworkConfiguration, self).__init__(id=id, **kwargs)
-        self.name = name
-        self.primary = primary
-        self.enable_accelerated_networking = enable_accelerated_networking
-        self.network_security_group = network_security_group
-        self.dns_settings = dns_settings
-        self.ip_configurations = ip_configurations
-        self.enable_ip_forwarding = enable_ip_forwarding
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_profile.py
deleted file mode 100644
index b7b3854e671e..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_profile.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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 VirtualMachineScaleSetNetworkProfile(Model):
-    """Describes a virtual machine scale set network profile.
-
-    :param health_probe: A reference to a load balancer probe used to
-     determine the health of an instance in the virtual machine scale set. The
-     reference will be in the form:
-     '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/probes/{probeName}'.
-    :type health_probe:
-     ~azure.mgmt.compute.v2018_04_01.models.ApiEntityReference
-    :param network_interface_configurations: The list of network
-     configurations.
-    :type network_interface_configurations:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetNetworkConfiguration]
-    """
-
-    _attribute_map = {
-        'health_probe': {'key': 'healthProbe', 'type': 'ApiEntityReference'},
-        'network_interface_configurations': {'key': 'networkInterfaceConfigurations', 'type': '[VirtualMachineScaleSetNetworkConfiguration]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetNetworkProfile, self).__init__(**kwargs)
-        self.health_probe = kwargs.get('health_probe', None)
-        self.network_interface_configurations = kwargs.get('network_interface_configurations', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_profile_py3.py
deleted file mode 100644
index 4fd85adaca7a..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_profile_py3.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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 VirtualMachineScaleSetNetworkProfile(Model):
-    """Describes a virtual machine scale set network profile.
-
-    :param health_probe: A reference to a load balancer probe used to
-     determine the health of an instance in the virtual machine scale set. The
-     reference will be in the form:
-     '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/probes/{probeName}'.
-    :type health_probe:
-     ~azure.mgmt.compute.v2018_04_01.models.ApiEntityReference
-    :param network_interface_configurations: The list of network
-     configurations.
-    :type network_interface_configurations:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetNetworkConfiguration]
-    """
-
-    _attribute_map = {
-        'health_probe': {'key': 'healthProbe', 'type': 'ApiEntityReference'},
-        'network_interface_configurations': {'key': 'networkInterfaceConfigurations', 'type': '[VirtualMachineScaleSetNetworkConfiguration]'},
-    }
-
-    def __init__(self, *, health_probe=None, network_interface_configurations=None, **kwargs) -> None:
-        super(VirtualMachineScaleSetNetworkProfile, self).__init__(**kwargs)
-        self.health_probe = health_probe
-        self.network_interface_configurations = network_interface_configurations
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_disk.py
deleted file mode 100644
index 3c27a4373376..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_disk.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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 VirtualMachineScaleSetOSDisk(Model):
-    """Describes a virtual machine scale set operating system disk.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param name: The disk name.
-    :type name: str
-    :param caching: Specifies the caching requirements. <br><br> Possible
-     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
-     <br><br> Default: **None for Standard storage. ReadOnly for Premium
-     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
-    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
-    :param write_accelerator_enabled: Specifies whether writeAccelerator
-     should be enabled or disabled on the disk.
-    :type write_accelerator_enabled: bool
-    :param create_option: Required. Specifies how the virtual machines in the
-     scale set should be created.<br><br> The only allowed value is:
-     **FromImage** \\u2013 This value is used when you are using an image to
-     create the virtual machine. If you are using a platform image, you also
-     use the imageReference element described above. If you are using a
-     marketplace image, you  also use the plan element previously described.
-     Possible values include: 'FromImage', 'Empty', 'Attach'
-    :type create_option: str or
-     ~azure.mgmt.compute.v2018_04_01.models.DiskCreateOptionTypes
-    :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**
-     <br><br> **Linux**. Possible values include: 'Windows', 'Linux'
-    :type os_type: str or
-     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
-    :param image: Specifies information about the unmanaged user image to base
-     the scale set on.
-    :type image: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
-    :param vhd_containers: Specifies the container urls that are used to store
-     operating system disks for the scale set.
-    :type vhd_containers: list[str]
-    :param managed_disk: The managed disk parameters.
-    :type managed_disk:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetManagedDiskParameters
-    """
-
-    _validation = {
-        'create_option': {'required': True},
-    }
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'caching': {'key': 'caching', 'type': 'CachingTypes'},
-        'write_accelerator_enabled': {'key': 'writeAcceleratorEnabled', 'type': 'bool'},
-        'create_option': {'key': 'createOption', 'type': 'str'},
-        '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, **kwargs):
-        super(VirtualMachineScaleSetOSDisk, self).__init__(**kwargs)
-        self.name = kwargs.get('name', None)
-        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.os_type = kwargs.get('os_type', 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_04_01/models/virtual_machine_scale_set_os_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_disk_py3.py
deleted file mode 100644
index a9e21e153d4d..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_disk_py3.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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 VirtualMachineScaleSetOSDisk(Model):
-    """Describes a virtual machine scale set operating system disk.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param name: The disk name.
-    :type name: str
-    :param caching: Specifies the caching requirements. <br><br> Possible
-     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
-     <br><br> Default: **None for Standard storage. ReadOnly for Premium
-     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
-    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
-    :param write_accelerator_enabled: Specifies whether writeAccelerator
-     should be enabled or disabled on the disk.
-    :type write_accelerator_enabled: bool
-    :param create_option: Required. Specifies how the virtual machines in the
-     scale set should be created.<br><br> The only allowed value is:
-     **FromImage** \\u2013 This value is used when you are using an image to
-     create the virtual machine. If you are using a platform image, you also
-     use the imageReference element described above. If you are using a
-     marketplace image, you  also use the plan element previously described.
-     Possible values include: 'FromImage', 'Empty', 'Attach'
-    :type create_option: str or
-     ~azure.mgmt.compute.v2018_04_01.models.DiskCreateOptionTypes
-    :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**
-     <br><br> **Linux**. Possible values include: 'Windows', 'Linux'
-    :type os_type: str or
-     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
-    :param image: Specifies information about the unmanaged user image to base
-     the scale set on.
-    :type image: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
-    :param vhd_containers: Specifies the container urls that are used to store
-     operating system disks for the scale set.
-    :type vhd_containers: list[str]
-    :param managed_disk: The managed disk parameters.
-    :type managed_disk:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetManagedDiskParameters
-    """
-
-    _validation = {
-        'create_option': {'required': True},
-    }
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'caching': {'key': 'caching', 'type': 'CachingTypes'},
-        'write_accelerator_enabled': {'key': 'writeAcceleratorEnabled', 'type': 'bool'},
-        'create_option': {'key': 'createOption', 'type': 'str'},
-        '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:
-        super(VirtualMachineScaleSetOSDisk, self).__init__(**kwargs)
-        self.name = name
-        self.caching = caching
-        self.write_accelerator_enabled = write_accelerator_enabled
-        self.create_option = create_option
-        self.os_type = os_type
-        self.image = image
-        self.vhd_containers = vhd_containers
-        self.managed_disk = managed_disk
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_profile.py
deleted file mode 100644
index fc813cc7a45f..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_profile.py
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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 VirtualMachineScaleSetOSProfile(Model):
-    """Describes a virtual machine scale set OS profile.
-
-    :param computer_name_prefix: Specifies the computer name prefix for all of
-     the virtual machines in the scale set. Computer name prefixes must be 1 to
-     15 characters long.
-    :type computer_name_prefix: str
-    :param admin_username: Specifies the name of the administrator account.
-     <br><br> **Windows-only restriction:** Cannot end in "." <br><br>
-     **Disallowed values:** "administrator", "admin", "user", "user1", "test",
-     "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm",
-     "admin2", "aspnet", "backup", "console", "david", "guest", "john",
-     "owner", "root", "server", "sql", "support", "support_388945a0", "sys",
-     "test2", "test3", "user4", "user5". <br><br> **Minimum-length (Linux):** 1
-     character <br><br> **Max-length (Linux):** 64 characters <br><br>
-     **Max-length (Windows):** 20 characters  <br><br><li> For root access to
-     the Linux VM, see [Using root privileges on Linux virtual machines in
-     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-use-root-privileges?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)<br><li>
-     For a list of built-in system users on Linux that should not be used in
-     this field, see [Selecting User Names for Linux on
-     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-usernames?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
-    :type admin_username: str
-    :param admin_password: Specifies the password of the administrator
-     account. <br><br> **Minimum-length (Windows):** 8 characters <br><br>
-     **Minimum-length (Linux):** 6 characters <br><br> **Max-length
-     (Windows):** 123 characters <br><br> **Max-length (Linux):** 72 characters
-     <br><br> **Complexity requirements:** 3 out of 4 conditions below need to
-     be fulfilled <br> Has lower characters <br>Has upper characters <br> Has a
-     digit <br> Has a special character (Regex match [\\W_]) <br><br>
-     **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123",
-     "Pa$$word", "pass@word1", "Password!", "Password1", "Password22",
-     "iloveyou!" <br><br> For resetting the password, see [How to reset the
-     Remote Desktop service or its login password in a Windows
-     VM](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-reset-rdp?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
-     <br><br> For resetting root password, see [Manage users, SSH, and check or
-     repair disks on Azure Linux VMs using the VMAccess
-     Extension](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-vmaccess-extension?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#reset-root-password)
-    :type admin_password: str
-    :param custom_data: Specifies a base-64 encoded string of custom data. The
-     base-64 encoded string is decoded to a binary array that is saved as a
-     file on the Virtual Machine. The maximum length of the binary array is
-     65535 bytes. <br><br> For using cloud-init for your VM, see [Using
-     cloud-init to customize a Linux VM during
-     creation](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-cloud-init?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
-    :type custom_data: str
-    :param windows_configuration: Specifies Windows operating system settings
-     on the virtual machine.
-    :type windows_configuration:
-     ~azure.mgmt.compute.v2018_04_01.models.WindowsConfiguration
-    :param linux_configuration: Specifies the Linux operating system settings
-     on the virtual machine. <br><br>For a list of supported Linux
-     distributions, see [Linux on Azure-Endorsed
-     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
-     <br><br> For running non-endorsed distributions, see [Information for
-     Non-Endorsed
-     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
-    :type linux_configuration:
-     ~azure.mgmt.compute.v2018_04_01.models.LinuxConfiguration
-    :param secrets: Specifies set of certificates that should be installed
-     onto the virtual machines in the scale set.
-    :type secrets:
-     list[~azure.mgmt.compute.v2018_04_01.models.VaultSecretGroup]
-    """
-
-    _attribute_map = {
-        'computer_name_prefix': {'key': 'computerNamePrefix', 'type': 'str'},
-        'admin_username': {'key': 'adminUsername', 'type': 'str'},
-        'admin_password': {'key': 'adminPassword', 'type': 'str'},
-        'custom_data': {'key': 'customData', 'type': 'str'},
-        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'WindowsConfiguration'},
-        'linux_configuration': {'key': 'linuxConfiguration', 'type': 'LinuxConfiguration'},
-        'secrets': {'key': 'secrets', 'type': '[VaultSecretGroup]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetOSProfile, self).__init__(**kwargs)
-        self.computer_name_prefix = kwargs.get('computer_name_prefix', None)
-        self.admin_username = kwargs.get('admin_username', None)
-        self.admin_password = kwargs.get('admin_password', None)
-        self.custom_data = kwargs.get('custom_data', None)
-        self.windows_configuration = kwargs.get('windows_configuration', None)
-        self.linux_configuration = kwargs.get('linux_configuration', None)
-        self.secrets = kwargs.get('secrets', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_profile_py3.py
deleted file mode 100644
index f6f5abf8eb58..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_profile_py3.py
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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 VirtualMachineScaleSetOSProfile(Model):
-    """Describes a virtual machine scale set OS profile.
-
-    :param computer_name_prefix: Specifies the computer name prefix for all of
-     the virtual machines in the scale set. Computer name prefixes must be 1 to
-     15 characters long.
-    :type computer_name_prefix: str
-    :param admin_username: Specifies the name of the administrator account.
-     <br><br> **Windows-only restriction:** Cannot end in "." <br><br>
-     **Disallowed values:** "administrator", "admin", "user", "user1", "test",
-     "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm",
-     "admin2", "aspnet", "backup", "console", "david", "guest", "john",
-     "owner", "root", "server", "sql", "support", "support_388945a0", "sys",
-     "test2", "test3", "user4", "user5". <br><br> **Minimum-length (Linux):** 1
-     character <br><br> **Max-length (Linux):** 64 characters <br><br>
-     **Max-length (Windows):** 20 characters  <br><br><li> For root access to
-     the Linux VM, see [Using root privileges on Linux virtual machines in
-     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-use-root-privileges?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)<br><li>
-     For a list of built-in system users on Linux that should not be used in
-     this field, see [Selecting User Names for Linux on
-     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-usernames?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
-    :type admin_username: str
-    :param admin_password: Specifies the password of the administrator
-     account. <br><br> **Minimum-length (Windows):** 8 characters <br><br>
-     **Minimum-length (Linux):** 6 characters <br><br> **Max-length
-     (Windows):** 123 characters <br><br> **Max-length (Linux):** 72 characters
-     <br><br> **Complexity requirements:** 3 out of 4 conditions below need to
-     be fulfilled <br> Has lower characters <br>Has upper characters <br> Has a
-     digit <br> Has a special character (Regex match [\\W_]) <br><br>
-     **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123",
-     "Pa$$word", "pass@word1", "Password!", "Password1", "Password22",
-     "iloveyou!" <br><br> For resetting the password, see [How to reset the
-     Remote Desktop service or its login password in a Windows
-     VM](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-reset-rdp?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
-     <br><br> For resetting root password, see [Manage users, SSH, and check or
-     repair disks on Azure Linux VMs using the VMAccess
-     Extension](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-vmaccess-extension?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#reset-root-password)
-    :type admin_password: str
-    :param custom_data: Specifies a base-64 encoded string of custom data. The
-     base-64 encoded string is decoded to a binary array that is saved as a
-     file on the Virtual Machine. The maximum length of the binary array is
-     65535 bytes. <br><br> For using cloud-init for your VM, see [Using
-     cloud-init to customize a Linux VM during
-     creation](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-cloud-init?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
-    :type custom_data: str
-    :param windows_configuration: Specifies Windows operating system settings
-     on the virtual machine.
-    :type windows_configuration:
-     ~azure.mgmt.compute.v2018_04_01.models.WindowsConfiguration
-    :param linux_configuration: Specifies the Linux operating system settings
-     on the virtual machine. <br><br>For a list of supported Linux
-     distributions, see [Linux on Azure-Endorsed
-     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
-     <br><br> For running non-endorsed distributions, see [Information for
-     Non-Endorsed
-     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
-    :type linux_configuration:
-     ~azure.mgmt.compute.v2018_04_01.models.LinuxConfiguration
-    :param secrets: Specifies set of certificates that should be installed
-     onto the virtual machines in the scale set.
-    :type secrets:
-     list[~azure.mgmt.compute.v2018_04_01.models.VaultSecretGroup]
-    """
-
-    _attribute_map = {
-        'computer_name_prefix': {'key': 'computerNamePrefix', 'type': 'str'},
-        'admin_username': {'key': 'adminUsername', 'type': 'str'},
-        'admin_password': {'key': 'adminPassword', 'type': 'str'},
-        'custom_data': {'key': 'customData', 'type': 'str'},
-        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'WindowsConfiguration'},
-        'linux_configuration': {'key': 'linuxConfiguration', 'type': 'LinuxConfiguration'},
-        'secrets': {'key': 'secrets', 'type': '[VaultSecretGroup]'},
-    }
-
-    def __init__(self, *, computer_name_prefix: str=None, admin_username: str=None, admin_password: str=None, custom_data: str=None, windows_configuration=None, linux_configuration=None, secrets=None, **kwargs) -> None:
-        super(VirtualMachineScaleSetOSProfile, self).__init__(**kwargs)
-        self.computer_name_prefix = computer_name_prefix
-        self.admin_username = admin_username
-        self.admin_password = admin_password
-        self.custom_data = custom_data
-        self.windows_configuration = windows_configuration
-        self.linux_configuration = linux_configuration
-        self.secrets = secrets
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_paged.py
deleted file mode 100644
index 5492e1f69e53..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_paged.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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 VirtualMachineScaleSetPaged(Paged):
-    """
-    A paging container for iterating over a list of :class:`VirtualMachineScaleSet <azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSet>` object
-    """
-
-    _attribute_map = {
-        'next_link': {'key': 'nextLink', 'type': 'str'},
-        'current_page': {'key': 'value', 'type': '[VirtualMachineScaleSet]'}
-    }
-
-    def __init__(self, *args, **kwargs):
-
-        super(VirtualMachineScaleSetPaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration.py
deleted file mode 100644
index d2d78be5db52..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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 VirtualMachineScaleSetPublicIPAddressConfiguration(Model):
-    """Describes a virtual machines scale set IP Configuration's PublicIPAddress
-    configuration.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param name: Required. The publicIP address configuration name.
-    :type name: str
-    :param idle_timeout_in_minutes: The idle timeout of the public IP address.
-    :type idle_timeout_in_minutes: int
-    :param dns_settings: The dns settings to be applied on the publicIP
-     addresses .
-    :type dns_settings:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings
-    """
-
-    _validation = {
-        'name': {'required': True},
-    }
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'idle_timeout_in_minutes': {'key': 'properties.idleTimeoutInMinutes', 'type': 'int'},
-        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetPublicIPAddressConfiguration, self).__init__(**kwargs)
-        self.name = kwargs.get('name', None)
-        self.idle_timeout_in_minutes = kwargs.get('idle_timeout_in_minutes', None)
-        self.dns_settings = kwargs.get('dns_settings', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings.py
deleted file mode 100644
index 2fe562244372..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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 VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings(Model):
-    """Describes a virtual machines scale sets network configuration's DNS
-    settings.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param domain_name_label: Required. The Domain name label.The
-     concatenation of the domain name label and vm index will be the domain
-     name labels of the PublicIPAddress resources that will be created
-    :type domain_name_label: str
-    """
-
-    _validation = {
-        'domain_name_label': {'required': True},
-    }
-
-    _attribute_map = {
-        'domain_name_label': {'key': 'domainNameLabel', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings, self).__init__(**kwargs)
-        self.domain_name_label = kwargs.get('domain_name_label', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings_py3.py
deleted file mode 100644
index 326a36708ff4..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings_py3.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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 VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings(Model):
-    """Describes a virtual machines scale sets network configuration's DNS
-    settings.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param domain_name_label: Required. The Domain name label.The
-     concatenation of the domain name label and vm index will be the domain
-     name labels of the PublicIPAddress resources that will be created
-    :type domain_name_label: str
-    """
-
-    _validation = {
-        'domain_name_label': {'required': True},
-    }
-
-    _attribute_map = {
-        'domain_name_label': {'key': 'domainNameLabel', 'type': 'str'},
-    }
-
-    def __init__(self, *, domain_name_label: str, **kwargs) -> None:
-        super(VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings, self).__init__(**kwargs)
-        self.domain_name_label = domain_name_label
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_py3.py
deleted file mode 100644
index 36fceb407e7f..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_py3.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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 VirtualMachineScaleSetPublicIPAddressConfiguration(Model):
-    """Describes a virtual machines scale set IP Configuration's PublicIPAddress
-    configuration.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param name: Required. The publicIP address configuration name.
-    :type name: str
-    :param idle_timeout_in_minutes: The idle timeout of the public IP address.
-    :type idle_timeout_in_minutes: int
-    :param dns_settings: The dns settings to be applied on the publicIP
-     addresses .
-    :type dns_settings:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings
-    """
-
-    _validation = {
-        'name': {'required': True},
-    }
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'idle_timeout_in_minutes': {'key': 'properties.idleTimeoutInMinutes', 'type': 'int'},
-        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings'},
-    }
-
-    def __init__(self, *, name: str, idle_timeout_in_minutes: int=None, dns_settings=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
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_py3.py
deleted file mode 100644
index a618d08a4ee6..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_py3.py
+++ /dev/null
@@ -1,116 +0,0 @@
-# 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 VirtualMachineScaleSet(Resource):
-    """Describes a Virtual Machine Scale Set.
-
-    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]
-    :param sku: The virtual machine scale set sku.
-    :type sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
-    :param plan: Specifies information about the marketplace image used to
-     create the virtual machine. This element is only used for marketplace
-     images. Before you can use a marketplace image from an API, you must
-     enable the image for programmatic use.  In the Azure portal, find the
-     marketplace image that you want to use and then click **Want to deploy
-     programmatically, Get Started ->**. Enter any required information and
-     then click **Save**.
-    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
-    :param upgrade_policy: The upgrade policy.
-    :type upgrade_policy: ~azure.mgmt.compute.v2018_04_01.models.UpgradePolicy
-    :param virtual_machine_profile: The virtual machine profile.
-    :type virtual_machine_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVMProfile
-    :ivar provisioning_state: The provisioning state, which only appears in
-     the response.
-    :vartype provisioning_state: str
-    :param overprovision: Specifies whether the Virtual Machine Scale Set
-     should be overprovisioned.
-    :type overprovision: bool
-    :ivar unique_id: Specifies the ID which uniquely identifies a Virtual
-     Machine Scale Set.
-    :vartype unique_id: str
-    :param single_placement_group: When true this limits the scale set to a
-     single placement group, of max size 100 virtual machines.
-    :type single_placement_group: bool
-    :param zone_balance: Whether to force stictly even Virtual Machine
-     distribution cross x-zones in case there is zone outage.
-    :type zone_balance: bool
-    :param platform_fault_domain_count: Fault Domain count for each placement
-     group.
-    :type platform_fault_domain_count: int
-    :param identity: The identity of the virtual machine scale set, if
-     configured.
-    :type identity:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetIdentity
-    :param zones: The virtual machine scale set zones.
-    :type zones: list[str]
-    """
-
-    _validation = {
-        'id': {'readonly': True},
-        'name': {'readonly': True},
-        'type': {'readonly': True},
-        'location': {'required': True},
-        'provisioning_state': {'readonly': True},
-        'unique_id': {'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}'},
-        'sku': {'key': 'sku', 'type': 'Sku'},
-        'plan': {'key': 'plan', 'type': 'Plan'},
-        'upgrade_policy': {'key': 'properties.upgradePolicy', 'type': 'UpgradePolicy'},
-        'virtual_machine_profile': {'key': 'properties.virtualMachineProfile', 'type': 'VirtualMachineScaleSetVMProfile'},
-        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
-        'overprovision': {'key': 'properties.overprovision', 'type': 'bool'},
-        'unique_id': {'key': 'properties.uniqueId', 'type': 'str'},
-        'single_placement_group': {'key': 'properties.singlePlacementGroup', 'type': 'bool'},
-        'zone_balance': {'key': 'properties.zoneBalance', 'type': 'bool'},
-        'platform_fault_domain_count': {'key': 'properties.platformFaultDomainCount', 'type': 'int'},
-        'identity': {'key': 'identity', 'type': 'VirtualMachineScaleSetIdentity'},
-        'zones': {'key': 'zones', 'type': '[str]'},
-    }
-
-    def __init__(self, *, location: str, tags=None, sku=None, plan=None, upgrade_policy=None, virtual_machine_profile=None, overprovision: bool=None, single_placement_group: bool=None, zone_balance: bool=None, platform_fault_domain_count: int=None, identity=None, zones=None, **kwargs) -> None:
-        super(VirtualMachineScaleSet, self).__init__(location=location, tags=tags, **kwargs)
-        self.sku = sku
-        self.plan = plan
-        self.upgrade_policy = upgrade_policy
-        self.virtual_machine_profile = virtual_machine_profile
-        self.provisioning_state = None
-        self.overprovision = overprovision
-        self.unique_id = None
-        self.single_placement_group = single_placement_group
-        self.zone_balance = zone_balance
-        self.platform_fault_domain_count = platform_fault_domain_count
-        self.identity = identity
-        self.zones = zones
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku.py
deleted file mode 100644
index 3c601b81ecda..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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 VirtualMachineScaleSetSku(Model):
-    """Describes an available virtual machine scale set sku.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar resource_type: The type of resource the sku applies to.
-    :vartype resource_type: str
-    :ivar sku: The Sku.
-    :vartype sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
-    :ivar capacity: Specifies the number of virtual machines in the scale set.
-    :vartype capacity:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetSkuCapacity
-    """
-
-    _validation = {
-        'resource_type': {'readonly': True},
-        'sku': {'readonly': True},
-        'capacity': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'resource_type': {'key': 'resourceType', 'type': 'str'},
-        'sku': {'key': 'sku', 'type': 'Sku'},
-        'capacity': {'key': 'capacity', 'type': 'VirtualMachineScaleSetSkuCapacity'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetSku, self).__init__(**kwargs)
-        self.resource_type = None
-        self.sku = None
-        self.capacity = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_capacity.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_capacity.py
deleted file mode 100644
index a54bfd2b20b1..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_capacity.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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 VirtualMachineScaleSetSkuCapacity(Model):
-    """Describes scaling information of a sku.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar minimum: The minimum capacity.
-    :vartype minimum: long
-    :ivar maximum: The maximum capacity that can be set.
-    :vartype maximum: long
-    :ivar default_capacity: The default capacity.
-    :vartype default_capacity: long
-    :ivar scale_type: The scale type applicable to the sku. Possible values
-     include: 'Automatic', 'None'
-    :vartype scale_type: str or
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetSkuScaleType
-    """
-
-    _validation = {
-        'minimum': {'readonly': True},
-        'maximum': {'readonly': True},
-        'default_capacity': {'readonly': True},
-        'scale_type': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'minimum': {'key': 'minimum', 'type': 'long'},
-        'maximum': {'key': 'maximum', 'type': 'long'},
-        'default_capacity': {'key': 'defaultCapacity', 'type': 'long'},
-        'scale_type': {'key': 'scaleType', 'type': 'VirtualMachineScaleSetSkuScaleType'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetSkuCapacity, self).__init__(**kwargs)
-        self.minimum = None
-        self.maximum = None
-        self.default_capacity = None
-        self.scale_type = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_capacity_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_capacity_py3.py
deleted file mode 100644
index e3906808d039..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_capacity_py3.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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 VirtualMachineScaleSetSkuCapacity(Model):
-    """Describes scaling information of a sku.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar minimum: The minimum capacity.
-    :vartype minimum: long
-    :ivar maximum: The maximum capacity that can be set.
-    :vartype maximum: long
-    :ivar default_capacity: The default capacity.
-    :vartype default_capacity: long
-    :ivar scale_type: The scale type applicable to the sku. Possible values
-     include: 'Automatic', 'None'
-    :vartype scale_type: str or
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetSkuScaleType
-    """
-
-    _validation = {
-        'minimum': {'readonly': True},
-        'maximum': {'readonly': True},
-        'default_capacity': {'readonly': True},
-        'scale_type': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'minimum': {'key': 'minimum', 'type': 'long'},
-        'maximum': {'key': 'maximum', 'type': 'long'},
-        'default_capacity': {'key': 'defaultCapacity', 'type': 'long'},
-        'scale_type': {'key': 'scaleType', 'type': 'VirtualMachineScaleSetSkuScaleType'},
-    }
-
-    def __init__(self, **kwargs) -> None:
-        super(VirtualMachineScaleSetSkuCapacity, self).__init__(**kwargs)
-        self.minimum = None
-        self.maximum = None
-        self.default_capacity = None
-        self.scale_type = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_paged.py
deleted file mode 100644
index e4ea6350b52c..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_paged.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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 VirtualMachineScaleSetSkuPaged(Paged):
-    """
-    A paging container for iterating over a list of :class:`VirtualMachineScaleSetSku <azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetSku>` object
-    """
-
-    _attribute_map = {
-        'next_link': {'key': 'nextLink', 'type': 'str'},
-        'current_page': {'key': 'value', 'type': '[VirtualMachineScaleSetSku]'}
-    }
-
-    def __init__(self, *args, **kwargs):
-
-        super(VirtualMachineScaleSetSkuPaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_py3.py
deleted file mode 100644
index 2c0303850bc0..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_py3.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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 VirtualMachineScaleSetSku(Model):
-    """Describes an available virtual machine scale set sku.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar resource_type: The type of resource the sku applies to.
-    :vartype resource_type: str
-    :ivar sku: The Sku.
-    :vartype sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
-    :ivar capacity: Specifies the number of virtual machines in the scale set.
-    :vartype capacity:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetSkuCapacity
-    """
-
-    _validation = {
-        'resource_type': {'readonly': True},
-        'sku': {'readonly': True},
-        'capacity': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'resource_type': {'key': 'resourceType', 'type': 'str'},
-        'sku': {'key': 'sku', 'type': 'Sku'},
-        'capacity': {'key': 'capacity', 'type': 'VirtualMachineScaleSetSkuCapacity'},
-    }
-
-    def __init__(self, **kwargs) -> None:
-        super(VirtualMachineScaleSetSku, self).__init__(**kwargs)
-        self.resource_type = None
-        self.sku = None
-        self.capacity = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_storage_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_storage_profile.py
deleted file mode 100644
index c80219cb987d..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_storage_profile.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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 VirtualMachineScaleSetStorageProfile(Model):
-    """Describes a virtual machine scale set storage profile.
-
-    :param image_reference: Specifies information about the image to use. You
-     can specify information about platform images, marketplace images, or
-     virtual machine images. This element is required when you want to use a
-     platform image, marketplace image, or virtual machine image, but is not
-     used in other creation operations.
-    :type image_reference:
-     ~azure.mgmt.compute.v2018_04_01.models.ImageReference
-    :param os_disk: Specifies information about the operating system disk used
-     by the virtual machines in the scale set. <br><br> For more information
-     about disks, see [About disks and VHDs for Azure virtual
-     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
-    :type os_disk:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetOSDisk
-    :param data_disks: Specifies the parameters that are used to add data
-     disks to the virtual machines in the scale set. <br><br> For more
-     information about disks, see [About disks and VHDs for Azure virtual
-     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
-    :type data_disks:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetDataDisk]
-    """
-
-    _attribute_map = {
-        'image_reference': {'key': 'imageReference', 'type': 'ImageReference'},
-        'os_disk': {'key': 'osDisk', 'type': 'VirtualMachineScaleSetOSDisk'},
-        'data_disks': {'key': 'dataDisks', 'type': '[VirtualMachineScaleSetDataDisk]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetStorageProfile, self).__init__(**kwargs)
-        self.image_reference = kwargs.get('image_reference', None)
-        self.os_disk = kwargs.get('os_disk', None)
-        self.data_disks = kwargs.get('data_disks', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_storage_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_storage_profile_py3.py
deleted file mode 100644
index e10ef0ecaed2..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_storage_profile_py3.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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 VirtualMachineScaleSetStorageProfile(Model):
-    """Describes a virtual machine scale set storage profile.
-
-    :param image_reference: Specifies information about the image to use. You
-     can specify information about platform images, marketplace images, or
-     virtual machine images. This element is required when you want to use a
-     platform image, marketplace image, or virtual machine image, but is not
-     used in other creation operations.
-    :type image_reference:
-     ~azure.mgmt.compute.v2018_04_01.models.ImageReference
-    :param os_disk: Specifies information about the operating system disk used
-     by the virtual machines in the scale set. <br><br> For more information
-     about disks, see [About disks and VHDs for Azure virtual
-     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
-    :type os_disk:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetOSDisk
-    :param data_disks: Specifies the parameters that are used to add data
-     disks to the virtual machines in the scale set. <br><br> For more
-     information about disks, see [About disks and VHDs for Azure virtual
-     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
-    :type data_disks:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetDataDisk]
-    """
-
-    _attribute_map = {
-        'image_reference': {'key': 'imageReference', 'type': 'ImageReference'},
-        'os_disk': {'key': 'osDisk', 'type': 'VirtualMachineScaleSetOSDisk'},
-        'data_disks': {'key': 'dataDisks', 'type': '[VirtualMachineScaleSetDataDisk]'},
-    }
-
-    def __init__(self, *, image_reference=None, os_disk=None, data_disks=None, **kwargs) -> None:
-        super(VirtualMachineScaleSetStorageProfile, self).__init__(**kwargs)
-        self.image_reference = image_reference
-        self.os_disk = os_disk
-        self.data_disks = data_disks
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update.py
deleted file mode 100644
index 150098be5e3a..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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 .update_resource import UpdateResource
-
-
-class VirtualMachineScaleSetUpdate(UpdateResource):
-    """Describes a Virtual Machine Scale Set.
-
-    :param tags: Resource tags
-    :type tags: dict[str, str]
-    :param sku: The virtual machine scale set sku.
-    :type sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
-    :param plan: The purchase plan when deploying a virtual machine scale set
-     from VM Marketplace images.
-    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
-    :param upgrade_policy: The upgrade policy.
-    :type upgrade_policy: ~azure.mgmt.compute.v2018_04_01.models.UpgradePolicy
-    :param virtual_machine_profile: The virtual machine profile.
-    :type virtual_machine_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateVMProfile
-    :param overprovision: Specifies whether the Virtual Machine Scale Set
-     should be overprovisioned.
-    :type overprovision: bool
-    :param single_placement_group: When true this limits the scale set to a
-     single placement group, of max size 100 virtual machines.
-    :type single_placement_group: bool
-    :param identity: The identity of the virtual machine scale set, if
-     configured.
-    :type identity:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetIdentity
-    """
-
-    _attribute_map = {
-        'tags': {'key': 'tags', 'type': '{str}'},
-        'sku': {'key': 'sku', 'type': 'Sku'},
-        'plan': {'key': 'plan', 'type': 'Plan'},
-        'upgrade_policy': {'key': 'properties.upgradePolicy', 'type': 'UpgradePolicy'},
-        'virtual_machine_profile': {'key': 'properties.virtualMachineProfile', 'type': 'VirtualMachineScaleSetUpdateVMProfile'},
-        'overprovision': {'key': 'properties.overprovision', 'type': 'bool'},
-        'single_placement_group': {'key': 'properties.singlePlacementGroup', 'type': 'bool'},
-        'identity': {'key': 'identity', 'type': 'VirtualMachineScaleSetIdentity'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetUpdate, self).__init__(**kwargs)
-        self.sku = kwargs.get('sku', None)
-        self.plan = kwargs.get('plan', None)
-        self.upgrade_policy = kwargs.get('upgrade_policy', None)
-        self.virtual_machine_profile = kwargs.get('virtual_machine_profile', None)
-        self.overprovision = kwargs.get('overprovision', None)
-        self.single_placement_group = kwargs.get('single_placement_group', None)
-        self.identity = kwargs.get('identity', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_ip_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_ip_configuration.py
deleted file mode 100644
index 6b71a481c5a0..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_ip_configuration.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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 .sub_resource import SubResource
-
-
-class VirtualMachineScaleSetUpdateIPConfiguration(SubResource):
-    """Describes a virtual machine scale set network profile's IP configuration.
-
-    :param id: Resource Id
-    :type id: str
-    :param name: The IP configuration name.
-    :type name: str
-    :param subnet: The subnet.
-    :type subnet: ~azure.mgmt.compute.v2018_04_01.models.ApiEntityReference
-    :param primary: Specifies the primary IP Configuration in case the network
-     interface has more than one IP Configuration.
-    :type primary: bool
-    :param public_ip_address_configuration: The publicIPAddressConfiguration.
-    :type public_ip_address_configuration:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdatePublicIPAddressConfiguration
-    :param private_ip_address_version: Available from Api-Version 2017-03-30
-     onwards, it represents whether the specific ipconfiguration is IPv4 or
-     IPv6. Default is taken as IPv4.  Possible values are: 'IPv4' and 'IPv6'.
-     Possible values include: 'IPv4', 'IPv6'
-    :type private_ip_address_version: str or
-     ~azure.mgmt.compute.v2018_04_01.models.IPVersion
-    :param application_gateway_backend_address_pools: The application gateway
-     backend address pools.
-    :type application_gateway_backend_address_pools:
-     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
-    :param load_balancer_backend_address_pools: The load balancer backend
-     address pools.
-    :type load_balancer_backend_address_pools:
-     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
-    :param load_balancer_inbound_nat_pools: The load balancer inbound nat
-     pools.
-    :type load_balancer_inbound_nat_pools:
-     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
-    """
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'name': {'key': 'name', 'type': 'str'},
-        'subnet': {'key': 'properties.subnet', 'type': 'ApiEntityReference'},
-        'primary': {'key': 'properties.primary', 'type': 'bool'},
-        'public_ip_address_configuration': {'key': 'properties.publicIPAddressConfiguration', 'type': 'VirtualMachineScaleSetUpdatePublicIPAddressConfiguration'},
-        'private_ip_address_version': {'key': 'properties.privateIPAddressVersion', 'type': 'str'},
-        'application_gateway_backend_address_pools': {'key': 'properties.applicationGatewayBackendAddressPools', 'type': '[SubResource]'},
-        'load_balancer_backend_address_pools': {'key': 'properties.loadBalancerBackendAddressPools', 'type': '[SubResource]'},
-        'load_balancer_inbound_nat_pools': {'key': 'properties.loadBalancerInboundNatPools', 'type': '[SubResource]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetUpdateIPConfiguration, self).__init__(**kwargs)
-        self.name = kwargs.get('name', None)
-        self.subnet = kwargs.get('subnet', None)
-        self.primary = kwargs.get('primary', None)
-        self.public_ip_address_configuration = kwargs.get('public_ip_address_configuration', None)
-        self.private_ip_address_version = kwargs.get('private_ip_address_version', None)
-        self.application_gateway_backend_address_pools = kwargs.get('application_gateway_backend_address_pools', None)
-        self.load_balancer_backend_address_pools = kwargs.get('load_balancer_backend_address_pools', None)
-        self.load_balancer_inbound_nat_pools = kwargs.get('load_balancer_inbound_nat_pools', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_ip_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_ip_configuration_py3.py
deleted file mode 100644
index 25a443480dba..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_ip_configuration_py3.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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 .sub_resource_py3 import SubResource
-
-
-class VirtualMachineScaleSetUpdateIPConfiguration(SubResource):
-    """Describes a virtual machine scale set network profile's IP configuration.
-
-    :param id: Resource Id
-    :type id: str
-    :param name: The IP configuration name.
-    :type name: str
-    :param subnet: The subnet.
-    :type subnet: ~azure.mgmt.compute.v2018_04_01.models.ApiEntityReference
-    :param primary: Specifies the primary IP Configuration in case the network
-     interface has more than one IP Configuration.
-    :type primary: bool
-    :param public_ip_address_configuration: The publicIPAddressConfiguration.
-    :type public_ip_address_configuration:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdatePublicIPAddressConfiguration
-    :param private_ip_address_version: Available from Api-Version 2017-03-30
-     onwards, it represents whether the specific ipconfiguration is IPv4 or
-     IPv6. Default is taken as IPv4.  Possible values are: 'IPv4' and 'IPv6'.
-     Possible values include: 'IPv4', 'IPv6'
-    :type private_ip_address_version: str or
-     ~azure.mgmt.compute.v2018_04_01.models.IPVersion
-    :param application_gateway_backend_address_pools: The application gateway
-     backend address pools.
-    :type application_gateway_backend_address_pools:
-     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
-    :param load_balancer_backend_address_pools: The load balancer backend
-     address pools.
-    :type load_balancer_backend_address_pools:
-     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
-    :param load_balancer_inbound_nat_pools: The load balancer inbound nat
-     pools.
-    :type load_balancer_inbound_nat_pools:
-     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
-    """
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'name': {'key': 'name', 'type': 'str'},
-        'subnet': {'key': 'properties.subnet', 'type': 'ApiEntityReference'},
-        'primary': {'key': 'properties.primary', 'type': 'bool'},
-        'public_ip_address_configuration': {'key': 'properties.publicIPAddressConfiguration', 'type': 'VirtualMachineScaleSetUpdatePublicIPAddressConfiguration'},
-        'private_ip_address_version': {'key': 'properties.privateIPAddressVersion', 'type': 'str'},
-        'application_gateway_backend_address_pools': {'key': 'properties.applicationGatewayBackendAddressPools', 'type': '[SubResource]'},
-        'load_balancer_backend_address_pools': {'key': 'properties.loadBalancerBackendAddressPools', 'type': '[SubResource]'},
-        'load_balancer_inbound_nat_pools': {'key': 'properties.loadBalancerInboundNatPools', 'type': '[SubResource]'},
-    }
-
-    def __init__(self, *, id: str=None, name: str=None, subnet=None, primary: bool=None, public_ip_address_configuration=None, private_ip_address_version=None, application_gateway_backend_address_pools=None, load_balancer_backend_address_pools=None, load_balancer_inbound_nat_pools=None, **kwargs) -> None:
-        super(VirtualMachineScaleSetUpdateIPConfiguration, self).__init__(id=id, **kwargs)
-        self.name = name
-        self.subnet = subnet
-        self.primary = primary
-        self.public_ip_address_configuration = public_ip_address_configuration
-        self.private_ip_address_version = private_ip_address_version
-        self.application_gateway_backend_address_pools = application_gateway_backend_address_pools
-        self.load_balancer_backend_address_pools = load_balancer_backend_address_pools
-        self.load_balancer_inbound_nat_pools = load_balancer_inbound_nat_pools
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_configuration.py
deleted file mode 100644
index d0fcbff4ffb9..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_configuration.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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 .sub_resource import SubResource
-
-
-class VirtualMachineScaleSetUpdateNetworkConfiguration(SubResource):
-    """Describes a virtual machine scale set network profile's network
-    configurations.
-
-    :param id: Resource Id
-    :type id: str
-    :param name: The network configuration name.
-    :type name: str
-    :param primary: Whether this is a primary NIC on a virtual machine.
-    :type primary: bool
-    :param enable_accelerated_networking: Specifies whether the network
-     interface is accelerated networking-enabled.
-    :type enable_accelerated_networking: bool
-    :param network_security_group: The network security group.
-    :type network_security_group:
-     ~azure.mgmt.compute.v2018_04_01.models.SubResource
-    :param dns_settings: The dns settings to be applied on the network
-     interfaces.
-    :type dns_settings:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetNetworkConfigurationDnsSettings
-    :param ip_configurations: The virtual machine scale set IP Configuration.
-    :type ip_configurations:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateIPConfiguration]
-    :param enable_ip_forwarding: Whether IP forwarding enabled on this NIC.
-    :type enable_ip_forwarding: bool
-    """
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'name': {'key': 'name', 'type': 'str'},
-        'primary': {'key': 'properties.primary', 'type': 'bool'},
-        'enable_accelerated_networking': {'key': 'properties.enableAcceleratedNetworking', 'type': 'bool'},
-        'network_security_group': {'key': 'properties.networkSecurityGroup', 'type': 'SubResource'},
-        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetNetworkConfigurationDnsSettings'},
-        'ip_configurations': {'key': 'properties.ipConfigurations', 'type': '[VirtualMachineScaleSetUpdateIPConfiguration]'},
-        'enable_ip_forwarding': {'key': 'properties.enableIPForwarding', 'type': 'bool'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetUpdateNetworkConfiguration, self).__init__(**kwargs)
-        self.name = kwargs.get('name', None)
-        self.primary = kwargs.get('primary', None)
-        self.enable_accelerated_networking = kwargs.get('enable_accelerated_networking', None)
-        self.network_security_group = kwargs.get('network_security_group', None)
-        self.dns_settings = kwargs.get('dns_settings', None)
-        self.ip_configurations = kwargs.get('ip_configurations', None)
-        self.enable_ip_forwarding = kwargs.get('enable_ip_forwarding', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_configuration_py3.py
deleted file mode 100644
index 131729e4532c..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_configuration_py3.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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 .sub_resource_py3 import SubResource
-
-
-class VirtualMachineScaleSetUpdateNetworkConfiguration(SubResource):
-    """Describes a virtual machine scale set network profile's network
-    configurations.
-
-    :param id: Resource Id
-    :type id: str
-    :param name: The network configuration name.
-    :type name: str
-    :param primary: Whether this is a primary NIC on a virtual machine.
-    :type primary: bool
-    :param enable_accelerated_networking: Specifies whether the network
-     interface is accelerated networking-enabled.
-    :type enable_accelerated_networking: bool
-    :param network_security_group: The network security group.
-    :type network_security_group:
-     ~azure.mgmt.compute.v2018_04_01.models.SubResource
-    :param dns_settings: The dns settings to be applied on the network
-     interfaces.
-    :type dns_settings:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetNetworkConfigurationDnsSettings
-    :param ip_configurations: The virtual machine scale set IP Configuration.
-    :type ip_configurations:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateIPConfiguration]
-    :param enable_ip_forwarding: Whether IP forwarding enabled on this NIC.
-    :type enable_ip_forwarding: bool
-    """
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-        'name': {'key': 'name', 'type': 'str'},
-        'primary': {'key': 'properties.primary', 'type': 'bool'},
-        'enable_accelerated_networking': {'key': 'properties.enableAcceleratedNetworking', 'type': 'bool'},
-        'network_security_group': {'key': 'properties.networkSecurityGroup', 'type': 'SubResource'},
-        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetNetworkConfigurationDnsSettings'},
-        'ip_configurations': {'key': 'properties.ipConfigurations', 'type': '[VirtualMachineScaleSetUpdateIPConfiguration]'},
-        'enable_ip_forwarding': {'key': 'properties.enableIPForwarding', 'type': 'bool'},
-    }
-
-    def __init__(self, *, id: str=None, name: str=None, primary: bool=None, enable_accelerated_networking: bool=None, network_security_group=None, dns_settings=None, ip_configurations=None, enable_ip_forwarding: bool=None, **kwargs) -> None:
-        super(VirtualMachineScaleSetUpdateNetworkConfiguration, self).__init__(id=id, **kwargs)
-        self.name = name
-        self.primary = primary
-        self.enable_accelerated_networking = enable_accelerated_networking
-        self.network_security_group = network_security_group
-        self.dns_settings = dns_settings
-        self.ip_configurations = ip_configurations
-        self.enable_ip_forwarding = enable_ip_forwarding
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_profile.py
deleted file mode 100644
index cd4f5f839764..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_profile.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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 VirtualMachineScaleSetUpdateNetworkProfile(Model):
-    """Describes a virtual machine scale set network profile.
-
-    :param network_interface_configurations: The list of network
-     configurations.
-    :type network_interface_configurations:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateNetworkConfiguration]
-    """
-
-    _attribute_map = {
-        'network_interface_configurations': {'key': 'networkInterfaceConfigurations', 'type': '[VirtualMachineScaleSetUpdateNetworkConfiguration]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetUpdateNetworkProfile, self).__init__(**kwargs)
-        self.network_interface_configurations = kwargs.get('network_interface_configurations', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_profile_py3.py
deleted file mode 100644
index 5dcc3e1dd1f2..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_profile_py3.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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 VirtualMachineScaleSetUpdateNetworkProfile(Model):
-    """Describes a virtual machine scale set network profile.
-
-    :param network_interface_configurations: The list of network
-     configurations.
-    :type network_interface_configurations:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateNetworkConfiguration]
-    """
-
-    _attribute_map = {
-        'network_interface_configurations': {'key': 'networkInterfaceConfigurations', 'type': '[VirtualMachineScaleSetUpdateNetworkConfiguration]'},
-    }
-
-    def __init__(self, *, network_interface_configurations=None, **kwargs) -> None:
-        super(VirtualMachineScaleSetUpdateNetworkProfile, self).__init__(**kwargs)
-        self.network_interface_configurations = network_interface_configurations
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_disk.py
deleted file mode 100644
index 1f48890ba840..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_disk.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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 VirtualMachineScaleSetUpdateOSDisk(Model):
-    """Describes virtual machine scale set operating system disk Update Object.
-    This should be used for Updating VMSS OS Disk.
-
-    :param caching: The caching type. Possible values include: 'None',
-     'ReadOnly', 'ReadWrite'
-    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
-    :param write_accelerator_enabled: Specifies whether writeAccelerator
-     should be enabled or disabled on the disk.
-    :type write_accelerator_enabled: bool
-    :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.
-    :type image: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
-    :param vhd_containers: The list of virtual hard disk container uris.
-    :type vhd_containers: list[str]
-    :param managed_disk: The managed disk parameters.
-    :type managed_disk:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetManagedDiskParameters
-    """
-
-    _attribute_map = {
-        'caching': {'key': 'caching', 'type': 'CachingTypes'},
-        'write_accelerator_enabled': {'key': 'writeAcceleratorEnabled', 'type': 'bool'},
-        'image': {'key': 'image', 'type': 'VirtualHardDisk'},
-        'vhd_containers': {'key': 'vhdContainers', 'type': '[str]'},
-        'managed_disk': {'key': 'managedDisk', 'type': 'VirtualMachineScaleSetManagedDiskParameters'},
-    }
-
-    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.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_04_01/models/virtual_machine_scale_set_update_os_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_disk_py3.py
deleted file mode 100644
index 420daf4f2dcf..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_disk_py3.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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 VirtualMachineScaleSetUpdateOSDisk(Model):
-    """Describes virtual machine scale set operating system disk Update Object.
-    This should be used for Updating VMSS OS Disk.
-
-    :param caching: The caching type. Possible values include: 'None',
-     'ReadOnly', 'ReadWrite'
-    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
-    :param write_accelerator_enabled: Specifies whether writeAccelerator
-     should be enabled or disabled on the disk.
-    :type write_accelerator_enabled: bool
-    :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.
-    :type image: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
-    :param vhd_containers: The list of virtual hard disk container uris.
-    :type vhd_containers: list[str]
-    :param managed_disk: The managed disk parameters.
-    :type managed_disk:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetManagedDiskParameters
-    """
-
-    _attribute_map = {
-        'caching': {'key': 'caching', 'type': 'CachingTypes'},
-        'write_accelerator_enabled': {'key': 'writeAcceleratorEnabled', 'type': 'bool'},
-        '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:
-        super(VirtualMachineScaleSetUpdateOSDisk, self).__init__(**kwargs)
-        self.caching = caching
-        self.write_accelerator_enabled = write_accelerator_enabled
-        self.image = image
-        self.vhd_containers = vhd_containers
-        self.managed_disk = managed_disk
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_profile.py
deleted file mode 100644
index 2ebc2b14b292..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_profile.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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 VirtualMachineScaleSetUpdateOSProfile(Model):
-    """Describes a virtual machine scale set OS profile.
-
-    :param custom_data: A base-64 encoded string of custom data.
-    :type custom_data: str
-    :param windows_configuration: The Windows Configuration of the OS profile.
-    :type windows_configuration:
-     ~azure.mgmt.compute.v2018_04_01.models.WindowsConfiguration
-    :param linux_configuration: The Linux Configuration of the OS profile.
-    :type linux_configuration:
-     ~azure.mgmt.compute.v2018_04_01.models.LinuxConfiguration
-    :param secrets: The List of certificates for addition to the VM.
-    :type secrets:
-     list[~azure.mgmt.compute.v2018_04_01.models.VaultSecretGroup]
-    """
-
-    _attribute_map = {
-        'custom_data': {'key': 'customData', 'type': 'str'},
-        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'WindowsConfiguration'},
-        'linux_configuration': {'key': 'linuxConfiguration', 'type': 'LinuxConfiguration'},
-        'secrets': {'key': 'secrets', 'type': '[VaultSecretGroup]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetUpdateOSProfile, self).__init__(**kwargs)
-        self.custom_data = kwargs.get('custom_data', None)
-        self.windows_configuration = kwargs.get('windows_configuration', None)
-        self.linux_configuration = kwargs.get('linux_configuration', None)
-        self.secrets = kwargs.get('secrets', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_profile_py3.py
deleted file mode 100644
index b54bfc2b563a..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_profile_py3.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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 VirtualMachineScaleSetUpdateOSProfile(Model):
-    """Describes a virtual machine scale set OS profile.
-
-    :param custom_data: A base-64 encoded string of custom data.
-    :type custom_data: str
-    :param windows_configuration: The Windows Configuration of the OS profile.
-    :type windows_configuration:
-     ~azure.mgmt.compute.v2018_04_01.models.WindowsConfiguration
-    :param linux_configuration: The Linux Configuration of the OS profile.
-    :type linux_configuration:
-     ~azure.mgmt.compute.v2018_04_01.models.LinuxConfiguration
-    :param secrets: The List of certificates for addition to the VM.
-    :type secrets:
-     list[~azure.mgmt.compute.v2018_04_01.models.VaultSecretGroup]
-    """
-
-    _attribute_map = {
-        'custom_data': {'key': 'customData', 'type': 'str'},
-        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'WindowsConfiguration'},
-        'linux_configuration': {'key': 'linuxConfiguration', 'type': 'LinuxConfiguration'},
-        'secrets': {'key': 'secrets', 'type': '[VaultSecretGroup]'},
-    }
-
-    def __init__(self, *, custom_data: str=None, windows_configuration=None, linux_configuration=None, secrets=None, **kwargs) -> None:
-        super(VirtualMachineScaleSetUpdateOSProfile, self).__init__(**kwargs)
-        self.custom_data = custom_data
-        self.windows_configuration = windows_configuration
-        self.linux_configuration = linux_configuration
-        self.secrets = secrets
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_public_ip_address_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_public_ip_address_configuration.py
deleted file mode 100644
index 0fc8d8517fcf..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_public_ip_address_configuration.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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 VirtualMachineScaleSetUpdatePublicIPAddressConfiguration(Model):
-    """Describes a virtual machines scale set IP Configuration's PublicIPAddress
-    configuration.
-
-    :param name: The publicIP address configuration name.
-    :type name: str
-    :param idle_timeout_in_minutes: The idle timeout of the public IP address.
-    :type idle_timeout_in_minutes: int
-    :param dns_settings: The dns settings to be applied on the publicIP
-     addresses .
-    :type dns_settings:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings
-    """
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'idle_timeout_in_minutes': {'key': 'properties.idleTimeoutInMinutes', 'type': 'int'},
-        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetUpdatePublicIPAddressConfiguration, self).__init__(**kwargs)
-        self.name = kwargs.get('name', None)
-        self.idle_timeout_in_minutes = kwargs.get('idle_timeout_in_minutes', None)
-        self.dns_settings = kwargs.get('dns_settings', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_public_ip_address_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_public_ip_address_configuration_py3.py
deleted file mode 100644
index 6675e7831652..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_public_ip_address_configuration_py3.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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 VirtualMachineScaleSetUpdatePublicIPAddressConfiguration(Model):
-    """Describes a virtual machines scale set IP Configuration's PublicIPAddress
-    configuration.
-
-    :param name: The publicIP address configuration name.
-    :type name: str
-    :param idle_timeout_in_minutes: The idle timeout of the public IP address.
-    :type idle_timeout_in_minutes: int
-    :param dns_settings: The dns settings to be applied on the publicIP
-     addresses .
-    :type dns_settings:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings
-    """
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'idle_timeout_in_minutes': {'key': 'properties.idleTimeoutInMinutes', 'type': 'int'},
-        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings'},
-    }
-
-    def __init__(self, *, name: str=None, idle_timeout_in_minutes: int=None, dns_settings=None, **kwargs) -> None:
-        super(VirtualMachineScaleSetUpdatePublicIPAddressConfiguration, self).__init__(**kwargs)
-        self.name = name
-        self.idle_timeout_in_minutes = idle_timeout_in_minutes
-        self.dns_settings = dns_settings
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_py3.py
deleted file mode 100644
index 48bb74fb1948..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_py3.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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 .update_resource_py3 import UpdateResource
-
-
-class VirtualMachineScaleSetUpdate(UpdateResource):
-    """Describes a Virtual Machine Scale Set.
-
-    :param tags: Resource tags
-    :type tags: dict[str, str]
-    :param sku: The virtual machine scale set sku.
-    :type sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
-    :param plan: The purchase plan when deploying a virtual machine scale set
-     from VM Marketplace images.
-    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
-    :param upgrade_policy: The upgrade policy.
-    :type upgrade_policy: ~azure.mgmt.compute.v2018_04_01.models.UpgradePolicy
-    :param virtual_machine_profile: The virtual machine profile.
-    :type virtual_machine_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateVMProfile
-    :param overprovision: Specifies whether the Virtual Machine Scale Set
-     should be overprovisioned.
-    :type overprovision: bool
-    :param single_placement_group: When true this limits the scale set to a
-     single placement group, of max size 100 virtual machines.
-    :type single_placement_group: bool
-    :param identity: The identity of the virtual machine scale set, if
-     configured.
-    :type identity:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetIdentity
-    """
-
-    _attribute_map = {
-        'tags': {'key': 'tags', 'type': '{str}'},
-        'sku': {'key': 'sku', 'type': 'Sku'},
-        'plan': {'key': 'plan', 'type': 'Plan'},
-        'upgrade_policy': {'key': 'properties.upgradePolicy', 'type': 'UpgradePolicy'},
-        'virtual_machine_profile': {'key': 'properties.virtualMachineProfile', 'type': 'VirtualMachineScaleSetUpdateVMProfile'},
-        'overprovision': {'key': 'properties.overprovision', 'type': 'bool'},
-        'single_placement_group': {'key': 'properties.singlePlacementGroup', 'type': 'bool'},
-        'identity': {'key': 'identity', 'type': 'VirtualMachineScaleSetIdentity'},
-    }
-
-    def __init__(self, *, tags=None, sku=None, plan=None, upgrade_policy=None, virtual_machine_profile=None, overprovision: bool=None, single_placement_group: bool=None, identity=None, **kwargs) -> None:
-        super(VirtualMachineScaleSetUpdate, self).__init__(tags=tags, **kwargs)
-        self.sku = sku
-        self.plan = plan
-        self.upgrade_policy = upgrade_policy
-        self.virtual_machine_profile = virtual_machine_profile
-        self.overprovision = overprovision
-        self.single_placement_group = single_placement_group
-        self.identity = identity
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_storage_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_storage_profile.py
deleted file mode 100644
index 037ebc157fc8..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_storage_profile.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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 VirtualMachineScaleSetUpdateStorageProfile(Model):
-    """Describes a virtual machine scale set storage profile.
-
-    :param image_reference: The image reference.
-    :type image_reference:
-     ~azure.mgmt.compute.v2018_04_01.models.ImageReference
-    :param os_disk: The OS disk.
-    :type os_disk:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateOSDisk
-    :param data_disks: The data disks.
-    :type data_disks:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetDataDisk]
-    """
-
-    _attribute_map = {
-        'image_reference': {'key': 'imageReference', 'type': 'ImageReference'},
-        'os_disk': {'key': 'osDisk', 'type': 'VirtualMachineScaleSetUpdateOSDisk'},
-        'data_disks': {'key': 'dataDisks', 'type': '[VirtualMachineScaleSetDataDisk]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetUpdateStorageProfile, self).__init__(**kwargs)
-        self.image_reference = kwargs.get('image_reference', None)
-        self.os_disk = kwargs.get('os_disk', None)
-        self.data_disks = kwargs.get('data_disks', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_storage_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_storage_profile_py3.py
deleted file mode 100644
index b442b5196c4e..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_storage_profile_py3.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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 VirtualMachineScaleSetUpdateStorageProfile(Model):
-    """Describes a virtual machine scale set storage profile.
-
-    :param image_reference: The image reference.
-    :type image_reference:
-     ~azure.mgmt.compute.v2018_04_01.models.ImageReference
-    :param os_disk: The OS disk.
-    :type os_disk:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateOSDisk
-    :param data_disks: The data disks.
-    :type data_disks:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetDataDisk]
-    """
-
-    _attribute_map = {
-        'image_reference': {'key': 'imageReference', 'type': 'ImageReference'},
-        'os_disk': {'key': 'osDisk', 'type': 'VirtualMachineScaleSetUpdateOSDisk'},
-        'data_disks': {'key': 'dataDisks', 'type': '[VirtualMachineScaleSetDataDisk]'},
-    }
-
-    def __init__(self, *, image_reference=None, os_disk=None, data_disks=None, **kwargs) -> None:
-        super(VirtualMachineScaleSetUpdateStorageProfile, self).__init__(**kwargs)
-        self.image_reference = image_reference
-        self.os_disk = os_disk
-        self.data_disks = data_disks
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_vm_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_vm_profile.py
deleted file mode 100644
index 88d5c0c10149..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_vm_profile.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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 VirtualMachineScaleSetUpdateVMProfile(Model):
-    """Describes a virtual machine scale set virtual machine profile.
-
-    :param os_profile: The virtual machine scale set OS profile.
-    :type os_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateOSProfile
-    :param storage_profile: The virtual machine scale set storage profile.
-    :type storage_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateStorageProfile
-    :param network_profile: The virtual machine scale set network profile.
-    :type network_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateNetworkProfile
-    :param diagnostics_profile: The virtual machine scale set diagnostics
-     profile.
-    :type diagnostics_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
-    :param extension_profile: The virtual machine scale set extension profile.
-    :type extension_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtensionProfile
-    :param license_type: The license type, which is for bring your own license
-     scenario.
-    :type license_type: str
-    """
-
-    _attribute_map = {
-        'os_profile': {'key': 'osProfile', 'type': 'VirtualMachineScaleSetUpdateOSProfile'},
-        'storage_profile': {'key': 'storageProfile', 'type': 'VirtualMachineScaleSetUpdateStorageProfile'},
-        'network_profile': {'key': 'networkProfile', 'type': 'VirtualMachineScaleSetUpdateNetworkProfile'},
-        'diagnostics_profile': {'key': 'diagnosticsProfile', 'type': 'DiagnosticsProfile'},
-        'extension_profile': {'key': 'extensionProfile', 'type': 'VirtualMachineScaleSetExtensionProfile'},
-        'license_type': {'key': 'licenseType', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetUpdateVMProfile, self).__init__(**kwargs)
-        self.os_profile = kwargs.get('os_profile', None)
-        self.storage_profile = kwargs.get('storage_profile', 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)
-        self.license_type = kwargs.get('license_type', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_vm_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_vm_profile_py3.py
deleted file mode 100644
index 83cab7cf6fd0..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_vm_profile_py3.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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 VirtualMachineScaleSetUpdateVMProfile(Model):
-    """Describes a virtual machine scale set virtual machine profile.
-
-    :param os_profile: The virtual machine scale set OS profile.
-    :type os_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateOSProfile
-    :param storage_profile: The virtual machine scale set storage profile.
-    :type storage_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateStorageProfile
-    :param network_profile: The virtual machine scale set network profile.
-    :type network_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateNetworkProfile
-    :param diagnostics_profile: The virtual machine scale set diagnostics
-     profile.
-    :type diagnostics_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
-    :param extension_profile: The virtual machine scale set extension profile.
-    :type extension_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtensionProfile
-    :param license_type: The license type, which is for bring your own license
-     scenario.
-    :type license_type: str
-    """
-
-    _attribute_map = {
-        'os_profile': {'key': 'osProfile', 'type': 'VirtualMachineScaleSetUpdateOSProfile'},
-        'storage_profile': {'key': 'storageProfile', 'type': 'VirtualMachineScaleSetUpdateStorageProfile'},
-        'network_profile': {'key': 'networkProfile', 'type': 'VirtualMachineScaleSetUpdateNetworkProfile'},
-        'diagnostics_profile': {'key': 'diagnosticsProfile', 'type': 'DiagnosticsProfile'},
-        'extension_profile': {'key': 'extensionProfile', 'type': 'VirtualMachineScaleSetExtensionProfile'},
-        'license_type': {'key': 'licenseType', 'type': 'str'},
-    }
-
-    def __init__(self, *, os_profile=None, storage_profile=None, network_profile=None, diagnostics_profile=None, extension_profile=None, license_type: str=None, **kwargs) -> None:
-        super(VirtualMachineScaleSetUpdateVMProfile, self).__init__(**kwargs)
-        self.os_profile = os_profile
-        self.storage_profile = storage_profile
-        self.network_profile = network_profile
-        self.diagnostics_profile = diagnostics_profile
-        self.extension_profile = extension_profile
-        self.license_type = license_type
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm.py
deleted file mode 100644
index 204a62f62a0c..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm.py
+++ /dev/null
@@ -1,155 +0,0 @@
-# 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 VirtualMachineScaleSetVM(Resource):
-    """Describes a virtual machine scale set virtual machine.
-
-    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 instance_id: The virtual machine instance ID.
-    :vartype instance_id: str
-    :ivar sku: The virtual machine SKU.
-    :vartype sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
-    :ivar latest_model_applied: Specifies whether the latest model has been
-     applied to the virtual machine.
-    :vartype latest_model_applied: bool
-    :ivar vm_id: Azure VM unique ID.
-    :vartype vm_id: str
-    :ivar instance_view: The virtual machine instance view.
-    :vartype instance_view:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineInstanceView
-    :param hardware_profile: Specifies the hardware settings for the virtual
-     machine.
-    :type hardware_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.HardwareProfile
-    :param storage_profile: Specifies the storage settings for the virtual
-     machine disks.
-    :type storage_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.StorageProfile
-    :param os_profile: Specifies the operating system settings for the virtual
-     machine.
-    :type os_profile: ~azure.mgmt.compute.v2018_04_01.models.OSProfile
-    :param network_profile: Specifies the network interfaces of the virtual
-     machine.
-    :type network_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.NetworkProfile
-    :param diagnostics_profile: Specifies the boot diagnostic settings state.
-     <br><br>Minimum api-version: 2015-06-15.
-    :type diagnostics_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
-    :param availability_set: Specifies information about the availability set
-     that the virtual machine should be assigned to. Virtual machines specified
-     in the same availability set are allocated to different nodes to maximize
-     availability. For more information about availability sets, see [Manage
-     the availability of virtual
-     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
-     <br><br> For more information on Azure planned maintainance, see [Planned
-     maintenance for virtual machines in
-     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
-     <br><br> Currently, a VM can only be added to availability set at creation
-     time. An existing VM cannot be added to an availability set.
-    :type availability_set: ~azure.mgmt.compute.v2018_04_01.models.SubResource
-    :ivar provisioning_state: The provisioning state, which only appears in
-     the response.
-    :vartype provisioning_state: str
-    :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:
-     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
-     is included in a request for an update, the value must match the initial
-     value. This value cannot be updated. <br><br> For more information, see
-     [Azure Hybrid Use Benefit for Windows
-     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
-     <br><br> Minimum api-version: 2015-06-15
-    :type license_type: str
-    :param plan: Specifies information about the marketplace image used to
-     create the virtual machine. This element is only used for marketplace
-     images. Before you can use a marketplace image from an API, you must
-     enable the image for programmatic use.  In the Azure portal, find the
-     marketplace image that you want to use and then click **Want to deploy
-     programmatically, Get Started ->**. Enter any required information and
-     then click **Save**.
-    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
-    :ivar resources: The virtual machine child extension resources.
-    :vartype resources:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]
-    """
-
-    _validation = {
-        'id': {'readonly': True},
-        'name': {'readonly': True},
-        'type': {'readonly': True},
-        'location': {'required': True},
-        'instance_id': {'readonly': True},
-        'sku': {'readonly': True},
-        'latest_model_applied': {'readonly': True},
-        'vm_id': {'readonly': True},
-        'instance_view': {'readonly': True},
-        'provisioning_state': {'readonly': True},
-        'resources': {'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}'},
-        'instance_id': {'key': 'instanceId', 'type': 'str'},
-        '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'},
-        'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
-        'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
-        'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
-        'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
-        'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'},
-        'availability_set': {'key': 'properties.availabilitySet', 'type': 'SubResource'},
-        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
-        'license_type': {'key': 'properties.licenseType', 'type': 'str'},
-        'plan': {'key': 'plan', 'type': 'Plan'},
-        'resources': {'key': 'resources', 'type': '[VirtualMachineExtension]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetVM, self).__init__(**kwargs)
-        self.instance_id = None
-        self.sku = None
-        self.latest_model_applied = None
-        self.vm_id = None
-        self.instance_view = None
-        self.hardware_profile = kwargs.get('hardware_profile', None)
-        self.storage_profile = kwargs.get('storage_profile', 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)
-        self.availability_set = kwargs.get('availability_set', None)
-        self.provisioning_state = None
-        self.license_type = kwargs.get('license_type', None)
-        self.plan = kwargs.get('plan', None)
-        self.resources = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_extensions_summary.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_extensions_summary.py
deleted file mode 100644
index e9e19adfc1b6..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_extensions_summary.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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 VirtualMachineScaleSetVMExtensionsSummary(Model):
-    """Extensions summary for virtual machines of a virtual machine scale set.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar name: The extension name.
-    :vartype name: str
-    :ivar statuses_summary: The extensions information.
-    :vartype statuses_summary:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineStatusCodeCount]
-    """
-
-    _validation = {
-        'name': {'readonly': True},
-        'statuses_summary': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'statuses_summary': {'key': 'statusesSummary', 'type': '[VirtualMachineStatusCodeCount]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetVMExtensionsSummary, self).__init__(**kwargs)
-        self.name = None
-        self.statuses_summary = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_extensions_summary_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_extensions_summary_py3.py
deleted file mode 100644
index c88df418881b..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_extensions_summary_py3.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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 VirtualMachineScaleSetVMExtensionsSummary(Model):
-    """Extensions summary for virtual machines of a virtual machine scale set.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar name: The extension name.
-    :vartype name: str
-    :ivar statuses_summary: The extensions information.
-    :vartype statuses_summary:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineStatusCodeCount]
-    """
-
-    _validation = {
-        'name': {'readonly': True},
-        'statuses_summary': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'statuses_summary': {'key': 'statusesSummary', 'type': '[VirtualMachineStatusCodeCount]'},
-    }
-
-    def __init__(self, **kwargs) -> None:
-        super(VirtualMachineScaleSetVMExtensionsSummary, self).__init__(**kwargs)
-        self.name = None
-        self.statuses_summary = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_ids.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_ids.py
deleted file mode 100644
index 772c66dad326..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_ids.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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 VirtualMachineScaleSetVMInstanceIDs(Model):
-    """Specifies a list of virtual machine instance IDs from the VM scale set.
-
-    :param instance_ids: The virtual machine scale set instance ids. Omitting
-     the virtual machine scale set instance ids will result in the operation
-     being performed on all virtual machines in the virtual machine scale set.
-    :type instance_ids: list[str]
-    """
-
-    _attribute_map = {
-        'instance_ids': {'key': 'instanceIds', 'type': '[str]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetVMInstanceIDs, self).__init__(**kwargs)
-        self.instance_ids = kwargs.get('instance_ids', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_ids_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_ids_py3.py
deleted file mode 100644
index 658a8ccb87d5..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_ids_py3.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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 VirtualMachineScaleSetVMInstanceIDs(Model):
-    """Specifies a list of virtual machine instance IDs from the VM scale set.
-
-    :param instance_ids: The virtual machine scale set instance ids. Omitting
-     the virtual machine scale set instance ids will result in the operation
-     being performed on all virtual machines in the virtual machine scale set.
-    :type instance_ids: list[str]
-    """
-
-    _attribute_map = {
-        'instance_ids': {'key': 'instanceIds', 'type': '[str]'},
-    }
-
-    def __init__(self, *, instance_ids=None, **kwargs) -> None:
-        super(VirtualMachineScaleSetVMInstanceIDs, self).__init__(**kwargs)
-        self.instance_ids = instance_ids
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_required_ids.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_required_ids.py
deleted file mode 100644
index ece250dd4fd4..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_required_ids.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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 VirtualMachineScaleSetVMInstanceRequiredIDs(Model):
-    """Specifies a list of virtual machine instance IDs from the VM scale set.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param instance_ids: Required. The virtual machine scale set instance ids.
-    :type instance_ids: list[str]
-    """
-
-    _validation = {
-        'instance_ids': {'required': True},
-    }
-
-    _attribute_map = {
-        'instance_ids': {'key': 'instanceIds', 'type': '[str]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetVMInstanceRequiredIDs, self).__init__(**kwargs)
-        self.instance_ids = kwargs.get('instance_ids', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_required_ids_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_required_ids_py3.py
deleted file mode 100644
index f32c6181467d..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_required_ids_py3.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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 VirtualMachineScaleSetVMInstanceRequiredIDs(Model):
-    """Specifies a list of virtual machine instance IDs from the VM scale set.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param instance_ids: Required. The virtual machine scale set instance ids.
-    :type instance_ids: list[str]
-    """
-
-    _validation = {
-        'instance_ids': {'required': True},
-    }
-
-    _attribute_map = {
-        'instance_ids': {'key': 'instanceIds', 'type': '[str]'},
-    }
-
-    def __init__(self, *, instance_ids, **kwargs) -> None:
-        super(VirtualMachineScaleSetVMInstanceRequiredIDs, self).__init__(**kwargs)
-        self.instance_ids = instance_ids
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_view.py
deleted file mode 100644
index 46c835c4dfd5..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_view.py
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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 VirtualMachineScaleSetVMInstanceView(Model):
-    """The instance view of a virtual machine scale set VM.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :param platform_update_domain: The Update Domain count.
-    :type platform_update_domain: int
-    :param platform_fault_domain: The Fault Domain count.
-    :type platform_fault_domain: int
-    :param rdp_thumb_print: The Remote desktop certificate thumbprint.
-    :type rdp_thumb_print: str
-    :param vm_agent: The VM Agent running on the virtual machine.
-    :type vm_agent:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineAgentInstanceView
-    :param maintenance_redeploy_status: The Maintenance Operation status on
-     the virtual machine.
-    :type maintenance_redeploy_status:
-     ~azure.mgmt.compute.v2018_04_01.models.MaintenanceRedeployStatus
-    :param disks: The disks information.
-    :type disks: list[~azure.mgmt.compute.v2018_04_01.models.DiskInstanceView]
-    :param extensions: The extensions information.
-    :type extensions:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionInstanceView]
-    :ivar vm_health: The health status for the VM.
-    :vartype vm_health:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineHealthStatus
-    :param boot_diagnostics: Boot Diagnostics is a debugging feature which
-     allows you to view Console Output and Screenshot to diagnose VM status.
-     <br><br> For Linux Virtual Machines, you can easily view the output of
-     your console log. <br><br> For both Windows and Linux virtual machines,
-     Azure also enables you to see a screenshot of the VM from the hypervisor.
-    :type boot_diagnostics:
-     ~azure.mgmt.compute.v2018_04_01.models.BootDiagnosticsInstanceView
-    :param statuses: The resource status information.
-    :type statuses:
-     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
-    :param placement_group_id: The placement group in which the VM is running.
-     If the VM is deallocated it will not have a placementGroupId.
-    :type placement_group_id: str
-    """
-
-    _validation = {
-        'vm_health': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'platform_update_domain': {'key': 'platformUpdateDomain', 'type': 'int'},
-        'platform_fault_domain': {'key': 'platformFaultDomain', 'type': 'int'},
-        'rdp_thumb_print': {'key': 'rdpThumbPrint', 'type': 'str'},
-        'vm_agent': {'key': 'vmAgent', 'type': 'VirtualMachineAgentInstanceView'},
-        'maintenance_redeploy_status': {'key': 'maintenanceRedeployStatus', 'type': 'MaintenanceRedeployStatus'},
-        'disks': {'key': 'disks', 'type': '[DiskInstanceView]'},
-        'extensions': {'key': 'extensions', 'type': '[VirtualMachineExtensionInstanceView]'},
-        'vm_health': {'key': 'vmHealth', 'type': 'VirtualMachineHealthStatus'},
-        'boot_diagnostics': {'key': 'bootDiagnostics', 'type': 'BootDiagnosticsInstanceView'},
-        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
-        'placement_group_id': {'key': 'placementGroupId', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineScaleSetVMInstanceView, self).__init__(**kwargs)
-        self.platform_update_domain = kwargs.get('platform_update_domain', None)
-        self.platform_fault_domain = kwargs.get('platform_fault_domain', None)
-        self.rdp_thumb_print = kwargs.get('rdp_thumb_print', None)
-        self.vm_agent = kwargs.get('vm_agent', None)
-        self.maintenance_redeploy_status = kwargs.get('maintenance_redeploy_status', None)
-        self.disks = kwargs.get('disks', None)
-        self.extensions = kwargs.get('extensions', None)
-        self.vm_health = None
-        self.boot_diagnostics = kwargs.get('boot_diagnostics', None)
-        self.statuses = kwargs.get('statuses', None)
-        self.placement_group_id = kwargs.get('placement_group_id', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_view_py3.py
deleted file mode 100644
index 6854c21d4706..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_view_py3.py
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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 VirtualMachineScaleSetVMInstanceView(Model):
-    """The instance view of a virtual machine scale set VM.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :param platform_update_domain: The Update Domain count.
-    :type platform_update_domain: int
-    :param platform_fault_domain: The Fault Domain count.
-    :type platform_fault_domain: int
-    :param rdp_thumb_print: The Remote desktop certificate thumbprint.
-    :type rdp_thumb_print: str
-    :param vm_agent: The VM Agent running on the virtual machine.
-    :type vm_agent:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineAgentInstanceView
-    :param maintenance_redeploy_status: The Maintenance Operation status on
-     the virtual machine.
-    :type maintenance_redeploy_status:
-     ~azure.mgmt.compute.v2018_04_01.models.MaintenanceRedeployStatus
-    :param disks: The disks information.
-    :type disks: list[~azure.mgmt.compute.v2018_04_01.models.DiskInstanceView]
-    :param extensions: The extensions information.
-    :type extensions:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionInstanceView]
-    :ivar vm_health: The health status for the VM.
-    :vartype vm_health:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineHealthStatus
-    :param boot_diagnostics: Boot Diagnostics is a debugging feature which
-     allows you to view Console Output and Screenshot to diagnose VM status.
-     <br><br> For Linux Virtual Machines, you can easily view the output of
-     your console log. <br><br> For both Windows and Linux virtual machines,
-     Azure also enables you to see a screenshot of the VM from the hypervisor.
-    :type boot_diagnostics:
-     ~azure.mgmt.compute.v2018_04_01.models.BootDiagnosticsInstanceView
-    :param statuses: The resource status information.
-    :type statuses:
-     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
-    :param placement_group_id: The placement group in which the VM is running.
-     If the VM is deallocated it will not have a placementGroupId.
-    :type placement_group_id: str
-    """
-
-    _validation = {
-        'vm_health': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'platform_update_domain': {'key': 'platformUpdateDomain', 'type': 'int'},
-        'platform_fault_domain': {'key': 'platformFaultDomain', 'type': 'int'},
-        'rdp_thumb_print': {'key': 'rdpThumbPrint', 'type': 'str'},
-        'vm_agent': {'key': 'vmAgent', 'type': 'VirtualMachineAgentInstanceView'},
-        'maintenance_redeploy_status': {'key': 'maintenanceRedeployStatus', 'type': 'MaintenanceRedeployStatus'},
-        'disks': {'key': 'disks', 'type': '[DiskInstanceView]'},
-        'extensions': {'key': 'extensions', 'type': '[VirtualMachineExtensionInstanceView]'},
-        'vm_health': {'key': 'vmHealth', 'type': 'VirtualMachineHealthStatus'},
-        'boot_diagnostics': {'key': 'bootDiagnostics', 'type': 'BootDiagnosticsInstanceView'},
-        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
-        'placement_group_id': {'key': 'placementGroupId', 'type': 'str'},
-    }
-
-    def __init__(self, *, platform_update_domain: int=None, platform_fault_domain: int=None, rdp_thumb_print: str=None, vm_agent=None, maintenance_redeploy_status=None, disks=None, extensions=None, boot_diagnostics=None, statuses=None, placement_group_id: str=None, **kwargs) -> None:
-        super(VirtualMachineScaleSetVMInstanceView, self).__init__(**kwargs)
-        self.platform_update_domain = platform_update_domain
-        self.platform_fault_domain = platform_fault_domain
-        self.rdp_thumb_print = rdp_thumb_print
-        self.vm_agent = vm_agent
-        self.maintenance_redeploy_status = maintenance_redeploy_status
-        self.disks = disks
-        self.extensions = extensions
-        self.vm_health = None
-        self.boot_diagnostics = boot_diagnostics
-        self.statuses = statuses
-        self.placement_group_id = placement_group_id
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_paged.py
deleted file mode 100644
index 52a46c26fd23..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_paged.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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 VirtualMachineScaleSetVMPaged(Paged):
-    """
-    A paging container for iterating over a list of :class:`VirtualMachineScaleSetVM <azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVM>` object
-    """
-
-    _attribute_map = {
-        'next_link': {'key': 'nextLink', 'type': 'str'},
-        'current_page': {'key': 'value', 'type': '[VirtualMachineScaleSetVM]'}
-    }
-
-    def __init__(self, *args, **kwargs):
-
-        super(VirtualMachineScaleSetVMPaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_profile.py
deleted file mode 100644
index 177efbb43373..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_profile.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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 VirtualMachineScaleSetVMProfile(Model):
-    """Describes a virtual machine scale set virtual machine profile.
-
-    :param os_profile: Specifies the operating system settings for the virtual
-     machines in the scale set.
-    :type os_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetOSProfile
-    :param storage_profile: Specifies the storage settings for the virtual
-     machine disks.
-    :type storage_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetStorageProfile
-    :param network_profile: Specifies properties of the network interfaces of
-     the virtual machines in the scale set.
-    :type network_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetNetworkProfile
-    :param diagnostics_profile: Specifies the boot diagnostic settings state.
-     <br><br>Minimum api-version: 2015-06-15.
-    :type diagnostics_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
-    :param extension_profile: Specifies a collection of settings for
-     extensions installed on virtual machines in the scale set.
-    :type extension_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtensionProfile
-    :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:
-     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
-     is included in a request for an update, the value must match the initial
-     value. This value cannot be updated. <br><br> For more information, see
-     [Azure Hybrid Use Benefit for Windows
-     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
-     <br><br> Minimum api-version: 2015-06-15
-    :type license_type: str
-    :param priority: Specifies the priority for the virtual machines in the
-     scale set. <br><br>Minimum api-version: 2017-10-30-preview. Possible
-     values include: 'Regular', 'Low'
-    :type priority: str or
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachinePriorityTypes
-    :param eviction_policy: Specifies the eviction policy for virtual machines
-     in a low priority scale set. <br><br>Minimum api-version:
-     2017-10-30-preview. Possible values include: 'Deallocate', 'Delete'
-    :type eviction_policy: str or
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineEvictionPolicyTypes
-    """
-
-    _attribute_map = {
-        'os_profile': {'key': 'osProfile', 'type': 'VirtualMachineScaleSetOSProfile'},
-        'storage_profile': {'key': 'storageProfile', 'type': 'VirtualMachineScaleSetStorageProfile'},
-        'network_profile': {'key': 'networkProfile', 'type': 'VirtualMachineScaleSetNetworkProfile'},
-        'diagnostics_profile': {'key': 'diagnosticsProfile', 'type': 'DiagnosticsProfile'},
-        'extension_profile': {'key': 'extensionProfile', 'type': 'VirtualMachineScaleSetExtensionProfile'},
-        'license_type': {'key': 'licenseType', 'type': 'str'},
-        'priority': {'key': 'priority', 'type': 'str'},
-        'eviction_policy': {'key': 'evictionPolicy', 'type': 'str'},
-    }
-
-    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.network_profile = kwargs.get('network_profile', None)
-        self.diagnostics_profile = kwargs.get('diagnostics_profile', None)
-        self.extension_profile = kwargs.get('extension_profile', None)
-        self.license_type = kwargs.get('license_type', None)
-        self.priority = kwargs.get('priority', None)
-        self.eviction_policy = kwargs.get('eviction_policy', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_profile_py3.py
deleted file mode 100644
index d7e74bb365b2..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_profile_py3.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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 VirtualMachineScaleSetVMProfile(Model):
-    """Describes a virtual machine scale set virtual machine profile.
-
-    :param os_profile: Specifies the operating system settings for the virtual
-     machines in the scale set.
-    :type os_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetOSProfile
-    :param storage_profile: Specifies the storage settings for the virtual
-     machine disks.
-    :type storage_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetStorageProfile
-    :param network_profile: Specifies properties of the network interfaces of
-     the virtual machines in the scale set.
-    :type network_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetNetworkProfile
-    :param diagnostics_profile: Specifies the boot diagnostic settings state.
-     <br><br>Minimum api-version: 2015-06-15.
-    :type diagnostics_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
-    :param extension_profile: Specifies a collection of settings for
-     extensions installed on virtual machines in the scale set.
-    :type extension_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtensionProfile
-    :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:
-     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
-     is included in a request for an update, the value must match the initial
-     value. This value cannot be updated. <br><br> For more information, see
-     [Azure Hybrid Use Benefit for Windows
-     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
-     <br><br> Minimum api-version: 2015-06-15
-    :type license_type: str
-    :param priority: Specifies the priority for the virtual machines in the
-     scale set. <br><br>Minimum api-version: 2017-10-30-preview. Possible
-     values include: 'Regular', 'Low'
-    :type priority: str or
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachinePriorityTypes
-    :param eviction_policy: Specifies the eviction policy for virtual machines
-     in a low priority scale set. <br><br>Minimum api-version:
-     2017-10-30-preview. Possible values include: 'Deallocate', 'Delete'
-    :type eviction_policy: str or
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineEvictionPolicyTypes
-    """
-
-    _attribute_map = {
-        'os_profile': {'key': 'osProfile', 'type': 'VirtualMachineScaleSetOSProfile'},
-        'storage_profile': {'key': 'storageProfile', 'type': 'VirtualMachineScaleSetStorageProfile'},
-        'network_profile': {'key': 'networkProfile', 'type': 'VirtualMachineScaleSetNetworkProfile'},
-        'diagnostics_profile': {'key': 'diagnosticsProfile', 'type': 'DiagnosticsProfile'},
-        'extension_profile': {'key': 'extensionProfile', 'type': 'VirtualMachineScaleSetExtensionProfile'},
-        'license_type': {'key': 'licenseType', 'type': 'str'},
-        'priority': {'key': 'priority', 'type': 'str'},
-        '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:
-        super(VirtualMachineScaleSetVMProfile, self).__init__(**kwargs)
-        self.os_profile = os_profile
-        self.storage_profile = storage_profile
-        self.network_profile = network_profile
-        self.diagnostics_profile = diagnostics_profile
-        self.extension_profile = extension_profile
-        self.license_type = license_type
-        self.priority = priority
-        self.eviction_policy = eviction_policy
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_py3.py
deleted file mode 100644
index bf822844f993..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_py3.py
+++ /dev/null
@@ -1,155 +0,0 @@
-# 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 VirtualMachineScaleSetVM(Resource):
-    """Describes a virtual machine scale set virtual machine.
-
-    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 instance_id: The virtual machine instance ID.
-    :vartype instance_id: str
-    :ivar sku: The virtual machine SKU.
-    :vartype sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
-    :ivar latest_model_applied: Specifies whether the latest model has been
-     applied to the virtual machine.
-    :vartype latest_model_applied: bool
-    :ivar vm_id: Azure VM unique ID.
-    :vartype vm_id: str
-    :ivar instance_view: The virtual machine instance view.
-    :vartype instance_view:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineInstanceView
-    :param hardware_profile: Specifies the hardware settings for the virtual
-     machine.
-    :type hardware_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.HardwareProfile
-    :param storage_profile: Specifies the storage settings for the virtual
-     machine disks.
-    :type storage_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.StorageProfile
-    :param os_profile: Specifies the operating system settings for the virtual
-     machine.
-    :type os_profile: ~azure.mgmt.compute.v2018_04_01.models.OSProfile
-    :param network_profile: Specifies the network interfaces of the virtual
-     machine.
-    :type network_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.NetworkProfile
-    :param diagnostics_profile: Specifies the boot diagnostic settings state.
-     <br><br>Minimum api-version: 2015-06-15.
-    :type diagnostics_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
-    :param availability_set: Specifies information about the availability set
-     that the virtual machine should be assigned to. Virtual machines specified
-     in the same availability set are allocated to different nodes to maximize
-     availability. For more information about availability sets, see [Manage
-     the availability of virtual
-     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
-     <br><br> For more information on Azure planned maintainance, see [Planned
-     maintenance for virtual machines in
-     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
-     <br><br> Currently, a VM can only be added to availability set at creation
-     time. An existing VM cannot be added to an availability set.
-    :type availability_set: ~azure.mgmt.compute.v2018_04_01.models.SubResource
-    :ivar provisioning_state: The provisioning state, which only appears in
-     the response.
-    :vartype provisioning_state: str
-    :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:
-     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
-     is included in a request for an update, the value must match the initial
-     value. This value cannot be updated. <br><br> For more information, see
-     [Azure Hybrid Use Benefit for Windows
-     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
-     <br><br> Minimum api-version: 2015-06-15
-    :type license_type: str
-    :param plan: Specifies information about the marketplace image used to
-     create the virtual machine. This element is only used for marketplace
-     images. Before you can use a marketplace image from an API, you must
-     enable the image for programmatic use.  In the Azure portal, find the
-     marketplace image that you want to use and then click **Want to deploy
-     programmatically, Get Started ->**. Enter any required information and
-     then click **Save**.
-    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
-    :ivar resources: The virtual machine child extension resources.
-    :vartype resources:
-     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]
-    """
-
-    _validation = {
-        'id': {'readonly': True},
-        'name': {'readonly': True},
-        'type': {'readonly': True},
-        'location': {'required': True},
-        'instance_id': {'readonly': True},
-        'sku': {'readonly': True},
-        'latest_model_applied': {'readonly': True},
-        'vm_id': {'readonly': True},
-        'instance_view': {'readonly': True},
-        'provisioning_state': {'readonly': True},
-        'resources': {'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}'},
-        'instance_id': {'key': 'instanceId', 'type': 'str'},
-        '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'},
-        'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
-        'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
-        'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
-        'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
-        'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'},
-        'availability_set': {'key': 'properties.availabilitySet', 'type': 'SubResource'},
-        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
-        'license_type': {'key': 'properties.licenseType', 'type': 'str'},
-        'plan': {'key': 'plan', 'type': 'Plan'},
-        'resources': {'key': 'resources', 'type': '[VirtualMachineExtension]'},
-    }
-
-    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:
-        super(VirtualMachineScaleSetVM, self).__init__(location=location, tags=tags, **kwargs)
-        self.instance_id = None
-        self.sku = None
-        self.latest_model_applied = None
-        self.vm_id = None
-        self.instance_view = None
-        self.hardware_profile = hardware_profile
-        self.storage_profile = storage_profile
-        self.os_profile = os_profile
-        self.network_profile = network_profile
-        self.diagnostics_profile = diagnostics_profile
-        self.availability_set = availability_set
-        self.provisioning_state = None
-        self.license_type = license_type
-        self.plan = plan
-        self.resources = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size.py
deleted file mode 100644
index 0fef3efd6c8e..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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 VirtualMachineSize(Model):
-    """Describes the properties of a VM size.
-
-    :param name: The name of the virtual machine size.
-    :type name: str
-    :param number_of_cores: The number of cores supported by the virtual
-     machine size.
-    :type number_of_cores: int
-    :param os_disk_size_in_mb: The OS disk size, in MB, allowed by the virtual
-     machine size.
-    :type os_disk_size_in_mb: int
-    :param resource_disk_size_in_mb: The resource disk size, in MB, allowed by
-     the virtual machine size.
-    :type resource_disk_size_in_mb: int
-    :param memory_in_mb: The amount of memory, in MB, supported by the virtual
-     machine size.
-    :type memory_in_mb: int
-    :param max_data_disk_count: The maximum number of data disks that can be
-     attached to the virtual machine size.
-    :type max_data_disk_count: int
-    """
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'number_of_cores': {'key': 'numberOfCores', 'type': 'int'},
-        'os_disk_size_in_mb': {'key': 'osDiskSizeInMB', 'type': 'int'},
-        'resource_disk_size_in_mb': {'key': 'resourceDiskSizeInMB', 'type': 'int'},
-        'memory_in_mb': {'key': 'memoryInMB', 'type': 'int'},
-        'max_data_disk_count': {'key': 'maxDataDiskCount', 'type': 'int'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineSize, self).__init__(**kwargs)
-        self.name = kwargs.get('name', None)
-        self.number_of_cores = kwargs.get('number_of_cores', None)
-        self.os_disk_size_in_mb = kwargs.get('os_disk_size_in_mb', None)
-        self.resource_disk_size_in_mb = kwargs.get('resource_disk_size_in_mb', None)
-        self.memory_in_mb = kwargs.get('memory_in_mb', None)
-        self.max_data_disk_count = kwargs.get('max_data_disk_count', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size_paged.py
deleted file mode 100644
index d8dc313a5c4a..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size_paged.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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 VirtualMachineSizePaged(Paged):
-    """
-    A paging container for iterating over a list of :class:`VirtualMachineSize <azure.mgmt.compute.v2018_04_01.models.VirtualMachineSize>` object
-    """
-
-    _attribute_map = {
-        'next_link': {'key': 'nextLink', 'type': 'str'},
-        'current_page': {'key': 'value', 'type': '[VirtualMachineSize]'}
-    }
-
-    def __init__(self, *args, **kwargs):
-
-        super(VirtualMachineSizePaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size_py3.py
deleted file mode 100644
index 9f99ba20ce42..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size_py3.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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 VirtualMachineSize(Model):
-    """Describes the properties of a VM size.
-
-    :param name: The name of the virtual machine size.
-    :type name: str
-    :param number_of_cores: The number of cores supported by the virtual
-     machine size.
-    :type number_of_cores: int
-    :param os_disk_size_in_mb: The OS disk size, in MB, allowed by the virtual
-     machine size.
-    :type os_disk_size_in_mb: int
-    :param resource_disk_size_in_mb: The resource disk size, in MB, allowed by
-     the virtual machine size.
-    :type resource_disk_size_in_mb: int
-    :param memory_in_mb: The amount of memory, in MB, supported by the virtual
-     machine size.
-    :type memory_in_mb: int
-    :param max_data_disk_count: The maximum number of data disks that can be
-     attached to the virtual machine size.
-    :type max_data_disk_count: int
-    """
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'number_of_cores': {'key': 'numberOfCores', 'type': 'int'},
-        'os_disk_size_in_mb': {'key': 'osDiskSizeInMB', 'type': 'int'},
-        'resource_disk_size_in_mb': {'key': 'resourceDiskSizeInMB', 'type': 'int'},
-        'memory_in_mb': {'key': 'memoryInMB', 'type': 'int'},
-        'max_data_disk_count': {'key': 'maxDataDiskCount', 'type': 'int'},
-    }
-
-    def __init__(self, *, name: str=None, number_of_cores: int=None, os_disk_size_in_mb: int=None, resource_disk_size_in_mb: int=None, memory_in_mb: int=None, max_data_disk_count: int=None, **kwargs) -> None:
-        super(VirtualMachineSize, self).__init__(**kwargs)
-        self.name = name
-        self.number_of_cores = number_of_cores
-        self.os_disk_size_in_mb = os_disk_size_in_mb
-        self.resource_disk_size_in_mb = resource_disk_size_in_mb
-        self.memory_in_mb = memory_in_mb
-        self.max_data_disk_count = max_data_disk_count
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_status_code_count.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_status_code_count.py
deleted file mode 100644
index 7df7b702acd7..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_status_code_count.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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 VirtualMachineStatusCodeCount(Model):
-    """The status code and count of the virtual machine scale set instance view
-    status summary.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar code: The instance view status code.
-    :vartype code: str
-    :ivar count: The number of instances having a particular status code.
-    :vartype count: int
-    """
-
-    _validation = {
-        'code': {'readonly': True},
-        'count': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'code': {'key': 'code', 'type': 'str'},
-        'count': {'key': 'count', 'type': 'int'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineStatusCodeCount, self).__init__(**kwargs)
-        self.code = None
-        self.count = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_status_code_count_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_status_code_count_py3.py
deleted file mode 100644
index c38800073a95..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_status_code_count_py3.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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 VirtualMachineStatusCodeCount(Model):
-    """The status code and count of the virtual machine scale set instance view
-    status summary.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar code: The instance view status code.
-    :vartype code: str
-    :ivar count: The number of instances having a particular status code.
-    :vartype count: int
-    """
-
-    _validation = {
-        'code': {'readonly': True},
-        'count': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'code': {'key': 'code', 'type': 'str'},
-        'count': {'key': 'count', 'type': 'int'},
-    }
-
-    def __init__(self, **kwargs) -> None:
-        super(VirtualMachineStatusCodeCount, self).__init__(**kwargs)
-        self.code = None
-        self.count = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_update.py
deleted file mode 100644
index 2b254de4ccaf..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_update.py
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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 .update_resource import UpdateResource
-
-
-class VirtualMachineUpdate(UpdateResource):
-    """Describes a Virtual Machine Update.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :param tags: Resource tags
-    :type tags: dict[str, str]
-    :param plan: Specifies information about the marketplace image used to
-     create the virtual machine. This element is only used for marketplace
-     images. Before you can use a marketplace image from an API, you must
-     enable the image for programmatic use.  In the Azure portal, find the
-     marketplace image that you want to use and then click **Want to deploy
-     programmatically, Get Started ->**. Enter any required information and
-     then click **Save**.
-    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
-    :param hardware_profile: Specifies the hardware settings for the virtual
-     machine.
-    :type hardware_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.HardwareProfile
-    :param storage_profile: Specifies the storage settings for the virtual
-     machine disks.
-    :type storage_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.StorageProfile
-    :param os_profile: Specifies the operating system settings for the virtual
-     machine.
-    :type os_profile: ~azure.mgmt.compute.v2018_04_01.models.OSProfile
-    :param network_profile: Specifies the network interfaces of the virtual
-     machine.
-    :type network_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.NetworkProfile
-    :param diagnostics_profile: Specifies the boot diagnostic settings state.
-     <br><br>Minimum api-version: 2015-06-15.
-    :type diagnostics_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
-    :param availability_set: Specifies information about the availability set
-     that the virtual machine should be assigned to. Virtual machines specified
-     in the same availability set are allocated to different nodes to maximize
-     availability. For more information about availability sets, see [Manage
-     the availability of virtual
-     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
-     <br><br> For more information on Azure planned maintainance, see [Planned
-     maintenance for virtual machines in
-     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
-     <br><br> Currently, a VM can only be added to availability set at creation
-     time. An existing VM cannot be added to an availability set.
-    :type availability_set: ~azure.mgmt.compute.v2018_04_01.models.SubResource
-    :ivar provisioning_state: The provisioning state, which only appears in
-     the response.
-    :vartype provisioning_state: str
-    :ivar instance_view: The virtual machine instance view.
-    :vartype instance_view:
-     ~azure.mgmt.compute.v2018_04_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:
-     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
-     is included in a request for an update, the value must match the initial
-     value. This value cannot be updated. <br><br> For more information, see
-     [Azure Hybrid Use Benefit for Windows
-     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
-     <br><br> Minimum api-version: 2015-06-15
-    :type license_type: str
-    :ivar vm_id: Specifies the VM unique ID which is a 128-bits identifier
-     that is encoded and stored in all Azure IaaS VMs SMBIOS and can be read
-     using platform BIOS commands.
-    :vartype vm_id: str
-    :param identity: The identity of the virtual machine, if configured.
-    :type identity:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineIdentity
-    :param zones: The virtual machine zones.
-    :type zones: list[str]
-    """
-
-    _validation = {
-        'provisioning_state': {'readonly': True},
-        'instance_view': {'readonly': True},
-        'vm_id': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'tags': {'key': 'tags', 'type': '{str}'},
-        'plan': {'key': 'plan', 'type': 'Plan'},
-        'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
-        'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
-        'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
-        'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
-        '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': 'VirtualMachineInstanceView'},
-        'license_type': {'key': 'properties.licenseType', 'type': 'str'},
-        'vm_id': {'key': 'properties.vmId', 'type': 'str'},
-        'identity': {'key': 'identity', 'type': 'VirtualMachineIdentity'},
-        'zones': {'key': 'zones', 'type': '[str]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(VirtualMachineUpdate, self).__init__(**kwargs)
-        self.plan = kwargs.get('plan', None)
-        self.hardware_profile = kwargs.get('hardware_profile', None)
-        self.storage_profile = kwargs.get('storage_profile', 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)
-        self.availability_set = kwargs.get('availability_set', None)
-        self.provisioning_state = None
-        self.instance_view = None
-        self.license_type = kwargs.get('license_type', None)
-        self.vm_id = None
-        self.identity = kwargs.get('identity', None)
-        self.zones = kwargs.get('zones', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_update_py3.py
deleted file mode 100644
index be9a3fc3e904..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_update_py3.py
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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 .update_resource_py3 import UpdateResource
-
-
-class VirtualMachineUpdate(UpdateResource):
-    """Describes a Virtual Machine Update.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :param tags: Resource tags
-    :type tags: dict[str, str]
-    :param plan: Specifies information about the marketplace image used to
-     create the virtual machine. This element is only used for marketplace
-     images. Before you can use a marketplace image from an API, you must
-     enable the image for programmatic use.  In the Azure portal, find the
-     marketplace image that you want to use and then click **Want to deploy
-     programmatically, Get Started ->**. Enter any required information and
-     then click **Save**.
-    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
-    :param hardware_profile: Specifies the hardware settings for the virtual
-     machine.
-    :type hardware_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.HardwareProfile
-    :param storage_profile: Specifies the storage settings for the virtual
-     machine disks.
-    :type storage_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.StorageProfile
-    :param os_profile: Specifies the operating system settings for the virtual
-     machine.
-    :type os_profile: ~azure.mgmt.compute.v2018_04_01.models.OSProfile
-    :param network_profile: Specifies the network interfaces of the virtual
-     machine.
-    :type network_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.NetworkProfile
-    :param diagnostics_profile: Specifies the boot diagnostic settings state.
-     <br><br>Minimum api-version: 2015-06-15.
-    :type diagnostics_profile:
-     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
-    :param availability_set: Specifies information about the availability set
-     that the virtual machine should be assigned to. Virtual machines specified
-     in the same availability set are allocated to different nodes to maximize
-     availability. For more information about availability sets, see [Manage
-     the availability of virtual
-     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
-     <br><br> For more information on Azure planned maintainance, see [Planned
-     maintenance for virtual machines in
-     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
-     <br><br> Currently, a VM can only be added to availability set at creation
-     time. An existing VM cannot be added to an availability set.
-    :type availability_set: ~azure.mgmt.compute.v2018_04_01.models.SubResource
-    :ivar provisioning_state: The provisioning state, which only appears in
-     the response.
-    :vartype provisioning_state: str
-    :ivar instance_view: The virtual machine instance view.
-    :vartype instance_view:
-     ~azure.mgmt.compute.v2018_04_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:
-     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
-     is included in a request for an update, the value must match the initial
-     value. This value cannot be updated. <br><br> For more information, see
-     [Azure Hybrid Use Benefit for Windows
-     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
-     <br><br> Minimum api-version: 2015-06-15
-    :type license_type: str
-    :ivar vm_id: Specifies the VM unique ID which is a 128-bits identifier
-     that is encoded and stored in all Azure IaaS VMs SMBIOS and can be read
-     using platform BIOS commands.
-    :vartype vm_id: str
-    :param identity: The identity of the virtual machine, if configured.
-    :type identity:
-     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineIdentity
-    :param zones: The virtual machine zones.
-    :type zones: list[str]
-    """
-
-    _validation = {
-        'provisioning_state': {'readonly': True},
-        'instance_view': {'readonly': True},
-        'vm_id': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'tags': {'key': 'tags', 'type': '{str}'},
-        'plan': {'key': 'plan', 'type': 'Plan'},
-        'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
-        'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
-        'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
-        'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
-        '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': 'VirtualMachineInstanceView'},
-        'license_type': {'key': 'properties.licenseType', 'type': 'str'},
-        'vm_id': {'key': 'properties.vmId', 'type': 'str'},
-        'identity': {'key': 'identity', 'type': 'VirtualMachineIdentity'},
-        '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:
-        super(VirtualMachineUpdate, self).__init__(tags=tags, **kwargs)
-        self.plan = plan
-        self.hardware_profile = hardware_profile
-        self.storage_profile = storage_profile
-        self.os_profile = os_profile
-        self.network_profile = network_profile
-        self.diagnostics_profile = diagnostics_profile
-        self.availability_set = availability_set
-        self.provisioning_state = None
-        self.instance_view = None
-        self.license_type = license_type
-        self.vm_id = None
-        self.identity = identity
-        self.zones = zones
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_configuration.py
deleted file mode 100644
index 0d429a3c06eb..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_configuration.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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 WinRMConfiguration(Model):
-    """Describes Windows Remote Management configuration of the VM.
-
-    :param listeners: The list of Windows Remote Management listeners
-    :type listeners:
-     list[~azure.mgmt.compute.v2018_04_01.models.WinRMListener]
-    """
-
-    _attribute_map = {
-        'listeners': {'key': 'listeners', 'type': '[WinRMListener]'},
-    }
-
-    def __init__(self, **kwargs):
-        super(WinRMConfiguration, self).__init__(**kwargs)
-        self.listeners = kwargs.get('listeners', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_configuration_py3.py
deleted file mode 100644
index 4a3c13531623..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_configuration_py3.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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 WinRMConfiguration(Model):
-    """Describes Windows Remote Management configuration of the VM.
-
-    :param listeners: The list of Windows Remote Management listeners
-    :type listeners:
-     list[~azure.mgmt.compute.v2018_04_01.models.WinRMListener]
-    """
-
-    _attribute_map = {
-        'listeners': {'key': 'listeners', 'type': '[WinRMListener]'},
-    }
-
-    def __init__(self, *, listeners=None, **kwargs) -> None:
-        super(WinRMConfiguration, self).__init__(**kwargs)
-        self.listeners = listeners
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_listener.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_listener.py
deleted file mode 100644
index dd80b495e328..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_listener.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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 WinRMListener(Model):
-    """Describes Protocol and thumbprint of Windows Remote Management listener.
-
-    :param protocol: Specifies the protocol of listener. <br><br> Possible
-     values are: <br>**http** <br><br> **https**. Possible values include:
-     'Http', 'Https'
-    :type protocol: str or
-     ~azure.mgmt.compute.v2018_04_01.models.ProtocolTypes
-    :param certificate_url: This is the URL of a certificate that has been
-     uploaded to Key Vault as a secret. For adding a secret to the Key Vault,
-     see [Add a key or secret to the key
-     vault](https://docs.microsoft.com/azure/key-vault/key-vault-get-started/#add).
-     In this case, your certificate needs to be It is the Base64 encoding of
-     the following JSON Object which is encoded in UTF-8: <br><br> {<br>
-     "data":"<Base64-encoded-certificate>",<br>  "dataType":"pfx",<br>
-     "password":"<pfx-file-password>"<br>}
-    :type certificate_url: str
-    """
-
-    _attribute_map = {
-        'protocol': {'key': 'protocol', 'type': 'ProtocolTypes'},
-        'certificate_url': {'key': 'certificateUrl', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(WinRMListener, self).__init__(**kwargs)
-        self.protocol = kwargs.get('protocol', None)
-        self.certificate_url = kwargs.get('certificate_url', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_listener_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_listener_py3.py
deleted file mode 100644
index a4aae022b007..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_listener_py3.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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 WinRMListener(Model):
-    """Describes Protocol and thumbprint of Windows Remote Management listener.
-
-    :param protocol: Specifies the protocol of listener. <br><br> Possible
-     values are: <br>**http** <br><br> **https**. Possible values include:
-     'Http', 'Https'
-    :type protocol: str or
-     ~azure.mgmt.compute.v2018_04_01.models.ProtocolTypes
-    :param certificate_url: This is the URL of a certificate that has been
-     uploaded to Key Vault as a secret. For adding a secret to the Key Vault,
-     see [Add a key or secret to the key
-     vault](https://docs.microsoft.com/azure/key-vault/key-vault-get-started/#add).
-     In this case, your certificate needs to be It is the Base64 encoding of
-     the following JSON Object which is encoded in UTF-8: <br><br> {<br>
-     "data":"<Base64-encoded-certificate>",<br>  "dataType":"pfx",<br>
-     "password":"<pfx-file-password>"<br>}
-    :type certificate_url: str
-    """
-
-    _attribute_map = {
-        'protocol': {'key': 'protocol', 'type': 'ProtocolTypes'},
-        'certificate_url': {'key': 'certificateUrl', 'type': 'str'},
-    }
-
-    def __init__(self, *, protocol=None, certificate_url: str=None, **kwargs) -> None:
-        super(WinRMListener, self).__init__(**kwargs)
-        self.protocol = protocol
-        self.certificate_url = certificate_url
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/windows_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/windows_configuration.py
deleted file mode 100644
index a8341ce9d8bb..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/windows_configuration.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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 WindowsConfiguration(Model):
-    """Specifies Windows operating system settings on the virtual machine.
-
-    :param provision_vm_agent: Indicates whether virtual machine agent should
-     be provisioned on the virtual machine. <br><br> When this property is not
-     specified in the request body, default behavior is to set it to true.
-     This will ensure that VM Agent is installed on the VM so that extensions
-     can be added to the VM later.
-    :type provision_vm_agent: bool
-    :param enable_automatic_updates: Indicates whether virtual machine is
-     enabled for automatic updates.
-    :type enable_automatic_updates: bool
-    :param time_zone: Specifies the time zone of the virtual machine. e.g.
-     "Pacific Standard Time"
-    :type time_zone: str
-    :param additional_unattend_content: Specifies additional base-64 encoded
-     XML formatted information that can be included in the Unattend.xml file,
-     which is used by Windows Setup.
-    :type additional_unattend_content:
-     list[~azure.mgmt.compute.v2018_04_01.models.AdditionalUnattendContent]
-    :param win_rm: Specifies the Windows Remote Management listeners. This
-     enables remote Windows PowerShell.
-    :type win_rm: ~azure.mgmt.compute.v2018_04_01.models.WinRMConfiguration
-    """
-
-    _attribute_map = {
-        'provision_vm_agent': {'key': 'provisionVMAgent', 'type': 'bool'},
-        'enable_automatic_updates': {'key': 'enableAutomaticUpdates', 'type': 'bool'},
-        'time_zone': {'key': 'timeZone', 'type': 'str'},
-        'additional_unattend_content': {'key': 'additionalUnattendContent', 'type': '[AdditionalUnattendContent]'},
-        'win_rm': {'key': 'winRM', 'type': 'WinRMConfiguration'},
-    }
-
-    def __init__(self, **kwargs):
-        super(WindowsConfiguration, self).__init__(**kwargs)
-        self.provision_vm_agent = kwargs.get('provision_vm_agent', None)
-        self.enable_automatic_updates = kwargs.get('enable_automatic_updates', None)
-        self.time_zone = kwargs.get('time_zone', None)
-        self.additional_unattend_content = kwargs.get('additional_unattend_content', None)
-        self.win_rm = kwargs.get('win_rm', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/windows_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/windows_configuration_py3.py
deleted file mode 100644
index fe5fc14e963f..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/windows_configuration_py3.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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 WindowsConfiguration(Model):
-    """Specifies Windows operating system settings on the virtual machine.
-
-    :param provision_vm_agent: Indicates whether virtual machine agent should
-     be provisioned on the virtual machine. <br><br> When this property is not
-     specified in the request body, default behavior is to set it to true.
-     This will ensure that VM Agent is installed on the VM so that extensions
-     can be added to the VM later.
-    :type provision_vm_agent: bool
-    :param enable_automatic_updates: Indicates whether virtual machine is
-     enabled for automatic updates.
-    :type enable_automatic_updates: bool
-    :param time_zone: Specifies the time zone of the virtual machine. e.g.
-     "Pacific Standard Time"
-    :type time_zone: str
-    :param additional_unattend_content: Specifies additional base-64 encoded
-     XML formatted information that can be included in the Unattend.xml file,
-     which is used by Windows Setup.
-    :type additional_unattend_content:
-     list[~azure.mgmt.compute.v2018_04_01.models.AdditionalUnattendContent]
-    :param win_rm: Specifies the Windows Remote Management listeners. This
-     enables remote Windows PowerShell.
-    :type win_rm: ~azure.mgmt.compute.v2018_04_01.models.WinRMConfiguration
-    """
-
-    _attribute_map = {
-        'provision_vm_agent': {'key': 'provisionVMAgent', 'type': 'bool'},
-        'enable_automatic_updates': {'key': 'enableAutomaticUpdates', 'type': 'bool'},
-        'time_zone': {'key': 'timeZone', 'type': 'str'},
-        'additional_unattend_content': {'key': 'additionalUnattendContent', 'type': '[AdditionalUnattendContent]'},
-        'win_rm': {'key': 'winRM', 'type': 'WinRMConfiguration'},
-    }
-
-    def __init__(self, *, provision_vm_agent: bool=None, enable_automatic_updates: bool=None, time_zone: str=None, additional_unattend_content=None, win_rm=None, **kwargs) -> None:
-        super(WindowsConfiguration, self).__init__(**kwargs)
-        self.provision_vm_agent = provision_vm_agent
-        self.enable_automatic_updates = enable_automatic_updates
-        self.time_zone = time_zone
-        self.additional_unattend_content = additional_unattend_content
-        self.win_rm = win_rm
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/__init__.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/__init__.py
index 576455e18810..aceddf83543c 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/__init__.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/__init__.py
@@ -9,40 +9,10 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .operations import Operations
-from .availability_sets_operations import AvailabilitySetsOperations
-from .virtual_machine_extension_images_operations import VirtualMachineExtensionImagesOperations
-from .virtual_machine_extensions_operations import VirtualMachineExtensionsOperations
-from .virtual_machines_operations import VirtualMachinesOperations
-from .virtual_machine_images_operations import VirtualMachineImagesOperations
-from .usage_operations import UsageOperations
-from .virtual_machine_sizes_operations import VirtualMachineSizesOperations
-from .images_operations import ImagesOperations
-from .virtual_machine_scale_sets_operations import VirtualMachineScaleSetsOperations
-from .virtual_machine_scale_set_extensions_operations import VirtualMachineScaleSetExtensionsOperations
-from .virtual_machine_scale_set_rolling_upgrades_operations import VirtualMachineScaleSetRollingUpgradesOperations
-from .virtual_machine_scale_set_vms_operations import VirtualMachineScaleSetVMsOperations
-from .log_analytics_operations import LogAnalyticsOperations
-from .virtual_machine_run_commands_operations import VirtualMachineRunCommandsOperations
 from .disks_operations import DisksOperations
 from .snapshots_operations import SnapshotsOperations
 
 __all__ = [
-    'Operations',
-    'AvailabilitySetsOperations',
-    'VirtualMachineExtensionImagesOperations',
-    'VirtualMachineExtensionsOperations',
-    'VirtualMachinesOperations',
-    'VirtualMachineImagesOperations',
-    'UsageOperations',
-    'VirtualMachineSizesOperations',
-    'ImagesOperations',
-    'VirtualMachineScaleSetsOperations',
-    'VirtualMachineScaleSetExtensionsOperations',
-    'VirtualMachineScaleSetRollingUpgradesOperations',
-    'VirtualMachineScaleSetVMsOperations',
-    'LogAnalyticsOperations',
-    'VirtualMachineRunCommandsOperations',
     'DisksOperations',
     'SnapshotsOperations',
 ]
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py
deleted file mode 100644
index ba8e21445a27..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py
+++ /dev/null
@@ -1,434 +0,0 @@
-# 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 .. import models
-
-
-class AvailabilitySetsOperations(object):
-    """AvailabilitySetsOperations 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-04-01".
-    """
-
-    models = models
-
-    def __init__(self, client, config, serializer, deserializer):
-
-        self._client = client
-        self._serialize = serializer
-        self._deserialize = deserializer
-        self.api_version = "2018-04-01"
-
-        self.config = config
-
-    def create_or_update(
-            self, resource_group_name, availability_set_name, parameters, custom_headers=None, raw=False, **operation_config):
-        """Create or update an availability set.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param availability_set_name: The name of the availability set.
-        :type availability_set_name: str
-        :param parameters: Parameters supplied to the Create Availability Set
-         operation.
-        :type parameters:
-         ~azure.mgmt.compute.v2018_04_01.models.AvailabilitySet
-        :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: AvailabilitySet or ClientRawResponse if raw=true
-        :rtype: ~azure.mgmt.compute.v2018_04_01.models.AvailabilitySet or
-         ~msrest.pipeline.ClientRawResponse
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        # Construct URL
-        url = self.create_or_update.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'availabilitySetName': self._serialize.url("availability_set_name", availability_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 = {}
-        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(parameters, 'AvailabilitySet')
-
-        # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, 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('AvailabilitySet', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
-
-    def update(
-            self, resource_group_name, availability_set_name, parameters, custom_headers=None, raw=False, **operation_config):
-        """Update an availability set.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param availability_set_name: The name of the availability set.
-        :type availability_set_name: str
-        :param parameters: Parameters supplied to the Update Availability Set
-         operation.
-        :type parameters:
-         ~azure.mgmt.compute.v2018_04_01.models.AvailabilitySetUpdate
-        :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: AvailabilitySet or ClientRawResponse if raw=true
-        :rtype: ~azure.mgmt.compute.v2018_04_01.models.AvailabilitySet or
-         ~msrest.pipeline.ClientRawResponse
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        # Construct URL
-        url = self.update.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'availabilitySetName': self._serialize.url("availability_set_name", availability_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 = {}
-        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(parameters, 'AvailabilitySetUpdate')
-
-        # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, 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('AvailabilitySet', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-    update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
-
-    def delete(
-            self, resource_group_name, availability_set_name, custom_headers=None, raw=False, **operation_config):
-        """Delete an availability set.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param availability_set_name: The name of the availability set.
-        :type availability_set_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: None or ClientRawResponse if raw=true
-        :rtype: None or ~msrest.pipeline.ClientRawResponse
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        # Construct URL
-        url = self.delete.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'availabilitySetName': self._serialize.url("availability_set_name", availability_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 = {}
-        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 and send request
-        request = self._client.delete(url, query_parameters)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
-
-        if response.status_code not in [200, 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
-    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
-
-    def get(
-            self, resource_group_name, availability_set_name, custom_headers=None, raw=False, **operation_config):
-        """Retrieves information about an availability set.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param availability_set_name: The name of the availability set.
-        :type availability_set_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: AvailabilitySet or ClientRawResponse if raw=true
-        :rtype: ~azure.mgmt.compute.v2018_04_01.models.AvailabilitySet or
-         ~msrest.pipeline.ClientRawResponse
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        # Construct URL
-        url = self.get.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'availabilitySetName': self._serialize.url("availability_set_name", availability_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 = {}
-        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 and send request
-        request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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('AvailabilitySet', 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/availabilitySets/{availabilitySetName}'}
-
-    def list(
-            self, resource_group_name, custom_headers=None, raw=False, **operation_config):
-        """Lists all availability sets in 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 AvailabilitySet
-        :rtype:
-         ~azure.mgmt.compute.v2018_04_01.models.AvailabilitySetPaged[~azure.mgmt.compute.v2018_04_01.models.AvailabilitySet]
-        :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 = {
-                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_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')
-
-            else:
-                url = next_link
-                query_parameters = {}
-
-            # Construct headers
-            header_parameters = {}
-            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 and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
-            return client_raw_response
-
-        return deserialized
-    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets'}
-
-    def list_available_sizes(
-            self, resource_group_name, availability_set_name, custom_headers=None, raw=False, **operation_config):
-        """Lists all available virtual machine sizes that can be used to create a
-        new virtual machine in an existing availability set.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param availability_set_name: The name of the availability set.
-        :type availability_set_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 VirtualMachineSize
-        :rtype:
-         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineSizePaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineSize]
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        def internal_paging(next_link=None, raw=False):
-
-            if not next_link:
-                # Construct URL
-                url = self.list_available_sizes.metadata['url']
-                path_format_arguments = {
-                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-                    'availabilitySetName': self._serialize.url("availability_set_name", availability_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')
-
-            else:
-                url = next_link
-                query_parameters = {}
-
-            # Construct headers
-            header_parameters = {}
-            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 and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, 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.VirtualMachineSizePaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.VirtualMachineSizePaged(internal_paging, self._deserialize.dependencies, header_dict)
-            return client_raw_response
-
-        return deserialized
-    list_available_sizes.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}/vmSizes'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/images_operations.py
deleted file mode 100644
index 030bf14e5115..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/images_operations.py
+++ /dev/null
@@ -1,525 +0,0 @@
-# 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 ImagesOperations(object):
-    """ImagesOperations 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-04-01".
-    """
-
-    models = models
-
-    def __init__(self, client, config, serializer, deserializer):
-
-        self._client = client
-        self._serialize = serializer
-        self._deserialize = deserializer
-        self.api_version = "2018-04-01"
-
-        self.config = config
-
-
-    def _create_or_update_initial(
-            self, resource_group_name, image_name, parameters, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.create_or_update.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'imageName': self._serialize.url("image_name", image_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 = {}
-        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(parameters, 'Image')
-
-        # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
-
-        if response.status_code not in [200, 201]:
-            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('Image', response)
-        if response.status_code == 201:
-            deserialized = self._deserialize('Image', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-
-    def create_or_update(
-            self, resource_group_name, image_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Create or update an image.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param image_name: The name of the image.
-        :type image_name: str
-        :param parameters: Parameters supplied to the Create Image operation.
-        :type parameters: ~azure.mgmt.compute.v2018_04_01.models.Image
-        :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 Image or
-         ClientRawResponse<Image> if raw==True
-        :rtype:
-         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.Image]
-         or
-         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.Image]]
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        raw_result = self._create_or_update_initial(
-            resource_group_name=resource_group_name,
-            image_name=image_name,
-            parameters=parameters,
-            custom_headers=custom_headers,
-            raw=True,
-            **operation_config
-        )
-
-        def get_long_running_output(response):
-            deserialized = self._deserialize('Image', 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/images/{imageName}'}
-
-
-    def _update_initial(
-            self, resource_group_name, image_name, parameters, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.update.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'imageName': self._serialize.url("image_name", image_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 = {}
-        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(parameters, 'ImageUpdate')
-
-        # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
-
-        if response.status_code not in [200, 201]:
-            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('Image', response)
-        if response.status_code == 201:
-            deserialized = self._deserialize('Image', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-
-    def update(
-            self, resource_group_name, image_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Update an image.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param image_name: The name of the image.
-        :type image_name: str
-        :param parameters: Parameters supplied to the Update Image operation.
-        :type parameters: ~azure.mgmt.compute.v2018_04_01.models.ImageUpdate
-        :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 Image or
-         ClientRawResponse<Image> if raw==True
-        :rtype:
-         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.Image]
-         or
-         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.Image]]
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        raw_result = self._update_initial(
-            resource_group_name=resource_group_name,
-            image_name=image_name,
-            parameters=parameters,
-            custom_headers=custom_headers,
-            raw=True,
-            **operation_config
-        )
-
-        def get_long_running_output(response):
-            deserialized = self._deserialize('Image', 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/images/{imageName}'}
-
-
-    def _delete_initial(
-            self, resource_group_name, image_name, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.delete.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'imageName': self._serialize.url("image_name", image_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 = {}
-        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 and send request
-        request = self._client.delete(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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, image_name, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Deletes an Image.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param image_name: The name of the image.
-        :type image_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,
-            image_name=image_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/images/{imageName}'}
-
-    def get(
-            self, resource_group_name, image_name, expand=None, custom_headers=None, raw=False, **operation_config):
-        """Gets an image.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param image_name: The name of the image.
-        :type image_name: str
-        :param expand: The expand expression to apply on the operation.
-        :type expand: 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: Image or ClientRawResponse if raw=true
-        :rtype: ~azure.mgmt.compute.v2018_04_01.models.Image or
-         ~msrest.pipeline.ClientRawResponse
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        # Construct URL
-        url = self.get.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'imageName': self._serialize.url("image_name", image_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 = {}
-        if expand is not None:
-            query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
-        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
-
-        # Construct headers
-        header_parameters = {}
-        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 and send request
-        request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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('Image', 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/images/{imageName}'}
-
-    def list_by_resource_group(
-            self, resource_group_name, custom_headers=None, raw=False, **operation_config):
-        """Gets the list of images 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 Image
-        :rtype:
-         ~azure.mgmt.compute.v2018_04_01.models.ImagePaged[~azure.mgmt.compute.v2018_04_01.models.Image]
-        :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 = {
-                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_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')
-
-            else:
-                url = next_link
-                query_parameters = {}
-
-            # Construct headers
-            header_parameters = {}
-            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 and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, 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.ImagePaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.ImagePaged(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/images'}
-
-    def list(
-            self, custom_headers=None, raw=False, **operation_config):
-        """Gets the list of Images in the subscription. Use nextLink property in
-        the response to get the next page of Images. Do this till nextLink is
-        null to fetch all the Images.
-
-        :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 Image
-        :rtype:
-         ~azure.mgmt.compute.v2018_04_01.models.ImagePaged[~azure.mgmt.compute.v2018_04_01.models.Image]
-        :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['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 and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, 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.ImagePaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.ImagePaged(internal_paging, self._deserialize.dependencies, header_dict)
-            return client_raw_response
-
-        return deserialized
-    list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/images'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/log_analytics_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/log_analytics_operations.py
deleted file mode 100644
index 0471d6db9c03..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/log_analytics_operations.py
+++ /dev/null
@@ -1,242 +0,0 @@
-# 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 LogAnalyticsOperations(object):
-    """LogAnalyticsOperations 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-04-01".
-    """
-
-    models = models
-
-    def __init__(self, client, config, serializer, deserializer):
-
-        self._client = client
-        self._serialize = serializer
-        self._deserialize = deserializer
-        self.api_version = "2018-04-01"
-
-        self.config = config
-
-
-    def _export_request_rate_by_interval_initial(
-            self, parameters, location, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.export_request_rate_by_interval.metadata['url']
-        path_format_arguments = {
-            'location': self._serialize.url("location", location, 'str', pattern=r'^[-\w\._]+$'),
-            '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 = {}
-        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(parameters, 'RequestRateByIntervalInput')
-
-        # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, 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('LogAnalyticsOperationResult', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-
-    def export_request_rate_by_interval(
-            self, parameters, location, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Export logs that show Api requests made by this subscription in the
-        given time window to show throttling activities.
-
-        :param parameters: Parameters supplied to the LogAnalytics
-         getRequestRateByInterval Api.
-        :type parameters:
-         ~azure.mgmt.compute.v2018_04_01.models.RequestRateByIntervalInput
-        :param location: The location upon which virtual-machine-sizes is
-         queried.
-        :type location: 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
-         LogAnalyticsOperationResult or
-         ClientRawResponse<LogAnalyticsOperationResult> if raw==True
-        :rtype:
-         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.LogAnalyticsOperationResult]
-         or
-         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.LogAnalyticsOperationResult]]
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        raw_result = self._export_request_rate_by_interval_initial(
-            parameters=parameters,
-            location=location,
-            custom_headers=custom_headers,
-            raw=True,
-            **operation_config
-        )
-
-        def get_long_running_output(response):
-            deserialized = self._deserialize('LogAnalyticsOperationResult', 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)
-    export_request_rate_by_interval.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/logAnalytics/apiAccess/getRequestRateByInterval'}
-
-
-    def _export_throttled_requests_initial(
-            self, parameters, location, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.export_throttled_requests.metadata['url']
-        path_format_arguments = {
-            'location': self._serialize.url("location", location, 'str', pattern=r'^[-\w\._]+$'),
-            '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 = {}
-        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(parameters, 'ThrottledRequestsInput')
-
-        # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, 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('LogAnalyticsOperationResult', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-
-    def export_throttled_requests(
-            self, parameters, location, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Export logs that show total throttled Api requests for this
-        subscription in the given time window.
-
-        :param parameters: Parameters supplied to the LogAnalytics
-         getThrottledRequests Api.
-        :type parameters:
-         ~azure.mgmt.compute.v2018_04_01.models.ThrottledRequestsInput
-        :param location: The location upon which virtual-machine-sizes is
-         queried.
-        :type location: 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
-         LogAnalyticsOperationResult or
-         ClientRawResponse<LogAnalyticsOperationResult> if raw==True
-        :rtype:
-         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.LogAnalyticsOperationResult]
-         or
-         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.LogAnalyticsOperationResult]]
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        raw_result = self._export_throttled_requests_initial(
-            parameters=parameters,
-            location=location,
-            custom_headers=custom_headers,
-            raw=True,
-            **operation_config
-        )
-
-        def get_long_running_output(response):
-            deserialized = self._deserialize('LogAnalyticsOperationResult', 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)
-    export_throttled_requests.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/logAnalytics/apiAccess/getThrottledRequests'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/operations.py
deleted file mode 100644
index a392e2cea622..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/operations.py
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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 .. import models
-
-
-class Operations(object):
-    """Operations 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-04-01".
-    """
-
-    models = models
-
-    def __init__(self, client, config, serializer, deserializer):
-
-        self._client = client
-        self._serialize = serializer
-        self._deserialize = deserializer
-        self.api_version = "2018-04-01"
-
-        self.config = config
-
-    def list(
-            self, custom_headers=None, raw=False, **operation_config):
-        """Gets a list of compute operations.
-
-        :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 ComputeOperationValue
-        :rtype:
-         ~azure.mgmt.compute.v2018_04_01.models.ComputeOperationValuePaged[~azure.mgmt.compute.v2018_04_01.models.ComputeOperationValue]
-        :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']
-
-                # 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['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 and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, 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.ComputeOperationValuePaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.ComputeOperationValuePaged(internal_paging, self._deserialize.dependencies, header_dict)
-            return client_raw_response
-
-        return deserialized
-    list.metadata = {'url': '/providers/Microsoft.Compute/operations'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/usage_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/usage_operations.py
deleted file mode 100644
index 607b8419477c..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/usage_operations.py
+++ /dev/null
@@ -1,108 +0,0 @@
-# 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 .. import models
-
-
-class UsageOperations(object):
-    """UsageOperations 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-04-01".
-    """
-
-    models = models
-
-    def __init__(self, client, config, serializer, deserializer):
-
-        self._client = client
-        self._serialize = serializer
-        self._deserialize = deserializer
-        self.api_version = "2018-04-01"
-
-        self.config = config
-
-    def list(
-            self, location, custom_headers=None, raw=False, **operation_config):
-        """Gets, for the specified location, the current compute resource usage
-        information as well as the limits for compute resources under the
-        subscription.
-
-        :param location: The location for which resource usage is queried.
-        :type location: 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 Usage
-        :rtype:
-         ~azure.mgmt.compute.v2018_04_01.models.UsagePaged[~azure.mgmt.compute.v2018_04_01.models.Usage]
-        :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 = {
-                    'location': self._serialize.url("location", location, 'str', pattern=r'^[-\w\._]+$'),
-                    '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['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 and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, 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.UsagePaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.UsagePaged(internal_paging, self._deserialize.dependencies, header_dict)
-            return client_raw_response
-
-        return deserialized
-    list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/usages'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extension_images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extension_images_operations.py
deleted file mode 100644
index f190183923a8..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extension_images_operations.py
+++ /dev/null
@@ -1,248 +0,0 @@
-# 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 .. import models
-
-
-class VirtualMachineExtensionImagesOperations(object):
-    """VirtualMachineExtensionImagesOperations 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-04-01".
-    """
-
-    models = models
-
-    def __init__(self, client, config, serializer, deserializer):
-
-        self._client = client
-        self._serialize = serializer
-        self._deserialize = deserializer
-        self.api_version = "2018-04-01"
-
-        self.config = config
-
-    def get(
-            self, location, publisher_name, type, version, custom_headers=None, raw=False, **operation_config):
-        """Gets a virtual machine extension image.
-
-        :param location: The name of a supported Azure region.
-        :type location: str
-        :param publisher_name:
-        :type publisher_name: str
-        :param type:
-        :type type: str
-        :param version:
-        :type version: 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: VirtualMachineExtensionImage or ClientRawResponse if raw=true
-        :rtype:
-         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionImage or
-         ~msrest.pipeline.ClientRawResponse
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        # Construct URL
-        url = self.get.metadata['url']
-        path_format_arguments = {
-            'location': self._serialize.url("location", location, 'str'),
-            'publisherName': self._serialize.url("publisher_name", publisher_name, 'str'),
-            'type': self._serialize.url("type", type, 'str'),
-            'version': self._serialize.url("version", version, '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 = {}
-        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 and send request
-        request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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('VirtualMachineExtensionImage', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-    get.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmextension/types/{type}/versions/{version}'}
-
-    def list_types(
-            self, location, publisher_name, custom_headers=None, raw=False, **operation_config):
-        """Gets a list of virtual machine extension image types.
-
-        :param location: The name of a supported Azure region.
-        :type location: str
-        :param publisher_name:
-        :type publisher_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: list or ClientRawResponse if raw=true
-        :rtype:
-         list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionImage]
-         or ~msrest.pipeline.ClientRawResponse
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        # Construct URL
-        url = self.list_types.metadata['url']
-        path_format_arguments = {
-            'location': self._serialize.url("location", location, 'str'),
-            'publisherName': self._serialize.url("publisher_name", publisher_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 = {}
-        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 and send request
-        request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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('[VirtualMachineExtensionImage]', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-    list_types.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmextension/types'}
-
-    def list_versions(
-            self, location, publisher_name, type, filter=None, top=None, orderby=None, custom_headers=None, raw=False, **operation_config):
-        """Gets a list of virtual machine extension image versions.
-
-        :param location: The name of a supported Azure region.
-        :type location: str
-        :param publisher_name:
-        :type publisher_name: str
-        :param type:
-        :type type: str
-        :param filter: The filter to apply on the operation.
-        :type filter: str
-        :param top:
-        :type top: int
-        :param orderby:
-        :type orderby: 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: list or ClientRawResponse if raw=true
-        :rtype:
-         list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionImage]
-         or ~msrest.pipeline.ClientRawResponse
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        # Construct URL
-        url = self.list_versions.metadata['url']
-        path_format_arguments = {
-            'location': self._serialize.url("location", location, 'str'),
-            'publisherName': self._serialize.url("publisher_name", publisher_name, 'str'),
-            'type': self._serialize.url("type", type, '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 = {}
-        if filter is not None:
-            query_parameters['$filter'] = self._serialize.query("filter", filter, 'str')
-        if top is not None:
-            query_parameters['$top'] = self._serialize.query("top", top, 'int')
-        if orderby is not None:
-            query_parameters['$orderby'] = self._serialize.query("orderby", orderby, 'str')
-        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
-
-        # Construct headers
-        header_parameters = {}
-        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 and send request
-        request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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('[VirtualMachineExtensionImage]', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-    list_versions.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmextension/types/{type}/versions'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extensions_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extensions_operations.py
deleted file mode 100644
index cce4450abd70..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extensions_operations.py
+++ /dev/null
@@ -1,411 +0,0 @@
-# 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 VirtualMachineExtensionsOperations(object):
-    """VirtualMachineExtensionsOperations 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-04-01".
-    """
-
-    models = models
-
-    def __init__(self, client, config, serializer, deserializer):
-
-        self._client = client
-        self._serialize = serializer
-        self._deserialize = deserializer
-        self.api_version = "2018-04-01"
-
-        self.config = config
-
-
-    def _create_or_update_initial(
-            self, resource_group_name, vm_name, vm_extension_name, extension_parameters, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.create_or_update.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'vmName': self._serialize.url("vm_name", vm_name, 'str'),
-            'vmExtensionName': self._serialize.url("vm_extension_name", vm_extension_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 = {}
-        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(extension_parameters, 'VirtualMachineExtension')
-
-        # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
-
-        if response.status_code not in [200, 201]:
-            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('VirtualMachineExtension', response)
-        if response.status_code == 201:
-            deserialized = self._deserialize('VirtualMachineExtension', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-
-    def create_or_update(
-            self, resource_group_name, vm_name, vm_extension_name, extension_parameters, custom_headers=None, raw=False, polling=True, **operation_config):
-        """The operation to create or update the extension.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param vm_name: The name of the virtual machine where the extension
-         should be created or updated.
-        :type vm_name: str
-        :param vm_extension_name: The name of the virtual machine extension.
-        :type vm_extension_name: str
-        :param extension_parameters: Parameters supplied to the Create Virtual
-         Machine Extension operation.
-        :type extension_parameters:
-         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension
-        :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 VirtualMachineExtension
-         or ClientRawResponse<VirtualMachineExtension> if raw==True
-        :rtype:
-         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]
-         or
-         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]]
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        raw_result = self._create_or_update_initial(
-            resource_group_name=resource_group_name,
-            vm_name=vm_name,
-            vm_extension_name=vm_extension_name,
-            extension_parameters=extension_parameters,
-            custom_headers=custom_headers,
-            raw=True,
-            **operation_config
-        )
-
-        def get_long_running_output(response):
-            deserialized = self._deserialize('VirtualMachineExtension', 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/virtualMachines/{vmName}/extensions/{vmExtensionName}'}
-
-
-    def _update_initial(
-            self, resource_group_name, vm_name, vm_extension_name, extension_parameters, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.update.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'vmName': self._serialize.url("vm_name", vm_name, 'str'),
-            'vmExtensionName': self._serialize.url("vm_extension_name", vm_extension_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 = {}
-        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(extension_parameters, 'VirtualMachineExtensionUpdate')
-
-        # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, 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('VirtualMachineExtension', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-
-    def update(
-            self, resource_group_name, vm_name, vm_extension_name, extension_parameters, custom_headers=None, raw=False, polling=True, **operation_config):
-        """The operation to update the extension.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param vm_name: The name of the virtual machine where the extension
-         should be updated.
-        :type vm_name: str
-        :param vm_extension_name: The name of the virtual machine extension.
-        :type vm_extension_name: str
-        :param extension_parameters: Parameters supplied to the Update Virtual
-         Machine Extension operation.
-        :type extension_parameters:
-         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionUpdate
-        :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 VirtualMachineExtension
-         or ClientRawResponse<VirtualMachineExtension> if raw==True
-        :rtype:
-         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]
-         or
-         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]]
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        raw_result = self._update_initial(
-            resource_group_name=resource_group_name,
-            vm_name=vm_name,
-            vm_extension_name=vm_extension_name,
-            extension_parameters=extension_parameters,
-            custom_headers=custom_headers,
-            raw=True,
-            **operation_config
-        )
-
-        def get_long_running_output(response):
-            deserialized = self._deserialize('VirtualMachineExtension', 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/virtualMachines/{vmName}/extensions/{vmExtensionName}'}
-
-
-    def _delete_initial(
-            self, resource_group_name, vm_name, vm_extension_name, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.delete.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'vmName': self._serialize.url("vm_name", vm_name, 'str'),
-            'vmExtensionName': self._serialize.url("vm_extension_name", vm_extension_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 = {}
-        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 and send request
-        request = self._client.delete(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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, vm_name, vm_extension_name, custom_headers=None, raw=False, polling=True, **operation_config):
-        """The operation to delete the extension.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param vm_name: The name of the virtual machine where the extension
-         should be deleted.
-        :type vm_name: str
-        :param vm_extension_name: The name of the virtual machine extension.
-        :type vm_extension_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,
-            vm_name=vm_name,
-            vm_extension_name=vm_extension_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/virtualMachines/{vmName}/extensions/{vmExtensionName}'}
-
-    def get(
-            self, resource_group_name, vm_name, vm_extension_name, expand=None, custom_headers=None, raw=False, **operation_config):
-        """The operation to get the extension.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param vm_name: The name of the virtual machine containing the
-         extension.
-        :type vm_name: str
-        :param vm_extension_name: The name of the virtual machine extension.
-        :type vm_extension_name: str
-        :param expand: The expand expression to apply on the operation.
-        :type expand: 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: VirtualMachineExtension or ClientRawResponse if raw=true
-        :rtype: ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension
-         or ~msrest.pipeline.ClientRawResponse
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        # Construct URL
-        url = self.get.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'vmName': self._serialize.url("vm_name", vm_name, 'str'),
-            'vmExtensionName': self._serialize.url("vm_extension_name", vm_extension_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 = {}
-        if expand is not None:
-            query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
-        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
-
-        # Construct headers
-        header_parameters = {}
-        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 and send request
-        request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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('VirtualMachineExtension', 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/virtualMachines/{vmName}/extensions/{vmExtensionName}'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_images_operations.py
deleted file mode 100644
index a58d2e394655..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_images_operations.py
+++ /dev/null
@@ -1,383 +0,0 @@
-# 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 .. import models
-
-
-class VirtualMachineImagesOperations(object):
-    """VirtualMachineImagesOperations 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-04-01".
-    """
-
-    models = models
-
-    def __init__(self, client, config, serializer, deserializer):
-
-        self._client = client
-        self._serialize = serializer
-        self._deserialize = deserializer
-        self.api_version = "2018-04-01"
-
-        self.config = config
-
-    def get(
-            self, location, publisher_name, offer, skus, version, custom_headers=None, raw=False, **operation_config):
-        """Gets a virtual machine image.
-
-        :param location: The name of a supported Azure region.
-        :type location: str
-        :param publisher_name: A valid image publisher.
-        :type publisher_name: str
-        :param offer: A valid image publisher offer.
-        :type offer: str
-        :param skus: A valid image SKU.
-        :type skus: str
-        :param version: A valid image SKU version.
-        :type version: 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: VirtualMachineImage or ClientRawResponse if raw=true
-        :rtype: ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineImage or
-         ~msrest.pipeline.ClientRawResponse
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        # Construct URL
-        url = self.get.metadata['url']
-        path_format_arguments = {
-            'location': self._serialize.url("location", location, 'str'),
-            'publisherName': self._serialize.url("publisher_name", publisher_name, 'str'),
-            'offer': self._serialize.url("offer", offer, 'str'),
-            'skus': self._serialize.url("skus", skus, 'str'),
-            'version': self._serialize.url("version", version, '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 = {}
-        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 and send request
-        request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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('VirtualMachineImage', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-    get.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmimage/offers/{offer}/skus/{skus}/versions/{version}'}
-
-    def list(
-            self, location, publisher_name, offer, skus, filter=None, top=None, orderby=None, custom_headers=None, raw=False, **operation_config):
-        """Gets a list of all virtual machine image versions for the specified
-        location, publisher, offer, and SKU.
-
-        :param location: The name of a supported Azure region.
-        :type location: str
-        :param publisher_name: A valid image publisher.
-        :type publisher_name: str
-        :param offer: A valid image publisher offer.
-        :type offer: str
-        :param skus: A valid image SKU.
-        :type skus: str
-        :param filter: The filter to apply on the operation.
-        :type filter: str
-        :param top:
-        :type top: int
-        :param orderby:
-        :type orderby: 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: list or ClientRawResponse if raw=true
-        :rtype:
-         list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineImageResource]
-         or ~msrest.pipeline.ClientRawResponse
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        # Construct URL
-        url = self.list.metadata['url']
-        path_format_arguments = {
-            'location': self._serialize.url("location", location, 'str'),
-            'publisherName': self._serialize.url("publisher_name", publisher_name, 'str'),
-            'offer': self._serialize.url("offer", offer, 'str'),
-            'skus': self._serialize.url("skus", skus, '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 = {}
-        if filter is not None:
-            query_parameters['$filter'] = self._serialize.query("filter", filter, 'str')
-        if top is not None:
-            query_parameters['$top'] = self._serialize.query("top", top, 'int')
-        if orderby is not None:
-            query_parameters['$orderby'] = self._serialize.query("orderby", orderby, 'str')
-        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
-
-        # Construct headers
-        header_parameters = {}
-        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 and send request
-        request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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('[VirtualMachineImageResource]', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-    list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmimage/offers/{offer}/skus/{skus}/versions'}
-
-    def list_offers(
-            self, location, publisher_name, custom_headers=None, raw=False, **operation_config):
-        """Gets a list of virtual machine image offers for the specified location
-        and publisher.
-
-        :param location: The name of a supported Azure region.
-        :type location: str
-        :param publisher_name: A valid image publisher.
-        :type publisher_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: list or ClientRawResponse if raw=true
-        :rtype:
-         list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineImageResource]
-         or ~msrest.pipeline.ClientRawResponse
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        # Construct URL
-        url = self.list_offers.metadata['url']
-        path_format_arguments = {
-            'location': self._serialize.url("location", location, 'str'),
-            'publisherName': self._serialize.url("publisher_name", publisher_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 = {}
-        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 and send request
-        request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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('[VirtualMachineImageResource]', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-    list_offers.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmimage/offers'}
-
-    def list_publishers(
-            self, location, custom_headers=None, raw=False, **operation_config):
-        """Gets a list of virtual machine image publishers for the specified Azure
-        location.
-
-        :param location: The name of a supported Azure region.
-        :type location: 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: list or ClientRawResponse if raw=true
-        :rtype:
-         list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineImageResource]
-         or ~msrest.pipeline.ClientRawResponse
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        # Construct URL
-        url = self.list_publishers.metadata['url']
-        path_format_arguments = {
-            'location': self._serialize.url("location", location, '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 = {}
-        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 and send request
-        request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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('[VirtualMachineImageResource]', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-    list_publishers.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers'}
-
-    def list_skus(
-            self, location, publisher_name, offer, custom_headers=None, raw=False, **operation_config):
-        """Gets a list of virtual machine image SKUs for the specified location,
-        publisher, and offer.
-
-        :param location: The name of a supported Azure region.
-        :type location: str
-        :param publisher_name: A valid image publisher.
-        :type publisher_name: str
-        :param offer: A valid image publisher offer.
-        :type offer: 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: list or ClientRawResponse if raw=true
-        :rtype:
-         list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineImageResource]
-         or ~msrest.pipeline.ClientRawResponse
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        # Construct URL
-        url = self.list_skus.metadata['url']
-        path_format_arguments = {
-            'location': self._serialize.url("location", location, 'str'),
-            'publisherName': self._serialize.url("publisher_name", publisher_name, 'str'),
-            'offer': self._serialize.url("offer", offer, '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 = {}
-        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 and send request
-        request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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('[VirtualMachineImageResource]', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-    list_skus.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmimage/offers/{offer}/skus'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_run_commands_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_run_commands_operations.py
deleted file mode 100644
index 9d04988797f7..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_run_commands_operations.py
+++ /dev/null
@@ -1,168 +0,0 @@
-# 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 .. import models
-
-
-class VirtualMachineRunCommandsOperations(object):
-    """VirtualMachineRunCommandsOperations 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-04-01".
-    """
-
-    models = models
-
-    def __init__(self, client, config, serializer, deserializer):
-
-        self._client = client
-        self._serialize = serializer
-        self._deserialize = deserializer
-        self.api_version = "2018-04-01"
-
-        self.config = config
-
-    def list(
-            self, location, custom_headers=None, raw=False, **operation_config):
-        """Lists all available run commands for a subscription in a location.
-
-        :param location: The location upon which run commands is queried.
-        :type location: 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 RunCommandDocumentBase
-        :rtype:
-         ~azure.mgmt.compute.v2018_04_01.models.RunCommandDocumentBasePaged[~azure.mgmt.compute.v2018_04_01.models.RunCommandDocumentBase]
-        :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 = {
-                    'location': self._serialize.url("location", location, 'str', pattern=r'^[-\w\._]+$'),
-                    '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['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 and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, 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.RunCommandDocumentBasePaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.RunCommandDocumentBasePaged(internal_paging, self._deserialize.dependencies, header_dict)
-            return client_raw_response
-
-        return deserialized
-    list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/runCommands'}
-
-    def get(
-            self, location, command_id, custom_headers=None, raw=False, **operation_config):
-        """Gets specific run command for a subscription in a location.
-
-        :param location: The location upon which run commands is queried.
-        :type location: str
-        :param command_id: The command id.
-        :type command_id: 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: RunCommandDocument or ClientRawResponse if raw=true
-        :rtype: ~azure.mgmt.compute.v2018_04_01.models.RunCommandDocument or
-         ~msrest.pipeline.ClientRawResponse
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        # Construct URL
-        url = self.get.metadata['url']
-        path_format_arguments = {
-            'location': self._serialize.url("location", location, 'str', pattern=r'^[-\w\._]+$'),
-            'commandId': self._serialize.url("command_id", command_id, '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 = {}
-        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 and send request
-        request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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('RunCommandDocument', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-    get.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/runCommands/{commandId}'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_extensions_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_extensions_operations.py
deleted file mode 100644
index 5d5476f92263..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_extensions_operations.py
+++ /dev/null
@@ -1,379 +0,0 @@
-# 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 VirtualMachineScaleSetExtensionsOperations(object):
-    """VirtualMachineScaleSetExtensionsOperations 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-04-01".
-    """
-
-    models = models
-
-    def __init__(self, client, config, serializer, deserializer):
-
-        self._client = client
-        self._serialize = serializer
-        self._deserialize = deserializer
-        self.api_version = "2018-04-01"
-
-        self.config = config
-
-
-    def _create_or_update_initial(
-            self, resource_group_name, vm_scale_set_name, vmss_extension_name, extension_parameters, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.create_or_update.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'),
-            'vmssExtensionName': self._serialize.url("vmss_extension_name", vmss_extension_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 = {}
-        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(extension_parameters, 'VirtualMachineScaleSetExtension')
-
-        # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
-
-        if response.status_code not in [200, 201]:
-            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('VirtualMachineScaleSetExtension', response)
-        if response.status_code == 201:
-            deserialized = self._deserialize('VirtualMachineScaleSetExtension', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-
-    def create_or_update(
-            self, resource_group_name, vm_scale_set_name, vmss_extension_name, extension_parameters, custom_headers=None, raw=False, polling=True, **operation_config):
-        """The operation to create or update an extension.
-
-        :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 where the
-         extension should be create or updated.
-        :type vm_scale_set_name: str
-        :param vmss_extension_name: The name of the VM scale set extension.
-        :type vmss_extension_name: str
-        :param extension_parameters: Parameters supplied to the Create VM
-         scale set Extension operation.
-        :type extension_parameters:
-         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtension
-        :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
-         VirtualMachineScaleSetExtension or
-         ClientRawResponse<VirtualMachineScaleSetExtension> if raw==True
-        :rtype:
-         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtension]
-         or
-         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtension]]
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        raw_result = self._create_or_update_initial(
-            resource_group_name=resource_group_name,
-            vm_scale_set_name=vm_scale_set_name,
-            vmss_extension_name=vmss_extension_name,
-            extension_parameters=extension_parameters,
-            custom_headers=custom_headers,
-            raw=True,
-            **operation_config
-        )
-
-        def get_long_running_output(response):
-            deserialized = self._deserialize('VirtualMachineScaleSetExtension', 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/virtualMachineScaleSets/{vmScaleSetName}/extensions/{vmssExtensionName}'}
-
-
-    def _delete_initial(
-            self, resource_group_name, vm_scale_set_name, vmss_extension_name, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.delete.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'),
-            'vmssExtensionName': self._serialize.url("vmss_extension_name", vmss_extension_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 = {}
-        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 and send request
-        request = self._client.delete(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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, vm_scale_set_name, vmss_extension_name, custom_headers=None, raw=False, polling=True, **operation_config):
-        """The operation to delete the extension.
-
-        :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 where the
-         extension should be deleted.
-        :type vm_scale_set_name: str
-        :param vmss_extension_name: The name of the VM scale set extension.
-        :type vmss_extension_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,
-            vm_scale_set_name=vm_scale_set_name,
-            vmss_extension_name=vmss_extension_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/virtualMachineScaleSets/{vmScaleSetName}/extensions/{vmssExtensionName}'}
-
-    def get(
-            self, resource_group_name, vm_scale_set_name, vmss_extension_name, expand=None, custom_headers=None, raw=False, **operation_config):
-        """The operation to get the extension.
-
-        :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 containing the
-         extension.
-        :type vm_scale_set_name: str
-        :param vmss_extension_name: The name of the VM scale set extension.
-        :type vmss_extension_name: str
-        :param expand: The expand expression to apply on the operation.
-        :type expand: 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: VirtualMachineScaleSetExtension or ClientRawResponse if
-         raw=true
-        :rtype:
-         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtension
-         or ~msrest.pipeline.ClientRawResponse
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        # Construct URL
-        url = self.get.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'),
-            'vmssExtensionName': self._serialize.url("vmss_extension_name", vmss_extension_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 = {}
-        if expand is not None:
-            query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
-        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
-
-        # Construct headers
-        header_parameters = {}
-        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 and send request
-        request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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('VirtualMachineScaleSetExtension', 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/virtualMachineScaleSets/{vmScaleSetName}/extensions/{vmssExtensionName}'}
-
-    def list(
-            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
-        """Gets a list of all extensions in a VM scale set.
-
-        :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 containing the
-         extension.
-        :type vm_scale_set_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 VirtualMachineScaleSetExtension
-        :rtype:
-         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtensionPaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtension]
-        :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 = {
-                    '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')
-
-            else:
-                url = next_link
-                query_parameters = {}
-
-            # Construct headers
-            header_parameters = {}
-            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 and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, 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.VirtualMachineScaleSetExtensionPaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.VirtualMachineScaleSetExtensionPaged(internal_paging, self._deserialize.dependencies, header_dict)
-            return client_raw_response
-
-        return deserialized
-    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/extensions'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_rolling_upgrades_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_rolling_upgrades_operations.py
deleted file mode 100644
index 81ffdda5f87e..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_rolling_upgrades_operations.py
+++ /dev/null
@@ -1,267 +0,0 @@
-# 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 VirtualMachineScaleSetRollingUpgradesOperations(object):
-    """VirtualMachineScaleSetRollingUpgradesOperations 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-04-01".
-    """
-
-    models = models
-
-    def __init__(self, client, config, serializer, deserializer):
-
-        self._client = client
-        self._serialize = serializer
-        self._deserialize = deserializer
-        self.api_version = "2018-04-01"
-
-        self.config = config
-
-
-    def _cancel_initial(
-            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.cancel.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 = {}
-        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 and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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 cancel(
-            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Cancels the current virtual machine scale set rolling upgrade.
-
-        :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._cancel_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)
-    cancel.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/rollingUpgrades/cancel'}
-
-
-    def _start_os_upgrade_initial(
-            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.start_os_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 = {}
-        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 and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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_os_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 virtual machine scale set
-        instances to the latest available Platform Image OS version. Instances
-        which are already running the latest available OS version 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_os_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_os_upgrade.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/osRollingUpgrade'}
-
-    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
-        upgrade.
-
-        :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: returns the direct response alongside the
-         deserialized response
-        :param operation_config: :ref:`Operation configuration
-         overrides<msrest:optionsforoperations>`.
-        :return: RollingUpgradeStatusInfo or ClientRawResponse if raw=true
-        :rtype:
-         ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeStatusInfo or
-         ~msrest.pipeline.ClientRawResponse
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        # Construct URL
-        url = self.get_latest.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 = {}
-        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 and send request
-        request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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('RollingUpgradeStatusInfo', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-    get_latest.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/rollingUpgrades/latest'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_vms_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_vms_operations.py
deleted file mode 100644
index 8ebd8a2fd266..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_vms_operations.py
+++ /dev/null
@@ -1,1131 +0,0 @@
-# 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 VirtualMachineScaleSetVMsOperations(object):
-    """VirtualMachineScaleSetVMsOperations 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-04-01".
-    """
-
-    models = models
-
-    def __init__(self, client, config, serializer, deserializer):
-
-        self._client = client
-        self._serialize = serializer
-        self._deserialize = deserializer
-        self.api_version = "2018-04-01"
-
-        self.config = config
-
-
-    def _reimage_initial(
-            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.reimage.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'),
-            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
-        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 and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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 reimage(
-            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Reimages (upgrade the operating system) a specific virtual machine in a
-        VM scale set.
-
-        :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 instance_id: The instance ID of the virtual machine.
-        :type instance_id: 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._reimage_initial(
-            resource_group_name=resource_group_name,
-            vm_scale_set_name=vm_scale_set_name,
-            instance_id=instance_id,
-            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)
-    reimage.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/reimage'}
-
-
-    def _reimage_all_initial(
-            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.reimage_all.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'),
-            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
-        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 and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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 reimage_all(
-            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Allows you to re-image all the disks ( including data disks ) in the a
-        VM scale set instance. This operation is only supported for managed
-        disks.
-
-        :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 instance_id: The instance ID of the virtual machine.
-        :type instance_id: 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._reimage_all_initial(
-            resource_group_name=resource_group_name,
-            vm_scale_set_name=vm_scale_set_name,
-            instance_id=instance_id,
-            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)
-    reimage_all.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/reimageall'}
-
-
-    def _deallocate_initial(
-            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.deallocate.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'),
-            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
-        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 and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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 deallocate(
-            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Deallocates a specific virtual machine in a VM scale set. Shuts down
-        the virtual machine and releases the compute resources it uses. You are
-        not billed for the compute resources of this virtual machine once it is
-        deallocated.
-
-        :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 instance_id: The instance ID of the virtual machine.
-        :type instance_id: 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._deallocate_initial(
-            resource_group_name=resource_group_name,
-            vm_scale_set_name=vm_scale_set_name,
-            instance_id=instance_id,
-            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)
-    deallocate.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/deallocate'}
-
-
-    def _update_initial(
-            self, resource_group_name, vm_scale_set_name, instance_id, parameters, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.update.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'),
-            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
-        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(parameters, 'VirtualMachineScaleSetVM')
-
-        # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, 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('VirtualMachineScaleSetVM', response)
-        if response.status_code == 202:
-            deserialized = self._deserialize('VirtualMachineScaleSetVM', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-
-    def update(
-            self, resource_group_name, vm_scale_set_name, instance_id, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Updates a virtual machine of a VM scale set.
-
-        :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 where the
-         extension should be create or updated.
-        :type vm_scale_set_name: str
-        :param instance_id: The instance ID of the virtual machine.
-        :type instance_id: str
-        :param parameters: Parameters supplied to the Update Virtual Machine
-         Scale Sets VM operation.
-        :type parameters:
-         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVM
-        :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
-         VirtualMachineScaleSetVM or
-         ClientRawResponse<VirtualMachineScaleSetVM> if raw==True
-        :rtype:
-         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVM]
-         or
-         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVM]]
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        raw_result = self._update_initial(
-            resource_group_name=resource_group_name,
-            vm_scale_set_name=vm_scale_set_name,
-            instance_id=instance_id,
-            parameters=parameters,
-            custom_headers=custom_headers,
-            raw=True,
-            **operation_config
-        )
-
-        def get_long_running_output(response):
-            deserialized = self._deserialize('VirtualMachineScaleSetVM', 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/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}'}
-
-
-    def _delete_initial(
-            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.delete.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'),
-            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
-        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 and send request
-        request = self._client.delete(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Deletes a virtual machine from a VM scale set.
-
-        :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 instance_id: The instance ID of the virtual machine.
-        :type instance_id: 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,
-            vm_scale_set_name=vm_scale_set_name,
-            instance_id=instance_id,
-            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/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}'}
-
-    def get(
-            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
-        """Gets a virtual machine from a VM scale set.
-
-        :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 instance_id: The instance ID of the virtual machine.
-        :type instance_id: 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: VirtualMachineScaleSetVM or ClientRawResponse if raw=true
-        :rtype:
-         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVM or
-         ~msrest.pipeline.ClientRawResponse
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        # Construct URL
-        url = self.get.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'),
-            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
-        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 and send request
-        request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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('VirtualMachineScaleSetVM', 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/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}'}
-
-    def get_instance_view(
-            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
-        """Gets the status of a virtual machine from a VM scale set.
-
-        :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 instance_id: The instance ID of the virtual machine.
-        :type instance_id: 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: VirtualMachineScaleSetVMInstanceView or ClientRawResponse if
-         raw=true
-        :rtype:
-         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVMInstanceView
-         or ~msrest.pipeline.ClientRawResponse
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        # Construct URL
-        url = self.get_instance_view.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'),
-            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
-        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 and send request
-        request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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('VirtualMachineScaleSetVMInstanceView', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-    get_instance_view.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/instanceView'}
-
-    def list(
-            self, resource_group_name, virtual_machine_scale_set_name, filter=None, select=None, expand=None, custom_headers=None, raw=False, **operation_config):
-        """Gets a list of all virtual machines in a VM scale sets.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param virtual_machine_scale_set_name: The name of the VM scale set.
-        :type virtual_machine_scale_set_name: str
-        :param filter: The filter to apply to the operation.
-        :type filter: str
-        :param select: The list parameters.
-        :type select: str
-        :param expand: The expand expression to apply to the operation.
-        :type expand: 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 VirtualMachineScaleSetVM
-        :rtype:
-         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVMPaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVM]
-        :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 = {
-                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-                    'virtualMachineScaleSetName': self._serialize.url("virtual_machine_scale_set_name", virtual_machine_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 = {}
-                if filter is not None:
-                    query_parameters['$filter'] = self._serialize.query("filter", filter, 'str')
-                if select is not None:
-                    query_parameters['$select'] = self._serialize.query("select", select, 'str')
-                if expand is not None:
-                    query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
-                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['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 and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, 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.VirtualMachineScaleSetVMPaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.VirtualMachineScaleSetVMPaged(internal_paging, self._deserialize.dependencies, header_dict)
-            return client_raw_response
-
-        return deserialized
-    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{virtualMachineScaleSetName}/virtualMachines'}
-
-
-    def _power_off_initial(
-            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.power_off.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'),
-            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
-        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 and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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 power_off(
-            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Power off (stop) a virtual machine in a VM scale set. Note that
-        resources are still attached and you are getting charged for the
-        resources. Instead, use deallocate to release resources and avoid
-        charges.
-
-        :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 instance_id: The instance ID of the virtual machine.
-        :type instance_id: 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._power_off_initial(
-            resource_group_name=resource_group_name,
-            vm_scale_set_name=vm_scale_set_name,
-            instance_id=instance_id,
-            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)
-    power_off.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/poweroff'}
-
-
-    def _restart_initial(
-            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.restart.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'),
-            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
-        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 and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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 restart(
-            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Restarts a virtual machine in a VM scale set.
-
-        :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 instance_id: The instance ID of the virtual machine.
-        :type instance_id: 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._restart_initial(
-            resource_group_name=resource_group_name,
-            vm_scale_set_name=vm_scale_set_name,
-            instance_id=instance_id,
-            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)
-    restart.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/restart'}
-
-
-    def _start_initial(
-            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.start.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'),
-            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
-        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 and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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(
-            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Starts a virtual machine in a VM scale set.
-
-        :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 instance_id: The instance ID of the virtual machine.
-        :type instance_id: 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_initial(
-            resource_group_name=resource_group_name,
-            vm_scale_set_name=vm_scale_set_name,
-            instance_id=instance_id,
-            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.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/start'}
-
-
-    def _redeploy_initial(
-            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.redeploy.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'),
-            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
-        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 and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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 redeploy(
-            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Redeploys a virtual machine in a VM scale set.
-
-        :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 instance_id: The instance ID of the virtual machine.
-        :type instance_id: 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._redeploy_initial(
-            resource_group_name=resource_group_name,
-            vm_scale_set_name=vm_scale_set_name,
-            instance_id=instance_id,
-            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)
-    redeploy.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/redeploy'}
-
-
-    def _perform_maintenance_initial(
-            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.perform_maintenance.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'),
-            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
-        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 and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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 perform_maintenance(
-            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Performs maintenance on a virtual machine in a VM scale set.
-
-        :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 instance_id: The instance ID of the virtual machine.
-        :type instance_id: 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._perform_maintenance_initial(
-            resource_group_name=resource_group_name,
-            vm_scale_set_name=vm_scale_set_name,
-            instance_id=instance_id,
-            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)
-    perform_maintenance.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/performMaintenance'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_sets_operations.py
deleted file mode 100644
index 0b8f451521c5..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_sets_operations.py
+++ /dev/null
@@ -1,1762 +0,0 @@
-# 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 VirtualMachineScaleSetsOperations(object):
-    """VirtualMachineScaleSetsOperations 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-04-01".
-    """
-
-    models = models
-
-    def __init__(self, client, config, serializer, deserializer):
-
-        self._client = client
-        self._serialize = serializer
-        self._deserialize = deserializer
-        self.api_version = "2018-04-01"
-
-        self.config = config
-
-
-    def _create_or_update_initial(
-            self, resource_group_name, vm_scale_set_name, parameters, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.create_or_update.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 = {}
-        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(parameters, 'VirtualMachineScaleSet')
-
-        # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
-
-        if response.status_code not in [200, 201]:
-            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('VirtualMachineScaleSet', response)
-        if response.status_code == 201:
-            deserialized = self._deserialize('VirtualMachineScaleSet', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-
-    def create_or_update(
-            self, resource_group_name, vm_scale_set_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Create or update a VM scale set.
-
-        :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 to create or
-         update.
-        :type vm_scale_set_name: str
-        :param parameters: The scale set object.
-        :type parameters:
-         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSet
-        :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 VirtualMachineScaleSet
-         or ClientRawResponse<VirtualMachineScaleSet> if raw==True
-        :rtype:
-         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSet]
-         or
-         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSet]]
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        raw_result = self._create_or_update_initial(
-            resource_group_name=resource_group_name,
-            vm_scale_set_name=vm_scale_set_name,
-            parameters=parameters,
-            custom_headers=custom_headers,
-            raw=True,
-            **operation_config
-        )
-
-        def get_long_running_output(response):
-            deserialized = self._deserialize('VirtualMachineScaleSet', 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/virtualMachineScaleSets/{vmScaleSetName}'}
-
-
-    def _update_initial(
-            self, resource_group_name, vm_scale_set_name, parameters, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.update.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 = {}
-        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(parameters, 'VirtualMachineScaleSetUpdate')
-
-        # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, 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('VirtualMachineScaleSet', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-
-    def update(
-            self, resource_group_name, vm_scale_set_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Update a VM scale set.
-
-        :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 to create or
-         update.
-        :type vm_scale_set_name: str
-        :param parameters: The scale set object.
-        :type parameters:
-         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdate
-        :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 VirtualMachineScaleSet
-         or ClientRawResponse<VirtualMachineScaleSet> if raw==True
-        :rtype:
-         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSet]
-         or
-         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSet]]
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        raw_result = self._update_initial(
-            resource_group_name=resource_group_name,
-            vm_scale_set_name=vm_scale_set_name,
-            parameters=parameters,
-            custom_headers=custom_headers,
-            raw=True,
-            **operation_config
-        )
-
-        def get_long_running_output(response):
-            deserialized = self._deserialize('VirtualMachineScaleSet', 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/virtualMachineScaleSets/{vmScaleSetName}'}
-
-
-    def _delete_initial(
-            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.delete.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 = {}
-        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 and send request
-        request = self._client.delete(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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, vm_scale_set_name, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Deletes a VM scale set.
-
-        :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._delete_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)
-    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}'}
-
-    def get(
-            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
-        """Display information about a virtual machine scale set.
-
-        :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: returns the direct response alongside the
-         deserialized response
-        :param operation_config: :ref:`Operation configuration
-         overrides<msrest:optionsforoperations>`.
-        :return: VirtualMachineScaleSet or ClientRawResponse if raw=true
-        :rtype: ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSet
-         or ~msrest.pipeline.ClientRawResponse
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        # Construct URL
-        url = self.get.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 = {}
-        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 and send request
-        request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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('VirtualMachineScaleSet', 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/virtualMachineScaleSets/{vmScaleSetName}'}
-
-
-    def _deallocate_initial(
-            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
-        vm_instance_ids = None
-        if instance_ids is not None:
-            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
-
-        # Construct URL
-        url = self.deallocate.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 = {}
-        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
-        if vm_instance_ids is not None:
-            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
-        else:
-            body_content = None
-
-        # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, 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 deallocate(
-            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Deallocates specific virtual machines in a VM scale set. Shuts down the
-        virtual machines and releases the compute resources. You are not billed
-        for the compute resources that this virtual machine scale set
-        deallocates.
-
-        :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 instance_ids: The virtual machine scale set instance ids.
-         Omitting the virtual machine scale set instance ids will result in the
-         operation being performed on all virtual machines in the virtual
-         machine scale set.
-        :type instance_ids: list[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._deallocate_initial(
-            resource_group_name=resource_group_name,
-            vm_scale_set_name=vm_scale_set_name,
-            instance_ids=instance_ids,
-            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)
-    deallocate.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/deallocate'}
-
-
-    def _delete_instances_initial(
-            self, resource_group_name, vm_scale_set_name, instance_ids, custom_headers=None, raw=False, **operation_config):
-        vm_instance_ids = models.VirtualMachineScaleSetVMInstanceRequiredIDs(instance_ids=instance_ids)
-
-        # Construct URL
-        url = self.delete_instances.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 = {}
-        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(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceRequiredIDs')
-
-        # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, 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 delete_instances(
-            self, resource_group_name, vm_scale_set_name, instance_ids, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Deletes virtual machines in a VM scale set.
-
-        :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 instance_ids: The virtual machine scale set instance ids.
-        :type instance_ids: list[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_instances_initial(
-            resource_group_name=resource_group_name,
-            vm_scale_set_name=vm_scale_set_name,
-            instance_ids=instance_ids,
-            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_instances.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/delete'}
-
-    def get_instance_view(
-            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
-        """Gets the status of a VM scale set instance.
-
-        :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: returns the direct response alongside the
-         deserialized response
-        :param operation_config: :ref:`Operation configuration
-         overrides<msrest:optionsforoperations>`.
-        :return: VirtualMachineScaleSetInstanceView or ClientRawResponse if
-         raw=true
-        :rtype:
-         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetInstanceView
-         or ~msrest.pipeline.ClientRawResponse
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        # Construct URL
-        url = self.get_instance_view.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 = {}
-        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 and send request
-        request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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('VirtualMachineScaleSetInstanceView', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-    get_instance_view.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/instanceView'}
-
-    def list(
-            self, resource_group_name, custom_headers=None, raw=False, **operation_config):
-        """Gets a list of all VM scale sets 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 VirtualMachineScaleSet
-        :rtype:
-         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetPaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSet]
-        :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 = {
-                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_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')
-
-            else:
-                url = next_link
-                query_parameters = {}
-
-            # Construct headers
-            header_parameters = {}
-            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 and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, 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.VirtualMachineScaleSetPaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.VirtualMachineScaleSetPaged(internal_paging, self._deserialize.dependencies, header_dict)
-            return client_raw_response
-
-        return deserialized
-    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets'}
-
-    def list_all(
-            self, custom_headers=None, raw=False, **operation_config):
-        """Gets a list of all VM Scale Sets in the subscription, regardless of the
-        associated resource group. Use nextLink property in the response to get
-        the next page of VM Scale Sets. Do this till nextLink is null to fetch
-        all the VM Scale Sets.
-
-        :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 VirtualMachineScaleSet
-        :rtype:
-         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetPaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSet]
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        def internal_paging(next_link=None, raw=False):
-
-            if not next_link:
-                # Construct URL
-                url = self.list_all.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['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 and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, 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.VirtualMachineScaleSetPaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.VirtualMachineScaleSetPaged(internal_paging, self._deserialize.dependencies, header_dict)
-            return client_raw_response
-
-        return deserialized
-    list_all.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/virtualMachineScaleSets'}
-
-    def list_skus(
-            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
-        """Gets a list of SKUs available for your VM scale set, including the
-        minimum and maximum VM instances allowed for each SKU.
-
-        :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: returns the direct response alongside the
-         deserialized response
-        :param operation_config: :ref:`Operation configuration
-         overrides<msrest:optionsforoperations>`.
-        :return: An iterator like instance of VirtualMachineScaleSetSku
-        :rtype:
-         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetSkuPaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetSku]
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        def internal_paging(next_link=None, raw=False):
-
-            if not next_link:
-                # Construct URL
-                url = self.list_skus.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')
-
-            else:
-                url = next_link
-                query_parameters = {}
-
-            # Construct headers
-            header_parameters = {}
-            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 and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, 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.VirtualMachineScaleSetSkuPaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.VirtualMachineScaleSetSkuPaged(internal_paging, self._deserialize.dependencies, header_dict)
-            return client_raw_response
-
-        return deserialized
-    list_skus.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/skus'}
-
-    def get_os_upgrade_history(
-            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
-        """Gets list of OS upgrades on a VM scale set instance.
-
-        :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: returns the direct response alongside the
-         deserialized response
-        :param operation_config: :ref:`Operation configuration
-         overrides<msrest:optionsforoperations>`.
-        :return: An iterator like instance of
-         UpgradeOperationHistoricalStatusInfo
-        :rtype:
-         ~azure.mgmt.compute.v2018_04_01.models.UpgradeOperationHistoricalStatusInfoPaged[~azure.mgmt.compute.v2018_04_01.models.UpgradeOperationHistoricalStatusInfo]
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        def internal_paging(next_link=None, raw=False):
-
-            if not next_link:
-                # Construct URL
-                url = self.get_os_upgrade_history.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')
-
-            else:
-                url = next_link
-                query_parameters = {}
-
-            # Construct headers
-            header_parameters = {}
-            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 and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, 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.UpgradeOperationHistoricalStatusInfoPaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.UpgradeOperationHistoricalStatusInfoPaged(internal_paging, self._deserialize.dependencies, header_dict)
-            return client_raw_response
-
-        return deserialized
-    get_os_upgrade_history.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/osUpgradeHistory'}
-
-
-    def _power_off_initial(
-            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
-        vm_instance_ids = None
-        if instance_ids is not None:
-            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
-
-        # Construct URL
-        url = self.power_off.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 = {}
-        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
-        if vm_instance_ids is not None:
-            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
-        else:
-            body_content = None
-
-        # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, 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 power_off(
-            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Power off (stop) one or more virtual machines in a VM scale set. Note
-        that resources are still attached and you are getting charged for the
-        resources. Instead, use deallocate to release resources and avoid
-        charges.
-
-        :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 instance_ids: The virtual machine scale set instance ids.
-         Omitting the virtual machine scale set instance ids will result in the
-         operation being performed on all virtual machines in the virtual
-         machine scale set.
-        :type instance_ids: list[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._power_off_initial(
-            resource_group_name=resource_group_name,
-            vm_scale_set_name=vm_scale_set_name,
-            instance_ids=instance_ids,
-            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)
-    power_off.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/poweroff'}
-
-
-    def _restart_initial(
-            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
-        vm_instance_ids = None
-        if instance_ids is not None:
-            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
-
-        # Construct URL
-        url = self.restart.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 = {}
-        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
-        if vm_instance_ids is not None:
-            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
-        else:
-            body_content = None
-
-        # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, 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 restart(
-            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Restarts one or more virtual machines in a VM scale set.
-
-        :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 instance_ids: The virtual machine scale set instance ids.
-         Omitting the virtual machine scale set instance ids will result in the
-         operation being performed on all virtual machines in the virtual
-         machine scale set.
-        :type instance_ids: list[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._restart_initial(
-            resource_group_name=resource_group_name,
-            vm_scale_set_name=vm_scale_set_name,
-            instance_ids=instance_ids,
-            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)
-    restart.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/restart'}
-
-
-    def _start_initial(
-            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
-        vm_instance_ids = None
-        if instance_ids is not None:
-            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
-
-        # Construct URL
-        url = self.start.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 = {}
-        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
-        if vm_instance_ids is not None:
-            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
-        else:
-            body_content = None
-
-        # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, 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(
-            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Starts one or more virtual machines in a VM scale set.
-
-        :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 instance_ids: The virtual machine scale set instance ids.
-         Omitting the virtual machine scale set instance ids will result in the
-         operation being performed on all virtual machines in the virtual
-         machine scale set.
-        :type instance_ids: list[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_initial(
-            resource_group_name=resource_group_name,
-            vm_scale_set_name=vm_scale_set_name,
-            instance_ids=instance_ids,
-            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.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/start'}
-
-
-    def _redeploy_initial(
-            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
-        vm_instance_ids = None
-        if instance_ids is not None:
-            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
-
-        # Construct URL
-        url = self.redeploy.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 = {}
-        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
-        if vm_instance_ids is not None:
-            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
-        else:
-            body_content = None
-
-        # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, 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 redeploy(
-            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Redeploy one or more virtual machines in a VM scale set.
-
-        :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 instance_ids: The virtual machine scale set instance ids.
-         Omitting the virtual machine scale set instance ids will result in the
-         operation being performed on all virtual machines in the virtual
-         machine scale set.
-        :type instance_ids: list[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._redeploy_initial(
-            resource_group_name=resource_group_name,
-            vm_scale_set_name=vm_scale_set_name,
-            instance_ids=instance_ids,
-            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)
-    redeploy.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/redeploy'}
-
-
-    def _perform_maintenance_initial(
-            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
-        vm_instance_ids = None
-        if instance_ids is not None:
-            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
-
-        # Construct URL
-        url = self.perform_maintenance.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 = {}
-        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
-        if vm_instance_ids is not None:
-            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
-        else:
-            body_content = None
-
-        # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, 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 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.
-
-        :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 instance_ids: The virtual machine scale set instance ids.
-         Omitting the virtual machine scale set instance ids will result in the
-         operation being performed on all virtual machines in the virtual
-         machine scale set.
-        :type instance_ids: list[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._perform_maintenance_initial(
-            resource_group_name=resource_group_name,
-            vm_scale_set_name=vm_scale_set_name,
-            instance_ids=instance_ids,
-            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)
-    perform_maintenance.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/performMaintenance'}
-
-
-    def _update_instances_initial(
-            self, resource_group_name, vm_scale_set_name, instance_ids, custom_headers=None, raw=False, **operation_config):
-        vm_instance_ids = models.VirtualMachineScaleSetVMInstanceRequiredIDs(instance_ids=instance_ids)
-
-        # Construct URL
-        url = self.update_instances.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 = {}
-        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(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceRequiredIDs')
-
-        # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, 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 update_instances(
-            self, resource_group_name, vm_scale_set_name, instance_ids, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Upgrades one or more virtual machines to the latest SKU set in the VM
-        scale set model.
-
-        :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 instance_ids: The virtual machine scale set instance ids.
-        :type instance_ids: list[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._update_instances_initial(
-            resource_group_name=resource_group_name,
-            vm_scale_set_name=vm_scale_set_name,
-            instance_ids=instance_ids,
-            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)
-    update_instances.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/manualupgrade'}
-
-
-    def _reimage_initial(
-            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
-        vm_instance_ids = None
-        if instance_ids is not None:
-            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
-
-        # Construct URL
-        url = self.reimage.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 = {}
-        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
-        if vm_instance_ids is not None:
-            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
-        else:
-            body_content = None
-
-        # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, 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 reimage(
-            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Reimages (upgrade the operating system) one or more virtual machines in
-        a VM scale set.
-
-        :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 instance_ids: The virtual machine scale set instance ids.
-         Omitting the virtual machine scale set instance ids will result in the
-         operation being performed on all virtual machines in the virtual
-         machine scale set.
-        :type instance_ids: list[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._reimage_initial(
-            resource_group_name=resource_group_name,
-            vm_scale_set_name=vm_scale_set_name,
-            instance_ids=instance_ids,
-            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)
-    reimage.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/reimage'}
-
-
-    def _reimage_all_initial(
-            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
-        vm_instance_ids = None
-        if instance_ids is not None:
-            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
-
-        # Construct URL
-        url = self.reimage_all.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 = {}
-        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
-        if vm_instance_ids is not None:
-            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
-        else:
-            body_content = None
-
-        # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, 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 reimage_all(
-            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Reimages all the disks ( including data disks ) in the virtual machines
-        in a VM scale set. This operation is only supported for managed disks.
-
-        :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 instance_ids: The virtual machine scale set instance ids.
-         Omitting the virtual machine scale set instance ids will result in the
-         operation being performed on all virtual machines in the virtual
-         machine scale set.
-        :type instance_ids: list[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._reimage_all_initial(
-            resource_group_name=resource_group_name,
-            vm_scale_set_name=vm_scale_set_name,
-            instance_ids=instance_ids,
-            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)
-    reimage_all.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/reimageall'}
-
-    def force_recovery_service_fabric_platform_update_domain_walk(
-            self, resource_group_name, vm_scale_set_name, platform_update_domain, custom_headers=None, raw=False, **operation_config):
-        """Manual platform update domain walk to update virtual machines in a
-        service fabric virtual machine scale set.
-
-        :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 platform_update_domain: The platform update domain for which a
-         manual recovery walk is requested
-        :type platform_update_domain: int
-        :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: RecoveryWalkResponse or ClientRawResponse if raw=true
-        :rtype: ~azure.mgmt.compute.v2018_04_01.models.RecoveryWalkResponse or
-         ~msrest.pipeline.ClientRawResponse
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        # Construct URL
-        url = self.force_recovery_service_fabric_platform_update_domain_walk.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')
-        query_parameters['platformUpdateDomain'] = self._serialize.query("platform_update_domain", platform_update_domain, 'int')
-
-        # Construct headers
-        header_parameters = {}
-        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 and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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('RecoveryWalkResponse', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-    force_recovery_service_fabric_platform_update_domain_walk.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/forceRecoveryServiceFabricPlatformUpdateDomainWalk'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_sizes_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_sizes_operations.py
deleted file mode 100644
index 0eef7f65066c..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_sizes_operations.py
+++ /dev/null
@@ -1,108 +0,0 @@
-# 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 .. import models
-
-
-class VirtualMachineSizesOperations(object):
-    """VirtualMachineSizesOperations 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-04-01".
-    """
-
-    models = models
-
-    def __init__(self, client, config, serializer, deserializer):
-
-        self._client = client
-        self._serialize = serializer
-        self._deserialize = deserializer
-        self.api_version = "2018-04-01"
-
-        self.config = config
-
-    def list(
-            self, location, custom_headers=None, raw=False, **operation_config):
-        """Lists all available virtual machine sizes for a subscription in a
-        location.
-
-        :param location: The location upon which virtual-machine-sizes is
-         queried.
-        :type location: 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 VirtualMachineSize
-        :rtype:
-         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineSizePaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineSize]
-        :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 = {
-                    'location': self._serialize.url("location", location, 'str', pattern=r'^[-\w\._]+$'),
-                    '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['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 and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, 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.VirtualMachineSizePaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.VirtualMachineSizePaged(internal_paging, self._deserialize.dependencies, header_dict)
-            return client_raw_response
-
-        return deserialized
-    list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/vmSizes'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machines_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machines_operations.py
deleted file mode 100644
index 0f0c13d75ea6..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machines_operations.py
+++ /dev/null
@@ -1,1563 +0,0 @@
-# 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 VirtualMachinesOperations(object):
-    """VirtualMachinesOperations 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-04-01".
-    """
-
-    models = models
-
-    def __init__(self, client, config, serializer, deserializer):
-
-        self._client = client
-        self._serialize = serializer
-        self._deserialize = deserializer
-        self.api_version = "2018-04-01"
-
-        self.config = config
-
-    def get_extensions(
-            self, resource_group_name, vm_name, expand=None, custom_headers=None, raw=False, **operation_config):
-        """The operation to get all extensions of a Virtual Machine.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param vm_name: The name of the virtual machine containing the
-         extension.
-        :type vm_name: str
-        :param expand: The expand expression to apply on the operation.
-        :type expand: 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: VirtualMachineExtensionsListResult or ClientRawResponse if
-         raw=true
-        :rtype:
-         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionsListResult
-         or ~msrest.pipeline.ClientRawResponse
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        # Construct URL
-        url = self.get_extensions.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'vmName': self._serialize.url("vm_name", vm_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 = {}
-        if expand is not None:
-            query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
-        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
-
-        # Construct headers
-        header_parameters = {}
-        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 and send request
-        request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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('VirtualMachineExtensionsListResult', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-    get_extensions.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/extensions'}
-
-
-    def _capture_initial(
-            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.capture.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'vmName': self._serialize.url("vm_name", vm_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 = {}
-        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(parameters, 'VirtualMachineCaptureParameters')
-
-        # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, 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('VirtualMachineCaptureResult', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-
-    def capture(
-            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Captures the VM by copying virtual hard disks of the VM and outputs a
-        template that can be used to create similar VMs.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param vm_name: The name of the virtual machine.
-        :type vm_name: str
-        :param parameters: Parameters supplied to the Capture Virtual Machine
-         operation.
-        :type parameters:
-         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineCaptureParameters
-        :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
-         VirtualMachineCaptureResult or
-         ClientRawResponse<VirtualMachineCaptureResult> if raw==True
-        :rtype:
-         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineCaptureResult]
-         or
-         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineCaptureResult]]
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        raw_result = self._capture_initial(
-            resource_group_name=resource_group_name,
-            vm_name=vm_name,
-            parameters=parameters,
-            custom_headers=custom_headers,
-            raw=True,
-            **operation_config
-        )
-
-        def get_long_running_output(response):
-            deserialized = self._deserialize('VirtualMachineCaptureResult', 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)
-    capture.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/capture'}
-
-
-    def _create_or_update_initial(
-            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.create_or_update.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'vmName': self._serialize.url("vm_name", vm_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 = {}
-        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(parameters, 'VirtualMachine')
-
-        # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
-
-        if response.status_code not in [200, 201]:
-            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('VirtualMachine', response)
-        if response.status_code == 201:
-            deserialized = self._deserialize('VirtualMachine', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-
-    def create_or_update(
-            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
-        """The operation to create or update a virtual machine.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param vm_name: The name of the virtual machine.
-        :type vm_name: str
-        :param parameters: Parameters supplied to the Create Virtual Machine
-         operation.
-        :type parameters:
-         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachine
-        :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 VirtualMachine or
-         ClientRawResponse<VirtualMachine> if raw==True
-        :rtype:
-         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.VirtualMachine]
-         or
-         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.VirtualMachine]]
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        raw_result = self._create_or_update_initial(
-            resource_group_name=resource_group_name,
-            vm_name=vm_name,
-            parameters=parameters,
-            custom_headers=custom_headers,
-            raw=True,
-            **operation_config
-        )
-
-        def get_long_running_output(response):
-            deserialized = self._deserialize('VirtualMachine', 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/virtualMachines/{vmName}'}
-
-
-    def _update_initial(
-            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.update.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'vmName': self._serialize.url("vm_name", vm_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 = {}
-        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(parameters, 'VirtualMachineUpdate')
-
-        # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
-
-        if response.status_code not in [200, 201]:
-            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('VirtualMachine', response)
-        if response.status_code == 201:
-            deserialized = self._deserialize('VirtualMachine', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-
-    def update(
-            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
-        """The operation to update a virtual machine.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param vm_name: The name of the virtual machine.
-        :type vm_name: str
-        :param parameters: Parameters supplied to the Update Virtual Machine
-         operation.
-        :type parameters:
-         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineUpdate
-        :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 VirtualMachine or
-         ClientRawResponse<VirtualMachine> if raw==True
-        :rtype:
-         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.VirtualMachine]
-         or
-         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.VirtualMachine]]
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        raw_result = self._update_initial(
-            resource_group_name=resource_group_name,
-            vm_name=vm_name,
-            parameters=parameters,
-            custom_headers=custom_headers,
-            raw=True,
-            **operation_config
-        )
-
-        def get_long_running_output(response):
-            deserialized = self._deserialize('VirtualMachine', 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/virtualMachines/{vmName}'}
-
-
-    def _delete_initial(
-            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.delete.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'vmName': self._serialize.url("vm_name", vm_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 = {}
-        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 and send request
-        request = self._client.delete(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
-        """The operation to delete a virtual machine.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param vm_name: The name of the virtual machine.
-        :type vm_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,
-            vm_name=vm_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/virtualMachines/{vmName}'}
-
-    def get(
-            self, resource_group_name, vm_name, expand=None, custom_headers=None, raw=False, **operation_config):
-        """Retrieves information about the model view or the instance view of a
-        virtual machine.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param vm_name: The name of the virtual machine.
-        :type vm_name: str
-        :param expand: The expand expression to apply on the operation.
-         Possible values include: 'instanceView'
-        :type expand: str or
-         ~azure.mgmt.compute.v2018_04_01.models.InstanceViewTypes
-        :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: VirtualMachine or ClientRawResponse if raw=true
-        :rtype: ~azure.mgmt.compute.v2018_04_01.models.VirtualMachine or
-         ~msrest.pipeline.ClientRawResponse
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        # Construct URL
-        url = self.get.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'vmName': self._serialize.url("vm_name", vm_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 = {}
-        if expand is not None:
-            query_parameters['$expand'] = self._serialize.query("expand", expand, 'InstanceViewTypes')
-        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
-
-        # Construct headers
-        header_parameters = {}
-        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 and send request
-        request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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('VirtualMachine', 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/virtualMachines/{vmName}'}
-
-    def instance_view(
-            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
-        """Retrieves information about the run-time state of a virtual machine.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param vm_name: The name of the virtual machine.
-        :type vm_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: VirtualMachineInstanceView or ClientRawResponse if raw=true
-        :rtype:
-         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineInstanceView or
-         ~msrest.pipeline.ClientRawResponse
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        # Construct URL
-        url = self.instance_view.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'vmName': self._serialize.url("vm_name", vm_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 = {}
-        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 and send request
-        request = self._client.get(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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('VirtualMachineInstanceView', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-    instance_view.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/instanceView'}
-
-
-    def _convert_to_managed_disks_initial(
-            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.convert_to_managed_disks.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'vmName': self._serialize.url("vm_name", vm_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 = {}
-        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 and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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 convert_to_managed_disks(
-            self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Converts virtual machine disks from blob-based to managed disks.
-        Virtual machine must be stop-deallocated before invoking this
-        operation.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param vm_name: The name of the virtual machine.
-        :type vm_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._convert_to_managed_disks_initial(
-            resource_group_name=resource_group_name,
-            vm_name=vm_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)
-    convert_to_managed_disks.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/convertToManagedDisks'}
-
-
-    def _deallocate_initial(
-            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.deallocate.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'vmName': self._serialize.url("vm_name", vm_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 = {}
-        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 and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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 deallocate(
-            self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Shuts down the virtual machine and releases the compute resources. You
-        are not billed for the compute resources that this virtual machine
-        uses.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param vm_name: The name of the virtual machine.
-        :type vm_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._deallocate_initial(
-            resource_group_name=resource_group_name,
-            vm_name=vm_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)
-    deallocate.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/deallocate'}
-
-    def generalize(
-            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
-        """Sets the state of the virtual machine to generalized.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param vm_name: The name of the virtual machine.
-        :type vm_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: None or ClientRawResponse if raw=true
-        :rtype: None or ~msrest.pipeline.ClientRawResponse
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        # Construct URL
-        url = self.generalize.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'vmName': self._serialize.url("vm_name", vm_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 = {}
-        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 and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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
-
-        if raw:
-            client_raw_response = ClientRawResponse(None, response)
-            return client_raw_response
-    generalize.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/generalize'}
-
-    def list(
-            self, resource_group_name, custom_headers=None, raw=False, **operation_config):
-        """Lists all of the virtual machines in the specified resource group. Use
-        the nextLink property in the response to get the next page of virtual
-        machines.
-
-        :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 VirtualMachine
-        :rtype:
-         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachinePaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachine]
-        :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 = {
-                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_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')
-
-            else:
-                url = next_link
-                query_parameters = {}
-
-            # Construct headers
-            header_parameters = {}
-            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 and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, 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.VirtualMachinePaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.VirtualMachinePaged(internal_paging, self._deserialize.dependencies, header_dict)
-            return client_raw_response
-
-        return deserialized
-    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines'}
-
-    def list_all(
-            self, custom_headers=None, raw=False, **operation_config):
-        """Lists all of the virtual machines in the specified subscription. Use
-        the nextLink property in the response to get the next page of virtual
-        machines.
-
-        :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 VirtualMachine
-        :rtype:
-         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachinePaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachine]
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        def internal_paging(next_link=None, raw=False):
-
-            if not next_link:
-                # Construct URL
-                url = self.list_all.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['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 and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, 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.VirtualMachinePaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.VirtualMachinePaged(internal_paging, self._deserialize.dependencies, header_dict)
-            return client_raw_response
-
-        return deserialized
-    list_all.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/virtualMachines'}
-
-    def list_available_sizes(
-            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
-        """Lists all available virtual machine sizes to which the specified
-        virtual machine can be resized.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param vm_name: The name of the virtual machine.
-        :type vm_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 VirtualMachineSize
-        :rtype:
-         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineSizePaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineSize]
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        def internal_paging(next_link=None, raw=False):
-
-            if not next_link:
-                # Construct URL
-                url = self.list_available_sizes.metadata['url']
-                path_format_arguments = {
-                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-                    'vmName': self._serialize.url("vm_name", vm_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')
-
-            else:
-                url = next_link
-                query_parameters = {}
-
-            # Construct headers
-            header_parameters = {}
-            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 and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, 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.VirtualMachineSizePaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.VirtualMachineSizePaged(internal_paging, self._deserialize.dependencies, header_dict)
-            return client_raw_response
-
-        return deserialized
-    list_available_sizes.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/vmSizes'}
-
-
-    def _power_off_initial(
-            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.power_off.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'vmName': self._serialize.url("vm_name", vm_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 = {}
-        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 and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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 power_off(
-            self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
-        """The operation to power off (stop) a virtual machine. The virtual
-        machine can be restarted with the same provisioned resources. You are
-        still charged for this virtual machine.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param vm_name: The name of the virtual machine.
-        :type vm_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._power_off_initial(
-            resource_group_name=resource_group_name,
-            vm_name=vm_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)
-    power_off.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/powerOff'}
-
-
-    def _restart_initial(
-            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.restart.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'vmName': self._serialize.url("vm_name", vm_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 = {}
-        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 and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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 restart(
-            self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
-        """The operation to restart a virtual machine.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param vm_name: The name of the virtual machine.
-        :type vm_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._restart_initial(
-            resource_group_name=resource_group_name,
-            vm_name=vm_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)
-    restart.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/restart'}
-
-
-    def _start_initial(
-            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.start.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'vmName': self._serialize.url("vm_name", vm_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 = {}
-        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 and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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(
-            self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
-        """The operation to start a virtual machine.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param vm_name: The name of the virtual machine.
-        :type vm_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_initial(
-            resource_group_name=resource_group_name,
-            vm_name=vm_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.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/start'}
-
-
-    def _redeploy_initial(
-            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.redeploy.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'vmName': self._serialize.url("vm_name", vm_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 = {}
-        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 and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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 redeploy(
-            self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
-        """The operation to redeploy a virtual machine.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param vm_name: The name of the virtual machine.
-        :type vm_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._redeploy_initial(
-            resource_group_name=resource_group_name,
-            vm_name=vm_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)
-    redeploy.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/redeploy'}
-
-
-    def _perform_maintenance_initial(
-            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.perform_maintenance.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'vmName': self._serialize.url("vm_name", vm_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 = {}
-        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 and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(request, header_parameters, 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 perform_maintenance(
-            self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
-        """The operation to perform maintenance on a virtual machine.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param vm_name: The name of the virtual machine.
-        :type vm_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._perform_maintenance_initial(
-            resource_group_name=resource_group_name,
-            vm_name=vm_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)
-    perform_maintenance.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/performMaintenance'}
-
-
-    def _run_command_initial(
-            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, **operation_config):
-        # Construct URL
-        url = self.run_command.metadata['url']
-        path_format_arguments = {
-            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
-            'vmName': self._serialize.url("vm_name", vm_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 = {}
-        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(parameters, 'RunCommandInput')
-
-        # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, 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('[InstanceViewStatus]', response)
-
-        if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
-            return client_raw_response
-
-        return deserialized
-
-    def run_command(
-            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
-        """Run command on the VM.
-
-        :param resource_group_name: The name of the resource group.
-        :type resource_group_name: str
-        :param vm_name: The name of the virtual machine.
-        :type vm_name: str
-        :param parameters: Parameters supplied to the Run command operation.
-        :type parameters:
-         ~azure.mgmt.compute.v2018_04_01.models.RunCommandInput
-        :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 list or
-         ClientRawResponse<list> if raw==True
-        :rtype:
-         ~msrestazure.azure_operation.AzureOperationPoller[list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]]
-         or
-         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]]]
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
-        """
-        raw_result = self._run_command_initial(
-            resource_group_name=resource_group_name,
-            vm_name=vm_name,
-            parameters=parameters,
-            custom_headers=custom_headers,
-            raw=True,
-            **operation_config
-        )
-
-        def get_long_running_output(response):
-            deserialized = self._deserialize('[InstanceViewStatus]', 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)
-    run_command.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/runCommand'}

From 9c49b8d9f582b97704dcf04dfead4e59486ba254 Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Mon, 4 Jun 2018 20:09:36 +0000
Subject: [PATCH 10/29] Rebuild by
 https://github.com/Azure/azure-sdk-for-python/pull/2487

---
 .../mgmt/compute/compute_management_client.py |   45 +
 .../v2018_04_01/compute_management_client.py  |   75 +
 .../compute/v2018_04_01/models/__init__.py    |  450 ++++-
 .../models/additional_unattend_content.py     |   52 +
 .../models/additional_unattend_content_py3.py |   52 +
 .../models/api_entity_reference.py            |   29 +
 .../models/api_entity_reference_py3.py        |   29 +
 .../compute/v2018_04_01/models/api_error.py   |   44 +
 .../v2018_04_01/models/api_error_base.py      |   36 +
 .../v2018_04_01/models/api_error_base_py3.py  |   36 +
 .../v2018_04_01/models/api_error_py3.py       |   44 +
 .../models/auto_os_upgrade_policy.py          |   29 +
 .../models/auto_os_upgrade_policy_py3.py      |   29 +
 .../v2018_04_01/models/availability_set.py    |   85 +
 .../models/availability_set_paged.py          |   27 +
 .../models/availability_set_py3.py            |   85 +
 .../models/availability_set_update.py         |   58 +
 .../models/availability_set_update_py3.py     |   58 +
 .../v2018_04_01/models/boot_diagnostics.py    |   38 +
 .../models/boot_diagnostics_instance_view.py  |   32 +
 .../boot_diagnostics_instance_view_py3.py     |   32 +
 .../models/boot_diagnostics_py3.py            |   38 +
 .../models/compute_management_client_enums.py |  314 ++-
 .../models/compute_operation_value.py         |   60 +
 .../models/compute_operation_value_paged.py   |   27 +
 .../models/compute_operation_value_py3.py     |   60 +
 .../compute/v2018_04_01/models/data_disk.py   |   87 +
 .../v2018_04_01/models/data_disk_image.py     |   37 +
 .../v2018_04_01/models/data_disk_image_py3.py |   37 +
 .../v2018_04_01/models/data_disk_py3.py       |   87 +
 .../v2018_04_01/models/diagnostics_profile.py |   34 +
 .../models/diagnostics_profile_py3.py         |   34 +
 .../models/disk_encryption_settings.py        |   41 +
 .../models/disk_encryption_settings_py3.py    |   41 +
 .../v2018_04_01/models/disk_instance_view.py  |   39 +
 .../models/disk_instance_view_py3.py          |   39 +
 .../compute/v2018_04_01/models/disk_update.py |   18 +-
 .../v2018_04_01/models/disk_update_py3.py     |   22 +-
 .../v2018_04_01/models/hardware_profile.py    |   85 +
 .../models/hardware_profile_py3.py            |   85 +
 .../mgmt/compute/v2018_04_01/models/image.py  |   70 +
 .../v2018_04_01/models/image_data_disk.py     |   68 +
 .../v2018_04_01/models/image_data_disk_py3.py |   68 +
 .../v2018_04_01/models/image_os_disk.py       |   77 +
 .../v2018_04_01/models/image_os_disk_py3.py   |   77 +
 .../compute/v2018_04_01/models/image_paged.py |   27 +
 .../compute/v2018_04_01/models/image_py3.py   |   70 +
 .../v2018_04_01/models/image_reference.py     |   54 +
 .../v2018_04_01/models/image_reference_py3.py |   54 +
 .../models/image_storage_profile.py           |   45 +
 .../models/image_storage_profile_py3.py       |   45 +
 .../v2018_04_01/models/image_update.py        |   50 +
 .../v2018_04_01/models/image_update_py3.py    |   50 +
 .../compute/v2018_04_01/models/inner_error.py |   32 +
 .../v2018_04_01/models/inner_error_py3.py     |   32 +
 .../models/instance_view_status.py            |   47 +
 .../models/instance_view_status_py3.py        |   47 +
 .../models/key_vault_key_reference.py         |   41 +
 .../models/key_vault_key_reference_py3.py     |   41 +
 .../models/key_vault_secret_reference.py      |   40 +
 .../models/key_vault_secret_reference_py3.py  |   40 +
 .../v2018_04_01/models/linux_configuration.py |   39 +
 .../models/linux_configuration_py3.py         |   39 +
 .../models/log_analytics_input_base.py        |   58 +
 .../models/log_analytics_input_base_py3.py    |   58 +
 .../models/log_analytics_operation_result.py  |   36 +
 .../log_analytics_operation_result_py3.py     |   36 +
 .../models/log_analytics_output.py            |   35 +
 .../models/log_analytics_output_py3.py        |   35 +
 .../models/maintenance_redeploy_status.py     |   60 +
 .../models/maintenance_redeploy_status_py3.py |   60 +
 .../models/managed_disk_parameters.py         |   34 +
 .../models/managed_disk_parameters_py3.py     |   34 +
 .../models/network_interface_reference.py     |   32 +
 .../models/network_interface_reference_py3.py |   32 +
 .../v2018_04_01/models/network_profile.py     |   30 +
 .../v2018_04_01/models/network_profile_py3.py |   30 +
 .../compute/v2018_04_01/models/os_disk.py     |   97 +
 .../v2018_04_01/models/os_disk_image.py       |   36 +
 .../v2018_04_01/models/os_disk_image_py3.py   |   36 +
 .../compute/v2018_04_01/models/os_disk_py3.py |   97 +
 .../compute/v2018_04_01/models/os_profile.py  |   99 +
 .../v2018_04_01/models/os_profile_py3.py      |   99 +
 .../mgmt/compute/v2018_04_01/models/plan.py   |   46 +
 .../compute/v2018_04_01/models/plan_py3.py    |   46 +
 .../v2018_04_01/models/purchase_plan.py       |   47 +
 .../v2018_04_01/models/purchase_plan_py3.py   |   47 +
 .../models/recovery_walk_response.py          |   41 +
 .../models/recovery_walk_response_py3.py      |   41 +
 .../models/request_rate_by_interval_input.py  |   60 +
 .../request_rate_by_interval_input_py3.py     |   60 +
 .../models/rollback_status_info.py            |   48 +
 .../models/rollback_status_info_py3.py        |   48 +
 .../models/rolling_upgrade_policy.py          |   63 +
 .../models/rolling_upgrade_policy_py3.py      |   63 +
 .../models/rolling_upgrade_progress_info.py   |   55 +
 .../rolling_upgrade_progress_info_py3.py      |   55 +
 .../models/rolling_upgrade_running_status.py  |   54 +
 .../rolling_upgrade_running_status_py3.py     |   54 +
 .../models/rolling_upgrade_status_info.py     |   76 +
 .../models/rolling_upgrade_status_info_py3.py |   76 +
 .../models/run_command_document.py            |   61 +
 .../models/run_command_document_base.py       |   56 +
 .../models/run_command_document_base_paged.py |   27 +
 .../models/run_command_document_base_py3.py   |   56 +
 .../models/run_command_document_py3.py        |   61 +
 .../v2018_04_01/models/run_command_input.py   |   44 +
 .../models/run_command_input_parameter.py     |   39 +
 .../models/run_command_input_parameter_py3.py |   39 +
 .../models/run_command_input_py3.py           |   44 +
 .../run_command_parameter_definition.py       |   48 +
 .../run_command_parameter_definition_py3.py   |   48 +
 .../v2018_04_01/models/run_command_result.py  |   28 +
 .../models/run_command_result_py3.py          |   28 +
 .../mgmt/compute/v2018_04_01/models/sku.py    |   38 +
 .../compute/v2018_04_01/models/sku_py3.py     |   38 +
 .../v2018_04_01/models/snapshot_update.py     |   18 +-
 .../v2018_04_01/models/snapshot_update_py3.py |   22 +-
 .../v2018_04_01/models/ssh_configuration.py   |   30 +
 .../models/ssh_configuration_py3.py           |   30 +
 .../v2018_04_01/models/ssh_public_key.py      |   39 +
 .../v2018_04_01/models/ssh_public_key_py3.py  |   39 +
 .../v2018_04_01/models/storage_profile.py     |   47 +
 .../v2018_04_01/models/storage_profile_py3.py |   47 +
 .../v2018_04_01/models/sub_resource.py        |   28 +
 .../v2018_04_01/models/sub_resource_py3.py    |   28 +
 .../models/sub_resource_read_only.py          |   35 +
 .../models/sub_resource_read_only_py3.py      |   35 +
 .../models/throttled_requests_input.py        |   52 +
 .../models/throttled_requests_input_py3.py    |   52 +
 ...{resource_update.py => update_resource.py} |   10 +-
 ...e_update_py3.py => update_resource_py3.py} |   12 +-
 ...pgrade_operation_historical_status_info.py |   47 +
 ..._operation_historical_status_info_paged.py |   27 +
 ...ation_historical_status_info_properties.py |   67 +
 ...n_historical_status_info_properties_py3.py |   67 +
 ...de_operation_historical_status_info_py3.py |   47 +
 .../upgrade_operation_history_status.py       |   46 +
 .../upgrade_operation_history_status_py3.py   |   46 +
 .../v2018_04_01/models/upgrade_policy.py      |   51 +
 .../v2018_04_01/models/upgrade_policy_py3.py  |   51 +
 .../mgmt/compute/v2018_04_01/models/usage.py  |   54 +
 .../compute/v2018_04_01/models/usage_name.py  |   32 +
 .../v2018_04_01/models/usage_name_py3.py      |   32 +
 .../compute/v2018_04_01/models/usage_paged.py |   27 +
 .../compute/v2018_04_01/models/usage_py3.py   |   54 +
 .../v2018_04_01/models/vault_certificate.py   |   46 +
 .../models/vault_certificate_py3.py           |   46 +
 .../v2018_04_01/models/vault_secret_group.py  |   35 +
 .../models/vault_secret_group_py3.py          |   35 +
 .../v2018_04_01/models/virtual_hard_disk.py   |   28 +
 .../models/virtual_hard_disk_py3.py           |   28 +
 .../v2018_04_01/models/virtual_machine.py     |  150 ++
 .../virtual_machine_agent_instance_view.py    |   39 +
 ...virtual_machine_agent_instance_view_py3.py |   39 +
 .../virtual_machine_capture_parameters.py     |   46 +
 .../virtual_machine_capture_parameters_py3.py |   46 +
 .../models/virtual_machine_capture_result.py  |   53 +
 .../virtual_machine_capture_result_py3.py     |   53 +
 .../models/virtual_machine_extension.py       |   97 +
 ...machine_extension_handler_instance_view.py |   37 +
 ...ine_extension_handler_instance_view_py3.py |   37 +
 .../models/virtual_machine_extension_image.py |   81 +
 .../virtual_machine_extension_image_py3.py    |   81 +
 ...virtual_machine_extension_instance_view.py |   47 +
 ...ual_machine_extension_instance_view_py3.py |   47 +
 .../models/virtual_machine_extension_py3.py   |   97 +
 .../virtual_machine_extension_update.py       |   62 +
 .../virtual_machine_extension_update_py3.py   |   62 +
 .../virtual_machine_extensions_list_result.py |   29 +
 ...tual_machine_extensions_list_result_py3.py |   29 +
 .../models/virtual_machine_health_status.py   |   35 +
 .../virtual_machine_health_status_py3.py      |   35 +
 .../models/virtual_machine_identity.py        |   58 +
 .../models/virtual_machine_identity_py3.py    |   58 +
 .../models/virtual_machine_image.py           |   59 +
 .../models/virtual_machine_image_py3.py       |   59 +
 .../models/virtual_machine_image_resource.py  |   49 +
 .../virtual_machine_image_resource_py3.py     |   49 +
 .../models/virtual_machine_instance_view.py   |   85 +
 .../virtual_machine_instance_view_py3.py      |   85 +
 .../models/virtual_machine_paged.py           |   27 +
 .../v2018_04_01/models/virtual_machine_py3.py |  150 ++
 .../models/virtual_machine_scale_set.py       |  116 ++
 .../virtual_machine_scale_set_data_disk.py    |   70 +
 ...virtual_machine_scale_set_data_disk_py3.py |   70 +
 .../virtual_machine_scale_set_extension.py    |   80 +
 ...rtual_machine_scale_set_extension_paged.py |   27 +
 ...ual_machine_scale_set_extension_profile.py |   30 +
 ...machine_scale_set_extension_profile_py3.py |   30 +
 ...virtual_machine_scale_set_extension_py3.py |   80 +
 .../virtual_machine_scale_set_identity.py     |   60 +
 .../virtual_machine_scale_set_identity_py3.py |   60 +
 ...virtual_machine_scale_set_instance_view.py |   48 +
 ...ual_machine_scale_set_instance_view_py3.py |   48 +
 ...cale_set_instance_view_statuses_summary.py |   37 +
 ..._set_instance_view_statuses_summary_py3.py |   37 +
 ...tual_machine_scale_set_ip_configuration.py |   83 +
 ..._machine_scale_set_ip_configuration_py3.py |   83 +
 .../virtual_machine_scale_set_ip_tag.py       |   33 +
 .../virtual_machine_scale_set_ip_tag_py3.py   |   33 +
 ...chine_scale_set_managed_disk_parameters.py |   31 +
 ...e_scale_set_managed_disk_parameters_py3.py |   31 +
 ...machine_scale_set_network_configuration.py |   70 +
 ..._set_network_configuration_dns_settings.py |   29 +
 ..._network_configuration_dns_settings_py3.py |   29 +
 ...ine_scale_set_network_configuration_py3.py |   70 +
 ...rtual_machine_scale_set_network_profile.py |   38 +
 ...l_machine_scale_set_network_profile_py3.py |   38 +
 .../virtual_machine_scale_set_os_disk.py      |   80 +
 .../virtual_machine_scale_set_os_disk_py3.py  |   80 +
 .../virtual_machine_scale_set_os_profile.py   |   97 +
 ...irtual_machine_scale_set_os_profile_py3.py |   97 +
 .../models/virtual_machine_scale_set_paged.py |   27 +
 ...ale_set_public_ip_address_configuration.py |   50 +
 ...c_ip_address_configuration_dns_settings.py |   37 +
 ..._address_configuration_dns_settings_py3.py |   37 +
 ...set_public_ip_address_configuration_py3.py |   50 +
 .../models/virtual_machine_scale_set_py3.py   |  116 ++
 .../models/virtual_machine_scale_set_sku.py   |   46 +
 .../virtual_machine_scale_set_sku_capacity.py |   52 +
 ...tual_machine_scale_set_sku_capacity_py3.py |   52 +
 .../virtual_machine_scale_set_sku_paged.py    |   27 +
 .../virtual_machine_scale_set_sku_py3.py      |   46 +
 ...rtual_machine_scale_set_storage_profile.py |   49 +
 ...l_machine_scale_set_storage_profile_py3.py |   49 +
 .../virtual_machine_scale_set_update.py       |   61 +
 ...chine_scale_set_update_ip_configuration.py |   71 +
 ...e_scale_set_update_ip_configuration_py3.py |   71 +
 ..._scale_set_update_network_configuration.py |   61 +
 ...le_set_update_network_configuration_py3.py |   61 +
 ...achine_scale_set_update_network_profile.py |   30 +
 ...ne_scale_set_update_network_profile_py3.py |   30 +
 ...irtual_machine_scale_set_update_os_disk.py |   50 +
 ...al_machine_scale_set_update_os_disk_py3.py |   50 +
 ...ual_machine_scale_set_update_os_profile.py |   43 +
 ...machine_scale_set_update_os_profile_py3.py |   43 +
 ..._update_public_ip_address_configuration.py |   39 +
 ...ate_public_ip_address_configuration_py3.py |   39 +
 .../virtual_machine_scale_set_update_py3.py   |   61 +
 ...achine_scale_set_update_storage_profile.py |   39 +
 ...ne_scale_set_update_storage_profile_py3.py |   39 +
 ...ual_machine_scale_set_update_vm_profile.py |   55 +
 ...machine_scale_set_update_vm_profile_py3.py |   55 +
 .../models/virtual_machine_scale_set_vm.py    |  155 ++
 ...machine_scale_set_vm_extensions_summary.py |   41 +
 ...ine_scale_set_vm_extensions_summary_py3.py |   41 +
 ...rtual_machine_scale_set_vm_instance_ids.py |   30 +
 ...l_machine_scale_set_vm_instance_ids_py3.py |   30 +
 ...hine_scale_set_vm_instance_required_ids.py |   34 +
 ..._scale_set_vm_instance_required_ids_py3.py |   34 +
 ...tual_machine_scale_set_vm_instance_view.py |   87 +
 ..._machine_scale_set_vm_instance_view_py3.py |   87 +
 .../virtual_machine_scale_set_vm_paged.py     |   27 +
 .../virtual_machine_scale_set_vm_profile.py   |   80 +
 ...irtual_machine_scale_set_vm_profile_py3.py |   80 +
 .../virtual_machine_scale_set_vm_py3.py       |  155 ++
 .../models/virtual_machine_size.py            |   53 +
 .../models/virtual_machine_size_paged.py      |   27 +
 .../models/virtual_machine_size_py3.py        |   53 +
 .../virtual_machine_status_code_count.py      |   41 +
 .../virtual_machine_status_code_count_py3.py  |   41 +
 .../models/virtual_machine_update.py          |  126 ++
 .../models/virtual_machine_update_py3.py      |  126 ++
 .../models/win_rm_configuration.py            |   29 +
 .../models/win_rm_configuration_py3.py        |   29 +
 .../v2018_04_01/models/win_rm_listener.py     |   42 +
 .../v2018_04_01/models/win_rm_listener_py3.py |   42 +
 .../models/windows_configuration.py           |   54 +
 .../models/windows_configuration_py3.py       |   54 +
 .../v2018_04_01/operations/__init__.py        |   30 +
 .../availability_sets_operations.py           |  434 ++++
 .../operations/images_operations.py           |  525 +++++
 .../operations/log_analytics_operations.py    |  242 +++
 .../v2018_04_01/operations/operations.py      |   99 +
 .../operations/usage_operations.py            |  108 +
 ...ual_machine_extension_images_operations.py |  248 +++
 .../virtual_machine_extensions_operations.py  |  480 +++++
 .../virtual_machine_images_operations.py      |  383 ++++
 ...virtual_machine_run_commands_operations.py |  168 ++
 ...machine_scale_set_extensions_operations.py |  379 ++++
 ...e_scale_set_rolling_upgrades_operations.py |  267 +++
 ...irtual_machine_scale_set_vms_operations.py | 1131 +++++++++++
 .../virtual_machine_scale_sets_operations.py  | 1762 +++++++++++++++++
 .../virtual_machine_sizes_operations.py       |  108 +
 .../operations/virtual_machines_operations.py | 1494 ++++++++++++++
 286 files changed, 22291 insertions(+), 59 deletions(-)
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/additional_unattend_content.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/additional_unattend_content_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_entity_reference.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_entity_reference_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/auto_os_upgrade_policy.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/auto_os_upgrade_policy_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_update.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_update_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_instance_view.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_instance_view_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_image.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_image_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/diagnostics_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/diagnostics_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_encryption_settings.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_encryption_settings_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_instance_view.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_instance_view_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/hardware_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/hardware_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_reference.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_reference_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_storage_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_storage_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_update.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_update_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/instance_view_status.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/instance_view_status_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_key_reference.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_key_reference_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_secret_reference.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_secret_reference_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/linux_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/linux_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_input_base.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_input_base_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_operation_result.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_operation_result_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_output.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_output_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/maintenance_redeploy_status.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/maintenance_redeploy_status_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_interface_reference.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_interface_reference_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_image.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_image_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/plan.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/plan_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/purchase_plan.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/purchase_plan_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/recovery_walk_response.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/recovery_walk_response_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/request_rate_by_interval_input.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/request_rate_by_interval_input_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rollback_status_info.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rollback_status_info_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_policy.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_policy_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_progress_info.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_progress_info_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_running_status.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_running_status_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_status_info.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_status_info_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_parameter.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_parameter_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_parameter_definition.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_parameter_definition_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sku.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sku_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_public_key.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_public_key_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/storage_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/storage_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_read_only.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_read_only_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/throttled_requests_input.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/throttled_requests_input_py3.py
 rename azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/{resource_update.py => update_resource.py} (71%)
 rename azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/{resource_update_py3.py => update_resource_py3.py} (67%)
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_properties.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_properties_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_history_status.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_history_status_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_policy.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_policy_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_name.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_name_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_certificate.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_certificate_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_secret_group.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_secret_group_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_hard_disk.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_hard_disk_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_agent_instance_view.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_agent_instance_view_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_parameters.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_parameters_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_result.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_result_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_handler_instance_view.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_handler_instance_view_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_image.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_image_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_instance_view.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_instance_view_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_update.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_update_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extensions_list_result.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extensions_list_result_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_health_status.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_health_status_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_identity.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_identity_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_resource.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_resource_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_instance_view.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_instance_view_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_data_disk.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_data_disk_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_identity.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_identity_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_statuses_summary.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_statuses_summary_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_tag.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_tag_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_dns_settings.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_dns_settings_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_disk.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_disk_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_capacity.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_capacity_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_storage_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_storage_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_ip_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_ip_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_disk.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_disk_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_public_ip_address_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_public_ip_address_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_storage_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_storage_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_vm_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_vm_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_extensions_summary.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_extensions_summary_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_ids.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_ids_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_required_ids.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_required_ids_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_view.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_view_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_status_code_count.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_status_code_count_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_update.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_update_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_listener.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_listener_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/windows_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/windows_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/images_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/log_analytics_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/usage_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extension_images_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extensions_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_images_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_run_commands_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_extensions_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_rolling_upgrades_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_vms_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_sets_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_sizes_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machines_operations.py

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 6c6f04ec9351..f12ba0766a1e 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py
@@ -158,6 +158,7 @@ def availability_sets(self):
            * 2016-04-30-preview: :class:`AvailabilitySetsOperations<azure.mgmt.compute.v2016_04_30_preview.operations.AvailabilitySetsOperations>`
            * 2017-03-30: :class:`AvailabilitySetsOperations<azure.mgmt.compute.v2017_03_30.operations.AvailabilitySetsOperations>`
            * 2017-12-01: :class:`AvailabilitySetsOperations<azure.mgmt.compute.v2017_12_01.operations.AvailabilitySetsOperations>`
+           * 2018-04-01: :class:`AvailabilitySetsOperations<azure.mgmt.compute.v2018_04_01.operations.AvailabilitySetsOperations>`
         """
         api_version = self._get_api_version('availability_sets')
         if api_version == '2015-06-15':
@@ -170,6 +171,8 @@ def availability_sets(self):
             from .v2017_03_30.operations import AvailabilitySetsOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import AvailabilitySetsOperations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import AvailabilitySetsOperations 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)))
@@ -239,6 +242,7 @@ def images(self):
            * 2016-04-30-preview: :class:`ImagesOperations<azure.mgmt.compute.v2016_04_30_preview.operations.ImagesOperations>`
            * 2017-03-30: :class:`ImagesOperations<azure.mgmt.compute.v2017_03_30.operations.ImagesOperations>`
            * 2017-12-01: :class:`ImagesOperations<azure.mgmt.compute.v2017_12_01.operations.ImagesOperations>`
+           * 2018-04-01: :class:`ImagesOperations<azure.mgmt.compute.v2018_04_01.operations.ImagesOperations>`
         """
         api_version = self._get_api_version('images')
         if api_version == '2016-04-30-preview':
@@ -247,6 +251,8 @@ def images(self):
             from .v2017_03_30.operations import ImagesOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import ImagesOperations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import ImagesOperations 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)))
@@ -256,10 +262,13 @@ def log_analytics(self):
         """Instance depends on the API version:
 
            * 2017-12-01: :class:`LogAnalyticsOperations<azure.mgmt.compute.v2017_12_01.operations.LogAnalyticsOperations>`
+           * 2018-04-01: :class:`LogAnalyticsOperations<azure.mgmt.compute.v2018_04_01.operations.LogAnalyticsOperations>`
         """
         api_version = self._get_api_version('log_analytics')
         if api_version == '2017-12-01':
             from .v2017_12_01.operations import LogAnalyticsOperations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import LogAnalyticsOperations 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)))
@@ -269,10 +278,13 @@ def operations(self):
         """Instance depends on the API version:
 
            * 2017-12-01: :class:`Operations<azure.mgmt.compute.v2017_12_01.operations.Operations>`
+           * 2018-04-01: :class:`Operations<azure.mgmt.compute.v2018_04_01.operations.Operations>`
         """
         api_version = self._get_api_version('operations')
         if api_version == '2017-12-01':
             from .v2017_12_01.operations import Operations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import Operations 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 +333,7 @@ def usage(self):
            * 2016-04-30-preview: :class:`UsageOperations<azure.mgmt.compute.v2016_04_30_preview.operations.UsageOperations>`
            * 2017-03-30: :class:`UsageOperations<azure.mgmt.compute.v2017_03_30.operations.UsageOperations>`
            * 2017-12-01: :class:`UsageOperations<azure.mgmt.compute.v2017_12_01.operations.UsageOperations>`
+           * 2018-04-01: :class:`UsageOperations<azure.mgmt.compute.v2018_04_01.operations.UsageOperations>`
         """
         api_version = self._get_api_version('usage')
         if api_version == '2015-06-15':
@@ -333,6 +346,8 @@ def usage(self):
             from .v2017_03_30.operations import UsageOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import UsageOperations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import UsageOperations 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)))
@@ -346,6 +361,7 @@ def virtual_machine_extension_images(self):
            * 2016-04-30-preview: :class:`VirtualMachineExtensionImagesOperations<azure.mgmt.compute.v2016_04_30_preview.operations.VirtualMachineExtensionImagesOperations>`
            * 2017-03-30: :class:`VirtualMachineExtensionImagesOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineExtensionImagesOperations>`
            * 2017-12-01: :class:`VirtualMachineExtensionImagesOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineExtensionImagesOperations>`
+           * 2018-04-01: :class:`VirtualMachineExtensionImagesOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineExtensionImagesOperations>`
         """
         api_version = self._get_api_version('virtual_machine_extension_images')
         if api_version == '2015-06-15':
@@ -358,6 +374,8 @@ def virtual_machine_extension_images(self):
             from .v2017_03_30.operations import VirtualMachineExtensionImagesOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachineExtensionImagesOperations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import VirtualMachineExtensionImagesOperations 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)))
@@ -371,6 +389,7 @@ def virtual_machine_extensions(self):
            * 2016-04-30-preview: :class:`VirtualMachineExtensionsOperations<azure.mgmt.compute.v2016_04_30_preview.operations.VirtualMachineExtensionsOperations>`
            * 2017-03-30: :class:`VirtualMachineExtensionsOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineExtensionsOperations>`
            * 2017-12-01: :class:`VirtualMachineExtensionsOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineExtensionsOperations>`
+           * 2018-04-01: :class:`VirtualMachineExtensionsOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineExtensionsOperations>`
         """
         api_version = self._get_api_version('virtual_machine_extensions')
         if api_version == '2015-06-15':
@@ -383,6 +402,8 @@ def virtual_machine_extensions(self):
             from .v2017_03_30.operations import VirtualMachineExtensionsOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachineExtensionsOperations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import VirtualMachineExtensionsOperations 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)))
@@ -396,6 +417,7 @@ def virtual_machine_images(self):
            * 2016-04-30-preview: :class:`VirtualMachineImagesOperations<azure.mgmt.compute.v2016_04_30_preview.operations.VirtualMachineImagesOperations>`
            * 2017-03-30: :class:`VirtualMachineImagesOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineImagesOperations>`
            * 2017-12-01: :class:`VirtualMachineImagesOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineImagesOperations>`
+           * 2018-04-01: :class:`VirtualMachineImagesOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineImagesOperations>`
         """
         api_version = self._get_api_version('virtual_machine_images')
         if api_version == '2015-06-15':
@@ -408,6 +430,8 @@ def virtual_machine_images(self):
             from .v2017_03_30.operations import VirtualMachineImagesOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachineImagesOperations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import VirtualMachineImagesOperations 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)))
@@ -418,12 +442,15 @@ def virtual_machine_run_commands(self):
 
            * 2017-03-30: :class:`VirtualMachineRunCommandsOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineRunCommandsOperations>`
            * 2017-12-01: :class:`VirtualMachineRunCommandsOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineRunCommandsOperations>`
+           * 2018-04-01: :class:`VirtualMachineRunCommandsOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineRunCommandsOperations>`
         """
         api_version = self._get_api_version('virtual_machine_run_commands')
         if api_version == '2017-03-30':
             from .v2017_03_30.operations import VirtualMachineRunCommandsOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachineRunCommandsOperations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import VirtualMachineRunCommandsOperations 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)))
@@ -434,12 +461,15 @@ def virtual_machine_scale_set_extensions(self):
 
            * 2017-03-30: :class:`VirtualMachineScaleSetExtensionsOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineScaleSetExtensionsOperations>`
            * 2017-12-01: :class:`VirtualMachineScaleSetExtensionsOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineScaleSetExtensionsOperations>`
+           * 2018-04-01: :class:`VirtualMachineScaleSetExtensionsOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineScaleSetExtensionsOperations>`
         """
         api_version = self._get_api_version('virtual_machine_scale_set_extensions')
         if api_version == '2017-03-30':
             from .v2017_03_30.operations import VirtualMachineScaleSetExtensionsOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachineScaleSetExtensionsOperations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import VirtualMachineScaleSetExtensionsOperations 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)))
@@ -450,12 +480,15 @@ def virtual_machine_scale_set_rolling_upgrades(self):
 
            * 2017-03-30: :class:`VirtualMachineScaleSetRollingUpgradesOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineScaleSetRollingUpgradesOperations>`
            * 2017-12-01: :class:`VirtualMachineScaleSetRollingUpgradesOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineScaleSetRollingUpgradesOperations>`
+           * 2018-04-01: :class:`VirtualMachineScaleSetRollingUpgradesOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineScaleSetRollingUpgradesOperations>`
         """
         api_version = self._get_api_version('virtual_machine_scale_set_rolling_upgrades')
         if api_version == '2017-03-30':
             from .v2017_03_30.operations import VirtualMachineScaleSetRollingUpgradesOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachineScaleSetRollingUpgradesOperations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import VirtualMachineScaleSetRollingUpgradesOperations 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)))
@@ -469,6 +502,7 @@ def virtual_machine_scale_set_vms(self):
            * 2016-04-30-preview: :class:`VirtualMachineScaleSetVMsOperations<azure.mgmt.compute.v2016_04_30_preview.operations.VirtualMachineScaleSetVMsOperations>`
            * 2017-03-30: :class:`VirtualMachineScaleSetVMsOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineScaleSetVMsOperations>`
            * 2017-12-01: :class:`VirtualMachineScaleSetVMsOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineScaleSetVMsOperations>`
+           * 2018-04-01: :class:`VirtualMachineScaleSetVMsOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineScaleSetVMsOperations>`
         """
         api_version = self._get_api_version('virtual_machine_scale_set_vms')
         if api_version == '2015-06-15':
@@ -481,6 +515,8 @@ def virtual_machine_scale_set_vms(self):
             from .v2017_03_30.operations import VirtualMachineScaleSetVMsOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachineScaleSetVMsOperations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import VirtualMachineScaleSetVMsOperations 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)))
@@ -494,6 +530,7 @@ def virtual_machine_scale_sets(self):
            * 2016-04-30-preview: :class:`VirtualMachineScaleSetsOperations<azure.mgmt.compute.v2016_04_30_preview.operations.VirtualMachineScaleSetsOperations>`
            * 2017-03-30: :class:`VirtualMachineScaleSetsOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineScaleSetsOperations>`
            * 2017-12-01: :class:`VirtualMachineScaleSetsOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineScaleSetsOperations>`
+           * 2018-04-01: :class:`VirtualMachineScaleSetsOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineScaleSetsOperations>`
         """
         api_version = self._get_api_version('virtual_machine_scale_sets')
         if api_version == '2015-06-15':
@@ -506,6 +543,8 @@ def virtual_machine_scale_sets(self):
             from .v2017_03_30.operations import VirtualMachineScaleSetsOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachineScaleSetsOperations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import VirtualMachineScaleSetsOperations 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)))
@@ -519,6 +558,7 @@ def virtual_machine_sizes(self):
            * 2016-04-30-preview: :class:`VirtualMachineSizesOperations<azure.mgmt.compute.v2016_04_30_preview.operations.VirtualMachineSizesOperations>`
            * 2017-03-30: :class:`VirtualMachineSizesOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineSizesOperations>`
            * 2017-12-01: :class:`VirtualMachineSizesOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineSizesOperations>`
+           * 2018-04-01: :class:`VirtualMachineSizesOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineSizesOperations>`
         """
         api_version = self._get_api_version('virtual_machine_sizes')
         if api_version == '2015-06-15':
@@ -531,6 +571,8 @@ def virtual_machine_sizes(self):
             from .v2017_03_30.operations import VirtualMachineSizesOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachineSizesOperations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import VirtualMachineSizesOperations 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)))
@@ -544,6 +586,7 @@ def virtual_machines(self):
            * 2016-04-30-preview: :class:`VirtualMachinesOperations<azure.mgmt.compute.v2016_04_30_preview.operations.VirtualMachinesOperations>`
            * 2017-03-30: :class:`VirtualMachinesOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachinesOperations>`
            * 2017-12-01: :class:`VirtualMachinesOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachinesOperations>`
+           * 2018-04-01: :class:`VirtualMachinesOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachinesOperations>`
         """
         api_version = self._get_api_version('virtual_machines')
         if api_version == '2015-06-15':
@@ -556,6 +599,8 @@ def virtual_machines(self):
             from .v2017_03_30.operations import VirtualMachinesOperations as OperationClass
         elif api_version == '2017-12-01':
             from .v2017_12_01.operations import VirtualMachinesOperations as OperationClass
+        elif api_version == '2018-04-01':
+            from .v2018_04_01.operations import VirtualMachinesOperations 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/v2018_04_01/compute_management_client.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/compute_management_client.py
index d815c08ac257..63b1db3da61a 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/compute_management_client.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/compute_management_client.py
@@ -13,6 +13,21 @@
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
+from .operations.operations import Operations
+from .operations.availability_sets_operations import AvailabilitySetsOperations
+from .operations.virtual_machine_extension_images_operations import VirtualMachineExtensionImagesOperations
+from .operations.virtual_machine_extensions_operations import VirtualMachineExtensionsOperations
+from .operations.virtual_machine_images_operations import VirtualMachineImagesOperations
+from .operations.usage_operations import UsageOperations
+from .operations.virtual_machine_sizes_operations import VirtualMachineSizesOperations
+from .operations.images_operations import ImagesOperations
+from .operations.virtual_machines_operations import VirtualMachinesOperations
+from .operations.virtual_machine_scale_sets_operations import VirtualMachineScaleSetsOperations
+from .operations.virtual_machine_scale_set_extensions_operations import VirtualMachineScaleSetExtensionsOperations
+from .operations.virtual_machine_scale_set_rolling_upgrades_operations import VirtualMachineScaleSetRollingUpgradesOperations
+from .operations.virtual_machine_scale_set_vms_operations import VirtualMachineScaleSetVMsOperations
+from .operations.log_analytics_operations import LogAnalyticsOperations
+from .operations.virtual_machine_run_commands_operations import VirtualMachineRunCommandsOperations
 from .operations.disks_operations import DisksOperations
 from .operations.snapshots_operations import SnapshotsOperations
 from . import models
@@ -58,6 +73,36 @@ class ComputeManagementClient(SDKClient):
     :ivar config: Configuration for client.
     :vartype config: ComputeManagementClientConfiguration
 
+    :ivar operations: Operations operations
+    :vartype operations: azure.mgmt.compute.v2018_04_01.operations.Operations
+    :ivar availability_sets: AvailabilitySets operations
+    :vartype availability_sets: azure.mgmt.compute.v2018_04_01.operations.AvailabilitySetsOperations
+    :ivar virtual_machine_extension_images: VirtualMachineExtensionImages operations
+    :vartype virtual_machine_extension_images: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineExtensionImagesOperations
+    :ivar virtual_machine_extensions: VirtualMachineExtensions operations
+    :vartype virtual_machine_extensions: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineExtensionsOperations
+    :ivar virtual_machine_images: VirtualMachineImages operations
+    :vartype virtual_machine_images: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineImagesOperations
+    :ivar usage: Usage operations
+    :vartype usage: azure.mgmt.compute.v2018_04_01.operations.UsageOperations
+    :ivar virtual_machine_sizes: VirtualMachineSizes operations
+    :vartype virtual_machine_sizes: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineSizesOperations
+    :ivar images: Images operations
+    :vartype images: azure.mgmt.compute.v2018_04_01.operations.ImagesOperations
+    :ivar virtual_machines: VirtualMachines operations
+    :vartype virtual_machines: azure.mgmt.compute.v2018_04_01.operations.VirtualMachinesOperations
+    :ivar virtual_machine_scale_sets: VirtualMachineScaleSets operations
+    :vartype virtual_machine_scale_sets: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineScaleSetsOperations
+    :ivar virtual_machine_scale_set_extensions: VirtualMachineScaleSetExtensions operations
+    :vartype virtual_machine_scale_set_extensions: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineScaleSetExtensionsOperations
+    :ivar virtual_machine_scale_set_rolling_upgrades: VirtualMachineScaleSetRollingUpgrades operations
+    :vartype virtual_machine_scale_set_rolling_upgrades: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineScaleSetRollingUpgradesOperations
+    :ivar virtual_machine_scale_set_vms: VirtualMachineScaleSetVMs operations
+    :vartype virtual_machine_scale_set_vms: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineScaleSetVMsOperations
+    :ivar log_analytics: LogAnalytics operations
+    :vartype log_analytics: azure.mgmt.compute.v2018_04_01.operations.LogAnalyticsOperations
+    :ivar virtual_machine_run_commands: VirtualMachineRunCommands operations
+    :vartype virtual_machine_run_commands: azure.mgmt.compute.v2018_04_01.operations.VirtualMachineRunCommandsOperations
     :ivar disks: Disks operations
     :vartype disks: azure.mgmt.compute.v2018_04_01.operations.DisksOperations
     :ivar snapshots: Snapshots operations
@@ -84,6 +129,36 @@ def __init__(
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
+        self.operations = Operations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.availability_sets = AvailabilitySetsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machine_extension_images = VirtualMachineExtensionImagesOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machine_extensions = VirtualMachineExtensionsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machine_images = VirtualMachineImagesOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.usage = UsageOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machine_sizes = VirtualMachineSizesOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.images = ImagesOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machines = VirtualMachinesOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machine_scale_sets = VirtualMachineScaleSetsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machine_scale_set_extensions = VirtualMachineScaleSetExtensionsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machine_scale_set_rolling_upgrades = VirtualMachineScaleSetRollingUpgradesOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machine_scale_set_vms = VirtualMachineScaleSetVMsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.log_analytics = LogAnalyticsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machine_run_commands = VirtualMachineRunCommandsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
         self.disks = DisksOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.snapshots = SnapshotsOperations(
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/__init__.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/__init__.py
index a9b68bd118f4..0dddc66aae88 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/__init__.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/__init__.py
@@ -10,9 +10,133 @@
 # --------------------------------------------------------------------------
 
 try:
+    from .compute_operation_value_py3 import ComputeOperationValue
+    from .instance_view_status_py3 import InstanceViewStatus
+    from .sub_resource_py3 import SubResource
+    from .sku_py3 import Sku
+    from .availability_set_py3 import AvailabilitySet
+    from .availability_set_update_py3 import AvailabilitySetUpdate
+    from .virtual_machine_size_py3 import VirtualMachineSize
+    from .virtual_machine_extension_image_py3 import VirtualMachineExtensionImage
+    from .virtual_machine_image_resource_py3 import VirtualMachineImageResource
+    from .virtual_machine_extension_instance_view_py3 import VirtualMachineExtensionInstanceView
+    from .virtual_machine_extension_py3 import VirtualMachineExtension
+    from .virtual_machine_extension_update_py3 import VirtualMachineExtensionUpdate
+    from .virtual_machine_extensions_list_result_py3 import VirtualMachineExtensionsListResult
+    from .purchase_plan_py3 import PurchasePlan
+    from .os_disk_image_py3 import OSDiskImage
+    from .data_disk_image_py3 import DataDiskImage
+    from .virtual_machine_image_py3 import VirtualMachineImage
+    from .usage_name_py3 import UsageName
+    from .usage_py3 import Usage
+    from .virtual_machine_capture_parameters_py3 import VirtualMachineCaptureParameters
+    from .virtual_machine_capture_result_py3 import VirtualMachineCaptureResult
+    from .plan_py3 import Plan
+    from .hardware_profile_py3 import HardwareProfile
+    from .image_reference_py3 import ImageReference
+    from .key_vault_secret_reference_py3 import KeyVaultSecretReference
+    from .key_vault_key_reference_py3 import KeyVaultKeyReference
+    from .disk_encryption_settings_py3 import DiskEncryptionSettings
+    from .virtual_hard_disk_py3 import VirtualHardDisk
+    from .managed_disk_parameters_py3 import ManagedDiskParameters
+    from .os_disk_py3 import OSDisk
+    from .data_disk_py3 import DataDisk
+    from .storage_profile_py3 import StorageProfile
+    from .additional_unattend_content_py3 import AdditionalUnattendContent
+    from .win_rm_listener_py3 import WinRMListener
+    from .win_rm_configuration_py3 import WinRMConfiguration
+    from .windows_configuration_py3 import WindowsConfiguration
+    from .ssh_public_key_py3 import SshPublicKey
+    from .ssh_configuration_py3 import SshConfiguration
+    from .linux_configuration_py3 import LinuxConfiguration
+    from .vault_certificate_py3 import VaultCertificate
+    from .vault_secret_group_py3 import VaultSecretGroup
+    from .os_profile_py3 import OSProfile
+    from .network_interface_reference_py3 import NetworkInterfaceReference
+    from .network_profile_py3 import NetworkProfile
+    from .boot_diagnostics_py3 import BootDiagnostics
+    from .diagnostics_profile_py3 import DiagnosticsProfile
+    from .virtual_machine_extension_handler_instance_view_py3 import VirtualMachineExtensionHandlerInstanceView
+    from .virtual_machine_agent_instance_view_py3 import VirtualMachineAgentInstanceView
+    from .disk_instance_view_py3 import DiskInstanceView
+    from .boot_diagnostics_instance_view_py3 import BootDiagnosticsInstanceView
+    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_py3 import VirtualMachine
+    from .virtual_machine_update_py3 import VirtualMachineUpdate
+    from .auto_os_upgrade_policy_py3 import AutoOSUpgradePolicy
+    from .rolling_upgrade_policy_py3 import RollingUpgradePolicy
+    from .upgrade_policy_py3 import UpgradePolicy
+    from .image_os_disk_py3 import ImageOSDisk
+    from .image_data_disk_py3 import ImageDataDisk
+    from .image_storage_profile_py3 import ImageStorageProfile
+    from .image_py3 import Image
+    from .image_update_py3 import ImageUpdate
+    from .virtual_machine_scale_set_identity_py3 import VirtualMachineScaleSetIdentity
+    from .virtual_machine_scale_set_os_profile_py3 import VirtualMachineScaleSetOSProfile
+    from .virtual_machine_scale_set_update_os_profile_py3 import VirtualMachineScaleSetUpdateOSProfile
+    from .virtual_machine_scale_set_managed_disk_parameters_py3 import VirtualMachineScaleSetManagedDiskParameters
+    from .virtual_machine_scale_set_os_disk_py3 import VirtualMachineScaleSetOSDisk
+    from .virtual_machine_scale_set_update_os_disk_py3 import VirtualMachineScaleSetUpdateOSDisk
+    from .virtual_machine_scale_set_data_disk_py3 import VirtualMachineScaleSetDataDisk
+    from .virtual_machine_scale_set_storage_profile_py3 import VirtualMachineScaleSetStorageProfile
+    from .virtual_machine_scale_set_update_storage_profile_py3 import VirtualMachineScaleSetUpdateStorageProfile
+    from .api_entity_reference_py3 import ApiEntityReference
+    from .virtual_machine_scale_set_public_ip_address_configuration_dns_settings_py3 import VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings
+    from .virtual_machine_scale_set_ip_tag_py3 import VirtualMachineScaleSetIpTag
+    from .virtual_machine_scale_set_public_ip_address_configuration_py3 import VirtualMachineScaleSetPublicIPAddressConfiguration
+    from .virtual_machine_scale_set_update_public_ip_address_configuration_py3 import VirtualMachineScaleSetUpdatePublicIPAddressConfiguration
+    from .virtual_machine_scale_set_ip_configuration_py3 import VirtualMachineScaleSetIPConfiguration
+    from .virtual_machine_scale_set_update_ip_configuration_py3 import VirtualMachineScaleSetUpdateIPConfiguration
+    from .virtual_machine_scale_set_network_configuration_dns_settings_py3 import VirtualMachineScaleSetNetworkConfigurationDnsSettings
+    from .virtual_machine_scale_set_network_configuration_py3 import VirtualMachineScaleSetNetworkConfiguration
+    from .virtual_machine_scale_set_update_network_configuration_py3 import VirtualMachineScaleSetUpdateNetworkConfiguration
+    from .virtual_machine_scale_set_network_profile_py3 import VirtualMachineScaleSetNetworkProfile
+    from .virtual_machine_scale_set_update_network_profile_py3 import VirtualMachineScaleSetUpdateNetworkProfile
+    from .virtual_machine_scale_set_extension_py3 import VirtualMachineScaleSetExtension
+    from .virtual_machine_scale_set_extension_profile_py3 import VirtualMachineScaleSetExtensionProfile
+    from .virtual_machine_scale_set_vm_profile_py3 import VirtualMachineScaleSetVMProfile
+    from .virtual_machine_scale_set_update_vm_profile_py3 import VirtualMachineScaleSetUpdateVMProfile
+    from .virtual_machine_scale_set_py3 import VirtualMachineScaleSet
+    from .virtual_machine_scale_set_update_py3 import VirtualMachineScaleSetUpdate
+    from .virtual_machine_scale_set_vm_instance_ids_py3 import VirtualMachineScaleSetVMInstanceIDs
+    from .virtual_machine_scale_set_vm_instance_required_ids_py3 import VirtualMachineScaleSetVMInstanceRequiredIDs
+    from .virtual_machine_status_code_count_py3 import VirtualMachineStatusCodeCount
+    from .virtual_machine_scale_set_instance_view_statuses_summary_py3 import VirtualMachineScaleSetInstanceViewStatusesSummary
+    from .virtual_machine_scale_set_vm_extensions_summary_py3 import VirtualMachineScaleSetVMExtensionsSummary
+    from .virtual_machine_scale_set_instance_view_py3 import VirtualMachineScaleSetInstanceView
+    from .virtual_machine_scale_set_sku_capacity_py3 import VirtualMachineScaleSetSkuCapacity
+    from .virtual_machine_scale_set_sku_py3 import VirtualMachineScaleSetSku
+    from .api_error_base_py3 import ApiErrorBase
+    from .inner_error_py3 import InnerError
+    from .api_error_py3 import ApiError
+    from .rollback_status_info_py3 import RollbackStatusInfo
+    from .upgrade_operation_history_status_py3 import UpgradeOperationHistoryStatus
+    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_scale_set_vm_py3 import VirtualMachineScaleSetVM
+    from .virtual_machine_health_status_py3 import VirtualMachineHealthStatus
+    from .virtual_machine_scale_set_vm_instance_view_py3 import VirtualMachineScaleSetVMInstanceView
+    from .rolling_upgrade_running_status_py3 import RollingUpgradeRunningStatus
+    from .rolling_upgrade_status_info_py3 import RollingUpgradeStatusInfo
     from .resource_py3 import Resource
+    from .update_resource_py3 import UpdateResource
+    from .sub_resource_read_only_py3 import SubResourceReadOnly
+    from .recovery_walk_response_py3 import RecoveryWalkResponse
+    from .request_rate_by_interval_input_py3 import RequestRateByIntervalInput
+    from .throttled_requests_input_py3 import ThrottledRequestsInput
+    from .log_analytics_input_base_py3 import LogAnalyticsInputBase
+    from .log_analytics_output_py3 import LogAnalyticsOutput
+    from .log_analytics_operation_result_py3 import LogAnalyticsOperationResult
+    from .run_command_input_parameter_py3 import RunCommandInputParameter
+    from .run_command_input_py3 import RunCommandInput
+    from .run_command_parameter_definition_py3 import RunCommandParameterDefinition
+    from .run_command_document_base_py3 import RunCommandDocumentBase
+    from .run_command_document_py3 import RunCommandDocument
+    from .run_command_result_py3 import RunCommandResult
     from .disk_sku_py3 import DiskSku
-    from .resource_update_py3 import ResourceUpdate
     from .image_disk_reference_py3 import ImageDiskReference
     from .creation_data_py3 import CreationData
     from .source_vault_py3 import SourceVault
@@ -27,9 +151,133 @@
     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
+    from .sub_resource import SubResource
+    from .sku import Sku
+    from .availability_set import AvailabilitySet
+    from .availability_set_update import AvailabilitySetUpdate
+    from .virtual_machine_size import VirtualMachineSize
+    from .virtual_machine_extension_image import VirtualMachineExtensionImage
+    from .virtual_machine_image_resource import VirtualMachineImageResource
+    from .virtual_machine_extension_instance_view import VirtualMachineExtensionInstanceView
+    from .virtual_machine_extension import VirtualMachineExtension
+    from .virtual_machine_extension_update import VirtualMachineExtensionUpdate
+    from .virtual_machine_extensions_list_result import VirtualMachineExtensionsListResult
+    from .purchase_plan import PurchasePlan
+    from .os_disk_image import OSDiskImage
+    from .data_disk_image import DataDiskImage
+    from .virtual_machine_image import VirtualMachineImage
+    from .usage_name import UsageName
+    from .usage import Usage
+    from .virtual_machine_capture_parameters import VirtualMachineCaptureParameters
+    from .virtual_machine_capture_result import VirtualMachineCaptureResult
+    from .plan import Plan
+    from .hardware_profile import HardwareProfile
+    from .image_reference import ImageReference
+    from .key_vault_secret_reference import KeyVaultSecretReference
+    from .key_vault_key_reference import KeyVaultKeyReference
+    from .disk_encryption_settings import DiskEncryptionSettings
+    from .virtual_hard_disk import VirtualHardDisk
+    from .managed_disk_parameters import ManagedDiskParameters
+    from .os_disk import OSDisk
+    from .data_disk import DataDisk
+    from .storage_profile import StorageProfile
+    from .additional_unattend_content import AdditionalUnattendContent
+    from .win_rm_listener import WinRMListener
+    from .win_rm_configuration import WinRMConfiguration
+    from .windows_configuration import WindowsConfiguration
+    from .ssh_public_key import SshPublicKey
+    from .ssh_configuration import SshConfiguration
+    from .linux_configuration import LinuxConfiguration
+    from .vault_certificate import VaultCertificate
+    from .vault_secret_group import VaultSecretGroup
+    from .os_profile import OSProfile
+    from .network_interface_reference import NetworkInterfaceReference
+    from .network_profile import NetworkProfile
+    from .boot_diagnostics import BootDiagnostics
+    from .diagnostics_profile import DiagnosticsProfile
+    from .virtual_machine_extension_handler_instance_view import VirtualMachineExtensionHandlerInstanceView
+    from .virtual_machine_agent_instance_view import VirtualMachineAgentInstanceView
+    from .disk_instance_view import DiskInstanceView
+    from .boot_diagnostics_instance_view import BootDiagnosticsInstanceView
+    from .virtual_machine_identity import VirtualMachineIdentity
+    from .maintenance_redeploy_status import MaintenanceRedeployStatus
+    from .virtual_machine_instance_view import VirtualMachineInstanceView
+    from .virtual_machine import VirtualMachine
+    from .virtual_machine_update import VirtualMachineUpdate
+    from .auto_os_upgrade_policy import AutoOSUpgradePolicy
+    from .rolling_upgrade_policy import RollingUpgradePolicy
+    from .upgrade_policy import UpgradePolicy
+    from .image_os_disk import ImageOSDisk
+    from .image_data_disk import ImageDataDisk
+    from .image_storage_profile import ImageStorageProfile
+    from .image import Image
+    from .image_update import ImageUpdate
+    from .virtual_machine_scale_set_identity import VirtualMachineScaleSetIdentity
+    from .virtual_machine_scale_set_os_profile import VirtualMachineScaleSetOSProfile
+    from .virtual_machine_scale_set_update_os_profile import VirtualMachineScaleSetUpdateOSProfile
+    from .virtual_machine_scale_set_managed_disk_parameters import VirtualMachineScaleSetManagedDiskParameters
+    from .virtual_machine_scale_set_os_disk import VirtualMachineScaleSetOSDisk
+    from .virtual_machine_scale_set_update_os_disk import VirtualMachineScaleSetUpdateOSDisk
+    from .virtual_machine_scale_set_data_disk import VirtualMachineScaleSetDataDisk
+    from .virtual_machine_scale_set_storage_profile import VirtualMachineScaleSetStorageProfile
+    from .virtual_machine_scale_set_update_storage_profile import VirtualMachineScaleSetUpdateStorageProfile
+    from .api_entity_reference import ApiEntityReference
+    from .virtual_machine_scale_set_public_ip_address_configuration_dns_settings import VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings
+    from .virtual_machine_scale_set_ip_tag import VirtualMachineScaleSetIpTag
+    from .virtual_machine_scale_set_public_ip_address_configuration import VirtualMachineScaleSetPublicIPAddressConfiguration
+    from .virtual_machine_scale_set_update_public_ip_address_configuration import VirtualMachineScaleSetUpdatePublicIPAddressConfiguration
+    from .virtual_machine_scale_set_ip_configuration import VirtualMachineScaleSetIPConfiguration
+    from .virtual_machine_scale_set_update_ip_configuration import VirtualMachineScaleSetUpdateIPConfiguration
+    from .virtual_machine_scale_set_network_configuration_dns_settings import VirtualMachineScaleSetNetworkConfigurationDnsSettings
+    from .virtual_machine_scale_set_network_configuration import VirtualMachineScaleSetNetworkConfiguration
+    from .virtual_machine_scale_set_update_network_configuration import VirtualMachineScaleSetUpdateNetworkConfiguration
+    from .virtual_machine_scale_set_network_profile import VirtualMachineScaleSetNetworkProfile
+    from .virtual_machine_scale_set_update_network_profile import VirtualMachineScaleSetUpdateNetworkProfile
+    from .virtual_machine_scale_set_extension import VirtualMachineScaleSetExtension
+    from .virtual_machine_scale_set_extension_profile import VirtualMachineScaleSetExtensionProfile
+    from .virtual_machine_scale_set_vm_profile import VirtualMachineScaleSetVMProfile
+    from .virtual_machine_scale_set_update_vm_profile import VirtualMachineScaleSetUpdateVMProfile
+    from .virtual_machine_scale_set import VirtualMachineScaleSet
+    from .virtual_machine_scale_set_update import VirtualMachineScaleSetUpdate
+    from .virtual_machine_scale_set_vm_instance_ids import VirtualMachineScaleSetVMInstanceIDs
+    from .virtual_machine_scale_set_vm_instance_required_ids import VirtualMachineScaleSetVMInstanceRequiredIDs
+    from .virtual_machine_status_code_count import VirtualMachineStatusCodeCount
+    from .virtual_machine_scale_set_instance_view_statuses_summary import VirtualMachineScaleSetInstanceViewStatusesSummary
+    from .virtual_machine_scale_set_vm_extensions_summary import VirtualMachineScaleSetVMExtensionsSummary
+    from .virtual_machine_scale_set_instance_view import VirtualMachineScaleSetInstanceView
+    from .virtual_machine_scale_set_sku_capacity import VirtualMachineScaleSetSkuCapacity
+    from .virtual_machine_scale_set_sku import VirtualMachineScaleSetSku
+    from .api_error_base import ApiErrorBase
+    from .inner_error import InnerError
+    from .api_error import ApiError
+    from .rollback_status_info import RollbackStatusInfo
+    from .upgrade_operation_history_status import UpgradeOperationHistoryStatus
+    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_scale_set_vm import VirtualMachineScaleSetVM
+    from .virtual_machine_health_status import VirtualMachineHealthStatus
+    from .virtual_machine_scale_set_vm_instance_view import VirtualMachineScaleSetVMInstanceView
+    from .rolling_upgrade_running_status import RollingUpgradeRunningStatus
+    from .rolling_upgrade_status_info import RollingUpgradeStatusInfo
     from .resource import Resource
+    from .update_resource import UpdateResource
+    from .sub_resource_read_only import SubResourceReadOnly
+    from .recovery_walk_response import RecoveryWalkResponse
+    from .request_rate_by_interval_input import RequestRateByIntervalInput
+    from .throttled_requests_input import ThrottledRequestsInput
+    from .log_analytics_input_base import LogAnalyticsInputBase
+    from .log_analytics_output import LogAnalyticsOutput
+    from .log_analytics_operation_result import LogAnalyticsOperationResult
+    from .run_command_input_parameter import RunCommandInputParameter
+    from .run_command_input import RunCommandInput
+    from .run_command_parameter_definition import RunCommandParameterDefinition
+    from .run_command_document_base import RunCommandDocumentBase
+    from .run_command_document import RunCommandDocument
+    from .run_command_result import RunCommandResult
     from .disk_sku import DiskSku
-    from .resource_update import ResourceUpdate
     from .image_disk_reference import ImageDiskReference
     from .creation_data import CreationData
     from .source_vault import SourceVault
@@ -43,20 +291,178 @@
     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
+from .usage_paged import UsagePaged
+from .image_paged import ImagePaged
+from .virtual_machine_paged import VirtualMachinePaged
+from .virtual_machine_scale_set_paged import VirtualMachineScaleSetPaged
+from .virtual_machine_scale_set_sku_paged import VirtualMachineScaleSetSkuPaged
+from .upgrade_operation_historical_status_info_paged import UpgradeOperationHistoricalStatusInfoPaged
+from .virtual_machine_scale_set_extension_paged import VirtualMachineScaleSetExtensionPaged
+from .virtual_machine_scale_set_vm_paged import VirtualMachineScaleSetVMPaged
+from .run_command_document_base_paged import RunCommandDocumentBasePaged
 from .disk_paged import DiskPaged
 from .snapshot_paged import SnapshotPaged
 from .compute_management_client_enums import (
-    StorageAccountTypes,
+    StatusLevelTypes,
     OperatingSystemTypes,
+    VirtualMachineSizeTypes,
+    CachingTypes,
+    DiskCreateOptionTypes,
+    StorageAccountTypes,
+    PassNames,
+    ComponentNames,
+    SettingNames,
+    ProtocolTypes,
+    ResourceIdentityType,
+    MaintenanceOperationResultCodeTypes,
+    UpgradeMode,
+    OperatingSystemStateTypes,
+    IPVersion,
+    VirtualMachinePriorityTypes,
+    VirtualMachineEvictionPolicyTypes,
+    VirtualMachineScaleSetSkuScaleType,
+    UpgradeState,
+    UpgradeOperationInvoker,
+    RollingUpgradeStatusCode,
+    RollingUpgradeActionType,
+    IntervalInMins,
     DiskCreateOption,
     SnapshotStorageAccountTypes,
     AccessLevel,
+    InstanceViewTypes,
 )
 
 __all__ = [
+    'ComputeOperationValue',
+    'InstanceViewStatus',
+    'SubResource',
+    'Sku',
+    'AvailabilitySet',
+    'AvailabilitySetUpdate',
+    'VirtualMachineSize',
+    'VirtualMachineExtensionImage',
+    'VirtualMachineImageResource',
+    'VirtualMachineExtensionInstanceView',
+    'VirtualMachineExtension',
+    'VirtualMachineExtensionUpdate',
+    'VirtualMachineExtensionsListResult',
+    'PurchasePlan',
+    'OSDiskImage',
+    'DataDiskImage',
+    'VirtualMachineImage',
+    'UsageName',
+    'Usage',
+    'VirtualMachineCaptureParameters',
+    'VirtualMachineCaptureResult',
+    'Plan',
+    'HardwareProfile',
+    'ImageReference',
+    'KeyVaultSecretReference',
+    'KeyVaultKeyReference',
+    'DiskEncryptionSettings',
+    'VirtualHardDisk',
+    'ManagedDiskParameters',
+    'OSDisk',
+    'DataDisk',
+    'StorageProfile',
+    'AdditionalUnattendContent',
+    'WinRMListener',
+    'WinRMConfiguration',
+    'WindowsConfiguration',
+    'SshPublicKey',
+    'SshConfiguration',
+    'LinuxConfiguration',
+    'VaultCertificate',
+    'VaultSecretGroup',
+    'OSProfile',
+    'NetworkInterfaceReference',
+    'NetworkProfile',
+    'BootDiagnostics',
+    'DiagnosticsProfile',
+    'VirtualMachineExtensionHandlerInstanceView',
+    'VirtualMachineAgentInstanceView',
+    'DiskInstanceView',
+    'BootDiagnosticsInstanceView',
+    'VirtualMachineIdentity',
+    'MaintenanceRedeployStatus',
+    'VirtualMachineInstanceView',
+    'VirtualMachine',
+    'VirtualMachineUpdate',
+    'AutoOSUpgradePolicy',
+    'RollingUpgradePolicy',
+    'UpgradePolicy',
+    'ImageOSDisk',
+    'ImageDataDisk',
+    'ImageStorageProfile',
+    'Image',
+    'ImageUpdate',
+    'VirtualMachineScaleSetIdentity',
+    'VirtualMachineScaleSetOSProfile',
+    'VirtualMachineScaleSetUpdateOSProfile',
+    'VirtualMachineScaleSetManagedDiskParameters',
+    'VirtualMachineScaleSetOSDisk',
+    'VirtualMachineScaleSetUpdateOSDisk',
+    'VirtualMachineScaleSetDataDisk',
+    'VirtualMachineScaleSetStorageProfile',
+    'VirtualMachineScaleSetUpdateStorageProfile',
+    'ApiEntityReference',
+    'VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings',
+    'VirtualMachineScaleSetIpTag',
+    'VirtualMachineScaleSetPublicIPAddressConfiguration',
+    'VirtualMachineScaleSetUpdatePublicIPAddressConfiguration',
+    'VirtualMachineScaleSetIPConfiguration',
+    'VirtualMachineScaleSetUpdateIPConfiguration',
+    'VirtualMachineScaleSetNetworkConfigurationDnsSettings',
+    'VirtualMachineScaleSetNetworkConfiguration',
+    'VirtualMachineScaleSetUpdateNetworkConfiguration',
+    'VirtualMachineScaleSetNetworkProfile',
+    'VirtualMachineScaleSetUpdateNetworkProfile',
+    'VirtualMachineScaleSetExtension',
+    'VirtualMachineScaleSetExtensionProfile',
+    'VirtualMachineScaleSetVMProfile',
+    'VirtualMachineScaleSetUpdateVMProfile',
+    'VirtualMachineScaleSet',
+    'VirtualMachineScaleSetUpdate',
+    'VirtualMachineScaleSetVMInstanceIDs',
+    'VirtualMachineScaleSetVMInstanceRequiredIDs',
+    'VirtualMachineStatusCodeCount',
+    'VirtualMachineScaleSetInstanceViewStatusesSummary',
+    'VirtualMachineScaleSetVMExtensionsSummary',
+    'VirtualMachineScaleSetInstanceView',
+    'VirtualMachineScaleSetSkuCapacity',
+    'VirtualMachineScaleSetSku',
+    'ApiErrorBase',
+    'InnerError',
+    'ApiError',
+    'RollbackStatusInfo',
+    'UpgradeOperationHistoryStatus',
+    'RollingUpgradeProgressInfo',
+    'UpgradeOperationHistoricalStatusInfoProperties',
+    'UpgradeOperationHistoricalStatusInfo',
+    'VirtualMachineScaleSetVM',
+    'VirtualMachineHealthStatus',
+    'VirtualMachineScaleSetVMInstanceView',
+    'RollingUpgradeRunningStatus',
+    'RollingUpgradeStatusInfo',
     'Resource',
+    'UpdateResource',
+    'SubResourceReadOnly',
+    'RecoveryWalkResponse',
+    'RequestRateByIntervalInput',
+    'ThrottledRequestsInput',
+    'LogAnalyticsInputBase',
+    'LogAnalyticsOutput',
+    'LogAnalyticsOperationResult',
+    'RunCommandInputParameter',
+    'RunCommandInput',
+    'RunCommandParameterDefinition',
+    'RunCommandDocumentBase',
+    'RunCommandDocument',
+    'RunCommandResult',
     'DiskSku',
-    'ResourceUpdate',
     'ImageDiskReference',
     'CreationData',
     'SourceVault',
@@ -70,11 +476,45 @@
     'AccessUri',
     'Snapshot',
     'SnapshotUpdate',
+    'ComputeOperationValuePaged',
+    'AvailabilitySetPaged',
+    'VirtualMachineSizePaged',
+    'UsagePaged',
+    'ImagePaged',
+    'VirtualMachinePaged',
+    'VirtualMachineScaleSetPaged',
+    'VirtualMachineScaleSetSkuPaged',
+    'UpgradeOperationHistoricalStatusInfoPaged',
+    'VirtualMachineScaleSetExtensionPaged',
+    'VirtualMachineScaleSetVMPaged',
+    'RunCommandDocumentBasePaged',
     'DiskPaged',
     'SnapshotPaged',
-    'StorageAccountTypes',
+    'StatusLevelTypes',
     'OperatingSystemTypes',
+    'VirtualMachineSizeTypes',
+    'CachingTypes',
+    'DiskCreateOptionTypes',
+    'StorageAccountTypes',
+    'PassNames',
+    'ComponentNames',
+    'SettingNames',
+    'ProtocolTypes',
+    'ResourceIdentityType',
+    'MaintenanceOperationResultCodeTypes',
+    'UpgradeMode',
+    'OperatingSystemStateTypes',
+    'IPVersion',
+    'VirtualMachinePriorityTypes',
+    'VirtualMachineEvictionPolicyTypes',
+    'VirtualMachineScaleSetSkuScaleType',
+    'UpgradeState',
+    'UpgradeOperationInvoker',
+    'RollingUpgradeStatusCode',
+    'RollingUpgradeActionType',
+    'IntervalInMins',
     'DiskCreateOption',
     'SnapshotStorageAccountTypes',
     'AccessLevel',
+    'InstanceViewTypes',
 ]
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/additional_unattend_content.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/additional_unattend_content.py
new file mode 100644
index 000000000000..c8262b8dc95f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/additional_unattend_content.py
@@ -0,0 +1,52 @@
+# 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 AdditionalUnattendContent(Model):
+    """Specifies additional XML formatted information that can be included in the
+    Unattend.xml file, which is used by Windows Setup. Contents are defined by
+    setting name, component name, and the pass in which the content is applied.
+
+    :param pass_name: The pass name. Currently, the only allowable value is
+     OobeSystem. Possible values include: 'OobeSystem'
+    :type pass_name: str or ~azure.mgmt.compute.v2018_04_01.models.PassNames
+    :param component_name: The component name. Currently, the only allowable
+     value is Microsoft-Windows-Shell-Setup. Possible values include:
+     'Microsoft-Windows-Shell-Setup'
+    :type component_name: str or
+     ~azure.mgmt.compute.v2018_04_01.models.ComponentNames
+    :param setting_name: Specifies the name of the setting to which the
+     content applies. Possible values are: FirstLogonCommands and AutoLogon.
+     Possible values include: 'AutoLogon', 'FirstLogonCommands'
+    :type setting_name: str or
+     ~azure.mgmt.compute.v2018_04_01.models.SettingNames
+    :param content: Specifies the XML formatted content that is added to the
+     unattend.xml file for the specified path and component. The XML must be
+     less than 4KB and must include the root element for the setting or feature
+     that is being inserted.
+    :type content: str
+    """
+
+    _attribute_map = {
+        'pass_name': {'key': 'passName', 'type': 'PassNames'},
+        'component_name': {'key': 'componentName', 'type': 'ComponentNames'},
+        'setting_name': {'key': 'settingName', 'type': 'SettingNames'},
+        'content': {'key': 'content', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(AdditionalUnattendContent, self).__init__(**kwargs)
+        self.pass_name = kwargs.get('pass_name', None)
+        self.component_name = kwargs.get('component_name', None)
+        self.setting_name = kwargs.get('setting_name', None)
+        self.content = kwargs.get('content', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/additional_unattend_content_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/additional_unattend_content_py3.py
new file mode 100644
index 000000000000..17c0266fe4b0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/additional_unattend_content_py3.py
@@ -0,0 +1,52 @@
+# 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 AdditionalUnattendContent(Model):
+    """Specifies additional XML formatted information that can be included in the
+    Unattend.xml file, which is used by Windows Setup. Contents are defined by
+    setting name, component name, and the pass in which the content is applied.
+
+    :param pass_name: The pass name. Currently, the only allowable value is
+     OobeSystem. Possible values include: 'OobeSystem'
+    :type pass_name: str or ~azure.mgmt.compute.v2018_04_01.models.PassNames
+    :param component_name: The component name. Currently, the only allowable
+     value is Microsoft-Windows-Shell-Setup. Possible values include:
+     'Microsoft-Windows-Shell-Setup'
+    :type component_name: str or
+     ~azure.mgmt.compute.v2018_04_01.models.ComponentNames
+    :param setting_name: Specifies the name of the setting to which the
+     content applies. Possible values are: FirstLogonCommands and AutoLogon.
+     Possible values include: 'AutoLogon', 'FirstLogonCommands'
+    :type setting_name: str or
+     ~azure.mgmt.compute.v2018_04_01.models.SettingNames
+    :param content: Specifies the XML formatted content that is added to the
+     unattend.xml file for the specified path and component. The XML must be
+     less than 4KB and must include the root element for the setting or feature
+     that is being inserted.
+    :type content: str
+    """
+
+    _attribute_map = {
+        'pass_name': {'key': 'passName', 'type': 'PassNames'},
+        'component_name': {'key': 'componentName', 'type': 'ComponentNames'},
+        'setting_name': {'key': 'settingName', 'type': 'SettingNames'},
+        'content': {'key': 'content', 'type': 'str'},
+    }
+
+    def __init__(self, *, pass_name=None, component_name=None, setting_name=None, content: str=None, **kwargs) -> None:
+        super(AdditionalUnattendContent, self).__init__(**kwargs)
+        self.pass_name = pass_name
+        self.component_name = component_name
+        self.setting_name = setting_name
+        self.content = content
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_entity_reference.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_entity_reference.py
new file mode 100644
index 000000000000..d1bf572e916d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_entity_reference.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 ApiEntityReference(Model):
+    """The API entity reference.
+
+    :param id: The ARM resource id in the form of
+     /subscriptions/{SubcriptionId}/resourceGroups/{ResourceGroupName}/...
+    :type id: str
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ApiEntityReference, self).__init__(**kwargs)
+        self.id = kwargs.get('id', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_entity_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_entity_reference_py3.py
new file mode 100644
index 000000000000..da3e07082381
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_entity_reference_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 ApiEntityReference(Model):
+    """The API entity reference.
+
+    :param id: The ARM resource id in the form of
+     /subscriptions/{SubcriptionId}/resourceGroups/{ResourceGroupName}/...
+    :type id: str
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+    }
+
+    def __init__(self, *, id: str=None, **kwargs) -> None:
+        super(ApiEntityReference, self).__init__(**kwargs)
+        self.id = id
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error.py
new file mode 100644
index 000000000000..6c3ce23571f7
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error.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 ApiError(Model):
+    """Api error.
+
+    :param details: The Api error details
+    :type details: list[~azure.mgmt.compute.v2018_04_01.models.ApiErrorBase]
+    :param innererror: The Api inner error
+    :type innererror: ~azure.mgmt.compute.v2018_04_01.models.InnerError
+    :param code: The error code.
+    :type code: str
+    :param target: The target of the particular error.
+    :type target: str
+    :param message: The error message.
+    :type message: str
+    """
+
+    _attribute_map = {
+        'details': {'key': 'details', 'type': '[ApiErrorBase]'},
+        'innererror': {'key': 'innererror', 'type': 'InnerError'},
+        'code': {'key': 'code', 'type': 'str'},
+        'target': {'key': 'target', 'type': 'str'},
+        'message': {'key': 'message', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ApiError, self).__init__(**kwargs)
+        self.details = kwargs.get('details', None)
+        self.innererror = kwargs.get('innererror', None)
+        self.code = kwargs.get('code', None)
+        self.target = kwargs.get('target', None)
+        self.message = kwargs.get('message', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base.py
new file mode 100644
index 000000000000..655c08638905
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base.py
@@ -0,0 +1,36 @@
+# 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 ApiErrorBase(Model):
+    """Api error base.
+
+    :param code: The error code.
+    :type code: str
+    :param target: The target of the particular error.
+    :type target: str
+    :param message: The error message.
+    :type message: str
+    """
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'str'},
+        'target': {'key': 'target', 'type': 'str'},
+        'message': {'key': 'message', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ApiErrorBase, self).__init__(**kwargs)
+        self.code = kwargs.get('code', None)
+        self.target = kwargs.get('target', None)
+        self.message = kwargs.get('message', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base_py3.py
new file mode 100644
index 000000000000..5ba95aa0283e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_base_py3.py
@@ -0,0 +1,36 @@
+# 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 ApiErrorBase(Model):
+    """Api error base.
+
+    :param code: The error code.
+    :type code: str
+    :param target: The target of the particular error.
+    :type target: str
+    :param message: The error message.
+    :type message: str
+    """
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'str'},
+        'target': {'key': 'target', 'type': 'str'},
+        'message': {'key': 'message', 'type': 'str'},
+    }
+
+    def __init__(self, *, code: str=None, target: str=None, message: str=None, **kwargs) -> None:
+        super(ApiErrorBase, self).__init__(**kwargs)
+        self.code = code
+        self.target = target
+        self.message = message
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_py3.py
new file mode 100644
index 000000000000..ad665ba38599
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/api_error_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 ApiError(Model):
+    """Api error.
+
+    :param details: The Api error details
+    :type details: list[~azure.mgmt.compute.v2018_04_01.models.ApiErrorBase]
+    :param innererror: The Api inner error
+    :type innererror: ~azure.mgmt.compute.v2018_04_01.models.InnerError
+    :param code: The error code.
+    :type code: str
+    :param target: The target of the particular error.
+    :type target: str
+    :param message: The error message.
+    :type message: str
+    """
+
+    _attribute_map = {
+        'details': {'key': 'details', 'type': '[ApiErrorBase]'},
+        'innererror': {'key': 'innererror', 'type': 'InnerError'},
+        'code': {'key': 'code', 'type': 'str'},
+        'target': {'key': 'target', 'type': 'str'},
+        'message': {'key': 'message', 'type': 'str'},
+    }
+
+    def __init__(self, *, details=None, innererror=None, code: str=None, target: str=None, message: str=None, **kwargs) -> None:
+        super(ApiError, self).__init__(**kwargs)
+        self.details = details
+        self.innererror = innererror
+        self.code = code
+        self.target = target
+        self.message = message
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/auto_os_upgrade_policy.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/auto_os_upgrade_policy.py
new file mode 100644
index 000000000000..2c74af408892
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/auto_os_upgrade_policy.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 AutoOSUpgradePolicy(Model):
+    """The configuration parameters used for performing automatic OS upgrade.
+
+    :param disable_auto_rollback: Whether OS image rollback feature should be
+     disabled. Default value is false.
+    :type disable_auto_rollback: bool
+    """
+
+    _attribute_map = {
+        'disable_auto_rollback': {'key': 'disableAutoRollback', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(AutoOSUpgradePolicy, self).__init__(**kwargs)
+        self.disable_auto_rollback = kwargs.get('disable_auto_rollback', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/auto_os_upgrade_policy_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/auto_os_upgrade_policy_py3.py
new file mode 100644
index 000000000000..3e3e751838a8
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/auto_os_upgrade_policy_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 AutoOSUpgradePolicy(Model):
+    """The configuration parameters used for performing automatic OS upgrade.
+
+    :param disable_auto_rollback: Whether OS image rollback feature should be
+     disabled. Default value is false.
+    :type disable_auto_rollback: bool
+    """
+
+    _attribute_map = {
+        'disable_auto_rollback': {'key': 'disableAutoRollback', 'type': 'bool'},
+    }
+
+    def __init__(self, *, disable_auto_rollback: bool=None, **kwargs) -> None:
+        super(AutoOSUpgradePolicy, self).__init__(**kwargs)
+        self.disable_auto_rollback = disable_auto_rollback
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set.py
new file mode 100644
index 000000000000..9221a6ce1278
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set.py
@@ -0,0 +1,85 @@
+# 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 AvailabilitySet(Resource):
+    """Specifies information about the availability set that the virtual machine
+    should be assigned to. Virtual machines specified in the same availability
+    set are allocated to different nodes to maximize availability. For more
+    information about availability sets, see [Manage the availability of
+    virtual
+    machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    <br><br> For more information on Azure planned maintainance, see [Planned
+    maintenance for virtual machines in
+    Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+    <br><br> Currently, a VM can only be added to availability set at creation
+    time. An existing VM cannot be added to an availability set.
+
+    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]
+    :param platform_update_domain_count: Update Domain count.
+    :type platform_update_domain_count: int
+    :param platform_fault_domain_count: Fault Domain count.
+    :type platform_fault_domain_count: int
+    :param virtual_machines: A list of references to all virtual machines in
+     the availability set.
+    :type virtual_machines:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    :ivar statuses: The resource status information.
+    :vartype statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    :param sku: Sku of the availability set
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'statuses': {'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}'},
+        'platform_update_domain_count': {'key': 'properties.platformUpdateDomainCount', 'type': 'int'},
+        'platform_fault_domain_count': {'key': 'properties.platformFaultDomainCount', 'type': 'int'},
+        'virtual_machines': {'key': 'properties.virtualMachines', 'type': '[SubResource]'},
+        'statuses': {'key': 'properties.statuses', 'type': '[InstanceViewStatus]'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+    }
+
+    def __init__(self, **kwargs):
+        super(AvailabilitySet, self).__init__(**kwargs)
+        self.platform_update_domain_count = kwargs.get('platform_update_domain_count', None)
+        self.platform_fault_domain_count = kwargs.get('platform_fault_domain_count', None)
+        self.virtual_machines = kwargs.get('virtual_machines', None)
+        self.statuses = None
+        self.sku = kwargs.get('sku', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_paged.py
new file mode 100644
index 000000000000..d3f242bb4d7d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_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 AvailabilitySetPaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`AvailabilitySet <azure.mgmt.compute.v2018_04_01.models.AvailabilitySet>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[AvailabilitySet]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(AvailabilitySetPaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_py3.py
new file mode 100644
index 000000000000..65c743257697
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_py3.py
@@ -0,0 +1,85 @@
+# 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 AvailabilitySet(Resource):
+    """Specifies information about the availability set that the virtual machine
+    should be assigned to. Virtual machines specified in the same availability
+    set are allocated to different nodes to maximize availability. For more
+    information about availability sets, see [Manage the availability of
+    virtual
+    machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    <br><br> For more information on Azure planned maintainance, see [Planned
+    maintenance for virtual machines in
+    Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+    <br><br> Currently, a VM can only be added to availability set at creation
+    time. An existing VM cannot be added to an availability set.
+
+    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]
+    :param platform_update_domain_count: Update Domain count.
+    :type platform_update_domain_count: int
+    :param platform_fault_domain_count: Fault Domain count.
+    :type platform_fault_domain_count: int
+    :param virtual_machines: A list of references to all virtual machines in
+     the availability set.
+    :type virtual_machines:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    :ivar statuses: The resource status information.
+    :vartype statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    :param sku: Sku of the availability set
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'statuses': {'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}'},
+        'platform_update_domain_count': {'key': 'properties.platformUpdateDomainCount', 'type': 'int'},
+        'platform_fault_domain_count': {'key': 'properties.platformFaultDomainCount', 'type': 'int'},
+        'virtual_machines': {'key': 'properties.virtualMachines', 'type': '[SubResource]'},
+        'statuses': {'key': 'properties.statuses', 'type': '[InstanceViewStatus]'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+    }
+
+    def __init__(self, *, location: str, tags=None, platform_update_domain_count: int=None, platform_fault_domain_count: int=None, virtual_machines=None, sku=None, **kwargs) -> None:
+        super(AvailabilitySet, self).__init__(location=location, tags=tags, **kwargs)
+        self.platform_update_domain_count = platform_update_domain_count
+        self.platform_fault_domain_count = platform_fault_domain_count
+        self.virtual_machines = virtual_machines
+        self.statuses = None
+        self.sku = sku
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_update.py
new file mode 100644
index 000000000000..749c2d03a3e1
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_update.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 .update_resource import UpdateResource
+
+
+class AvailabilitySetUpdate(UpdateResource):
+    """Specifies information about the availability set that the virtual machine
+    should be assigned to. Only tags may be updated.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param platform_update_domain_count: Update Domain count.
+    :type platform_update_domain_count: int
+    :param platform_fault_domain_count: Fault Domain count.
+    :type platform_fault_domain_count: int
+    :param virtual_machines: A list of references to all virtual machines in
+     the availability set.
+    :type virtual_machines:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    :ivar statuses: The resource status information.
+    :vartype statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    :param sku: Sku of the availability set
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
+    """
+
+    _validation = {
+        'statuses': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'platform_update_domain_count': {'key': 'properties.platformUpdateDomainCount', 'type': 'int'},
+        'platform_fault_domain_count': {'key': 'properties.platformFaultDomainCount', 'type': 'int'},
+        'virtual_machines': {'key': 'properties.virtualMachines', 'type': '[SubResource]'},
+        'statuses': {'key': 'properties.statuses', 'type': '[InstanceViewStatus]'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+    }
+
+    def __init__(self, **kwargs):
+        super(AvailabilitySetUpdate, self).__init__(**kwargs)
+        self.platform_update_domain_count = kwargs.get('platform_update_domain_count', None)
+        self.platform_fault_domain_count = kwargs.get('platform_fault_domain_count', None)
+        self.virtual_machines = kwargs.get('virtual_machines', None)
+        self.statuses = None
+        self.sku = kwargs.get('sku', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_update_py3.py
new file mode 100644
index 000000000000..099479e29c04
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/availability_set_update_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 .update_resource_py3 import UpdateResource
+
+
+class AvailabilitySetUpdate(UpdateResource):
+    """Specifies information about the availability set that the virtual machine
+    should be assigned to. Only tags may be updated.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param platform_update_domain_count: Update Domain count.
+    :type platform_update_domain_count: int
+    :param platform_fault_domain_count: Fault Domain count.
+    :type platform_fault_domain_count: int
+    :param virtual_machines: A list of references to all virtual machines in
+     the availability set.
+    :type virtual_machines:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    :ivar statuses: The resource status information.
+    :vartype statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    :param sku: Sku of the availability set
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
+    """
+
+    _validation = {
+        'statuses': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'platform_update_domain_count': {'key': 'properties.platformUpdateDomainCount', 'type': 'int'},
+        'platform_fault_domain_count': {'key': 'properties.platformFaultDomainCount', 'type': 'int'},
+        'virtual_machines': {'key': 'properties.virtualMachines', 'type': '[SubResource]'},
+        'statuses': {'key': 'properties.statuses', 'type': '[InstanceViewStatus]'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+    }
+
+    def __init__(self, *, tags=None, platform_update_domain_count: int=None, platform_fault_domain_count: int=None, virtual_machines=None, sku=None, **kwargs) -> None:
+        super(AvailabilitySetUpdate, self).__init__(tags=tags, **kwargs)
+        self.platform_update_domain_count = platform_update_domain_count
+        self.platform_fault_domain_count = platform_fault_domain_count
+        self.virtual_machines = virtual_machines
+        self.statuses = None
+        self.sku = sku
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics.py
new file mode 100644
index 000000000000..ca3dbdd4f23c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics.py
@@ -0,0 +1,38 @@
+# 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 BootDiagnostics(Model):
+    """Boot Diagnostics is a debugging feature which allows you to view Console
+    Output and Screenshot to diagnose VM status. <br><br> For Linux Virtual
+    Machines, you can easily view the output of your console log. <br><br> For
+    both Windows and Linux virtual machines, Azure also enables you to see a
+    screenshot of the VM from the hypervisor.
+
+    :param enabled: Whether boot diagnostics should be enabled on the Virtual
+     Machine.
+    :type enabled: bool
+    :param storage_uri: Uri of the storage account to use for placing the
+     console output and screenshot.
+    :type storage_uri: str
+    """
+
+    _attribute_map = {
+        'enabled': {'key': 'enabled', 'type': 'bool'},
+        'storage_uri': {'key': 'storageUri', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(BootDiagnostics, self).__init__(**kwargs)
+        self.enabled = kwargs.get('enabled', None)
+        self.storage_uri = kwargs.get('storage_uri', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_instance_view.py
new file mode 100644
index 000000000000..6fe1f84a3910
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_instance_view.py
@@ -0,0 +1,32 @@
+# 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 BootDiagnosticsInstanceView(Model):
+    """The instance view of a virtual machine boot diagnostics.
+
+    :param console_screenshot_blob_uri: The console screenshot blob URI.
+    :type console_screenshot_blob_uri: str
+    :param serial_console_log_blob_uri: The Linux serial console log blob Uri.
+    :type serial_console_log_blob_uri: str
+    """
+
+    _attribute_map = {
+        'console_screenshot_blob_uri': {'key': 'consoleScreenshotBlobUri', 'type': 'str'},
+        'serial_console_log_blob_uri': {'key': 'serialConsoleLogBlobUri', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(BootDiagnosticsInstanceView, self).__init__(**kwargs)
+        self.console_screenshot_blob_uri = kwargs.get('console_screenshot_blob_uri', None)
+        self.serial_console_log_blob_uri = kwargs.get('serial_console_log_blob_uri', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_instance_view_py3.py
new file mode 100644
index 000000000000..d85b51981ab9
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_instance_view_py3.py
@@ -0,0 +1,32 @@
+# 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 BootDiagnosticsInstanceView(Model):
+    """The instance view of a virtual machine boot diagnostics.
+
+    :param console_screenshot_blob_uri: The console screenshot blob URI.
+    :type console_screenshot_blob_uri: str
+    :param serial_console_log_blob_uri: The Linux serial console log blob Uri.
+    :type serial_console_log_blob_uri: str
+    """
+
+    _attribute_map = {
+        'console_screenshot_blob_uri': {'key': 'consoleScreenshotBlobUri', 'type': 'str'},
+        'serial_console_log_blob_uri': {'key': 'serialConsoleLogBlobUri', 'type': 'str'},
+    }
+
+    def __init__(self, *, console_screenshot_blob_uri: str=None, serial_console_log_blob_uri: str=None, **kwargs) -> None:
+        super(BootDiagnosticsInstanceView, self).__init__(**kwargs)
+        self.console_screenshot_blob_uri = console_screenshot_blob_uri
+        self.serial_console_log_blob_uri = serial_console_log_blob_uri
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_py3.py
new file mode 100644
index 000000000000..b0a756ea4fa0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/boot_diagnostics_py3.py
@@ -0,0 +1,38 @@
+# 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 BootDiagnostics(Model):
+    """Boot Diagnostics is a debugging feature which allows you to view Console
+    Output and Screenshot to diagnose VM status. <br><br> For Linux Virtual
+    Machines, you can easily view the output of your console log. <br><br> For
+    both Windows and Linux virtual machines, Azure also enables you to see a
+    screenshot of the VM from the hypervisor.
+
+    :param enabled: Whether boot diagnostics should be enabled on the Virtual
+     Machine.
+    :type enabled: bool
+    :param storage_uri: Uri of the storage account to use for placing the
+     console output and screenshot.
+    :type storage_uri: str
+    """
+
+    _attribute_map = {
+        'enabled': {'key': 'enabled', 'type': 'bool'},
+        'storage_uri': {'key': 'storageUri', 'type': 'str'},
+    }
+
+    def __init__(self, *, enabled: bool=None, storage_uri: str=None, **kwargs) -> None:
+        super(BootDiagnostics, self).__init__(**kwargs)
+        self.enabled = enabled
+        self.storage_uri = storage_uri
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py
index 94796a92c793..b66be29c4cf4 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py
@@ -12,10 +12,11 @@
 from enum import Enum
 
 
-class StorageAccountTypes(str, Enum):
+class StatusLevelTypes(str, Enum):
 
-    standard_lrs = "Standard_LRS"
-    premium_lrs = "Premium_LRS"
+    info = "Info"
+    warning = "Warning"
+    error = "Error"
 
 
 class OperatingSystemTypes(str, Enum):
@@ -24,6 +25,308 @@ class OperatingSystemTypes(str, Enum):
     linux = "Linux"
 
 
+class VirtualMachineSizeTypes(str, Enum):
+
+    basic_a0 = "Basic_A0"
+    basic_a1 = "Basic_A1"
+    basic_a2 = "Basic_A2"
+    basic_a3 = "Basic_A3"
+    basic_a4 = "Basic_A4"
+    standard_a0 = "Standard_A0"
+    standard_a1 = "Standard_A1"
+    standard_a2 = "Standard_A2"
+    standard_a3 = "Standard_A3"
+    standard_a4 = "Standard_A4"
+    standard_a5 = "Standard_A5"
+    standard_a6 = "Standard_A6"
+    standard_a7 = "Standard_A7"
+    standard_a8 = "Standard_A8"
+    standard_a9 = "Standard_A9"
+    standard_a10 = "Standard_A10"
+    standard_a11 = "Standard_A11"
+    standard_a1_v2 = "Standard_A1_v2"
+    standard_a2_v2 = "Standard_A2_v2"
+    standard_a4_v2 = "Standard_A4_v2"
+    standard_a8_v2 = "Standard_A8_v2"
+    standard_a2m_v2 = "Standard_A2m_v2"
+    standard_a4m_v2 = "Standard_A4m_v2"
+    standard_a8m_v2 = "Standard_A8m_v2"
+    standard_b1s = "Standard_B1s"
+    standard_b1ms = "Standard_B1ms"
+    standard_b2s = "Standard_B2s"
+    standard_b2ms = "Standard_B2ms"
+    standard_b4ms = "Standard_B4ms"
+    standard_b8ms = "Standard_B8ms"
+    standard_d1 = "Standard_D1"
+    standard_d2 = "Standard_D2"
+    standard_d3 = "Standard_D3"
+    standard_d4 = "Standard_D4"
+    standard_d11 = "Standard_D11"
+    standard_d12 = "Standard_D12"
+    standard_d13 = "Standard_D13"
+    standard_d14 = "Standard_D14"
+    standard_d1_v2 = "Standard_D1_v2"
+    standard_d2_v2 = "Standard_D2_v2"
+    standard_d3_v2 = "Standard_D3_v2"
+    standard_d4_v2 = "Standard_D4_v2"
+    standard_d5_v2 = "Standard_D5_v2"
+    standard_d2_v3 = "Standard_D2_v3"
+    standard_d4_v3 = "Standard_D4_v3"
+    standard_d8_v3 = "Standard_D8_v3"
+    standard_d16_v3 = "Standard_D16_v3"
+    standard_d32_v3 = "Standard_D32_v3"
+    standard_d64_v3 = "Standard_D64_v3"
+    standard_d2s_v3 = "Standard_D2s_v3"
+    standard_d4s_v3 = "Standard_D4s_v3"
+    standard_d8s_v3 = "Standard_D8s_v3"
+    standard_d16s_v3 = "Standard_D16s_v3"
+    standard_d32s_v3 = "Standard_D32s_v3"
+    standard_d64s_v3 = "Standard_D64s_v3"
+    standard_d11_v2 = "Standard_D11_v2"
+    standard_d12_v2 = "Standard_D12_v2"
+    standard_d13_v2 = "Standard_D13_v2"
+    standard_d14_v2 = "Standard_D14_v2"
+    standard_d15_v2 = "Standard_D15_v2"
+    standard_ds1 = "Standard_DS1"
+    standard_ds2 = "Standard_DS2"
+    standard_ds3 = "Standard_DS3"
+    standard_ds4 = "Standard_DS4"
+    standard_ds11 = "Standard_DS11"
+    standard_ds12 = "Standard_DS12"
+    standard_ds13 = "Standard_DS13"
+    standard_ds14 = "Standard_DS14"
+    standard_ds1_v2 = "Standard_DS1_v2"
+    standard_ds2_v2 = "Standard_DS2_v2"
+    standard_ds3_v2 = "Standard_DS3_v2"
+    standard_ds4_v2 = "Standard_DS4_v2"
+    standard_ds5_v2 = "Standard_DS5_v2"
+    standard_ds11_v2 = "Standard_DS11_v2"
+    standard_ds12_v2 = "Standard_DS12_v2"
+    standard_ds13_v2 = "Standard_DS13_v2"
+    standard_ds14_v2 = "Standard_DS14_v2"
+    standard_ds15_v2 = "Standard_DS15_v2"
+    standard_ds13_4_v2 = "Standard_DS13-4_v2"
+    standard_ds13_2_v2 = "Standard_DS13-2_v2"
+    standard_ds14_8_v2 = "Standard_DS14-8_v2"
+    standard_ds14_4_v2 = "Standard_DS14-4_v2"
+    standard_e2_v3 = "Standard_E2_v3"
+    standard_e4_v3 = "Standard_E4_v3"
+    standard_e8_v3 = "Standard_E8_v3"
+    standard_e16_v3 = "Standard_E16_v3"
+    standard_e32_v3 = "Standard_E32_v3"
+    standard_e64_v3 = "Standard_E64_v3"
+    standard_e2s_v3 = "Standard_E2s_v3"
+    standard_e4s_v3 = "Standard_E4s_v3"
+    standard_e8s_v3 = "Standard_E8s_v3"
+    standard_e16s_v3 = "Standard_E16s_v3"
+    standard_e32s_v3 = "Standard_E32s_v3"
+    standard_e64s_v3 = "Standard_E64s_v3"
+    standard_e32_16_v3 = "Standard_E32-16_v3"
+    standard_e32_8s_v3 = "Standard_E32-8s_v3"
+    standard_e64_32s_v3 = "Standard_E64-32s_v3"
+    standard_e64_16s_v3 = "Standard_E64-16s_v3"
+    standard_f1 = "Standard_F1"
+    standard_f2 = "Standard_F2"
+    standard_f4 = "Standard_F4"
+    standard_f8 = "Standard_F8"
+    standard_f16 = "Standard_F16"
+    standard_f1s = "Standard_F1s"
+    standard_f2s = "Standard_F2s"
+    standard_f4s = "Standard_F4s"
+    standard_f8s = "Standard_F8s"
+    standard_f16s = "Standard_F16s"
+    standard_f2s_v2 = "Standard_F2s_v2"
+    standard_f4s_v2 = "Standard_F4s_v2"
+    standard_f8s_v2 = "Standard_F8s_v2"
+    standard_f16s_v2 = "Standard_F16s_v2"
+    standard_f32s_v2 = "Standard_F32s_v2"
+    standard_f64s_v2 = "Standard_F64s_v2"
+    standard_f72s_v2 = "Standard_F72s_v2"
+    standard_g1 = "Standard_G1"
+    standard_g2 = "Standard_G2"
+    standard_g3 = "Standard_G3"
+    standard_g4 = "Standard_G4"
+    standard_g5 = "Standard_G5"
+    standard_gs1 = "Standard_GS1"
+    standard_gs2 = "Standard_GS2"
+    standard_gs3 = "Standard_GS3"
+    standard_gs4 = "Standard_GS4"
+    standard_gs5 = "Standard_GS5"
+    standard_gs4_8 = "Standard_GS4-8"
+    standard_gs4_4 = "Standard_GS4-4"
+    standard_gs5_16 = "Standard_GS5-16"
+    standard_gs5_8 = "Standard_GS5-8"
+    standard_h8 = "Standard_H8"
+    standard_h16 = "Standard_H16"
+    standard_h8m = "Standard_H8m"
+    standard_h16m = "Standard_H16m"
+    standard_h16r = "Standard_H16r"
+    standard_h16mr = "Standard_H16mr"
+    standard_l4s = "Standard_L4s"
+    standard_l8s = "Standard_L8s"
+    standard_l16s = "Standard_L16s"
+    standard_l32s = "Standard_L32s"
+    standard_m64s = "Standard_M64s"
+    standard_m64ms = "Standard_M64ms"
+    standard_m128s = "Standard_M128s"
+    standard_m128ms = "Standard_M128ms"
+    standard_m64_32ms = "Standard_M64-32ms"
+    standard_m64_16ms = "Standard_M64-16ms"
+    standard_m128_64ms = "Standard_M128-64ms"
+    standard_m128_32ms = "Standard_M128-32ms"
+    standard_nc6 = "Standard_NC6"
+    standard_nc12 = "Standard_NC12"
+    standard_nc24 = "Standard_NC24"
+    standard_nc24r = "Standard_NC24r"
+    standard_nc6s_v2 = "Standard_NC6s_v2"
+    standard_nc12s_v2 = "Standard_NC12s_v2"
+    standard_nc24s_v2 = "Standard_NC24s_v2"
+    standard_nc24rs_v2 = "Standard_NC24rs_v2"
+    standard_nc6s_v3 = "Standard_NC6s_v3"
+    standard_nc12s_v3 = "Standard_NC12s_v3"
+    standard_nc24s_v3 = "Standard_NC24s_v3"
+    standard_nc24rs_v3 = "Standard_NC24rs_v3"
+    standard_nd6s = "Standard_ND6s"
+    standard_nd12s = "Standard_ND12s"
+    standard_nd24s = "Standard_ND24s"
+    standard_nd24rs = "Standard_ND24rs"
+    standard_nv6 = "Standard_NV6"
+    standard_nv12 = "Standard_NV12"
+    standard_nv24 = "Standard_NV24"
+
+
+class CachingTypes(str, Enum):
+
+    none = "None"
+    read_only = "ReadOnly"
+    read_write = "ReadWrite"
+
+
+class DiskCreateOptionTypes(str, Enum):
+
+    from_image = "FromImage"
+    empty = "Empty"
+    attach = "Attach"
+
+
+class StorageAccountTypes(str, Enum):
+
+    standard_lrs = "Standard_LRS"
+    premium_lrs = "Premium_LRS"
+
+
+class PassNames(str, Enum):
+
+    oobe_system = "OobeSystem"
+
+
+class ComponentNames(str, Enum):
+
+    microsoft_windows_shell_setup = "Microsoft-Windows-Shell-Setup"
+
+
+class SettingNames(str, Enum):
+
+    auto_logon = "AutoLogon"
+    first_logon_commands = "FirstLogonCommands"
+
+
+class ProtocolTypes(str, Enum):
+
+    http = "Http"
+    https = "Https"
+
+
+class ResourceIdentityType(str, Enum):
+
+    system_assigned = "SystemAssigned"
+    user_assigned = "UserAssigned"
+    system_assigned_user_assigned = "SystemAssigned, UserAssigned"
+    none = "None"
+
+
+class MaintenanceOperationResultCodeTypes(str, Enum):
+
+    none = "None"
+    retry_later = "RetryLater"
+    maintenance_aborted = "MaintenanceAborted"
+    maintenance_completed = "MaintenanceCompleted"
+
+
+class UpgradeMode(str, Enum):
+
+    automatic = "Automatic"
+    manual = "Manual"
+    rolling = "Rolling"
+
+
+class OperatingSystemStateTypes(str, Enum):
+
+    generalized = "Generalized"
+    specialized = "Specialized"
+
+
+class IPVersion(str, Enum):
+
+    ipv4 = "IPv4"
+    ipv6 = "IPv6"
+
+
+class VirtualMachinePriorityTypes(str, Enum):
+
+    regular = "Regular"
+    low = "Low"
+
+
+class VirtualMachineEvictionPolicyTypes(str, Enum):
+
+    deallocate = "Deallocate"
+    delete = "Delete"
+
+
+class VirtualMachineScaleSetSkuScaleType(str, Enum):
+
+    automatic = "Automatic"
+    none = "None"
+
+
+class UpgradeState(str, Enum):
+
+    rolling_forward = "RollingForward"
+    cancelled = "Cancelled"
+    completed = "Completed"
+    faulted = "Faulted"
+
+
+class UpgradeOperationInvoker(str, Enum):
+
+    unknown = "Unknown"
+    user = "User"
+    platform = "Platform"
+
+
+class RollingUpgradeStatusCode(str, Enum):
+
+    rolling_forward = "RollingForward"
+    cancelled = "Cancelled"
+    completed = "Completed"
+    faulted = "Faulted"
+
+
+class RollingUpgradeActionType(str, Enum):
+
+    start = "Start"
+    cancel = "Cancel"
+
+
+class IntervalInMins(str, Enum):
+
+    three_mins = "ThreeMins"
+    five_mins = "FiveMins"
+    thirty_mins = "ThirtyMins"
+    sixty_mins = "SixtyMins"
+
+
 class DiskCreateOption(str, Enum):
 
     empty = "Empty"
@@ -45,3 +348,8 @@ 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_04_01/models/compute_operation_value.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value.py
new file mode 100644
index 000000000000..525ef3bbb69a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value.py
@@ -0,0 +1,60 @@
+# 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 ComputeOperationValue(Model):
+    """Describes the properties of a Compute Operation value.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar origin: The origin of the compute operation.
+    :vartype origin: str
+    :ivar name: The name of the compute operation.
+    :vartype name: str
+    :ivar operation: The display name of the compute operation.
+    :vartype operation: str
+    :ivar resource: The display name of the resource the operation applies to.
+    :vartype resource: str
+    :ivar description: The description of the operation.
+    :vartype description: str
+    :ivar provider: The resource provider for the operation.
+    :vartype provider: str
+    """
+
+    _validation = {
+        'origin': {'readonly': True},
+        'name': {'readonly': True},
+        'operation': {'readonly': True},
+        'resource': {'readonly': True},
+        'description': {'readonly': True},
+        'provider': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'origin': {'key': 'origin', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'operation': {'key': 'display.operation', 'type': 'str'},
+        'resource': {'key': 'display.resource', 'type': 'str'},
+        'description': {'key': 'display.description', 'type': 'str'},
+        'provider': {'key': 'display.provider', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ComputeOperationValue, self).__init__(**kwargs)
+        self.origin = None
+        self.name = None
+        self.operation = None
+        self.resource = None
+        self.description = None
+        self.provider = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value_paged.py
new file mode 100644
index 000000000000..0735c0107487
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value_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 ComputeOperationValuePaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`ComputeOperationValue <azure.mgmt.compute.v2018_04_01.models.ComputeOperationValue>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[ComputeOperationValue]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(ComputeOperationValuePaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value_py3.py
new file mode 100644
index 000000000000..3c4388f312b9
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_operation_value_py3.py
@@ -0,0 +1,60 @@
+# 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 ComputeOperationValue(Model):
+    """Describes the properties of a Compute Operation value.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar origin: The origin of the compute operation.
+    :vartype origin: str
+    :ivar name: The name of the compute operation.
+    :vartype name: str
+    :ivar operation: The display name of the compute operation.
+    :vartype operation: str
+    :ivar resource: The display name of the resource the operation applies to.
+    :vartype resource: str
+    :ivar description: The description of the operation.
+    :vartype description: str
+    :ivar provider: The resource provider for the operation.
+    :vartype provider: str
+    """
+
+    _validation = {
+        'origin': {'readonly': True},
+        'name': {'readonly': True},
+        'operation': {'readonly': True},
+        'resource': {'readonly': True},
+        'description': {'readonly': True},
+        'provider': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'origin': {'key': 'origin', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'operation': {'key': 'display.operation', 'type': 'str'},
+        'resource': {'key': 'display.resource', 'type': 'str'},
+        'description': {'key': 'display.description', 'type': 'str'},
+        'provider': {'key': 'display.provider', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(ComputeOperationValue, self).__init__(**kwargs)
+        self.origin = None
+        self.name = None
+        self.operation = None
+        self.resource = None
+        self.description = None
+        self.provider = 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
new file mode 100644
index 000000000000..b72af03bf155
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk.py
@@ -0,0 +1,87 @@
+# 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 DataDisk(Model):
+    """Describes a data disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param lun: Required. Specifies the logical unit number of the data disk.
+     This value is used to identify data disks within the VM and therefore must
+     be unique for each data disk attached to a VM.
+    :type lun: int
+    :param name: The disk name.
+    :type name: str
+    :param vhd: The virtual hard disk.
+    :type vhd: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
+    :param image: The source user image virtual hard disk. The virtual hard
+     disk will be copied before being attached to the virtual machine. If
+     SourceImage is provided, the destination virtual hard drive must not
+     exist.
+    :type image: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :param create_option: Required. Specifies how the virtual machine should
+     be created.<br><br> Possible values are:<br><br> **Attach** \\u2013 This
+     value is used when you are using a specialized disk to create the virtual
+     machine.<br><br> **FromImage** \\u2013 This value is used when you are
+     using an image to create the virtual machine. If you are using a platform
+     image, you also use the imageReference element described above. If you are
+     using a marketplace image, you  also use the plan element previously
+     described. Possible values include: 'FromImage', 'Empty', 'Attach'
+    :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
+     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.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_04_01.models.ManagedDiskParameters
+    """
+
+    _validation = {
+        'lun': {'required': True},
+        'create_option': {'required': True},
+    }
+
+    _attribute_map = {
+        'lun': {'key': 'lun', 'type': 'int'},
+        'name': {'key': 'name', 'type': 'str'},
+        'vhd': {'key': 'vhd', 'type': 'VirtualHardDisk'},
+        'image': {'key': 'image', 'type': 'VirtualHardDisk'},
+        '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'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'ManagedDiskParameters'},
+    }
+
+    def __init__(self, **kwargs):
+        super(DataDisk, self).__init__(**kwargs)
+        self.lun = kwargs.get('lun', None)
+        self.name = kwargs.get('name', None)
+        self.vhd = kwargs.get('vhd', None)
+        self.image = kwargs.get('image', None)
+        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.managed_disk = kwargs.get('managed_disk', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_image.py
new file mode 100644
index 000000000000..b5dbfcefb472
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_image.py
@@ -0,0 +1,37 @@
+# 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 DataDiskImage(Model):
+    """Contains the data disk images information.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar lun: Specifies the logical unit number of the data disk. This value
+     is used to identify data disks within the VM and therefore must be unique
+     for each data disk attached to a VM.
+    :vartype lun: int
+    """
+
+    _validation = {
+        'lun': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'lun': {'key': 'lun', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs):
+        super(DataDiskImage, self).__init__(**kwargs)
+        self.lun = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_image_py3.py
new file mode 100644
index 000000000000..8431a3988502
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_image_py3.py
@@ -0,0 +1,37 @@
+# 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 DataDiskImage(Model):
+    """Contains the data disk images information.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar lun: Specifies the logical unit number of the data disk. This value
+     is used to identify data disks within the VM and therefore must be unique
+     for each data disk attached to a VM.
+    :vartype lun: int
+    """
+
+    _validation = {
+        'lun': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'lun': {'key': 'lun', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(DataDiskImage, self).__init__(**kwargs)
+        self.lun = None
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
new file mode 100644
index 000000000000..9a75b455ed11
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/data_disk_py3.py
@@ -0,0 +1,87 @@
+# 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 DataDisk(Model):
+    """Describes a data disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param lun: Required. Specifies the logical unit number of the data disk.
+     This value is used to identify data disks within the VM and therefore must
+     be unique for each data disk attached to a VM.
+    :type lun: int
+    :param name: The disk name.
+    :type name: str
+    :param vhd: The virtual hard disk.
+    :type vhd: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
+    :param image: The source user image virtual hard disk. The virtual hard
+     disk will be copied before being attached to the virtual machine. If
+     SourceImage is provided, the destination virtual hard drive must not
+     exist.
+    :type image: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :param create_option: Required. Specifies how the virtual machine should
+     be created.<br><br> Possible values are:<br><br> **Attach** \\u2013 This
+     value is used when you are using a specialized disk to create the virtual
+     machine.<br><br> **FromImage** \\u2013 This value is used when you are
+     using an image to create the virtual machine. If you are using a platform
+     image, you also use the imageReference element described above. If you are
+     using a marketplace image, you  also use the plan element previously
+     described. Possible values include: 'FromImage', 'Empty', 'Attach'
+    :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
+     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.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_04_01.models.ManagedDiskParameters
+    """
+
+    _validation = {
+        'lun': {'required': True},
+        'create_option': {'required': True},
+    }
+
+    _attribute_map = {
+        'lun': {'key': 'lun', 'type': 'int'},
+        'name': {'key': 'name', 'type': 'str'},
+        'vhd': {'key': 'vhd', 'type': 'VirtualHardDisk'},
+        'image': {'key': 'image', 'type': 'VirtualHardDisk'},
+        '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'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'ManagedDiskParameters'},
+    }
+
+    def __init__(self, *, lun: int, create_option, name: str=None, vhd=None, image=None, caching=None, write_accelerator_enabled: bool=None, disk_size_gb: int=None, managed_disk=None, **kwargs) -> None:
+        super(DataDisk, self).__init__(**kwargs)
+        self.lun = lun
+        self.name = name
+        self.vhd = vhd
+        self.image = image
+        self.caching = caching
+        self.write_accelerator_enabled = write_accelerator_enabled
+        self.create_option = create_option
+        self.disk_size_gb = disk_size_gb
+        self.managed_disk = managed_disk
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/diagnostics_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/diagnostics_profile.py
new file mode 100644
index 000000000000..c809544d655e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/diagnostics_profile.py
@@ -0,0 +1,34 @@
+# 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 DiagnosticsProfile(Model):
+    """Specifies the boot diagnostic settings state. <br><br>Minimum api-version:
+    2015-06-15.
+
+    :param boot_diagnostics: Boot Diagnostics is a debugging feature which
+     allows you to view Console Output and Screenshot to diagnose VM status.
+     <br><br> For Linux Virtual Machines, you can easily view the output of
+     your console log. <br><br> For both Windows and Linux virtual machines,
+     Azure also enables you to see a screenshot of the VM from the hypervisor.
+    :type boot_diagnostics:
+     ~azure.mgmt.compute.v2018_04_01.models.BootDiagnostics
+    """
+
+    _attribute_map = {
+        'boot_diagnostics': {'key': 'bootDiagnostics', 'type': 'BootDiagnostics'},
+    }
+
+    def __init__(self, **kwargs):
+        super(DiagnosticsProfile, self).__init__(**kwargs)
+        self.boot_diagnostics = kwargs.get('boot_diagnostics', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/diagnostics_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/diagnostics_profile_py3.py
new file mode 100644
index 000000000000..0193402fe61f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/diagnostics_profile_py3.py
@@ -0,0 +1,34 @@
+# 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 DiagnosticsProfile(Model):
+    """Specifies the boot diagnostic settings state. <br><br>Minimum api-version:
+    2015-06-15.
+
+    :param boot_diagnostics: Boot Diagnostics is a debugging feature which
+     allows you to view Console Output and Screenshot to diagnose VM status.
+     <br><br> For Linux Virtual Machines, you can easily view the output of
+     your console log. <br><br> For both Windows and Linux virtual machines,
+     Azure also enables you to see a screenshot of the VM from the hypervisor.
+    :type boot_diagnostics:
+     ~azure.mgmt.compute.v2018_04_01.models.BootDiagnostics
+    """
+
+    _attribute_map = {
+        'boot_diagnostics': {'key': 'bootDiagnostics', 'type': 'BootDiagnostics'},
+    }
+
+    def __init__(self, *, boot_diagnostics=None, **kwargs) -> None:
+        super(DiagnosticsProfile, self).__init__(**kwargs)
+        self.boot_diagnostics = boot_diagnostics
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_encryption_settings.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_encryption_settings.py
new file mode 100644
index 000000000000..7fd550357d75
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_encryption_settings.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 DiskEncryptionSettings(Model):
+    """Describes a Encryption Settings for a Disk.
+
+    :param disk_encryption_key: Specifies the location of the disk encryption
+     key, which is a Key Vault Secret.
+    :type disk_encryption_key:
+     ~azure.mgmt.compute.v2018_04_01.models.KeyVaultSecretReference
+    :param key_encryption_key: Specifies the location of the key encryption
+     key in Key Vault.
+    :type key_encryption_key:
+     ~azure.mgmt.compute.v2018_04_01.models.KeyVaultKeyReference
+    :param enabled: Specifies whether disk encryption should be enabled on the
+     virtual machine.
+    :type enabled: bool
+    """
+
+    _attribute_map = {
+        'disk_encryption_key': {'key': 'diskEncryptionKey', 'type': 'KeyVaultSecretReference'},
+        'key_encryption_key': {'key': 'keyEncryptionKey', 'type': 'KeyVaultKeyReference'},
+        'enabled': {'key': 'enabled', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(DiskEncryptionSettings, self).__init__(**kwargs)
+        self.disk_encryption_key = kwargs.get('disk_encryption_key', None)
+        self.key_encryption_key = kwargs.get('key_encryption_key', None)
+        self.enabled = kwargs.get('enabled', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_encryption_settings_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_encryption_settings_py3.py
new file mode 100644
index 000000000000..380a0b7f1176
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_encryption_settings_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 DiskEncryptionSettings(Model):
+    """Describes a Encryption Settings for a Disk.
+
+    :param disk_encryption_key: Specifies the location of the disk encryption
+     key, which is a Key Vault Secret.
+    :type disk_encryption_key:
+     ~azure.mgmt.compute.v2018_04_01.models.KeyVaultSecretReference
+    :param key_encryption_key: Specifies the location of the key encryption
+     key in Key Vault.
+    :type key_encryption_key:
+     ~azure.mgmt.compute.v2018_04_01.models.KeyVaultKeyReference
+    :param enabled: Specifies whether disk encryption should be enabled on the
+     virtual machine.
+    :type enabled: bool
+    """
+
+    _attribute_map = {
+        'disk_encryption_key': {'key': 'diskEncryptionKey', 'type': 'KeyVaultSecretReference'},
+        'key_encryption_key': {'key': 'keyEncryptionKey', 'type': 'KeyVaultKeyReference'},
+        'enabled': {'key': 'enabled', 'type': 'bool'},
+    }
+
+    def __init__(self, *, disk_encryption_key=None, key_encryption_key=None, enabled: bool=None, **kwargs) -> None:
+        super(DiskEncryptionSettings, self).__init__(**kwargs)
+        self.disk_encryption_key = disk_encryption_key
+        self.key_encryption_key = key_encryption_key
+        self.enabled = enabled
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_instance_view.py
new file mode 100644
index 000000000000..9a040fd5739b
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_instance_view.py
@@ -0,0 +1,39 @@
+# 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 DiskInstanceView(Model):
+    """The instance view of the disk.
+
+    :param name: The disk name.
+    :type name: str
+    :param encryption_settings: Specifies the encryption settings for the OS
+     Disk. <br><br> Minimum api-version: 2015-06-15
+    :type encryption_settings:
+     list[~azure.mgmt.compute.v2018_04_01.models.DiskEncryptionSettings]
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'encryption_settings': {'key': 'encryptionSettings', 'type': '[DiskEncryptionSettings]'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(DiskInstanceView, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.encryption_settings = kwargs.get('encryption_settings', None)
+        self.statuses = kwargs.get('statuses', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_instance_view_py3.py
new file mode 100644
index 000000000000..b9583371ba8b
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_instance_view_py3.py
@@ -0,0 +1,39 @@
+# 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 DiskInstanceView(Model):
+    """The instance view of the disk.
+
+    :param name: The disk name.
+    :type name: str
+    :param encryption_settings: Specifies the encryption settings for the OS
+     Disk. <br><br> Minimum api-version: 2015-06-15
+    :type encryption_settings:
+     list[~azure.mgmt.compute.v2018_04_01.models.DiskEncryptionSettings]
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'encryption_settings': {'key': 'encryptionSettings', 'type': '[DiskEncryptionSettings]'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, *, name: str=None, encryption_settings=None, statuses=None, **kwargs) -> None:
+        super(DiskInstanceView, self).__init__(**kwargs)
+        self.name = name
+        self.encryption_settings = encryption_settings
+        self.statuses = statuses
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update.py
index 7364769892bf..3ca75fec3871 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update.py
@@ -9,16 +9,12 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource_update import ResourceUpdate
+from msrest.serialization import Model
 
 
-class DiskUpdate(ResourceUpdate):
+class DiskUpdate(Model):
     """Disk update resource.
 
-    :param tags: Resource tags
-    :type tags: dict[str, str]
-    :param sku:
-    :type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
     :param os_type: the Operating System type. Possible values include:
      'Windows', 'Linux'
     :type os_type: str or
@@ -32,14 +28,18 @@ class DiskUpdate(ResourceUpdate):
     :param encryption_settings: Encryption settings for disk or snapshot
     :type encryption_settings:
      ~azure.mgmt.compute.v2018_04_01.models.EncryptionSettings
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param sku:
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
     """
 
     _attribute_map = {
-        'tags': {'key': 'tags', 'type': '{str}'},
-        'sku': {'key': 'sku', 'type': 'DiskSku'},
         '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': 'DiskSku'},
     }
 
     def __init__(self, **kwargs):
@@ -47,3 +47,5 @@ def __init__(self, **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_04_01/models/disk_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update_py3.py
index b2445fda4cc9..407d553cff9e 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update_py3.py
@@ -9,16 +9,12 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource_update_py3 import ResourceUpdate
+from msrest.serialization import Model
 
 
-class DiskUpdate(ResourceUpdate):
+class DiskUpdate(Model):
     """Disk update resource.
 
-    :param tags: Resource tags
-    :type tags: dict[str, str]
-    :param sku:
-    :type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
     :param os_type: the Operating System type. Possible values include:
      'Windows', 'Linux'
     :type os_type: str or
@@ -32,18 +28,24 @@ class DiskUpdate(ResourceUpdate):
     :param encryption_settings: Encryption settings for disk or snapshot
     :type encryption_settings:
      ~azure.mgmt.compute.v2018_04_01.models.EncryptionSettings
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param sku:
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
     """
 
     _attribute_map = {
-        'tags': {'key': 'tags', 'type': '{str}'},
-        'sku': {'key': 'sku', 'type': 'DiskSku'},
         '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': 'DiskSku'},
     }
 
-    def __init__(self, *, tags=None, sku=None, os_type=None, disk_size_gb: int=None, encryption_settings=None, **kwargs) -> None:
-        super(DiskUpdate, self).__init__(tags=tags, sku=sku, **kwargs)
+    def __init__(self, *, os_type=None, disk_size_gb: int=None, encryption_settings=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.tags = tags
+        self.sku = sku
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/hardware_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/hardware_profile.py
new file mode 100644
index 000000000000..c9f1db70f257
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/hardware_profile.py
@@ -0,0 +1,85 @@
+# 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 HardwareProfile(Model):
+    """Specifies the hardware settings for the virtual machine.
+
+    :param vm_size: Specifies the size of the virtual machine. For more
+     information about virtual machine sizes, see [Sizes for virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-sizes?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+     <br><br> The available VM sizes depend on region and availability set. For
+     a list of available sizes use these APIs:  <br><br> [List all available
+     virtual machine sizes in an availability
+     set](https://docs.microsoft.com/rest/api/compute/availabilitysets/listavailablesizes)
+     <br><br> [List all available virtual machine sizes in a
+     region](https://docs.microsoft.com/rest/api/compute/virtualmachinesizes/list)
+     <br><br> [List all available virtual machine sizes for
+     resizing](https://docs.microsoft.com/rest/api/compute/virtualmachines/listavailablesizes).
+     Possible values include: 'Basic_A0', 'Basic_A1', 'Basic_A2', 'Basic_A3',
+     'Basic_A4', 'Standard_A0', 'Standard_A1', 'Standard_A2', 'Standard_A3',
+     'Standard_A4', 'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8',
+     'Standard_A9', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2',
+     'Standard_A2_v2', 'Standard_A4_v2', 'Standard_A8_v2', 'Standard_A2m_v2',
+     'Standard_A4m_v2', 'Standard_A8m_v2', 'Standard_B1s', 'Standard_B1ms',
+     'Standard_B2s', 'Standard_B2ms', 'Standard_B4ms', 'Standard_B8ms',
+     'Standard_D1', 'Standard_D2', 'Standard_D3', 'Standard_D4',
+     'Standard_D11', 'Standard_D12', 'Standard_D13', 'Standard_D14',
+     'Standard_D1_v2', 'Standard_D2_v2', 'Standard_D3_v2', 'Standard_D4_v2',
+     'Standard_D5_v2', 'Standard_D2_v3', 'Standard_D4_v3', 'Standard_D8_v3',
+     'Standard_D16_v3', 'Standard_D32_v3', 'Standard_D64_v3',
+     'Standard_D2s_v3', 'Standard_D4s_v3', 'Standard_D8s_v3',
+     'Standard_D16s_v3', 'Standard_D32s_v3', 'Standard_D64s_v3',
+     'Standard_D11_v2', 'Standard_D12_v2', 'Standard_D13_v2',
+     'Standard_D14_v2', 'Standard_D15_v2', 'Standard_DS1', 'Standard_DS2',
+     'Standard_DS3', 'Standard_DS4', 'Standard_DS11', 'Standard_DS12',
+     'Standard_DS13', 'Standard_DS14', 'Standard_DS1_v2', 'Standard_DS2_v2',
+     'Standard_DS3_v2', 'Standard_DS4_v2', 'Standard_DS5_v2',
+     'Standard_DS11_v2', 'Standard_DS12_v2', 'Standard_DS13_v2',
+     'Standard_DS14_v2', 'Standard_DS15_v2', 'Standard_DS13-4_v2',
+     'Standard_DS13-2_v2', 'Standard_DS14-8_v2', 'Standard_DS14-4_v2',
+     'Standard_E2_v3', 'Standard_E4_v3', 'Standard_E8_v3', 'Standard_E16_v3',
+     'Standard_E32_v3', 'Standard_E64_v3', 'Standard_E2s_v3',
+     'Standard_E4s_v3', 'Standard_E8s_v3', 'Standard_E16s_v3',
+     'Standard_E32s_v3', 'Standard_E64s_v3', 'Standard_E32-16_v3',
+     'Standard_E32-8s_v3', 'Standard_E64-32s_v3', 'Standard_E64-16s_v3',
+     'Standard_F1', 'Standard_F2', 'Standard_F4', 'Standard_F8',
+     'Standard_F16', 'Standard_F1s', 'Standard_F2s', 'Standard_F4s',
+     'Standard_F8s', 'Standard_F16s', 'Standard_F2s_v2', 'Standard_F4s_v2',
+     'Standard_F8s_v2', 'Standard_F16s_v2', 'Standard_F32s_v2',
+     'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_G1', 'Standard_G2',
+     'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1',
+     'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS5',
+     'Standard_GS4-8', 'Standard_GS4-4', 'Standard_GS5-16', 'Standard_GS5-8',
+     'Standard_H8', 'Standard_H16', 'Standard_H8m', 'Standard_H16m',
+     'Standard_H16r', 'Standard_H16mr', 'Standard_L4s', 'Standard_L8s',
+     'Standard_L16s', 'Standard_L32s', 'Standard_M64s', 'Standard_M64ms',
+     'Standard_M128s', 'Standard_M128ms', 'Standard_M64-32ms',
+     'Standard_M64-16ms', 'Standard_M128-64ms', 'Standard_M128-32ms',
+     'Standard_NC6', 'Standard_NC12', 'Standard_NC24', 'Standard_NC24r',
+     'Standard_NC6s_v2', 'Standard_NC12s_v2', 'Standard_NC24s_v2',
+     'Standard_NC24rs_v2', 'Standard_NC6s_v3', 'Standard_NC12s_v3',
+     'Standard_NC24s_v3', 'Standard_NC24rs_v3', 'Standard_ND6s',
+     'Standard_ND12s', 'Standard_ND24s', 'Standard_ND24rs', 'Standard_NV6',
+     'Standard_NV12', 'Standard_NV24'
+    :type vm_size: str or
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineSizeTypes
+    """
+
+    _attribute_map = {
+        'vm_size': {'key': 'vmSize', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(HardwareProfile, self).__init__(**kwargs)
+        self.vm_size = kwargs.get('vm_size', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/hardware_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/hardware_profile_py3.py
new file mode 100644
index 000000000000..a9f8ba14df0e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/hardware_profile_py3.py
@@ -0,0 +1,85 @@
+# 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 HardwareProfile(Model):
+    """Specifies the hardware settings for the virtual machine.
+
+    :param vm_size: Specifies the size of the virtual machine. For more
+     information about virtual machine sizes, see [Sizes for virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-sizes?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+     <br><br> The available VM sizes depend on region and availability set. For
+     a list of available sizes use these APIs:  <br><br> [List all available
+     virtual machine sizes in an availability
+     set](https://docs.microsoft.com/rest/api/compute/availabilitysets/listavailablesizes)
+     <br><br> [List all available virtual machine sizes in a
+     region](https://docs.microsoft.com/rest/api/compute/virtualmachinesizes/list)
+     <br><br> [List all available virtual machine sizes for
+     resizing](https://docs.microsoft.com/rest/api/compute/virtualmachines/listavailablesizes).
+     Possible values include: 'Basic_A0', 'Basic_A1', 'Basic_A2', 'Basic_A3',
+     'Basic_A4', 'Standard_A0', 'Standard_A1', 'Standard_A2', 'Standard_A3',
+     'Standard_A4', 'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8',
+     'Standard_A9', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2',
+     'Standard_A2_v2', 'Standard_A4_v2', 'Standard_A8_v2', 'Standard_A2m_v2',
+     'Standard_A4m_v2', 'Standard_A8m_v2', 'Standard_B1s', 'Standard_B1ms',
+     'Standard_B2s', 'Standard_B2ms', 'Standard_B4ms', 'Standard_B8ms',
+     'Standard_D1', 'Standard_D2', 'Standard_D3', 'Standard_D4',
+     'Standard_D11', 'Standard_D12', 'Standard_D13', 'Standard_D14',
+     'Standard_D1_v2', 'Standard_D2_v2', 'Standard_D3_v2', 'Standard_D4_v2',
+     'Standard_D5_v2', 'Standard_D2_v3', 'Standard_D4_v3', 'Standard_D8_v3',
+     'Standard_D16_v3', 'Standard_D32_v3', 'Standard_D64_v3',
+     'Standard_D2s_v3', 'Standard_D4s_v3', 'Standard_D8s_v3',
+     'Standard_D16s_v3', 'Standard_D32s_v3', 'Standard_D64s_v3',
+     'Standard_D11_v2', 'Standard_D12_v2', 'Standard_D13_v2',
+     'Standard_D14_v2', 'Standard_D15_v2', 'Standard_DS1', 'Standard_DS2',
+     'Standard_DS3', 'Standard_DS4', 'Standard_DS11', 'Standard_DS12',
+     'Standard_DS13', 'Standard_DS14', 'Standard_DS1_v2', 'Standard_DS2_v2',
+     'Standard_DS3_v2', 'Standard_DS4_v2', 'Standard_DS5_v2',
+     'Standard_DS11_v2', 'Standard_DS12_v2', 'Standard_DS13_v2',
+     'Standard_DS14_v2', 'Standard_DS15_v2', 'Standard_DS13-4_v2',
+     'Standard_DS13-2_v2', 'Standard_DS14-8_v2', 'Standard_DS14-4_v2',
+     'Standard_E2_v3', 'Standard_E4_v3', 'Standard_E8_v3', 'Standard_E16_v3',
+     'Standard_E32_v3', 'Standard_E64_v3', 'Standard_E2s_v3',
+     'Standard_E4s_v3', 'Standard_E8s_v3', 'Standard_E16s_v3',
+     'Standard_E32s_v3', 'Standard_E64s_v3', 'Standard_E32-16_v3',
+     'Standard_E32-8s_v3', 'Standard_E64-32s_v3', 'Standard_E64-16s_v3',
+     'Standard_F1', 'Standard_F2', 'Standard_F4', 'Standard_F8',
+     'Standard_F16', 'Standard_F1s', 'Standard_F2s', 'Standard_F4s',
+     'Standard_F8s', 'Standard_F16s', 'Standard_F2s_v2', 'Standard_F4s_v2',
+     'Standard_F8s_v2', 'Standard_F16s_v2', 'Standard_F32s_v2',
+     'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_G1', 'Standard_G2',
+     'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1',
+     'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS5',
+     'Standard_GS4-8', 'Standard_GS4-4', 'Standard_GS5-16', 'Standard_GS5-8',
+     'Standard_H8', 'Standard_H16', 'Standard_H8m', 'Standard_H16m',
+     'Standard_H16r', 'Standard_H16mr', 'Standard_L4s', 'Standard_L8s',
+     'Standard_L16s', 'Standard_L32s', 'Standard_M64s', 'Standard_M64ms',
+     'Standard_M128s', 'Standard_M128ms', 'Standard_M64-32ms',
+     'Standard_M64-16ms', 'Standard_M128-64ms', 'Standard_M128-32ms',
+     'Standard_NC6', 'Standard_NC12', 'Standard_NC24', 'Standard_NC24r',
+     'Standard_NC6s_v2', 'Standard_NC12s_v2', 'Standard_NC24s_v2',
+     'Standard_NC24rs_v2', 'Standard_NC6s_v3', 'Standard_NC12s_v3',
+     'Standard_NC24s_v3', 'Standard_NC24rs_v3', 'Standard_ND6s',
+     'Standard_ND12s', 'Standard_ND24s', 'Standard_ND24rs', 'Standard_NV6',
+     'Standard_NV12', 'Standard_NV24'
+    :type vm_size: str or
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineSizeTypes
+    """
+
+    _attribute_map = {
+        'vm_size': {'key': 'vmSize', 'type': 'str'},
+    }
+
+    def __init__(self, *, vm_size=None, **kwargs) -> None:
+        super(HardwareProfile, self).__init__(**kwargs)
+        self.vm_size = vm_size
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image.py
new file mode 100644
index 000000000000..d3a1f84f255c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image.py
@@ -0,0 +1,70 @@
+# 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 Image(Resource):
+    """The source user image virtual hard disk. The virtual hard disk will be
+    copied before being attached to the virtual machine. If SourceImage is
+    provided, the destination virtual hard drive must not exist.
+
+    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]
+    :param source_virtual_machine: The source virtual machine from which Image
+     is created.
+    :type source_virtual_machine:
+     ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.ImageStorageProfile
+    :ivar provisioning_state: The provisioning state.
+    :vartype provisioning_state: str
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'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}'},
+        'source_virtual_machine': {'key': 'properties.sourceVirtualMachine', 'type': 'SubResource'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'ImageStorageProfile'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(Image, self).__init__(**kwargs)
+        self.source_virtual_machine = kwargs.get('source_virtual_machine', None)
+        self.storage_profile = kwargs.get('storage_profile', None)
+        self.provisioning_state = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py
new file mode 100644
index 000000000000..ae905adba8c4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py
@@ -0,0 +1,68 @@
+# 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 ImageDataDisk(Model):
+    """Describes a data disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param lun: Required. Specifies the logical unit number of the data disk.
+     This value is used to identify data disks within the VM and therefore must
+     be unique for each data disk attached to a VM.
+    :type lun: int
+    :param snapshot: The snapshot.
+    :type snapshot: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param managed_disk: The managedDisk.
+    :type managed_disk: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param blob_uri: The Virtual Hard Disk.
+    :type blob_uri: str
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
+    :param disk_size_gb: Specifies the size of empty data disks in gigabytes.
+     This element can be used to overwrite the name of the disk in a virtual
+     machine image. <br><br> This value cannot be larger than 1023 GB
+    :type disk_size_gb: int
+    :param storage_account_type: Specifies the storage account type for the
+     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
+    :type storage_account_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
+    """
+
+    _validation = {
+        'lun': {'required': True},
+    }
+
+    _attribute_map = {
+        'lun': {'key': 'lun', 'type': 'int'},
+        'snapshot': {'key': 'snapshot', 'type': 'SubResource'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'SubResource'},
+        'blob_uri': {'key': 'blobUri', 'type': 'str'},
+        'caching': {'key': 'caching', 'type': 'CachingTypes'},
+        'disk_size_gb': {'key': 'diskSizeGB', 'type': 'int'},
+        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ImageDataDisk, self).__init__(**kwargs)
+        self.lun = kwargs.get('lun', None)
+        self.snapshot = kwargs.get('snapshot', None)
+        self.managed_disk = kwargs.get('managed_disk', None)
+        self.blob_uri = kwargs.get('blob_uri', None)
+        self.caching = kwargs.get('caching', None)
+        self.disk_size_gb = kwargs.get('disk_size_gb', None)
+        self.storage_account_type = kwargs.get('storage_account_type', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py
new file mode 100644
index 000000000000..7112f92f78c0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py
@@ -0,0 +1,68 @@
+# 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 ImageDataDisk(Model):
+    """Describes a data disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param lun: Required. Specifies the logical unit number of the data disk.
+     This value is used to identify data disks within the VM and therefore must
+     be unique for each data disk attached to a VM.
+    :type lun: int
+    :param snapshot: The snapshot.
+    :type snapshot: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param managed_disk: The managedDisk.
+    :type managed_disk: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param blob_uri: The Virtual Hard Disk.
+    :type blob_uri: str
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
+    :param disk_size_gb: Specifies the size of empty data disks in gigabytes.
+     This element can be used to overwrite the name of the disk in a virtual
+     machine image. <br><br> This value cannot be larger than 1023 GB
+    :type disk_size_gb: int
+    :param storage_account_type: Specifies the storage account type for the
+     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
+    :type storage_account_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
+    """
+
+    _validation = {
+        'lun': {'required': True},
+    }
+
+    _attribute_map = {
+        'lun': {'key': 'lun', 'type': 'int'},
+        'snapshot': {'key': 'snapshot', 'type': 'SubResource'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'SubResource'},
+        'blob_uri': {'key': 'blobUri', 'type': 'str'},
+        'caching': {'key': 'caching', 'type': 'CachingTypes'},
+        'disk_size_gb': {'key': 'diskSizeGB', 'type': 'int'},
+        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
+    }
+
+    def __init__(self, *, lun: int, snapshot=None, managed_disk=None, blob_uri: str=None, caching=None, disk_size_gb: int=None, storage_account_type=None, **kwargs) -> None:
+        super(ImageDataDisk, self).__init__(**kwargs)
+        self.lun = lun
+        self.snapshot = snapshot
+        self.managed_disk = managed_disk
+        self.blob_uri = blob_uri
+        self.caching = caching
+        self.disk_size_gb = disk_size_gb
+        self.storage_account_type = storage_account_type
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py
new file mode 100644
index 000000000000..3ef3a0cd4414
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py
@@ -0,0 +1,77 @@
+# 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 ImageOSDisk(Model):
+    """Describes an Operating System disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :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 a custom image.
+     <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_04_01.models.OperatingSystemTypes
+    :param os_state: Required. The OS State. Possible values include:
+     'Generalized', 'Specialized'
+    :type os_state: str or
+     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemStateTypes
+    :param snapshot: The snapshot.
+    :type snapshot: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param managed_disk: The managedDisk.
+    :type managed_disk: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param blob_uri: The Virtual Hard Disk.
+    :type blob_uri: str
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
+    :param disk_size_gb: Specifies the size of empty data disks in gigabytes.
+     This element can be used to overwrite the name of the disk in a virtual
+     machine image. <br><br> This value cannot be larger than 1023 GB
+    :type disk_size_gb: int
+    :param storage_account_type: Specifies the storage account type for the
+     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
+    :type storage_account_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
+    """
+
+    _validation = {
+        'os_type': {'required': True},
+        'os_state': {'required': True},
+    }
+
+    _attribute_map = {
+        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
+        'os_state': {'key': 'osState', 'type': 'OperatingSystemStateTypes'},
+        'snapshot': {'key': 'snapshot', 'type': 'SubResource'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'SubResource'},
+        'blob_uri': {'key': 'blobUri', 'type': 'str'},
+        'caching': {'key': 'caching', 'type': 'CachingTypes'},
+        'disk_size_gb': {'key': 'diskSizeGB', 'type': 'int'},
+        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ImageOSDisk, self).__init__(**kwargs)
+        self.os_type = kwargs.get('os_type', None)
+        self.os_state = kwargs.get('os_state', None)
+        self.snapshot = kwargs.get('snapshot', None)
+        self.managed_disk = kwargs.get('managed_disk', None)
+        self.blob_uri = kwargs.get('blob_uri', None)
+        self.caching = kwargs.get('caching', None)
+        self.disk_size_gb = kwargs.get('disk_size_gb', None)
+        self.storage_account_type = kwargs.get('storage_account_type', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py
new file mode 100644
index 000000000000..59c61abd3f0f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py
@@ -0,0 +1,77 @@
+# 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 ImageOSDisk(Model):
+    """Describes an Operating System disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :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 a custom image.
+     <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_04_01.models.OperatingSystemTypes
+    :param os_state: Required. The OS State. Possible values include:
+     'Generalized', 'Specialized'
+    :type os_state: str or
+     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemStateTypes
+    :param snapshot: The snapshot.
+    :type snapshot: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param managed_disk: The managedDisk.
+    :type managed_disk: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param blob_uri: The Virtual Hard Disk.
+    :type blob_uri: str
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
+    :param disk_size_gb: Specifies the size of empty data disks in gigabytes.
+     This element can be used to overwrite the name of the disk in a virtual
+     machine image. <br><br> This value cannot be larger than 1023 GB
+    :type disk_size_gb: int
+    :param storage_account_type: Specifies the storage account type for the
+     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
+    :type storage_account_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
+    """
+
+    _validation = {
+        'os_type': {'required': True},
+        'os_state': {'required': True},
+    }
+
+    _attribute_map = {
+        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
+        'os_state': {'key': 'osState', 'type': 'OperatingSystemStateTypes'},
+        'snapshot': {'key': 'snapshot', 'type': 'SubResource'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'SubResource'},
+        'blob_uri': {'key': 'blobUri', 'type': 'str'},
+        'caching': {'key': 'caching', 'type': 'CachingTypes'},
+        'disk_size_gb': {'key': 'diskSizeGB', 'type': 'int'},
+        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
+    }
+
+    def __init__(self, *, os_type, os_state, snapshot=None, managed_disk=None, blob_uri: str=None, caching=None, disk_size_gb: int=None, storage_account_type=None, **kwargs) -> None:
+        super(ImageOSDisk, self).__init__(**kwargs)
+        self.os_type = os_type
+        self.os_state = os_state
+        self.snapshot = snapshot
+        self.managed_disk = managed_disk
+        self.blob_uri = blob_uri
+        self.caching = caching
+        self.disk_size_gb = disk_size_gb
+        self.storage_account_type = storage_account_type
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_paged.py
new file mode 100644
index 000000000000..de04f8efc49c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_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 ImagePaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`Image <azure.mgmt.compute.v2018_04_01.models.Image>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[Image]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(ImagePaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_py3.py
new file mode 100644
index 000000000000..916f2df5e511
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_py3.py
@@ -0,0 +1,70 @@
+# 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 Image(Resource):
+    """The source user image virtual hard disk. The virtual hard disk will be
+    copied before being attached to the virtual machine. If SourceImage is
+    provided, the destination virtual hard drive must not exist.
+
+    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]
+    :param source_virtual_machine: The source virtual machine from which Image
+     is created.
+    :type source_virtual_machine:
+     ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.ImageStorageProfile
+    :ivar provisioning_state: The provisioning state.
+    :vartype provisioning_state: str
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'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}'},
+        'source_virtual_machine': {'key': 'properties.sourceVirtualMachine', 'type': 'SubResource'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'ImageStorageProfile'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+    }
+
+    def __init__(self, *, location: str, tags=None, source_virtual_machine=None, storage_profile=None, **kwargs) -> None:
+        super(Image, self).__init__(location=location, tags=tags, **kwargs)
+        self.source_virtual_machine = source_virtual_machine
+        self.storage_profile = storage_profile
+        self.provisioning_state = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_reference.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_reference.py
new file mode 100644
index 000000000000..b8f929f4ad70
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_reference.py
@@ -0,0 +1,54 @@
+# 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 .sub_resource import SubResource
+
+
+class ImageReference(SubResource):
+    """Specifies information about the image to use. You can specify information
+    about platform images, marketplace images, or virtual machine images. This
+    element is required when you want to use a platform image, marketplace
+    image, or virtual machine image, but is not used in other creation
+    operations.
+
+    :param id: Resource Id
+    :type id: str
+    :param publisher: The image publisher.
+    :type publisher: str
+    :param offer: Specifies the offer of the platform image or marketplace
+     image used to create the virtual machine.
+    :type offer: str
+    :param sku: The image SKU.
+    :type sku: str
+    :param version: Specifies the version of the platform image or marketplace
+     image used to create the virtual machine. The allowed formats are
+     Major.Minor.Build or 'latest'. Major, Minor, and Build are decimal
+     numbers. Specify 'latest' to use the latest version of an image available
+     at deploy time. Even if you use 'latest', the VM image will not
+     automatically update after deploy time even if a new version becomes
+     available.
+    :type version: str
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'publisher': {'key': 'publisher', 'type': 'str'},
+        'offer': {'key': 'offer', 'type': 'str'},
+        'sku': {'key': 'sku', 'type': 'str'},
+        'version': {'key': 'version', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ImageReference, self).__init__(**kwargs)
+        self.publisher = kwargs.get('publisher', None)
+        self.offer = kwargs.get('offer', None)
+        self.sku = kwargs.get('sku', None)
+        self.version = kwargs.get('version', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_reference_py3.py
new file mode 100644
index 000000000000..1d7eefe5ac65
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_reference_py3.py
@@ -0,0 +1,54 @@
+# 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 .sub_resource_py3 import SubResource
+
+
+class ImageReference(SubResource):
+    """Specifies information about the image to use. You can specify information
+    about platform images, marketplace images, or virtual machine images. This
+    element is required when you want to use a platform image, marketplace
+    image, or virtual machine image, but is not used in other creation
+    operations.
+
+    :param id: Resource Id
+    :type id: str
+    :param publisher: The image publisher.
+    :type publisher: str
+    :param offer: Specifies the offer of the platform image or marketplace
+     image used to create the virtual machine.
+    :type offer: str
+    :param sku: The image SKU.
+    :type sku: str
+    :param version: Specifies the version of the platform image or marketplace
+     image used to create the virtual machine. The allowed formats are
+     Major.Minor.Build or 'latest'. Major, Minor, and Build are decimal
+     numbers. Specify 'latest' to use the latest version of an image available
+     at deploy time. Even if you use 'latest', the VM image will not
+     automatically update after deploy time even if a new version becomes
+     available.
+    :type version: str
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'publisher': {'key': 'publisher', 'type': 'str'},
+        'offer': {'key': 'offer', 'type': 'str'},
+        'sku': {'key': 'sku', 'type': 'str'},
+        'version': {'key': 'version', 'type': 'str'},
+    }
+
+    def __init__(self, *, id: str=None, publisher: str=None, offer: str=None, sku: str=None, version: str=None, **kwargs) -> None:
+        super(ImageReference, self).__init__(id=id, **kwargs)
+        self.publisher = publisher
+        self.offer = offer
+        self.sku = sku
+        self.version = version
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_storage_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_storage_profile.py
new file mode 100644
index 000000000000..2cd188cf28f9
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_storage_profile.py
@@ -0,0 +1,45 @@
+# 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 ImageStorageProfile(Model):
+    """Describes a storage profile.
+
+    :param os_disk: Specifies information about the operating system disk used
+     by the virtual machine. <br><br> For more information about disks, see
+     [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type os_disk: ~azure.mgmt.compute.v2018_04_01.models.ImageOSDisk
+    :param data_disks: Specifies the parameters that are used to add a data
+     disk to a virtual machine. <br><br> For more information about disks, see
+     [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type data_disks:
+     list[~azure.mgmt.compute.v2018_04_01.models.ImageDataDisk]
+    :param zone_resilient: Specifies whether an image is zone resilient or
+     not. Default is false. Zone resilient images can be created only in
+     regions that provide Zone Redundant Storage (ZRS).
+    :type zone_resilient: bool
+    """
+
+    _attribute_map = {
+        'os_disk': {'key': 'osDisk', 'type': 'ImageOSDisk'},
+        'data_disks': {'key': 'dataDisks', 'type': '[ImageDataDisk]'},
+        'zone_resilient': {'key': 'zoneResilient', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ImageStorageProfile, self).__init__(**kwargs)
+        self.os_disk = kwargs.get('os_disk', None)
+        self.data_disks = kwargs.get('data_disks', None)
+        self.zone_resilient = kwargs.get('zone_resilient', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_storage_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_storage_profile_py3.py
new file mode 100644
index 000000000000..359c87789cc3
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_storage_profile_py3.py
@@ -0,0 +1,45 @@
+# 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 ImageStorageProfile(Model):
+    """Describes a storage profile.
+
+    :param os_disk: Specifies information about the operating system disk used
+     by the virtual machine. <br><br> For more information about disks, see
+     [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type os_disk: ~azure.mgmt.compute.v2018_04_01.models.ImageOSDisk
+    :param data_disks: Specifies the parameters that are used to add a data
+     disk to a virtual machine. <br><br> For more information about disks, see
+     [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type data_disks:
+     list[~azure.mgmt.compute.v2018_04_01.models.ImageDataDisk]
+    :param zone_resilient: Specifies whether an image is zone resilient or
+     not. Default is false. Zone resilient images can be created only in
+     regions that provide Zone Redundant Storage (ZRS).
+    :type zone_resilient: bool
+    """
+
+    _attribute_map = {
+        'os_disk': {'key': 'osDisk', 'type': 'ImageOSDisk'},
+        'data_disks': {'key': 'dataDisks', 'type': '[ImageDataDisk]'},
+        'zone_resilient': {'key': 'zoneResilient', 'type': 'bool'},
+    }
+
+    def __init__(self, *, os_disk=None, data_disks=None, zone_resilient: bool=None, **kwargs) -> None:
+        super(ImageStorageProfile, self).__init__(**kwargs)
+        self.os_disk = os_disk
+        self.data_disks = data_disks
+        self.zone_resilient = zone_resilient
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_update.py
new file mode 100644
index 000000000000..56f1f29d62d6
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_update.py
@@ -0,0 +1,50 @@
+# 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 .update_resource import UpdateResource
+
+
+class ImageUpdate(UpdateResource):
+    """The source user image virtual hard disk. Only tags may be updated.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param source_virtual_machine: The source virtual machine from which Image
+     is created.
+    :type source_virtual_machine:
+     ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.ImageStorageProfile
+    :ivar provisioning_state: The provisioning state.
+    :vartype provisioning_state: str
+    """
+
+    _validation = {
+        'provisioning_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'source_virtual_machine': {'key': 'properties.sourceVirtualMachine', 'type': 'SubResource'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'ImageStorageProfile'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ImageUpdate, self).__init__(**kwargs)
+        self.source_virtual_machine = kwargs.get('source_virtual_machine', None)
+        self.storage_profile = kwargs.get('storage_profile', None)
+        self.provisioning_state = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_update_py3.py
new file mode 100644
index 000000000000..47658e7217f1
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_update_py3.py
@@ -0,0 +1,50 @@
+# 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 .update_resource_py3 import UpdateResource
+
+
+class ImageUpdate(UpdateResource):
+    """The source user image virtual hard disk. Only tags may be updated.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param source_virtual_machine: The source virtual machine from which Image
+     is created.
+    :type source_virtual_machine:
+     ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.ImageStorageProfile
+    :ivar provisioning_state: The provisioning state.
+    :vartype provisioning_state: str
+    """
+
+    _validation = {
+        'provisioning_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'source_virtual_machine': {'key': 'properties.sourceVirtualMachine', 'type': 'SubResource'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'ImageStorageProfile'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+    }
+
+    def __init__(self, *, tags=None, source_virtual_machine=None, storage_profile=None, **kwargs) -> None:
+        super(ImageUpdate, self).__init__(tags=tags, **kwargs)
+        self.source_virtual_machine = source_virtual_machine
+        self.storage_profile = storage_profile
+        self.provisioning_state = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error.py
new file mode 100644
index 000000000000..6324249d7c19
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error.py
@@ -0,0 +1,32 @@
+# 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 InnerError(Model):
+    """Inner error details.
+
+    :param exceptiontype: The exception type.
+    :type exceptiontype: str
+    :param errordetail: The internal error message or exception dump.
+    :type errordetail: str
+    """
+
+    _attribute_map = {
+        'exceptiontype': {'key': 'exceptiontype', 'type': 'str'},
+        'errordetail': {'key': 'errordetail', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(InnerError, self).__init__(**kwargs)
+        self.exceptiontype = kwargs.get('exceptiontype', None)
+        self.errordetail = kwargs.get('errordetail', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error_py3.py
new file mode 100644
index 000000000000..ccec30d7b53f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/inner_error_py3.py
@@ -0,0 +1,32 @@
+# 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 InnerError(Model):
+    """Inner error details.
+
+    :param exceptiontype: The exception type.
+    :type exceptiontype: str
+    :param errordetail: The internal error message or exception dump.
+    :type errordetail: str
+    """
+
+    _attribute_map = {
+        'exceptiontype': {'key': 'exceptiontype', 'type': 'str'},
+        'errordetail': {'key': 'errordetail', 'type': 'str'},
+    }
+
+    def __init__(self, *, exceptiontype: str=None, errordetail: str=None, **kwargs) -> None:
+        super(InnerError, self).__init__(**kwargs)
+        self.exceptiontype = exceptiontype
+        self.errordetail = errordetail
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/instance_view_status.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/instance_view_status.py
new file mode 100644
index 000000000000..fb7e1d99269e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/instance_view_status.py
@@ -0,0 +1,47 @@
+# 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 InstanceViewStatus(Model):
+    """Instance view status.
+
+    :param code: The status code.
+    :type code: str
+    :param level: The level code. Possible values include: 'Info', 'Warning',
+     'Error'
+    :type level: str or
+     ~azure.mgmt.compute.v2018_04_01.models.StatusLevelTypes
+    :param display_status: The short localizable label for the status.
+    :type display_status: str
+    :param message: The detailed status message, including for alerts and
+     error messages.
+    :type message: str
+    :param time: The time of the status.
+    :type time: datetime
+    """
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'str'},
+        'level': {'key': 'level', 'type': 'StatusLevelTypes'},
+        'display_status': {'key': 'displayStatus', 'type': 'str'},
+        'message': {'key': 'message', 'type': 'str'},
+        'time': {'key': 'time', 'type': 'iso-8601'},
+    }
+
+    def __init__(self, **kwargs):
+        super(InstanceViewStatus, self).__init__(**kwargs)
+        self.code = kwargs.get('code', None)
+        self.level = kwargs.get('level', None)
+        self.display_status = kwargs.get('display_status', None)
+        self.message = kwargs.get('message', None)
+        self.time = kwargs.get('time', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/instance_view_status_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/instance_view_status_py3.py
new file mode 100644
index 000000000000..b3cf969f8cae
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/instance_view_status_py3.py
@@ -0,0 +1,47 @@
+# 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 InstanceViewStatus(Model):
+    """Instance view status.
+
+    :param code: The status code.
+    :type code: str
+    :param level: The level code. Possible values include: 'Info', 'Warning',
+     'Error'
+    :type level: str or
+     ~azure.mgmt.compute.v2018_04_01.models.StatusLevelTypes
+    :param display_status: The short localizable label for the status.
+    :type display_status: str
+    :param message: The detailed status message, including for alerts and
+     error messages.
+    :type message: str
+    :param time: The time of the status.
+    :type time: datetime
+    """
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'str'},
+        'level': {'key': 'level', 'type': 'StatusLevelTypes'},
+        'display_status': {'key': 'displayStatus', 'type': 'str'},
+        'message': {'key': 'message', 'type': 'str'},
+        'time': {'key': 'time', 'type': 'iso-8601'},
+    }
+
+    def __init__(self, *, code: str=None, level=None, display_status: str=None, message: str=None, time=None, **kwargs) -> None:
+        super(InstanceViewStatus, self).__init__(**kwargs)
+        self.code = code
+        self.level = level
+        self.display_status = display_status
+        self.message = message
+        self.time = time
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_key_reference.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_key_reference.py
new file mode 100644
index 000000000000..f1eb6d6c120a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_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 KeyVaultKeyReference(Model):
+    """Describes a reference to Key Vault Key.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param key_url: Required. The URL referencing a key encryption key in Key
+     Vault.
+    :type key_url: str
+    :param source_vault: Required. The relative URL of the Key Vault
+     containing the key.
+    :type source_vault: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    """
+
+    _validation = {
+        'key_url': {'required': True},
+        'source_vault': {'required': True},
+    }
+
+    _attribute_map = {
+        'key_url': {'key': 'keyUrl', 'type': 'str'},
+        'source_vault': {'key': 'sourceVault', 'type': 'SubResource'},
+    }
+
+    def __init__(self, **kwargs):
+        super(KeyVaultKeyReference, self).__init__(**kwargs)
+        self.key_url = kwargs.get('key_url', None)
+        self.source_vault = kwargs.get('source_vault', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_key_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_key_reference_py3.py
new file mode 100644
index 000000000000..378de235d684
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_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 KeyVaultKeyReference(Model):
+    """Describes a reference to Key Vault Key.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param key_url: Required. The URL referencing a key encryption key in Key
+     Vault.
+    :type key_url: str
+    :param source_vault: Required. The relative URL of the Key Vault
+     containing the key.
+    :type source_vault: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    """
+
+    _validation = {
+        'key_url': {'required': True},
+        'source_vault': {'required': True},
+    }
+
+    _attribute_map = {
+        'key_url': {'key': 'keyUrl', 'type': 'str'},
+        'source_vault': {'key': 'sourceVault', 'type': 'SubResource'},
+    }
+
+    def __init__(self, *, key_url: str, source_vault, **kwargs) -> None:
+        super(KeyVaultKeyReference, self).__init__(**kwargs)
+        self.key_url = key_url
+        self.source_vault = source_vault
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_secret_reference.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_secret_reference.py
new file mode 100644
index 000000000000..082199bce901
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_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 KeyVaultSecretReference(Model):
+    """Describes a reference to Key Vault Secret.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param secret_url: Required. The URL referencing a secret in a Key Vault.
+    :type secret_url: str
+    :param source_vault: Required. The relative URL of the Key Vault
+     containing the secret.
+    :type source_vault: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    """
+
+    _validation = {
+        'secret_url': {'required': True},
+        'source_vault': {'required': True},
+    }
+
+    _attribute_map = {
+        'secret_url': {'key': 'secretUrl', 'type': 'str'},
+        'source_vault': {'key': 'sourceVault', 'type': 'SubResource'},
+    }
+
+    def __init__(self, **kwargs):
+        super(KeyVaultSecretReference, self).__init__(**kwargs)
+        self.secret_url = kwargs.get('secret_url', None)
+        self.source_vault = kwargs.get('source_vault', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_secret_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_secret_reference_py3.py
new file mode 100644
index 000000000000..8d938cbf5e89
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/key_vault_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 KeyVaultSecretReference(Model):
+    """Describes a reference to Key Vault Secret.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param secret_url: Required. The URL referencing a secret in a Key Vault.
+    :type secret_url: str
+    :param source_vault: Required. The relative URL of the Key Vault
+     containing the secret.
+    :type source_vault: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    """
+
+    _validation = {
+        'secret_url': {'required': True},
+        'source_vault': {'required': True},
+    }
+
+    _attribute_map = {
+        'secret_url': {'key': 'secretUrl', 'type': 'str'},
+        'source_vault': {'key': 'sourceVault', 'type': 'SubResource'},
+    }
+
+    def __init__(self, *, secret_url: str, source_vault, **kwargs) -> None:
+        super(KeyVaultSecretReference, self).__init__(**kwargs)
+        self.secret_url = secret_url
+        self.source_vault = source_vault
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/linux_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/linux_configuration.py
new file mode 100644
index 000000000000..3dc5246c35d7
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/linux_configuration.py
@@ -0,0 +1,39 @@
+# 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 LinuxConfiguration(Model):
+    """Specifies the Linux operating system settings on the virtual machine.
+    <br><br>For a list of supported Linux distributions, see [Linux on
+    Azure-Endorsed
+    Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    <br><br> For running non-endorsed distributions, see [Information for
+    Non-Endorsed
+    Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
+
+    :param disable_password_authentication: Specifies whether password
+     authentication should be disabled.
+    :type disable_password_authentication: bool
+    :param ssh: Specifies the ssh key configuration for a Linux OS.
+    :type ssh: ~azure.mgmt.compute.v2018_04_01.models.SshConfiguration
+    """
+
+    _attribute_map = {
+        'disable_password_authentication': {'key': 'disablePasswordAuthentication', 'type': 'bool'},
+        'ssh': {'key': 'ssh', 'type': 'SshConfiguration'},
+    }
+
+    def __init__(self, **kwargs):
+        super(LinuxConfiguration, self).__init__(**kwargs)
+        self.disable_password_authentication = kwargs.get('disable_password_authentication', None)
+        self.ssh = kwargs.get('ssh', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/linux_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/linux_configuration_py3.py
new file mode 100644
index 000000000000..45614597db33
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/linux_configuration_py3.py
@@ -0,0 +1,39 @@
+# 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 LinuxConfiguration(Model):
+    """Specifies the Linux operating system settings on the virtual machine.
+    <br><br>For a list of supported Linux distributions, see [Linux on
+    Azure-Endorsed
+    Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    <br><br> For running non-endorsed distributions, see [Information for
+    Non-Endorsed
+    Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
+
+    :param disable_password_authentication: Specifies whether password
+     authentication should be disabled.
+    :type disable_password_authentication: bool
+    :param ssh: Specifies the ssh key configuration for a Linux OS.
+    :type ssh: ~azure.mgmt.compute.v2018_04_01.models.SshConfiguration
+    """
+
+    _attribute_map = {
+        'disable_password_authentication': {'key': 'disablePasswordAuthentication', 'type': 'bool'},
+        'ssh': {'key': 'ssh', 'type': 'SshConfiguration'},
+    }
+
+    def __init__(self, *, disable_password_authentication: bool=None, ssh=None, **kwargs) -> None:
+        super(LinuxConfiguration, self).__init__(**kwargs)
+        self.disable_password_authentication = disable_password_authentication
+        self.ssh = ssh
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_input_base.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_input_base.py
new file mode 100644
index 000000000000..843b739a0328
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_input_base.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 LogAnalyticsInputBase(Model):
+    """Api input base class for LogAnalytics Api.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param blob_container_sas_uri: Required. SAS Uri of the logging blob
+     container to which LogAnalytics Api writes output logs to.
+    :type blob_container_sas_uri: str
+    :param from_time: Required. From time of the query
+    :type from_time: datetime
+    :param to_time: Required. To time of the query
+    :type to_time: datetime
+    :param group_by_throttle_policy: Group query result by Throttle Policy
+     applied.
+    :type group_by_throttle_policy: bool
+    :param group_by_operation_name: Group query result by  by Operation Name.
+    :type group_by_operation_name: bool
+    :param group_by_resource_name: Group query result by Resource Name.
+    :type group_by_resource_name: bool
+    """
+
+    _validation = {
+        'blob_container_sas_uri': {'required': True},
+        'from_time': {'required': True},
+        'to_time': {'required': True},
+    }
+
+    _attribute_map = {
+        'blob_container_sas_uri': {'key': 'blobContainerSasUri', 'type': 'str'},
+        'from_time': {'key': 'fromTime', 'type': 'iso-8601'},
+        'to_time': {'key': 'toTime', 'type': 'iso-8601'},
+        'group_by_throttle_policy': {'key': 'groupByThrottlePolicy', 'type': 'bool'},
+        'group_by_operation_name': {'key': 'groupByOperationName', 'type': 'bool'},
+        'group_by_resource_name': {'key': 'groupByResourceName', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(LogAnalyticsInputBase, self).__init__(**kwargs)
+        self.blob_container_sas_uri = kwargs.get('blob_container_sas_uri', None)
+        self.from_time = kwargs.get('from_time', None)
+        self.to_time = kwargs.get('to_time', None)
+        self.group_by_throttle_policy = kwargs.get('group_by_throttle_policy', None)
+        self.group_by_operation_name = kwargs.get('group_by_operation_name', None)
+        self.group_by_resource_name = kwargs.get('group_by_resource_name', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_input_base_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_input_base_py3.py
new file mode 100644
index 000000000000..b9420117a8ca
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_input_base_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 LogAnalyticsInputBase(Model):
+    """Api input base class for LogAnalytics Api.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param blob_container_sas_uri: Required. SAS Uri of the logging blob
+     container to which LogAnalytics Api writes output logs to.
+    :type blob_container_sas_uri: str
+    :param from_time: Required. From time of the query
+    :type from_time: datetime
+    :param to_time: Required. To time of the query
+    :type to_time: datetime
+    :param group_by_throttle_policy: Group query result by Throttle Policy
+     applied.
+    :type group_by_throttle_policy: bool
+    :param group_by_operation_name: Group query result by  by Operation Name.
+    :type group_by_operation_name: bool
+    :param group_by_resource_name: Group query result by Resource Name.
+    :type group_by_resource_name: bool
+    """
+
+    _validation = {
+        'blob_container_sas_uri': {'required': True},
+        'from_time': {'required': True},
+        'to_time': {'required': True},
+    }
+
+    _attribute_map = {
+        'blob_container_sas_uri': {'key': 'blobContainerSasUri', 'type': 'str'},
+        'from_time': {'key': 'fromTime', 'type': 'iso-8601'},
+        'to_time': {'key': 'toTime', 'type': 'iso-8601'},
+        'group_by_throttle_policy': {'key': 'groupByThrottlePolicy', 'type': 'bool'},
+        'group_by_operation_name': {'key': 'groupByOperationName', 'type': 'bool'},
+        'group_by_resource_name': {'key': 'groupByResourceName', 'type': 'bool'},
+    }
+
+    def __init__(self, *, blob_container_sas_uri: str, from_time, to_time, group_by_throttle_policy: bool=None, group_by_operation_name: bool=None, group_by_resource_name: bool=None, **kwargs) -> None:
+        super(LogAnalyticsInputBase, self).__init__(**kwargs)
+        self.blob_container_sas_uri = blob_container_sas_uri
+        self.from_time = from_time
+        self.to_time = to_time
+        self.group_by_throttle_policy = group_by_throttle_policy
+        self.group_by_operation_name = group_by_operation_name
+        self.group_by_resource_name = group_by_resource_name
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_operation_result.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_operation_result.py
new file mode 100644
index 000000000000..ebb7a1177049
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_operation_result.py
@@ -0,0 +1,36 @@
+# 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 LogAnalyticsOperationResult(Model):
+    """LogAnalytics operation status response.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar properties: LogAnalyticsOutput
+    :vartype properties:
+     ~azure.mgmt.compute.v2018_04_01.models.LogAnalyticsOutput
+    """
+
+    _validation = {
+        'properties': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'properties': {'key': 'properties', 'type': 'LogAnalyticsOutput'},
+    }
+
+    def __init__(self, **kwargs):
+        super(LogAnalyticsOperationResult, self).__init__(**kwargs)
+        self.properties = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_operation_result_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_operation_result_py3.py
new file mode 100644
index 000000000000..dfeceeb58cf4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_operation_result_py3.py
@@ -0,0 +1,36 @@
+# 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 LogAnalyticsOperationResult(Model):
+    """LogAnalytics operation status response.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar properties: LogAnalyticsOutput
+    :vartype properties:
+     ~azure.mgmt.compute.v2018_04_01.models.LogAnalyticsOutput
+    """
+
+    _validation = {
+        'properties': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'properties': {'key': 'properties', 'type': 'LogAnalyticsOutput'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(LogAnalyticsOperationResult, self).__init__(**kwargs)
+        self.properties = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_output.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_output.py
new file mode 100644
index 000000000000..5ea1615011c3
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_output.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 LogAnalyticsOutput(Model):
+    """LogAnalytics output properties.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar output: Output file Uri path to blob container.
+    :vartype output: str
+    """
+
+    _validation = {
+        'output': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'output': {'key': 'output', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(LogAnalyticsOutput, self).__init__(**kwargs)
+        self.output = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_output_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_output_py3.py
new file mode 100644
index 000000000000..71a428a8e49a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/log_analytics_output_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 LogAnalyticsOutput(Model):
+    """LogAnalytics output properties.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar output: Output file Uri path to blob container.
+    :vartype output: str
+    """
+
+    _validation = {
+        'output': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'output': {'key': 'output', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(LogAnalyticsOutput, self).__init__(**kwargs)
+        self.output = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/maintenance_redeploy_status.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/maintenance_redeploy_status.py
new file mode 100644
index 000000000000..6c22c904d185
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/maintenance_redeploy_status.py
@@ -0,0 +1,60 @@
+# 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 MaintenanceRedeployStatus(Model):
+    """Maintenance Operation Status.
+
+    :param is_customer_initiated_maintenance_allowed: True, if customer is
+     allowed to perform Maintenance.
+    :type is_customer_initiated_maintenance_allowed: bool
+    :param pre_maintenance_window_start_time: Start Time for the Pre
+     Maintenance Window.
+    :type pre_maintenance_window_start_time: datetime
+    :param pre_maintenance_window_end_time: End Time for the Pre Maintenance
+     Window.
+    :type pre_maintenance_window_end_time: datetime
+    :param maintenance_window_start_time: Start Time for the Maintenance
+     Window.
+    :type maintenance_window_start_time: datetime
+    :param maintenance_window_end_time: End Time for the Maintenance Window.
+    :type maintenance_window_end_time: datetime
+    :param last_operation_result_code: The Last Maintenance Operation Result
+     Code. Possible values include: 'None', 'RetryLater', 'MaintenanceAborted',
+     'MaintenanceCompleted'
+    :type last_operation_result_code: str or
+     ~azure.mgmt.compute.v2018_04_01.models.MaintenanceOperationResultCodeTypes
+    :param last_operation_message: Message returned for the last Maintenance
+     Operation.
+    :type last_operation_message: str
+    """
+
+    _attribute_map = {
+        'is_customer_initiated_maintenance_allowed': {'key': 'isCustomerInitiatedMaintenanceAllowed', 'type': 'bool'},
+        'pre_maintenance_window_start_time': {'key': 'preMaintenanceWindowStartTime', 'type': 'iso-8601'},
+        'pre_maintenance_window_end_time': {'key': 'preMaintenanceWindowEndTime', 'type': 'iso-8601'},
+        'maintenance_window_start_time': {'key': 'maintenanceWindowStartTime', 'type': 'iso-8601'},
+        'maintenance_window_end_time': {'key': 'maintenanceWindowEndTime', 'type': 'iso-8601'},
+        'last_operation_result_code': {'key': 'lastOperationResultCode', 'type': 'MaintenanceOperationResultCodeTypes'},
+        'last_operation_message': {'key': 'lastOperationMessage', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MaintenanceRedeployStatus, self).__init__(**kwargs)
+        self.is_customer_initiated_maintenance_allowed = kwargs.get('is_customer_initiated_maintenance_allowed', None)
+        self.pre_maintenance_window_start_time = kwargs.get('pre_maintenance_window_start_time', None)
+        self.pre_maintenance_window_end_time = kwargs.get('pre_maintenance_window_end_time', None)
+        self.maintenance_window_start_time = kwargs.get('maintenance_window_start_time', None)
+        self.maintenance_window_end_time = kwargs.get('maintenance_window_end_time', None)
+        self.last_operation_result_code = kwargs.get('last_operation_result_code', None)
+        self.last_operation_message = kwargs.get('last_operation_message', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/maintenance_redeploy_status_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/maintenance_redeploy_status_py3.py
new file mode 100644
index 000000000000..f2e8bbf807df
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/maintenance_redeploy_status_py3.py
@@ -0,0 +1,60 @@
+# 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 MaintenanceRedeployStatus(Model):
+    """Maintenance Operation Status.
+
+    :param is_customer_initiated_maintenance_allowed: True, if customer is
+     allowed to perform Maintenance.
+    :type is_customer_initiated_maintenance_allowed: bool
+    :param pre_maintenance_window_start_time: Start Time for the Pre
+     Maintenance Window.
+    :type pre_maintenance_window_start_time: datetime
+    :param pre_maintenance_window_end_time: End Time for the Pre Maintenance
+     Window.
+    :type pre_maintenance_window_end_time: datetime
+    :param maintenance_window_start_time: Start Time for the Maintenance
+     Window.
+    :type maintenance_window_start_time: datetime
+    :param maintenance_window_end_time: End Time for the Maintenance Window.
+    :type maintenance_window_end_time: datetime
+    :param last_operation_result_code: The Last Maintenance Operation Result
+     Code. Possible values include: 'None', 'RetryLater', 'MaintenanceAborted',
+     'MaintenanceCompleted'
+    :type last_operation_result_code: str or
+     ~azure.mgmt.compute.v2018_04_01.models.MaintenanceOperationResultCodeTypes
+    :param last_operation_message: Message returned for the last Maintenance
+     Operation.
+    :type last_operation_message: str
+    """
+
+    _attribute_map = {
+        'is_customer_initiated_maintenance_allowed': {'key': 'isCustomerInitiatedMaintenanceAllowed', 'type': 'bool'},
+        'pre_maintenance_window_start_time': {'key': 'preMaintenanceWindowStartTime', 'type': 'iso-8601'},
+        'pre_maintenance_window_end_time': {'key': 'preMaintenanceWindowEndTime', 'type': 'iso-8601'},
+        'maintenance_window_start_time': {'key': 'maintenanceWindowStartTime', 'type': 'iso-8601'},
+        'maintenance_window_end_time': {'key': 'maintenanceWindowEndTime', 'type': 'iso-8601'},
+        'last_operation_result_code': {'key': 'lastOperationResultCode', 'type': 'MaintenanceOperationResultCodeTypes'},
+        'last_operation_message': {'key': 'lastOperationMessage', 'type': 'str'},
+    }
+
+    def __init__(self, *, is_customer_initiated_maintenance_allowed: bool=None, pre_maintenance_window_start_time=None, pre_maintenance_window_end_time=None, maintenance_window_start_time=None, maintenance_window_end_time=None, last_operation_result_code=None, last_operation_message: str=None, **kwargs) -> None:
+        super(MaintenanceRedeployStatus, self).__init__(**kwargs)
+        self.is_customer_initiated_maintenance_allowed = is_customer_initiated_maintenance_allowed
+        self.pre_maintenance_window_start_time = pre_maintenance_window_start_time
+        self.pre_maintenance_window_end_time = pre_maintenance_window_end_time
+        self.maintenance_window_start_time = maintenance_window_start_time
+        self.maintenance_window_end_time = maintenance_window_end_time
+        self.last_operation_result_code = last_operation_result_code
+        self.last_operation_message = last_operation_message
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py
new file mode 100644
index 000000000000..a16aed3bbcbf
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py
@@ -0,0 +1,34 @@
+# 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 .sub_resource import SubResource
+
+
+class ManagedDiskParameters(SubResource):
+    """The parameters of a managed disk.
+
+    :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 or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
+    :type storage_account_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ManagedDiskParameters, self).__init__(**kwargs)
+        self.storage_account_type = kwargs.get('storage_account_type', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py
new file mode 100644
index 000000000000..50b8a76181d6
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py
@@ -0,0 +1,34 @@
+# 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 .sub_resource_py3 import SubResource
+
+
+class ManagedDiskParameters(SubResource):
+    """The parameters of a managed disk.
+
+    :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 or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
+    :type storage_account_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
+    }
+
+    def __init__(self, *, id: str=None, storage_account_type=None, **kwargs) -> None:
+        super(ManagedDiskParameters, self).__init__(id=id, **kwargs)
+        self.storage_account_type = storage_account_type
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_interface_reference.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_interface_reference.py
new file mode 100644
index 000000000000..b86e305e3f74
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_interface_reference.py
@@ -0,0 +1,32 @@
+# 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 .sub_resource import SubResource
+
+
+class NetworkInterfaceReference(SubResource):
+    """Describes a network interface reference.
+
+    :param id: Resource Id
+    :type id: str
+    :param primary: Specifies the primary network interface in case the
+     virtual machine has more than 1 network interface.
+    :type primary: bool
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(NetworkInterfaceReference, self).__init__(**kwargs)
+        self.primary = kwargs.get('primary', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_interface_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_interface_reference_py3.py
new file mode 100644
index 000000000000..47da29278832
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_interface_reference_py3.py
@@ -0,0 +1,32 @@
+# 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 .sub_resource_py3 import SubResource
+
+
+class NetworkInterfaceReference(SubResource):
+    """Describes a network interface reference.
+
+    :param id: Resource Id
+    :type id: str
+    :param primary: Specifies the primary network interface in case the
+     virtual machine has more than 1 network interface.
+    :type primary: bool
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+    }
+
+    def __init__(self, *, id: str=None, primary: bool=None, **kwargs) -> None:
+        super(NetworkInterfaceReference, self).__init__(id=id, **kwargs)
+        self.primary = primary
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_profile.py
new file mode 100644
index 000000000000..b547518c8397
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_profile.py
@@ -0,0 +1,30 @@
+# 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 NetworkProfile(Model):
+    """Specifies the network interfaces of the virtual machine.
+
+    :param network_interfaces: Specifies the list of resource Ids for the
+     network interfaces associated with the virtual machine.
+    :type network_interfaces:
+     list[~azure.mgmt.compute.v2018_04_01.models.NetworkInterfaceReference]
+    """
+
+    _attribute_map = {
+        'network_interfaces': {'key': 'networkInterfaces', 'type': '[NetworkInterfaceReference]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(NetworkProfile, self).__init__(**kwargs)
+        self.network_interfaces = kwargs.get('network_interfaces', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_profile_py3.py
new file mode 100644
index 000000000000..63e37d139e29
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/network_profile_py3.py
@@ -0,0 +1,30 @@
+# 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 NetworkProfile(Model):
+    """Specifies the network interfaces of the virtual machine.
+
+    :param network_interfaces: Specifies the list of resource Ids for the
+     network interfaces associated with the virtual machine.
+    :type network_interfaces:
+     list[~azure.mgmt.compute.v2018_04_01.models.NetworkInterfaceReference]
+    """
+
+    _attribute_map = {
+        'network_interfaces': {'key': 'networkInterfaces', 'type': '[NetworkInterfaceReference]'},
+    }
+
+    def __init__(self, *, network_interfaces=None, **kwargs) -> None:
+        super(NetworkProfile, self).__init__(**kwargs)
+        self.network_interfaces = network_interfaces
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
new file mode 100644
index 000000000000..e82f77c2447c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk.py
@@ -0,0 +1,97 @@
+# 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 OSDisk(Model):
+    """Specifies information about the operating system disk used by the virtual
+    machine. <br><br> For more information about disks, see [About disks and
+    VHDs for Azure virtual
+    machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+
+    All required parameters must be populated in order to send to Azure.
+
+    :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**
+     <br><br> **Linux**. Possible values include: 'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
+    :param encryption_settings: Specifies the encryption settings for the OS
+     Disk. <br><br> Minimum api-version: 2015-06-15
+    :type encryption_settings:
+     ~azure.mgmt.compute.v2018_04_01.models.DiskEncryptionSettings
+    :param name: The disk name.
+    :type name: str
+    :param vhd: The virtual hard disk.
+    :type vhd: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
+    :param image: The source user image virtual hard disk. The virtual hard
+     disk will be copied before being attached to the virtual machine. If
+     SourceImage is provided, the destination virtual hard drive must not
+     exist.
+    :type image: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :param create_option: Required. Specifies how the virtual machine should
+     be created.<br><br> Possible values are:<br><br> **Attach** \\u2013 This
+     value is used when you are using a specialized disk to create the virtual
+     machine.<br><br> **FromImage** \\u2013 This value is used when you are
+     using an image to create the virtual machine. If you are using a platform
+     image, you also use the imageReference element described above. If you are
+     using a marketplace image, you  also use the plan element previously
+     described. Possible values include: 'FromImage', 'Empty', 'Attach'
+    :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
+     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.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_04_01.models.ManagedDiskParameters
+    """
+
+    _validation = {
+        'create_option': {'required': True},
+    }
+
+    _attribute_map = {
+        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
+        'encryption_settings': {'key': 'encryptionSettings', 'type': 'DiskEncryptionSettings'},
+        'name': {'key': 'name', 'type': 'str'},
+        'vhd': {'key': 'vhd', 'type': 'VirtualHardDisk'},
+        'image': {'key': 'image', 'type': 'VirtualHardDisk'},
+        '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'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'ManagedDiskParameters'},
+    }
+
+    def __init__(self, **kwargs):
+        super(OSDisk, self).__init__(**kwargs)
+        self.os_type = kwargs.get('os_type', None)
+        self.encryption_settings = kwargs.get('encryption_settings', None)
+        self.name = kwargs.get('name', None)
+        self.vhd = kwargs.get('vhd', None)
+        self.image = kwargs.get('image', None)
+        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.managed_disk = kwargs.get('managed_disk', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_image.py
new file mode 100644
index 000000000000..ad439c7ab470
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_image.py
@@ -0,0 +1,36 @@
+# 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 OSDiskImage(Model):
+    """Contains the os disk image information.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param operating_system: Required. The operating system of the
+     osDiskImage. Possible values include: 'Windows', 'Linux'
+    :type operating_system: str or
+     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
+    """
+
+    _validation = {
+        'operating_system': {'required': True},
+    }
+
+    _attribute_map = {
+        'operating_system': {'key': 'operatingSystem', 'type': 'OperatingSystemTypes'},
+    }
+
+    def __init__(self, **kwargs):
+        super(OSDiskImage, self).__init__(**kwargs)
+        self.operating_system = kwargs.get('operating_system', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_image_py3.py
new file mode 100644
index 000000000000..1d9c6e45d677
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_image_py3.py
@@ -0,0 +1,36 @@
+# 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 OSDiskImage(Model):
+    """Contains the os disk image information.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param operating_system: Required. The operating system of the
+     osDiskImage. Possible values include: 'Windows', 'Linux'
+    :type operating_system: str or
+     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
+    """
+
+    _validation = {
+        'operating_system': {'required': True},
+    }
+
+    _attribute_map = {
+        'operating_system': {'key': 'operatingSystem', 'type': 'OperatingSystemTypes'},
+    }
+
+    def __init__(self, *, operating_system, **kwargs) -> None:
+        super(OSDiskImage, self).__init__(**kwargs)
+        self.operating_system = operating_system
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
new file mode 100644
index 000000000000..e45324c5df9c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_disk_py3.py
@@ -0,0 +1,97 @@
+# 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 OSDisk(Model):
+    """Specifies information about the operating system disk used by the virtual
+    machine. <br><br> For more information about disks, see [About disks and
+    VHDs for Azure virtual
+    machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+
+    All required parameters must be populated in order to send to Azure.
+
+    :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**
+     <br><br> **Linux**. Possible values include: 'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
+    :param encryption_settings: Specifies the encryption settings for the OS
+     Disk. <br><br> Minimum api-version: 2015-06-15
+    :type encryption_settings:
+     ~azure.mgmt.compute.v2018_04_01.models.DiskEncryptionSettings
+    :param name: The disk name.
+    :type name: str
+    :param vhd: The virtual hard disk.
+    :type vhd: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
+    :param image: The source user image virtual hard disk. The virtual hard
+     disk will be copied before being attached to the virtual machine. If
+     SourceImage is provided, the destination virtual hard drive must not
+     exist.
+    :type image: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :param create_option: Required. Specifies how the virtual machine should
+     be created.<br><br> Possible values are:<br><br> **Attach** \\u2013 This
+     value is used when you are using a specialized disk to create the virtual
+     machine.<br><br> **FromImage** \\u2013 This value is used when you are
+     using an image to create the virtual machine. If you are using a platform
+     image, you also use the imageReference element described above. If you are
+     using a marketplace image, you  also use the plan element previously
+     described. Possible values include: 'FromImage', 'Empty', 'Attach'
+    :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
+     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.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_04_01.models.ManagedDiskParameters
+    """
+
+    _validation = {
+        'create_option': {'required': True},
+    }
+
+    _attribute_map = {
+        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
+        'encryption_settings': {'key': 'encryptionSettings', 'type': 'DiskEncryptionSettings'},
+        'name': {'key': 'name', 'type': 'str'},
+        'vhd': {'key': 'vhd', 'type': 'VirtualHardDisk'},
+        'image': {'key': 'image', 'type': 'VirtualHardDisk'},
+        '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'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'ManagedDiskParameters'},
+    }
+
+    def __init__(self, *, create_option, os_type=None, encryption_settings=None, name: str=None, vhd=None, image=None, caching=None, write_accelerator_enabled: bool=None, disk_size_gb: int=None, managed_disk=None, **kwargs) -> None:
+        super(OSDisk, self).__init__(**kwargs)
+        self.os_type = os_type
+        self.encryption_settings = encryption_settings
+        self.name = name
+        self.vhd = vhd
+        self.image = image
+        self.caching = caching
+        self.write_accelerator_enabled = write_accelerator_enabled
+        self.create_option = create_option
+        self.disk_size_gb = disk_size_gb
+        self.managed_disk = managed_disk
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_profile.py
new file mode 100644
index 000000000000..3197bdb4b81f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_profile.py
@@ -0,0 +1,99 @@
+# 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 OSProfile(Model):
+    """Specifies the operating system settings for the virtual machine.
+
+    :param computer_name: Specifies the host OS name of the virtual machine.
+     <br><br> **Max-length (Windows):** 15 characters <br><br> **Max-length
+     (Linux):** 64 characters. <br><br> For naming conventions and restrictions
+     see [Azure infrastructure services implementation
+     guidelines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-infrastructure-subscription-accounts-guidelines?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#1-naming-conventions).
+    :type computer_name: str
+    :param admin_username: Specifies the name of the administrator account.
+     <br><br> **Windows-only restriction:** Cannot end in "." <br><br>
+     **Disallowed values:** "administrator", "admin", "user", "user1", "test",
+     "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm",
+     "admin2", "aspnet", "backup", "console", "david", "guest", "john",
+     "owner", "root", "server", "sql", "support", "support_388945a0", "sys",
+     "test2", "test3", "user4", "user5". <br><br> **Minimum-length (Linux):** 1
+     character <br><br> **Max-length (Linux):** 64 characters <br><br>
+     **Max-length (Windows):** 20 characters  <br><br><li> For root access to
+     the Linux VM, see [Using root privileges on Linux virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-use-root-privileges?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)<br><li>
+     For a list of built-in system users on Linux that should not be used in
+     this field, see [Selecting User Names for Linux on
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-usernames?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    :type admin_username: str
+    :param admin_password: Specifies the password of the administrator
+     account. <br><br> **Minimum-length (Windows):** 8 characters <br><br>
+     **Minimum-length (Linux):** 6 characters <br><br> **Max-length
+     (Windows):** 123 characters <br><br> **Max-length (Linux):** 72 characters
+     <br><br> **Complexity requirements:** 3 out of 4 conditions below need to
+     be fulfilled <br> Has lower characters <br>Has upper characters <br> Has a
+     digit <br> Has a special character (Regex match [\\W_]) <br><br>
+     **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123",
+     "Pa$$word", "pass@word1", "Password!", "Password1", "Password22",
+     "iloveyou!" <br><br> For resetting the password, see [How to reset the
+     Remote Desktop service or its login password in a Windows
+     VM](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-reset-rdp?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> For resetting root password, see [Manage users, SSH, and check or
+     repair disks on Azure Linux VMs using the VMAccess
+     Extension](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-vmaccess-extension?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#reset-root-password)
+    :type admin_password: str
+    :param custom_data: Specifies a base-64 encoded string of custom data. The
+     base-64 encoded string is decoded to a binary array that is saved as a
+     file on the Virtual Machine. The maximum length of the binary array is
+     65535 bytes. <br><br> For using cloud-init for your VM, see [Using
+     cloud-init to customize a Linux VM during
+     creation](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-cloud-init?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    :type custom_data: str
+    :param windows_configuration: Specifies Windows operating system settings
+     on the virtual machine.
+    :type windows_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.WindowsConfiguration
+    :param linux_configuration: Specifies the Linux operating system settings
+     on the virtual machine. <br><br>For a list of supported Linux
+     distributions, see [Linux on Azure-Endorsed
+     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+     <br><br> For running non-endorsed distributions, see [Information for
+     Non-Endorsed
+     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
+    :type linux_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.LinuxConfiguration
+    :param secrets: Specifies set of certificates that should be installed
+     onto the virtual machine.
+    :type secrets:
+     list[~azure.mgmt.compute.v2018_04_01.models.VaultSecretGroup]
+    """
+
+    _attribute_map = {
+        'computer_name': {'key': 'computerName', 'type': 'str'},
+        'admin_username': {'key': 'adminUsername', 'type': 'str'},
+        'admin_password': {'key': 'adminPassword', 'type': 'str'},
+        'custom_data': {'key': 'customData', 'type': 'str'},
+        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'WindowsConfiguration'},
+        'linux_configuration': {'key': 'linuxConfiguration', 'type': 'LinuxConfiguration'},
+        'secrets': {'key': 'secrets', 'type': '[VaultSecretGroup]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(OSProfile, self).__init__(**kwargs)
+        self.computer_name = kwargs.get('computer_name', None)
+        self.admin_username = kwargs.get('admin_username', None)
+        self.admin_password = kwargs.get('admin_password', None)
+        self.custom_data = kwargs.get('custom_data', None)
+        self.windows_configuration = kwargs.get('windows_configuration', None)
+        self.linux_configuration = kwargs.get('linux_configuration', None)
+        self.secrets = kwargs.get('secrets', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_profile_py3.py
new file mode 100644
index 000000000000..eaef9a9ff6a0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/os_profile_py3.py
@@ -0,0 +1,99 @@
+# 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 OSProfile(Model):
+    """Specifies the operating system settings for the virtual machine.
+
+    :param computer_name: Specifies the host OS name of the virtual machine.
+     <br><br> **Max-length (Windows):** 15 characters <br><br> **Max-length
+     (Linux):** 64 characters. <br><br> For naming conventions and restrictions
+     see [Azure infrastructure services implementation
+     guidelines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-infrastructure-subscription-accounts-guidelines?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#1-naming-conventions).
+    :type computer_name: str
+    :param admin_username: Specifies the name of the administrator account.
+     <br><br> **Windows-only restriction:** Cannot end in "." <br><br>
+     **Disallowed values:** "administrator", "admin", "user", "user1", "test",
+     "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm",
+     "admin2", "aspnet", "backup", "console", "david", "guest", "john",
+     "owner", "root", "server", "sql", "support", "support_388945a0", "sys",
+     "test2", "test3", "user4", "user5". <br><br> **Minimum-length (Linux):** 1
+     character <br><br> **Max-length (Linux):** 64 characters <br><br>
+     **Max-length (Windows):** 20 characters  <br><br><li> For root access to
+     the Linux VM, see [Using root privileges on Linux virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-use-root-privileges?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)<br><li>
+     For a list of built-in system users on Linux that should not be used in
+     this field, see [Selecting User Names for Linux on
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-usernames?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    :type admin_username: str
+    :param admin_password: Specifies the password of the administrator
+     account. <br><br> **Minimum-length (Windows):** 8 characters <br><br>
+     **Minimum-length (Linux):** 6 characters <br><br> **Max-length
+     (Windows):** 123 characters <br><br> **Max-length (Linux):** 72 characters
+     <br><br> **Complexity requirements:** 3 out of 4 conditions below need to
+     be fulfilled <br> Has lower characters <br>Has upper characters <br> Has a
+     digit <br> Has a special character (Regex match [\\W_]) <br><br>
+     **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123",
+     "Pa$$word", "pass@word1", "Password!", "Password1", "Password22",
+     "iloveyou!" <br><br> For resetting the password, see [How to reset the
+     Remote Desktop service or its login password in a Windows
+     VM](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-reset-rdp?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> For resetting root password, see [Manage users, SSH, and check or
+     repair disks on Azure Linux VMs using the VMAccess
+     Extension](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-vmaccess-extension?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#reset-root-password)
+    :type admin_password: str
+    :param custom_data: Specifies a base-64 encoded string of custom data. The
+     base-64 encoded string is decoded to a binary array that is saved as a
+     file on the Virtual Machine. The maximum length of the binary array is
+     65535 bytes. <br><br> For using cloud-init for your VM, see [Using
+     cloud-init to customize a Linux VM during
+     creation](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-cloud-init?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    :type custom_data: str
+    :param windows_configuration: Specifies Windows operating system settings
+     on the virtual machine.
+    :type windows_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.WindowsConfiguration
+    :param linux_configuration: Specifies the Linux operating system settings
+     on the virtual machine. <br><br>For a list of supported Linux
+     distributions, see [Linux on Azure-Endorsed
+     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+     <br><br> For running non-endorsed distributions, see [Information for
+     Non-Endorsed
+     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
+    :type linux_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.LinuxConfiguration
+    :param secrets: Specifies set of certificates that should be installed
+     onto the virtual machine.
+    :type secrets:
+     list[~azure.mgmt.compute.v2018_04_01.models.VaultSecretGroup]
+    """
+
+    _attribute_map = {
+        'computer_name': {'key': 'computerName', 'type': 'str'},
+        'admin_username': {'key': 'adminUsername', 'type': 'str'},
+        'admin_password': {'key': 'adminPassword', 'type': 'str'},
+        'custom_data': {'key': 'customData', 'type': 'str'},
+        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'WindowsConfiguration'},
+        'linux_configuration': {'key': 'linuxConfiguration', 'type': 'LinuxConfiguration'},
+        'secrets': {'key': 'secrets', 'type': '[VaultSecretGroup]'},
+    }
+
+    def __init__(self, *, computer_name: str=None, admin_username: str=None, admin_password: str=None, custom_data: str=None, windows_configuration=None, linux_configuration=None, secrets=None, **kwargs) -> None:
+        super(OSProfile, self).__init__(**kwargs)
+        self.computer_name = computer_name
+        self.admin_username = admin_username
+        self.admin_password = admin_password
+        self.custom_data = custom_data
+        self.windows_configuration = windows_configuration
+        self.linux_configuration = linux_configuration
+        self.secrets = secrets
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/plan.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/plan.py
new file mode 100644
index 000000000000..d42b6b32cfac
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/plan.py
@@ -0,0 +1,46 @@
+# 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 Plan(Model):
+    """Specifies information about the marketplace image used to create the
+    virtual machine. This element is only used for marketplace images. Before
+    you can use a marketplace image from an API, you must enable the image for
+    programmatic use.  In the Azure portal, find the marketplace image that you
+    want to use and then click **Want to deploy programmatically, Get Started
+    ->**. Enter any required information and then click **Save**.
+
+    :param name: The plan ID.
+    :type name: str
+    :param publisher: The publisher ID.
+    :type publisher: str
+    :param product: Specifies the product of the image from the marketplace.
+     This is the same value as Offer under the imageReference element.
+    :type product: str
+    :param promotion_code: The promotion code.
+    :type promotion_code: str
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'publisher': {'key': 'publisher', 'type': 'str'},
+        'product': {'key': 'product', 'type': 'str'},
+        'promotion_code': {'key': 'promotionCode', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(Plan, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.publisher = kwargs.get('publisher', None)
+        self.product = kwargs.get('product', None)
+        self.promotion_code = kwargs.get('promotion_code', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/plan_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/plan_py3.py
new file mode 100644
index 000000000000..9cca2c78a123
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/plan_py3.py
@@ -0,0 +1,46 @@
+# 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 Plan(Model):
+    """Specifies information about the marketplace image used to create the
+    virtual machine. This element is only used for marketplace images. Before
+    you can use a marketplace image from an API, you must enable the image for
+    programmatic use.  In the Azure portal, find the marketplace image that you
+    want to use and then click **Want to deploy programmatically, Get Started
+    ->**. Enter any required information and then click **Save**.
+
+    :param name: The plan ID.
+    :type name: str
+    :param publisher: The publisher ID.
+    :type publisher: str
+    :param product: Specifies the product of the image from the marketplace.
+     This is the same value as Offer under the imageReference element.
+    :type product: str
+    :param promotion_code: The promotion code.
+    :type promotion_code: str
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'publisher': {'key': 'publisher', 'type': 'str'},
+        'product': {'key': 'product', 'type': 'str'},
+        'promotion_code': {'key': 'promotionCode', 'type': 'str'},
+    }
+
+    def __init__(self, *, name: str=None, publisher: str=None, product: str=None, promotion_code: str=None, **kwargs) -> None:
+        super(Plan, self).__init__(**kwargs)
+        self.name = name
+        self.publisher = publisher
+        self.product = product
+        self.promotion_code = promotion_code
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/purchase_plan.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/purchase_plan.py
new file mode 100644
index 000000000000..2e1509addca6
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/purchase_plan.py
@@ -0,0 +1,47 @@
+# 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 PurchasePlan(Model):
+    """Used for establishing the purchase context of any 3rd Party artifact
+    through MarketPlace.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param publisher: Required. The publisher ID.
+    :type publisher: str
+    :param name: Required. The plan ID.
+    :type name: str
+    :param product: Required. Specifies the product of the image from the
+     marketplace. This is the same value as Offer under the imageReference
+     element.
+    :type product: str
+    """
+
+    _validation = {
+        'publisher': {'required': True},
+        'name': {'required': True},
+        'product': {'required': True},
+    }
+
+    _attribute_map = {
+        'publisher': {'key': 'publisher', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'product': {'key': 'product', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(PurchasePlan, self).__init__(**kwargs)
+        self.publisher = kwargs.get('publisher', None)
+        self.name = kwargs.get('name', None)
+        self.product = kwargs.get('product', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/purchase_plan_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/purchase_plan_py3.py
new file mode 100644
index 000000000000..26f7996f1633
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/purchase_plan_py3.py
@@ -0,0 +1,47 @@
+# 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 PurchasePlan(Model):
+    """Used for establishing the purchase context of any 3rd Party artifact
+    through MarketPlace.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param publisher: Required. The publisher ID.
+    :type publisher: str
+    :param name: Required. The plan ID.
+    :type name: str
+    :param product: Required. Specifies the product of the image from the
+     marketplace. This is the same value as Offer under the imageReference
+     element.
+    :type product: str
+    """
+
+    _validation = {
+        'publisher': {'required': True},
+        'name': {'required': True},
+        'product': {'required': True},
+    }
+
+    _attribute_map = {
+        'publisher': {'key': 'publisher', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'product': {'key': 'product', 'type': 'str'},
+    }
+
+    def __init__(self, *, publisher: str, name: str, product: str, **kwargs) -> None:
+        super(PurchasePlan, self).__init__(**kwargs)
+        self.publisher = publisher
+        self.name = name
+        self.product = product
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/recovery_walk_response.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/recovery_walk_response.py
new file mode 100644
index 000000000000..8dcbca604c7e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/recovery_walk_response.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 RecoveryWalkResponse(Model):
+    """Response after calling a manual recovery walk.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar walk_performed: Whether the recovery walk was performed
+    :vartype walk_performed: bool
+    :ivar next_platform_update_domain: The next update domain that needs to be
+     walked. Null means walk spanning all update domains has been completed
+    :vartype next_platform_update_domain: int
+    """
+
+    _validation = {
+        'walk_performed': {'readonly': True},
+        'next_platform_update_domain': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'walk_performed': {'key': 'walkPerformed', 'type': 'bool'},
+        'next_platform_update_domain': {'key': 'nextPlatformUpdateDomain', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RecoveryWalkResponse, self).__init__(**kwargs)
+        self.walk_performed = None
+        self.next_platform_update_domain = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/recovery_walk_response_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/recovery_walk_response_py3.py
new file mode 100644
index 000000000000..5b24a0ed9b7a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/recovery_walk_response_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 RecoveryWalkResponse(Model):
+    """Response after calling a manual recovery walk.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar walk_performed: Whether the recovery walk was performed
+    :vartype walk_performed: bool
+    :ivar next_platform_update_domain: The next update domain that needs to be
+     walked. Null means walk spanning all update domains has been completed
+    :vartype next_platform_update_domain: int
+    """
+
+    _validation = {
+        'walk_performed': {'readonly': True},
+        'next_platform_update_domain': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'walk_performed': {'key': 'walkPerformed', 'type': 'bool'},
+        'next_platform_update_domain': {'key': 'nextPlatformUpdateDomain', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(RecoveryWalkResponse, self).__init__(**kwargs)
+        self.walk_performed = None
+        self.next_platform_update_domain = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/request_rate_by_interval_input.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/request_rate_by_interval_input.py
new file mode 100644
index 000000000000..8712882e54db
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/request_rate_by_interval_input.py
@@ -0,0 +1,60 @@
+# 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 .log_analytics_input_base import LogAnalyticsInputBase
+
+
+class RequestRateByIntervalInput(LogAnalyticsInputBase):
+    """Api request input for LogAnalytics getRequestRateByInterval Api.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param blob_container_sas_uri: Required. SAS Uri of the logging blob
+     container to which LogAnalytics Api writes output logs to.
+    :type blob_container_sas_uri: str
+    :param from_time: Required. From time of the query
+    :type from_time: datetime
+    :param to_time: Required. To time of the query
+    :type to_time: datetime
+    :param group_by_throttle_policy: Group query result by Throttle Policy
+     applied.
+    :type group_by_throttle_policy: bool
+    :param group_by_operation_name: Group query result by  by Operation Name.
+    :type group_by_operation_name: bool
+    :param group_by_resource_name: Group query result by Resource Name.
+    :type group_by_resource_name: bool
+    :param interval_length: Required. Interval value in minutes used to create
+     LogAnalytics call rate logs. Possible values include: 'ThreeMins',
+     'FiveMins', 'ThirtyMins', 'SixtyMins'
+    :type interval_length: str or
+     ~azure.mgmt.compute.v2018_04_01.models.IntervalInMins
+    """
+
+    _validation = {
+        'blob_container_sas_uri': {'required': True},
+        'from_time': {'required': True},
+        'to_time': {'required': True},
+        'interval_length': {'required': True},
+    }
+
+    _attribute_map = {
+        'blob_container_sas_uri': {'key': 'blobContainerSasUri', 'type': 'str'},
+        'from_time': {'key': 'fromTime', 'type': 'iso-8601'},
+        'to_time': {'key': 'toTime', 'type': 'iso-8601'},
+        'group_by_throttle_policy': {'key': 'groupByThrottlePolicy', 'type': 'bool'},
+        'group_by_operation_name': {'key': 'groupByOperationName', 'type': 'bool'},
+        'group_by_resource_name': {'key': 'groupByResourceName', 'type': 'bool'},
+        'interval_length': {'key': 'intervalLength', 'type': 'IntervalInMins'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RequestRateByIntervalInput, self).__init__(**kwargs)
+        self.interval_length = kwargs.get('interval_length', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/request_rate_by_interval_input_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/request_rate_by_interval_input_py3.py
new file mode 100644
index 000000000000..c073513f5d59
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/request_rate_by_interval_input_py3.py
@@ -0,0 +1,60 @@
+# 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 .log_analytics_input_base_py3 import LogAnalyticsInputBase
+
+
+class RequestRateByIntervalInput(LogAnalyticsInputBase):
+    """Api request input for LogAnalytics getRequestRateByInterval Api.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param blob_container_sas_uri: Required. SAS Uri of the logging blob
+     container to which LogAnalytics Api writes output logs to.
+    :type blob_container_sas_uri: str
+    :param from_time: Required. From time of the query
+    :type from_time: datetime
+    :param to_time: Required. To time of the query
+    :type to_time: datetime
+    :param group_by_throttle_policy: Group query result by Throttle Policy
+     applied.
+    :type group_by_throttle_policy: bool
+    :param group_by_operation_name: Group query result by  by Operation Name.
+    :type group_by_operation_name: bool
+    :param group_by_resource_name: Group query result by Resource Name.
+    :type group_by_resource_name: bool
+    :param interval_length: Required. Interval value in minutes used to create
+     LogAnalytics call rate logs. Possible values include: 'ThreeMins',
+     'FiveMins', 'ThirtyMins', 'SixtyMins'
+    :type interval_length: str or
+     ~azure.mgmt.compute.v2018_04_01.models.IntervalInMins
+    """
+
+    _validation = {
+        'blob_container_sas_uri': {'required': True},
+        'from_time': {'required': True},
+        'to_time': {'required': True},
+        'interval_length': {'required': True},
+    }
+
+    _attribute_map = {
+        'blob_container_sas_uri': {'key': 'blobContainerSasUri', 'type': 'str'},
+        'from_time': {'key': 'fromTime', 'type': 'iso-8601'},
+        'to_time': {'key': 'toTime', 'type': 'iso-8601'},
+        'group_by_throttle_policy': {'key': 'groupByThrottlePolicy', 'type': 'bool'},
+        'group_by_operation_name': {'key': 'groupByOperationName', 'type': 'bool'},
+        'group_by_resource_name': {'key': 'groupByResourceName', 'type': 'bool'},
+        'interval_length': {'key': 'intervalLength', 'type': 'IntervalInMins'},
+    }
+
+    def __init__(self, *, blob_container_sas_uri: str, from_time, to_time, interval_length, group_by_throttle_policy: bool=None, group_by_operation_name: bool=None, group_by_resource_name: bool=None, **kwargs) -> None:
+        super(RequestRateByIntervalInput, self).__init__(blob_container_sas_uri=blob_container_sas_uri, from_time=from_time, to_time=to_time, group_by_throttle_policy=group_by_throttle_policy, group_by_operation_name=group_by_operation_name, group_by_resource_name=group_by_resource_name, **kwargs)
+        self.interval_length = interval_length
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rollback_status_info.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rollback_status_info.py
new file mode 100644
index 000000000000..ebc35953f076
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rollback_status_info.py
@@ -0,0 +1,48 @@
+# 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 RollbackStatusInfo(Model):
+    """Information about rollback on failed VM instances after a OS Upgrade
+    operation.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar successfully_rolledback_instance_count: The number of instances
+     which have been successfully rolled back.
+    :vartype successfully_rolledback_instance_count: int
+    :ivar failed_rolledback_instance_count: The number of instances which
+     failed to rollback.
+    :vartype failed_rolledback_instance_count: int
+    :ivar rollback_error: Error details if OS rollback failed.
+    :vartype rollback_error: ~azure.mgmt.compute.v2018_04_01.models.ApiError
+    """
+
+    _validation = {
+        'successfully_rolledback_instance_count': {'readonly': True},
+        'failed_rolledback_instance_count': {'readonly': True},
+        'rollback_error': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'successfully_rolledback_instance_count': {'key': 'successfullyRolledbackInstanceCount', 'type': 'int'},
+        'failed_rolledback_instance_count': {'key': 'failedRolledbackInstanceCount', 'type': 'int'},
+        'rollback_error': {'key': 'rollbackError', 'type': 'ApiError'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RollbackStatusInfo, self).__init__(**kwargs)
+        self.successfully_rolledback_instance_count = None
+        self.failed_rolledback_instance_count = None
+        self.rollback_error = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rollback_status_info_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rollback_status_info_py3.py
new file mode 100644
index 000000000000..478f15ca323b
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rollback_status_info_py3.py
@@ -0,0 +1,48 @@
+# 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 RollbackStatusInfo(Model):
+    """Information about rollback on failed VM instances after a OS Upgrade
+    operation.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar successfully_rolledback_instance_count: The number of instances
+     which have been successfully rolled back.
+    :vartype successfully_rolledback_instance_count: int
+    :ivar failed_rolledback_instance_count: The number of instances which
+     failed to rollback.
+    :vartype failed_rolledback_instance_count: int
+    :ivar rollback_error: Error details if OS rollback failed.
+    :vartype rollback_error: ~azure.mgmt.compute.v2018_04_01.models.ApiError
+    """
+
+    _validation = {
+        'successfully_rolledback_instance_count': {'readonly': True},
+        'failed_rolledback_instance_count': {'readonly': True},
+        'rollback_error': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'successfully_rolledback_instance_count': {'key': 'successfullyRolledbackInstanceCount', 'type': 'int'},
+        'failed_rolledback_instance_count': {'key': 'failedRolledbackInstanceCount', 'type': 'int'},
+        'rollback_error': {'key': 'rollbackError', 'type': 'ApiError'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(RollbackStatusInfo, self).__init__(**kwargs)
+        self.successfully_rolledback_instance_count = None
+        self.failed_rolledback_instance_count = None
+        self.rollback_error = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_policy.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_policy.py
new file mode 100644
index 000000000000..1eecaa5e2e65
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_policy.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 RollingUpgradePolicy(Model):
+    """The configuration parameters used while performing a rolling upgrade.
+
+    :param max_batch_instance_percent: The maximum percent of total virtual
+     machine instances that will be upgraded simultaneously by the rolling
+     upgrade in one batch. As this is a maximum, unhealthy instances in
+     previous or future batches can cause the percentage of instances in a
+     batch to decrease to ensure higher reliability. The default value for this
+     parameter is 20%.
+    :type max_batch_instance_percent: int
+    :param max_unhealthy_instance_percent: The maximum percentage of the total
+     virtual machine instances in the scale set that can be simultaneously
+     unhealthy, either as a result of being upgraded, or by being found in an
+     unhealthy state by the virtual machine health checks before the rolling
+     upgrade aborts. This constraint will be checked prior to starting any
+     batch. The default value for this parameter is 20%.
+    :type max_unhealthy_instance_percent: int
+    :param max_unhealthy_upgraded_instance_percent: The maximum percentage of
+     upgraded virtual machine instances that can be found to be in an unhealthy
+     state. This check will happen after each batch is upgraded. If this
+     percentage is ever exceeded, the rolling update aborts. The default value
+     for this parameter is 20%.
+    :type max_unhealthy_upgraded_instance_percent: int
+    :param pause_time_between_batches: The wait time between completing the
+     update for all virtual machines in one batch and starting the next batch.
+     The time duration should be specified in ISO 8601 format. The default
+     value is 0 seconds (PT0S).
+    :type pause_time_between_batches: str
+    """
+
+    _validation = {
+        'max_batch_instance_percent': {'maximum': 100, 'minimum': 5},
+        'max_unhealthy_instance_percent': {'maximum': 100, 'minimum': 5},
+        'max_unhealthy_upgraded_instance_percent': {'maximum': 100, 'minimum': 0},
+    }
+
+    _attribute_map = {
+        'max_batch_instance_percent': {'key': 'maxBatchInstancePercent', 'type': 'int'},
+        'max_unhealthy_instance_percent': {'key': 'maxUnhealthyInstancePercent', 'type': 'int'},
+        'max_unhealthy_upgraded_instance_percent': {'key': 'maxUnhealthyUpgradedInstancePercent', 'type': 'int'},
+        'pause_time_between_batches': {'key': 'pauseTimeBetweenBatches', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RollingUpgradePolicy, self).__init__(**kwargs)
+        self.max_batch_instance_percent = kwargs.get('max_batch_instance_percent', None)
+        self.max_unhealthy_instance_percent = kwargs.get('max_unhealthy_instance_percent', None)
+        self.max_unhealthy_upgraded_instance_percent = kwargs.get('max_unhealthy_upgraded_instance_percent', None)
+        self.pause_time_between_batches = kwargs.get('pause_time_between_batches', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_policy_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_policy_py3.py
new file mode 100644
index 000000000000..e698a382f112
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_policy_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 RollingUpgradePolicy(Model):
+    """The configuration parameters used while performing a rolling upgrade.
+
+    :param max_batch_instance_percent: The maximum percent of total virtual
+     machine instances that will be upgraded simultaneously by the rolling
+     upgrade in one batch. As this is a maximum, unhealthy instances in
+     previous or future batches can cause the percentage of instances in a
+     batch to decrease to ensure higher reliability. The default value for this
+     parameter is 20%.
+    :type max_batch_instance_percent: int
+    :param max_unhealthy_instance_percent: The maximum percentage of the total
+     virtual machine instances in the scale set that can be simultaneously
+     unhealthy, either as a result of being upgraded, or by being found in an
+     unhealthy state by the virtual machine health checks before the rolling
+     upgrade aborts. This constraint will be checked prior to starting any
+     batch. The default value for this parameter is 20%.
+    :type max_unhealthy_instance_percent: int
+    :param max_unhealthy_upgraded_instance_percent: The maximum percentage of
+     upgraded virtual machine instances that can be found to be in an unhealthy
+     state. This check will happen after each batch is upgraded. If this
+     percentage is ever exceeded, the rolling update aborts. The default value
+     for this parameter is 20%.
+    :type max_unhealthy_upgraded_instance_percent: int
+    :param pause_time_between_batches: The wait time between completing the
+     update for all virtual machines in one batch and starting the next batch.
+     The time duration should be specified in ISO 8601 format. The default
+     value is 0 seconds (PT0S).
+    :type pause_time_between_batches: str
+    """
+
+    _validation = {
+        'max_batch_instance_percent': {'maximum': 100, 'minimum': 5},
+        'max_unhealthy_instance_percent': {'maximum': 100, 'minimum': 5},
+        'max_unhealthy_upgraded_instance_percent': {'maximum': 100, 'minimum': 0},
+    }
+
+    _attribute_map = {
+        'max_batch_instance_percent': {'key': 'maxBatchInstancePercent', 'type': 'int'},
+        'max_unhealthy_instance_percent': {'key': 'maxUnhealthyInstancePercent', 'type': 'int'},
+        'max_unhealthy_upgraded_instance_percent': {'key': 'maxUnhealthyUpgradedInstancePercent', 'type': 'int'},
+        'pause_time_between_batches': {'key': 'pauseTimeBetweenBatches', 'type': 'str'},
+    }
+
+    def __init__(self, *, max_batch_instance_percent: int=None, max_unhealthy_instance_percent: int=None, max_unhealthy_upgraded_instance_percent: int=None, pause_time_between_batches: str=None, **kwargs) -> None:
+        super(RollingUpgradePolicy, self).__init__(**kwargs)
+        self.max_batch_instance_percent = max_batch_instance_percent
+        self.max_unhealthy_instance_percent = max_unhealthy_instance_percent
+        self.max_unhealthy_upgraded_instance_percent = max_unhealthy_upgraded_instance_percent
+        self.pause_time_between_batches = pause_time_between_batches
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_progress_info.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_progress_info.py
new file mode 100644
index 000000000000..87e40590e275
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_progress_info.py
@@ -0,0 +1,55 @@
+# 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 RollingUpgradeProgressInfo(Model):
+    """Information about the number of virtual machine instances in each upgrade
+    state.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar successful_instance_count: The number of instances that have been
+     successfully upgraded.
+    :vartype successful_instance_count: int
+    :ivar failed_instance_count: The number of instances that have failed to
+     be upgraded successfully.
+    :vartype failed_instance_count: int
+    :ivar in_progress_instance_count: The number of instances that are
+     currently being upgraded.
+    :vartype in_progress_instance_count: int
+    :ivar pending_instance_count: The number of instances that have not yet
+     begun to be upgraded.
+    :vartype pending_instance_count: int
+    """
+
+    _validation = {
+        'successful_instance_count': {'readonly': True},
+        'failed_instance_count': {'readonly': True},
+        'in_progress_instance_count': {'readonly': True},
+        'pending_instance_count': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'successful_instance_count': {'key': 'successfulInstanceCount', 'type': 'int'},
+        'failed_instance_count': {'key': 'failedInstanceCount', 'type': 'int'},
+        'in_progress_instance_count': {'key': 'inProgressInstanceCount', 'type': 'int'},
+        'pending_instance_count': {'key': 'pendingInstanceCount', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RollingUpgradeProgressInfo, self).__init__(**kwargs)
+        self.successful_instance_count = None
+        self.failed_instance_count = None
+        self.in_progress_instance_count = None
+        self.pending_instance_count = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_progress_info_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_progress_info_py3.py
new file mode 100644
index 000000000000..060abc3063b4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_progress_info_py3.py
@@ -0,0 +1,55 @@
+# 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 RollingUpgradeProgressInfo(Model):
+    """Information about the number of virtual machine instances in each upgrade
+    state.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar successful_instance_count: The number of instances that have been
+     successfully upgraded.
+    :vartype successful_instance_count: int
+    :ivar failed_instance_count: The number of instances that have failed to
+     be upgraded successfully.
+    :vartype failed_instance_count: int
+    :ivar in_progress_instance_count: The number of instances that are
+     currently being upgraded.
+    :vartype in_progress_instance_count: int
+    :ivar pending_instance_count: The number of instances that have not yet
+     begun to be upgraded.
+    :vartype pending_instance_count: int
+    """
+
+    _validation = {
+        'successful_instance_count': {'readonly': True},
+        'failed_instance_count': {'readonly': True},
+        'in_progress_instance_count': {'readonly': True},
+        'pending_instance_count': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'successful_instance_count': {'key': 'successfulInstanceCount', 'type': 'int'},
+        'failed_instance_count': {'key': 'failedInstanceCount', 'type': 'int'},
+        'in_progress_instance_count': {'key': 'inProgressInstanceCount', 'type': 'int'},
+        'pending_instance_count': {'key': 'pendingInstanceCount', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(RollingUpgradeProgressInfo, self).__init__(**kwargs)
+        self.successful_instance_count = None
+        self.failed_instance_count = None
+        self.in_progress_instance_count = None
+        self.pending_instance_count = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_running_status.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_running_status.py
new file mode 100644
index 000000000000..0fc6dadaaac9
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_running_status.py
@@ -0,0 +1,54 @@
+# 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 RollingUpgradeRunningStatus(Model):
+    """Information about the current running state of the overall upgrade.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar code: Code indicating the current status of the upgrade. Possible
+     values include: 'RollingForward', 'Cancelled', 'Completed', 'Faulted'
+    :vartype code: str or
+     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeStatusCode
+    :ivar start_time: Start time of the upgrade.
+    :vartype start_time: datetime
+    :ivar last_action: The last action performed on the rolling upgrade.
+     Possible values include: 'Start', 'Cancel'
+    :vartype last_action: str or
+     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeActionType
+    :ivar last_action_time: Last action time of the upgrade.
+    :vartype last_action_time: datetime
+    """
+
+    _validation = {
+        'code': {'readonly': True},
+        'start_time': {'readonly': True},
+        'last_action': {'readonly': True},
+        'last_action_time': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'RollingUpgradeStatusCode'},
+        'start_time': {'key': 'startTime', 'type': 'iso-8601'},
+        'last_action': {'key': 'lastAction', 'type': 'RollingUpgradeActionType'},
+        'last_action_time': {'key': 'lastActionTime', 'type': 'iso-8601'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RollingUpgradeRunningStatus, self).__init__(**kwargs)
+        self.code = None
+        self.start_time = None
+        self.last_action = None
+        self.last_action_time = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_running_status_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_running_status_py3.py
new file mode 100644
index 000000000000..013502d02229
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_running_status_py3.py
@@ -0,0 +1,54 @@
+# 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 RollingUpgradeRunningStatus(Model):
+    """Information about the current running state of the overall upgrade.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar code: Code indicating the current status of the upgrade. Possible
+     values include: 'RollingForward', 'Cancelled', 'Completed', 'Faulted'
+    :vartype code: str or
+     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeStatusCode
+    :ivar start_time: Start time of the upgrade.
+    :vartype start_time: datetime
+    :ivar last_action: The last action performed on the rolling upgrade.
+     Possible values include: 'Start', 'Cancel'
+    :vartype last_action: str or
+     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeActionType
+    :ivar last_action_time: Last action time of the upgrade.
+    :vartype last_action_time: datetime
+    """
+
+    _validation = {
+        'code': {'readonly': True},
+        'start_time': {'readonly': True},
+        'last_action': {'readonly': True},
+        'last_action_time': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'RollingUpgradeStatusCode'},
+        'start_time': {'key': 'startTime', 'type': 'iso-8601'},
+        'last_action': {'key': 'lastAction', 'type': 'RollingUpgradeActionType'},
+        'last_action_time': {'key': 'lastActionTime', 'type': 'iso-8601'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(RollingUpgradeRunningStatus, self).__init__(**kwargs)
+        self.code = None
+        self.start_time = None
+        self.last_action = None
+        self.last_action_time = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_status_info.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_status_info.py
new file mode 100644
index 000000000000..eb679db28958
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_status_info.py
@@ -0,0 +1,76 @@
+# 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 RollingUpgradeStatusInfo(Resource):
+    """The status of the latest virtual machine scale set rolling upgrade.
+
+    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 policy: The rolling upgrade policies applied for this upgrade.
+    :vartype policy:
+     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradePolicy
+    :ivar running_status: Information about the current running state of the
+     overall upgrade.
+    :vartype running_status:
+     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeRunningStatus
+    :ivar progress: Information about the number of virtual machine instances
+     in each upgrade state.
+    :vartype progress:
+     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeProgressInfo
+    :ivar error: Error details for this upgrade, if there are any.
+    :vartype error: ~azure.mgmt.compute.v2018_04_01.models.ApiError
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'policy': {'readonly': True},
+        'running_status': {'readonly': True},
+        'progress': {'readonly': True},
+        'error': {'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}'},
+        'policy': {'key': 'properties.policy', 'type': 'RollingUpgradePolicy'},
+        'running_status': {'key': 'properties.runningStatus', 'type': 'RollingUpgradeRunningStatus'},
+        'progress': {'key': 'properties.progress', 'type': 'RollingUpgradeProgressInfo'},
+        'error': {'key': 'properties.error', 'type': 'ApiError'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RollingUpgradeStatusInfo, self).__init__(**kwargs)
+        self.policy = None
+        self.running_status = None
+        self.progress = None
+        self.error = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_status_info_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_status_info_py3.py
new file mode 100644
index 000000000000..8baa5b20df04
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/rolling_upgrade_status_info_py3.py
@@ -0,0 +1,76 @@
+# 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 RollingUpgradeStatusInfo(Resource):
+    """The status of the latest virtual machine scale set rolling upgrade.
+
+    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 policy: The rolling upgrade policies applied for this upgrade.
+    :vartype policy:
+     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradePolicy
+    :ivar running_status: Information about the current running state of the
+     overall upgrade.
+    :vartype running_status:
+     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeRunningStatus
+    :ivar progress: Information about the number of virtual machine instances
+     in each upgrade state.
+    :vartype progress:
+     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeProgressInfo
+    :ivar error: Error details for this upgrade, if there are any.
+    :vartype error: ~azure.mgmt.compute.v2018_04_01.models.ApiError
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'policy': {'readonly': True},
+        'running_status': {'readonly': True},
+        'progress': {'readonly': True},
+        'error': {'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}'},
+        'policy': {'key': 'properties.policy', 'type': 'RollingUpgradePolicy'},
+        'running_status': {'key': 'properties.runningStatus', 'type': 'RollingUpgradeRunningStatus'},
+        'progress': {'key': 'properties.progress', 'type': 'RollingUpgradeProgressInfo'},
+        'error': {'key': 'properties.error', 'type': 'ApiError'},
+    }
+
+    def __init__(self, *, location: str, tags=None, **kwargs) -> None:
+        super(RollingUpgradeStatusInfo, self).__init__(location=location, tags=tags, **kwargs)
+        self.policy = None
+        self.running_status = None
+        self.progress = None
+        self.error = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document.py
new file mode 100644
index 000000000000..fb511a45281d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document.py
@@ -0,0 +1,61 @@
+# 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 .run_command_document_base import RunCommandDocumentBase
+
+
+class RunCommandDocument(RunCommandDocumentBase):
+    """Describes the properties of a Run Command.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param schema: Required. The VM run command schema.
+    :type schema: str
+    :param id: Required. The VM run command id.
+    :type id: str
+    :param os_type: Required. The Operating System type. Possible values
+     include: 'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
+    :param label: Required. The VM run command label.
+    :type label: str
+    :param description: Required. The VM run command description.
+    :type description: str
+    :param script: Required. The script to be executed.
+    :type script: list[str]
+    :param parameters: The parameters used by the script.
+    :type parameters:
+     list[~azure.mgmt.compute.v2018_04_01.models.RunCommandParameterDefinition]
+    """
+
+    _validation = {
+        'schema': {'required': True},
+        'id': {'required': True},
+        'os_type': {'required': True},
+        'label': {'required': True},
+        'description': {'required': True},
+        'script': {'required': True},
+    }
+
+    _attribute_map = {
+        'schema': {'key': '$schema', 'type': 'str'},
+        'id': {'key': 'id', 'type': 'str'},
+        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
+        'label': {'key': 'label', 'type': 'str'},
+        'description': {'key': 'description', 'type': 'str'},
+        'script': {'key': 'script', 'type': '[str]'},
+        'parameters': {'key': 'parameters', 'type': '[RunCommandParameterDefinition]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RunCommandDocument, self).__init__(**kwargs)
+        self.script = kwargs.get('script', None)
+        self.parameters = kwargs.get('parameters', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base.py
new file mode 100644
index 000000000000..2ae3371b83e7
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base.py
@@ -0,0 +1,56 @@
+# 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 RunCommandDocumentBase(Model):
+    """Describes the properties of a Run Command metadata.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param schema: Required. The VM run command schema.
+    :type schema: str
+    :param id: Required. The VM run command id.
+    :type id: str
+    :param os_type: Required. The Operating System type. Possible values
+     include: 'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
+    :param label: Required. The VM run command label.
+    :type label: str
+    :param description: Required. The VM run command description.
+    :type description: str
+    """
+
+    _validation = {
+        'schema': {'required': True},
+        'id': {'required': True},
+        'os_type': {'required': True},
+        'label': {'required': True},
+        'description': {'required': True},
+    }
+
+    _attribute_map = {
+        'schema': {'key': '$schema', 'type': 'str'},
+        'id': {'key': 'id', 'type': 'str'},
+        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
+        'label': {'key': 'label', 'type': 'str'},
+        'description': {'key': 'description', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RunCommandDocumentBase, self).__init__(**kwargs)
+        self.schema = kwargs.get('schema', None)
+        self.id = kwargs.get('id', None)
+        self.os_type = kwargs.get('os_type', None)
+        self.label = kwargs.get('label', None)
+        self.description = kwargs.get('description', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base_paged.py
new file mode 100644
index 000000000000..1ac583338364
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base_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 RunCommandDocumentBasePaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`RunCommandDocumentBase <azure.mgmt.compute.v2018_04_01.models.RunCommandDocumentBase>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[RunCommandDocumentBase]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(RunCommandDocumentBasePaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base_py3.py
new file mode 100644
index 000000000000..45919bf4d325
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_base_py3.py
@@ -0,0 +1,56 @@
+# 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 RunCommandDocumentBase(Model):
+    """Describes the properties of a Run Command metadata.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param schema: Required. The VM run command schema.
+    :type schema: str
+    :param id: Required. The VM run command id.
+    :type id: str
+    :param os_type: Required. The Operating System type. Possible values
+     include: 'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
+    :param label: Required. The VM run command label.
+    :type label: str
+    :param description: Required. The VM run command description.
+    :type description: str
+    """
+
+    _validation = {
+        'schema': {'required': True},
+        'id': {'required': True},
+        'os_type': {'required': True},
+        'label': {'required': True},
+        'description': {'required': True},
+    }
+
+    _attribute_map = {
+        'schema': {'key': '$schema', 'type': 'str'},
+        'id': {'key': 'id', 'type': 'str'},
+        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
+        'label': {'key': 'label', 'type': 'str'},
+        'description': {'key': 'description', 'type': 'str'},
+    }
+
+    def __init__(self, *, schema: str, id: str, os_type, label: str, description: str, **kwargs) -> None:
+        super(RunCommandDocumentBase, self).__init__(**kwargs)
+        self.schema = schema
+        self.id = id
+        self.os_type = os_type
+        self.label = label
+        self.description = description
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_py3.py
new file mode 100644
index 000000000000..3543a6d45ef5
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_document_py3.py
@@ -0,0 +1,61 @@
+# 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 .run_command_document_base_py3 import RunCommandDocumentBase
+
+
+class RunCommandDocument(RunCommandDocumentBase):
+    """Describes the properties of a Run Command.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param schema: Required. The VM run command schema.
+    :type schema: str
+    :param id: Required. The VM run command id.
+    :type id: str
+    :param os_type: Required. The Operating System type. Possible values
+     include: 'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
+    :param label: Required. The VM run command label.
+    :type label: str
+    :param description: Required. The VM run command description.
+    :type description: str
+    :param script: Required. The script to be executed.
+    :type script: list[str]
+    :param parameters: The parameters used by the script.
+    :type parameters:
+     list[~azure.mgmt.compute.v2018_04_01.models.RunCommandParameterDefinition]
+    """
+
+    _validation = {
+        'schema': {'required': True},
+        'id': {'required': True},
+        'os_type': {'required': True},
+        'label': {'required': True},
+        'description': {'required': True},
+        'script': {'required': True},
+    }
+
+    _attribute_map = {
+        'schema': {'key': '$schema', 'type': 'str'},
+        'id': {'key': 'id', 'type': 'str'},
+        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
+        'label': {'key': 'label', 'type': 'str'},
+        'description': {'key': 'description', 'type': 'str'},
+        'script': {'key': 'script', 'type': '[str]'},
+        'parameters': {'key': 'parameters', 'type': '[RunCommandParameterDefinition]'},
+    }
+
+    def __init__(self, *, schema: str, id: str, os_type, label: str, description: str, script, parameters=None, **kwargs) -> None:
+        super(RunCommandDocument, self).__init__(schema=schema, id=id, os_type=os_type, label=label, description=description, **kwargs)
+        self.script = script
+        self.parameters = parameters
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input.py
new file mode 100644
index 000000000000..25b53a1f0336
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input.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 RunCommandInput(Model):
+    """Capture Virtual Machine parameters.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param command_id: Required. The run command id.
+    :type command_id: str
+    :param script: Optional. The script to be executed.  When this value is
+     given, the given script will override the default script of the command.
+    :type script: list[str]
+    :param parameters: The run command parameters.
+    :type parameters:
+     list[~azure.mgmt.compute.v2018_04_01.models.RunCommandInputParameter]
+    """
+
+    _validation = {
+        'command_id': {'required': True},
+    }
+
+    _attribute_map = {
+        'command_id': {'key': 'commandId', 'type': 'str'},
+        'script': {'key': 'script', 'type': '[str]'},
+        'parameters': {'key': 'parameters', 'type': '[RunCommandInputParameter]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RunCommandInput, self).__init__(**kwargs)
+        self.command_id = kwargs.get('command_id', None)
+        self.script = kwargs.get('script', None)
+        self.parameters = kwargs.get('parameters', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_parameter.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_parameter.py
new file mode 100644
index 000000000000..cd76ad81bfa2
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_parameter.py
@@ -0,0 +1,39 @@
+# 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 RunCommandInputParameter(Model):
+    """Describes the properties of a run command parameter.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: Required. The run command parameter name.
+    :type name: str
+    :param value: Required. The run command parameter value.
+    :type value: str
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'value': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'value': {'key': 'value', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RunCommandInputParameter, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.value = kwargs.get('value', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_parameter_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_parameter_py3.py
new file mode 100644
index 000000000000..6013f038a1c3
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_parameter_py3.py
@@ -0,0 +1,39 @@
+# 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 RunCommandInputParameter(Model):
+    """Describes the properties of a run command parameter.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: Required. The run command parameter name.
+    :type name: str
+    :param value: Required. The run command parameter value.
+    :type value: str
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'value': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'value': {'key': 'value', 'type': 'str'},
+    }
+
+    def __init__(self, *, name: str, value: str, **kwargs) -> None:
+        super(RunCommandInputParameter, self).__init__(**kwargs)
+        self.name = name
+        self.value = value
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_py3.py
new file mode 100644
index 000000000000..ae2a3588c64d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_input_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 RunCommandInput(Model):
+    """Capture Virtual Machine parameters.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param command_id: Required. The run command id.
+    :type command_id: str
+    :param script: Optional. The script to be executed.  When this value is
+     given, the given script will override the default script of the command.
+    :type script: list[str]
+    :param parameters: The run command parameters.
+    :type parameters:
+     list[~azure.mgmt.compute.v2018_04_01.models.RunCommandInputParameter]
+    """
+
+    _validation = {
+        'command_id': {'required': True},
+    }
+
+    _attribute_map = {
+        'command_id': {'key': 'commandId', 'type': 'str'},
+        'script': {'key': 'script', 'type': '[str]'},
+        'parameters': {'key': 'parameters', 'type': '[RunCommandInputParameter]'},
+    }
+
+    def __init__(self, *, command_id: str, script=None, parameters=None, **kwargs) -> None:
+        super(RunCommandInput, self).__init__(**kwargs)
+        self.command_id = command_id
+        self.script = script
+        self.parameters = parameters
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_parameter_definition.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_parameter_definition.py
new file mode 100644
index 000000000000..e09f774d8241
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_parameter_definition.py
@@ -0,0 +1,48 @@
+# 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 RunCommandParameterDefinition(Model):
+    """Describes the properties of a run command parameter.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: Required. The run command parameter name.
+    :type name: str
+    :param type: Required. The run command parameter type.
+    :type type: str
+    :param default_value: The run command parameter default value.
+    :type default_value: str
+    :param required: The run command parameter required. Default value: False
+     .
+    :type required: bool
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'type': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'default_value': {'key': 'defaultValue', 'type': 'str'},
+        'required': {'key': 'required', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RunCommandParameterDefinition, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.type = kwargs.get('type', None)
+        self.default_value = kwargs.get('default_value', None)
+        self.required = kwargs.get('required', False)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_parameter_definition_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_parameter_definition_py3.py
new file mode 100644
index 000000000000..e5fbc708f965
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_parameter_definition_py3.py
@@ -0,0 +1,48 @@
+# 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 RunCommandParameterDefinition(Model):
+    """Describes the properties of a run command parameter.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: Required. The run command parameter name.
+    :type name: str
+    :param type: Required. The run command parameter type.
+    :type type: str
+    :param default_value: The run command parameter default value.
+    :type default_value: str
+    :param required: The run command parameter required. Default value: False
+     .
+    :type required: bool
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'type': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'default_value': {'key': 'defaultValue', 'type': 'str'},
+        'required': {'key': 'required', 'type': 'bool'},
+    }
+
+    def __init__(self, *, name: str, type: str, default_value: str=None, required: bool=False, **kwargs) -> None:
+        super(RunCommandParameterDefinition, self).__init__(**kwargs)
+        self.name = name
+        self.type = type
+        self.default_value = default_value
+        self.required = required
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result.py
new file mode 100644
index 000000000000..8fafc31dd548
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result.py
@@ -0,0 +1,28 @@
+# 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 RunCommandResult(Model):
+    """Run command operation response.
+
+    :param output: Operation output data (raw JSON)
+    :type output: object
+    """
+
+    _attribute_map = {
+        'output': {'key': 'properties.output', 'type': 'object'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RunCommandResult, self).__init__(**kwargs)
+        self.output = kwargs.get('output', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result_py3.py
new file mode 100644
index 000000000000..852c2895dcee
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result_py3.py
@@ -0,0 +1,28 @@
+# 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 RunCommandResult(Model):
+    """Run command operation response.
+
+    :param output: Operation output data (raw JSON)
+    :type output: object
+    """
+
+    _attribute_map = {
+        'output': {'key': 'properties.output', 'type': 'object'},
+    }
+
+    def __init__(self, *, output=None, **kwargs) -> None:
+        super(RunCommandResult, self).__init__(**kwargs)
+        self.output = output
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sku.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sku.py
new file mode 100644
index 000000000000..5c07709435e0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sku.py
@@ -0,0 +1,38 @@
+# 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 Sku(Model):
+    """Describes a virtual machine scale set sku.
+
+    :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**
+    :type tier: str
+    :param capacity: Specifies the number of virtual machines in the scale
+     set.
+    :type capacity: long
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'tier': {'key': 'tier', 'type': 'str'},
+        'capacity': {'key': 'capacity', 'type': 'long'},
+    }
+
+    def __init__(self, **kwargs):
+        super(Sku, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.tier = kwargs.get('tier', None)
+        self.capacity = kwargs.get('capacity', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sku_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sku_py3.py
new file mode 100644
index 000000000000..f6bc74afaadc
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sku_py3.py
@@ -0,0 +1,38 @@
+# 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 Sku(Model):
+    """Describes a virtual machine scale set sku.
+
+    :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**
+    :type tier: str
+    :param capacity: Specifies the number of virtual machines in the scale
+     set.
+    :type capacity: long
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'tier': {'key': 'tier', 'type': 'str'},
+        'capacity': {'key': 'capacity', 'type': 'long'},
+    }
+
+    def __init__(self, *, name: str=None, tier: str=None, capacity: int=None, **kwargs) -> None:
+        super(Sku, self).__init__(**kwargs)
+        self.name = name
+        self.tier = tier
+        self.capacity = capacity
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update.py
index 6483ca6dd981..119c6f05bc49 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update.py
@@ -9,16 +9,12 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource_update import ResourceUpdate
+from msrest.serialization import Model
 
 
-class SnapshotUpdate(ResourceUpdate):
+class SnapshotUpdate(Model):
     """Snapshot update resource.
 
-    :param tags: Resource tags
-    :type tags: dict[str, str]
-    :param sku:
-    :type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
     :param os_type: the Operating System type. Possible values include:
      'Windows', 'Linux'
     :type os_type: str or
@@ -32,14 +28,18 @@ class SnapshotUpdate(ResourceUpdate):
     :param encryption_settings: Encryption settings for disk or snapshot
     :type encryption_settings:
      ~azure.mgmt.compute.v2018_04_01.models.EncryptionSettings
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param sku:
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.SnapshotSku
     """
 
     _attribute_map = {
-        'tags': {'key': 'tags', 'type': '{str}'},
-        'sku': {'key': 'sku', 'type': 'DiskSku'},
         '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):
@@ -47,3 +47,5 @@ def __init__(self, **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_04_01/models/snapshot_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update_py3.py
index c1a7cec5da8c..54e05426ce8e 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update_py3.py
@@ -9,16 +9,12 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource_update_py3 import ResourceUpdate
+from msrest.serialization import Model
 
 
-class SnapshotUpdate(ResourceUpdate):
+class SnapshotUpdate(Model):
     """Snapshot update resource.
 
-    :param tags: Resource tags
-    :type tags: dict[str, str]
-    :param sku:
-    :type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
     :param os_type: the Operating System type. Possible values include:
      'Windows', 'Linux'
     :type os_type: str or
@@ -32,18 +28,24 @@ class SnapshotUpdate(ResourceUpdate):
     :param encryption_settings: Encryption settings for disk or snapshot
     :type encryption_settings:
      ~azure.mgmt.compute.v2018_04_01.models.EncryptionSettings
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param sku:
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.SnapshotSku
     """
 
     _attribute_map = {
-        'tags': {'key': 'tags', 'type': '{str}'},
-        'sku': {'key': 'sku', 'type': 'DiskSku'},
         '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, *, tags=None, sku=None, os_type=None, disk_size_gb: int=None, encryption_settings=None, **kwargs) -> None:
-        super(SnapshotUpdate, self).__init__(tags=tags, sku=sku, **kwargs)
+    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_04_01/models/ssh_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_configuration.py
new file mode 100644
index 000000000000..ff92fd1a9376
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_configuration.py
@@ -0,0 +1,30 @@
+# 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 SshConfiguration(Model):
+    """SSH configuration for Linux based VMs running on Azure.
+
+    :param public_keys: The list of SSH public keys used to authenticate with
+     linux based VMs.
+    :type public_keys:
+     list[~azure.mgmt.compute.v2018_04_01.models.SshPublicKey]
+    """
+
+    _attribute_map = {
+        'public_keys': {'key': 'publicKeys', 'type': '[SshPublicKey]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(SshConfiguration, self).__init__(**kwargs)
+        self.public_keys = kwargs.get('public_keys', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_configuration_py3.py
new file mode 100644
index 000000000000..e81ca2f47af3
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_configuration_py3.py
@@ -0,0 +1,30 @@
+# 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 SshConfiguration(Model):
+    """SSH configuration for Linux based VMs running on Azure.
+
+    :param public_keys: The list of SSH public keys used to authenticate with
+     linux based VMs.
+    :type public_keys:
+     list[~azure.mgmt.compute.v2018_04_01.models.SshPublicKey]
+    """
+
+    _attribute_map = {
+        'public_keys': {'key': 'publicKeys', 'type': '[SshPublicKey]'},
+    }
+
+    def __init__(self, *, public_keys=None, **kwargs) -> None:
+        super(SshConfiguration, self).__init__(**kwargs)
+        self.public_keys = public_keys
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_public_key.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_public_key.py
new file mode 100644
index 000000000000..122e0d3b9fdd
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_public_key.py
@@ -0,0 +1,39 @@
+# 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 SshPublicKey(Model):
+    """Contains information about SSH certificate public key and the path on the
+    Linux VM where the public key is placed.
+
+    :param path: Specifies the full path on the created VM where ssh public
+     key is stored. If the file already exists, the specified key is appended
+     to the file. Example: /home/user/.ssh/authorized_keys
+    :type path: str
+    :param key_data: SSH public key certificate used to authenticate with the
+     VM through ssh. The key needs to be at least 2048-bit and in ssh-rsa
+     format. <br><br> For creating ssh keys, see [Create SSH keys on Linux and
+     Mac for Linux VMs in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-mac-create-ssh-keys?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
+    :type key_data: str
+    """
+
+    _attribute_map = {
+        'path': {'key': 'path', 'type': 'str'},
+        'key_data': {'key': 'keyData', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(SshPublicKey, self).__init__(**kwargs)
+        self.path = kwargs.get('path', None)
+        self.key_data = kwargs.get('key_data', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_public_key_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_public_key_py3.py
new file mode 100644
index 000000000000..b16ee085b36b
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/ssh_public_key_py3.py
@@ -0,0 +1,39 @@
+# 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 SshPublicKey(Model):
+    """Contains information about SSH certificate public key and the path on the
+    Linux VM where the public key is placed.
+
+    :param path: Specifies the full path on the created VM where ssh public
+     key is stored. If the file already exists, the specified key is appended
+     to the file. Example: /home/user/.ssh/authorized_keys
+    :type path: str
+    :param key_data: SSH public key certificate used to authenticate with the
+     VM through ssh. The key needs to be at least 2048-bit and in ssh-rsa
+     format. <br><br> For creating ssh keys, see [Create SSH keys on Linux and
+     Mac for Linux VMs in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-mac-create-ssh-keys?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
+    :type key_data: str
+    """
+
+    _attribute_map = {
+        'path': {'key': 'path', 'type': 'str'},
+        'key_data': {'key': 'keyData', 'type': 'str'},
+    }
+
+    def __init__(self, *, path: str=None, key_data: str=None, **kwargs) -> None:
+        super(SshPublicKey, self).__init__(**kwargs)
+        self.path = path
+        self.key_data = key_data
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/storage_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/storage_profile.py
new file mode 100644
index 000000000000..da1fef243048
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/storage_profile.py
@@ -0,0 +1,47 @@
+# 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 StorageProfile(Model):
+    """Specifies the storage settings for the virtual machine disks.
+
+    :param image_reference: Specifies information about the image to use. You
+     can specify information about platform images, marketplace images, or
+     virtual machine images. This element is required when you want to use a
+     platform image, marketplace image, or virtual machine image, but is not
+     used in other creation operations.
+    :type image_reference:
+     ~azure.mgmt.compute.v2018_04_01.models.ImageReference
+    :param os_disk: Specifies information about the operating system disk used
+     by the virtual machine. <br><br> For more information about disks, see
+     [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type os_disk: ~azure.mgmt.compute.v2018_04_01.models.OSDisk
+    :param data_disks: Specifies the parameters that are used to add a data
+     disk to a virtual machine. <br><br> For more information about disks, see
+     [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type data_disks: list[~azure.mgmt.compute.v2018_04_01.models.DataDisk]
+    """
+
+    _attribute_map = {
+        'image_reference': {'key': 'imageReference', 'type': 'ImageReference'},
+        'os_disk': {'key': 'osDisk', 'type': 'OSDisk'},
+        'data_disks': {'key': 'dataDisks', 'type': '[DataDisk]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(StorageProfile, self).__init__(**kwargs)
+        self.image_reference = kwargs.get('image_reference', None)
+        self.os_disk = kwargs.get('os_disk', None)
+        self.data_disks = kwargs.get('data_disks', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/storage_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/storage_profile_py3.py
new file mode 100644
index 000000000000..62cb9eb9b38e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/storage_profile_py3.py
@@ -0,0 +1,47 @@
+# 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 StorageProfile(Model):
+    """Specifies the storage settings for the virtual machine disks.
+
+    :param image_reference: Specifies information about the image to use. You
+     can specify information about platform images, marketplace images, or
+     virtual machine images. This element is required when you want to use a
+     platform image, marketplace image, or virtual machine image, but is not
+     used in other creation operations.
+    :type image_reference:
+     ~azure.mgmt.compute.v2018_04_01.models.ImageReference
+    :param os_disk: Specifies information about the operating system disk used
+     by the virtual machine. <br><br> For more information about disks, see
+     [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type os_disk: ~azure.mgmt.compute.v2018_04_01.models.OSDisk
+    :param data_disks: Specifies the parameters that are used to add a data
+     disk to a virtual machine. <br><br> For more information about disks, see
+     [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type data_disks: list[~azure.mgmt.compute.v2018_04_01.models.DataDisk]
+    """
+
+    _attribute_map = {
+        'image_reference': {'key': 'imageReference', 'type': 'ImageReference'},
+        'os_disk': {'key': 'osDisk', 'type': 'OSDisk'},
+        'data_disks': {'key': 'dataDisks', 'type': '[DataDisk]'},
+    }
+
+    def __init__(self, *, image_reference=None, os_disk=None, data_disks=None, **kwargs) -> None:
+        super(StorageProfile, self).__init__(**kwargs)
+        self.image_reference = image_reference
+        self.os_disk = os_disk
+        self.data_disks = data_disks
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource.py
new file mode 100644
index 000000000000..11e092cc6ff5
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource.py
@@ -0,0 +1,28 @@
+# 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 SubResource(Model):
+    """SubResource.
+
+    :param id: Resource Id
+    :type id: str
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(SubResource, self).__init__(**kwargs)
+        self.id = kwargs.get('id', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_py3.py
new file mode 100644
index 000000000000..29e5afee38f9
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_py3.py
@@ -0,0 +1,28 @@
+# 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 SubResource(Model):
+    """SubResource.
+
+    :param id: Resource Id
+    :type id: str
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+    }
+
+    def __init__(self, *, id: str=None, **kwargs) -> None:
+        super(SubResource, self).__init__(**kwargs)
+        self.id = id
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_read_only.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_read_only.py
new file mode 100644
index 000000000000..4a0ec466c0d4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_read_only.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 SubResourceReadOnly(Model):
+    """SubResourceReadOnly.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(SubResourceReadOnly, self).__init__(**kwargs)
+        self.id = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_read_only_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_read_only_py3.py
new file mode 100644
index 000000000000..cb918e9a2ac6
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/sub_resource_read_only_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 SubResourceReadOnly(Model):
+    """SubResourceReadOnly.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(SubResourceReadOnly, self).__init__(**kwargs)
+        self.id = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/throttled_requests_input.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/throttled_requests_input.py
new file mode 100644
index 000000000000..5eac2a5540ac
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/throttled_requests_input.py
@@ -0,0 +1,52 @@
+# 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 .log_analytics_input_base import LogAnalyticsInputBase
+
+
+class ThrottledRequestsInput(LogAnalyticsInputBase):
+    """Api request input for LogAnalytics getThrottledRequests Api.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param blob_container_sas_uri: Required. SAS Uri of the logging blob
+     container to which LogAnalytics Api writes output logs to.
+    :type blob_container_sas_uri: str
+    :param from_time: Required. From time of the query
+    :type from_time: datetime
+    :param to_time: Required. To time of the query
+    :type to_time: datetime
+    :param group_by_throttle_policy: Group query result by Throttle Policy
+     applied.
+    :type group_by_throttle_policy: bool
+    :param group_by_operation_name: Group query result by  by Operation Name.
+    :type group_by_operation_name: bool
+    :param group_by_resource_name: Group query result by Resource Name.
+    :type group_by_resource_name: bool
+    """
+
+    _validation = {
+        'blob_container_sas_uri': {'required': True},
+        'from_time': {'required': True},
+        'to_time': {'required': True},
+    }
+
+    _attribute_map = {
+        'blob_container_sas_uri': {'key': 'blobContainerSasUri', 'type': 'str'},
+        'from_time': {'key': 'fromTime', 'type': 'iso-8601'},
+        'to_time': {'key': 'toTime', 'type': 'iso-8601'},
+        'group_by_throttle_policy': {'key': 'groupByThrottlePolicy', 'type': 'bool'},
+        'group_by_operation_name': {'key': 'groupByOperationName', 'type': 'bool'},
+        'group_by_resource_name': {'key': 'groupByResourceName', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ThrottledRequestsInput, self).__init__(**kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/throttled_requests_input_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/throttled_requests_input_py3.py
new file mode 100644
index 000000000000..025900705375
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/throttled_requests_input_py3.py
@@ -0,0 +1,52 @@
+# 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 .log_analytics_input_base_py3 import LogAnalyticsInputBase
+
+
+class ThrottledRequestsInput(LogAnalyticsInputBase):
+    """Api request input for LogAnalytics getThrottledRequests Api.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param blob_container_sas_uri: Required. SAS Uri of the logging blob
+     container to which LogAnalytics Api writes output logs to.
+    :type blob_container_sas_uri: str
+    :param from_time: Required. From time of the query
+    :type from_time: datetime
+    :param to_time: Required. To time of the query
+    :type to_time: datetime
+    :param group_by_throttle_policy: Group query result by Throttle Policy
+     applied.
+    :type group_by_throttle_policy: bool
+    :param group_by_operation_name: Group query result by  by Operation Name.
+    :type group_by_operation_name: bool
+    :param group_by_resource_name: Group query result by Resource Name.
+    :type group_by_resource_name: bool
+    """
+
+    _validation = {
+        'blob_container_sas_uri': {'required': True},
+        'from_time': {'required': True},
+        'to_time': {'required': True},
+    }
+
+    _attribute_map = {
+        'blob_container_sas_uri': {'key': 'blobContainerSasUri', 'type': 'str'},
+        'from_time': {'key': 'fromTime', 'type': 'iso-8601'},
+        'to_time': {'key': 'toTime', 'type': 'iso-8601'},
+        'group_by_throttle_policy': {'key': 'groupByThrottlePolicy', 'type': 'bool'},
+        'group_by_operation_name': {'key': 'groupByOperationName', 'type': 'bool'},
+        'group_by_resource_name': {'key': 'groupByResourceName', 'type': 'bool'},
+    }
+
+    def __init__(self, *, blob_container_sas_uri: str, from_time, to_time, group_by_throttle_policy: bool=None, group_by_operation_name: bool=None, group_by_resource_name: bool=None, **kwargs) -> None:
+        super(ThrottledRequestsInput, self).__init__(blob_container_sas_uri=blob_container_sas_uri, from_time=from_time, to_time=to_time, group_by_throttle_policy=group_by_throttle_policy, group_by_operation_name=group_by_operation_name, group_by_resource_name=group_by_resource_name, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/resource_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/update_resource.py
similarity index 71%
rename from azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/resource_update.py
rename to azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/update_resource.py
index 1ab6fb273f49..b1d2898ff082 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/resource_update.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/update_resource.py
@@ -12,21 +12,17 @@
 from msrest.serialization import Model
 
 
-class ResourceUpdate(Model):
-    """The Resource model definition.
+class UpdateResource(Model):
+    """The Update Resource model definition.
 
     :param tags: Resource tags
     :type tags: dict[str, str]
-    :param sku:
-    :type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
     """
 
     _attribute_map = {
         'tags': {'key': 'tags', 'type': '{str}'},
-        'sku': {'key': 'sku', 'type': 'DiskSku'},
     }
 
     def __init__(self, **kwargs):
-        super(ResourceUpdate, self).__init__(**kwargs)
+        super(UpdateResource, self).__init__(**kwargs)
         self.tags = kwargs.get('tags', None)
-        self.sku = kwargs.get('sku', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/resource_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/update_resource_py3.py
similarity index 67%
rename from azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/resource_update_py3.py
rename to azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/update_resource_py3.py
index 1074982f9341..c06c17c124d9 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/resource_update_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/update_resource_py3.py
@@ -12,21 +12,17 @@
 from msrest.serialization import Model
 
 
-class ResourceUpdate(Model):
-    """The Resource model definition.
+class UpdateResource(Model):
+    """The Update Resource model definition.
 
     :param tags: Resource tags
     :type tags: dict[str, str]
-    :param sku:
-    :type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
     """
 
     _attribute_map = {
         'tags': {'key': 'tags', 'type': '{str}'},
-        'sku': {'key': 'sku', 'type': 'DiskSku'},
     }
 
-    def __init__(self, *, tags=None, sku=None, **kwargs) -> None:
-        super(ResourceUpdate, self).__init__(**kwargs)
+    def __init__(self, *, tags=None, **kwargs) -> None:
+        super(UpdateResource, self).__init__(**kwargs)
         self.tags = tags
-        self.sku = sku
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info.py
new file mode 100644
index 000000000000..d243b61b2e80
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info.py
@@ -0,0 +1,47 @@
+# 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 UpgradeOperationHistoricalStatusInfo(Model):
+    """Virtual Machine Scale Set OS Upgrade History operation response.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar properties: Information about the properties of the upgrade
+     operation.
+    :vartype properties:
+     ~azure.mgmt.compute.v2018_04_01.models.UpgradeOperationHistoricalStatusInfoProperties
+    :ivar type: Resource type
+    :vartype type: str
+    :ivar location: Resource location
+    :vartype location: str
+    """
+
+    _validation = {
+        'properties': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'properties': {'key': 'properties', 'type': 'UpgradeOperationHistoricalStatusInfoProperties'},
+        'type': {'key': 'type', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(UpgradeOperationHistoricalStatusInfo, self).__init__(**kwargs)
+        self.properties = None
+        self.type = None
+        self.location = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_paged.py
new file mode 100644
index 000000000000..b7296a3dedb1
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_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 UpgradeOperationHistoricalStatusInfoPaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`UpgradeOperationHistoricalStatusInfo <azure.mgmt.compute.v2018_04_01.models.UpgradeOperationHistoricalStatusInfo>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[UpgradeOperationHistoricalStatusInfo]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(UpgradeOperationHistoricalStatusInfoPaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_properties.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_properties.py
new file mode 100644
index 000000000000..45437a8f2f76
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_properties.py
@@ -0,0 +1,67 @@
+# 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 UpgradeOperationHistoricalStatusInfoProperties(Model):
+    """Describes each OS upgrade on the Virtual Machine Scale Set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar running_status: Information about the overall status of the upgrade
+     operation.
+    :vartype running_status:
+     ~azure.mgmt.compute.v2018_04_01.models.UpgradeOperationHistoryStatus
+    :ivar progress: Counts of the VM's in each state.
+    :vartype progress:
+     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeProgressInfo
+    :ivar error: Error Details for this upgrade if there are any.
+    :vartype error: ~azure.mgmt.compute.v2018_04_01.models.ApiError
+    :ivar started_by: Invoker of the Upgrade Operation. Possible values
+     include: 'Unknown', 'User', 'Platform'
+    :vartype started_by: str or
+     ~azure.mgmt.compute.v2018_04_01.models.UpgradeOperationInvoker
+    :ivar target_image_reference: Image Reference details
+    :vartype target_image_reference:
+     ~azure.mgmt.compute.v2018_04_01.models.ImageReference
+    :ivar rollback_info: Information about OS rollback if performed
+    :vartype rollback_info:
+     ~azure.mgmt.compute.v2018_04_01.models.RollbackStatusInfo
+    """
+
+    _validation = {
+        'running_status': {'readonly': True},
+        'progress': {'readonly': True},
+        'error': {'readonly': True},
+        'started_by': {'readonly': True},
+        'target_image_reference': {'readonly': True},
+        'rollback_info': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'running_status': {'key': 'runningStatus', 'type': 'UpgradeOperationHistoryStatus'},
+        'progress': {'key': 'progress', 'type': 'RollingUpgradeProgressInfo'},
+        'error': {'key': 'error', 'type': 'ApiError'},
+        'started_by': {'key': 'startedBy', 'type': 'UpgradeOperationInvoker'},
+        'target_image_reference': {'key': 'targetImageReference', 'type': 'ImageReference'},
+        'rollback_info': {'key': 'rollbackInfo', 'type': 'RollbackStatusInfo'},
+    }
+
+    def __init__(self, **kwargs):
+        super(UpgradeOperationHistoricalStatusInfoProperties, self).__init__(**kwargs)
+        self.running_status = None
+        self.progress = None
+        self.error = None
+        self.started_by = None
+        self.target_image_reference = None
+        self.rollback_info = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_properties_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_properties_py3.py
new file mode 100644
index 000000000000..b06dcb8a034a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_properties_py3.py
@@ -0,0 +1,67 @@
+# 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 UpgradeOperationHistoricalStatusInfoProperties(Model):
+    """Describes each OS upgrade on the Virtual Machine Scale Set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar running_status: Information about the overall status of the upgrade
+     operation.
+    :vartype running_status:
+     ~azure.mgmt.compute.v2018_04_01.models.UpgradeOperationHistoryStatus
+    :ivar progress: Counts of the VM's in each state.
+    :vartype progress:
+     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeProgressInfo
+    :ivar error: Error Details for this upgrade if there are any.
+    :vartype error: ~azure.mgmt.compute.v2018_04_01.models.ApiError
+    :ivar started_by: Invoker of the Upgrade Operation. Possible values
+     include: 'Unknown', 'User', 'Platform'
+    :vartype started_by: str or
+     ~azure.mgmt.compute.v2018_04_01.models.UpgradeOperationInvoker
+    :ivar target_image_reference: Image Reference details
+    :vartype target_image_reference:
+     ~azure.mgmt.compute.v2018_04_01.models.ImageReference
+    :ivar rollback_info: Information about OS rollback if performed
+    :vartype rollback_info:
+     ~azure.mgmt.compute.v2018_04_01.models.RollbackStatusInfo
+    """
+
+    _validation = {
+        'running_status': {'readonly': True},
+        'progress': {'readonly': True},
+        'error': {'readonly': True},
+        'started_by': {'readonly': True},
+        'target_image_reference': {'readonly': True},
+        'rollback_info': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'running_status': {'key': 'runningStatus', 'type': 'UpgradeOperationHistoryStatus'},
+        'progress': {'key': 'progress', 'type': 'RollingUpgradeProgressInfo'},
+        'error': {'key': 'error', 'type': 'ApiError'},
+        'started_by': {'key': 'startedBy', 'type': 'UpgradeOperationInvoker'},
+        'target_image_reference': {'key': 'targetImageReference', 'type': 'ImageReference'},
+        'rollback_info': {'key': 'rollbackInfo', 'type': 'RollbackStatusInfo'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(UpgradeOperationHistoricalStatusInfoProperties, self).__init__(**kwargs)
+        self.running_status = None
+        self.progress = None
+        self.error = None
+        self.started_by = None
+        self.target_image_reference = None
+        self.rollback_info = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_py3.py
new file mode 100644
index 000000000000..9e967e04a07d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_historical_status_info_py3.py
@@ -0,0 +1,47 @@
+# 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 UpgradeOperationHistoricalStatusInfo(Model):
+    """Virtual Machine Scale Set OS Upgrade History operation response.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar properties: Information about the properties of the upgrade
+     operation.
+    :vartype properties:
+     ~azure.mgmt.compute.v2018_04_01.models.UpgradeOperationHistoricalStatusInfoProperties
+    :ivar type: Resource type
+    :vartype type: str
+    :ivar location: Resource location
+    :vartype location: str
+    """
+
+    _validation = {
+        'properties': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'properties': {'key': 'properties', 'type': 'UpgradeOperationHistoricalStatusInfoProperties'},
+        'type': {'key': 'type', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(UpgradeOperationHistoricalStatusInfo, self).__init__(**kwargs)
+        self.properties = None
+        self.type = None
+        self.location = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_history_status.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_history_status.py
new file mode 100644
index 000000000000..e0d6390aeeb5
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_history_status.py
@@ -0,0 +1,46 @@
+# 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 UpgradeOperationHistoryStatus(Model):
+    """Information about the current running state of the overall upgrade.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar code: Code indicating the current status of the upgrade. Possible
+     values include: 'RollingForward', 'Cancelled', 'Completed', 'Faulted'
+    :vartype code: str or ~azure.mgmt.compute.v2018_04_01.models.UpgradeState
+    :ivar start_time: Start time of the upgrade.
+    :vartype start_time: datetime
+    :ivar end_time: End time of the upgrade.
+    :vartype end_time: datetime
+    """
+
+    _validation = {
+        'code': {'readonly': True},
+        'start_time': {'readonly': True},
+        'end_time': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'UpgradeState'},
+        'start_time': {'key': 'startTime', 'type': 'iso-8601'},
+        'end_time': {'key': 'endTime', 'type': 'iso-8601'},
+    }
+
+    def __init__(self, **kwargs):
+        super(UpgradeOperationHistoryStatus, self).__init__(**kwargs)
+        self.code = None
+        self.start_time = None
+        self.end_time = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_history_status_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_history_status_py3.py
new file mode 100644
index 000000000000..a7e9eaa62a69
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_operation_history_status_py3.py
@@ -0,0 +1,46 @@
+# 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 UpgradeOperationHistoryStatus(Model):
+    """Information about the current running state of the overall upgrade.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar code: Code indicating the current status of the upgrade. Possible
+     values include: 'RollingForward', 'Cancelled', 'Completed', 'Faulted'
+    :vartype code: str or ~azure.mgmt.compute.v2018_04_01.models.UpgradeState
+    :ivar start_time: Start time of the upgrade.
+    :vartype start_time: datetime
+    :ivar end_time: End time of the upgrade.
+    :vartype end_time: datetime
+    """
+
+    _validation = {
+        'code': {'readonly': True},
+        'start_time': {'readonly': True},
+        'end_time': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'UpgradeState'},
+        'start_time': {'key': 'startTime', 'type': 'iso-8601'},
+        'end_time': {'key': 'endTime', 'type': 'iso-8601'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(UpgradeOperationHistoryStatus, self).__init__(**kwargs)
+        self.code = None
+        self.start_time = None
+        self.end_time = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_policy.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_policy.py
new file mode 100644
index 000000000000..4335909afd81
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_policy.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 UpgradePolicy(Model):
+    """Describes an upgrade policy - automatic, manual, or rolling.
+
+    :param mode: Specifies the mode of an upgrade to virtual machines in the
+     scale set.<br /><br /> Possible values are:<br /><br /> **Manual** - You
+     control the application of updates to virtual machines in the scale set.
+     You do this by using the manualUpgrade action.<br /><br /> **Automatic** -
+     All virtual machines in the scale set are  automatically updated at the
+     same time. Possible values include: 'Automatic', 'Manual', 'Rolling'
+    :type mode: str or ~azure.mgmt.compute.v2018_04_01.models.UpgradeMode
+    :param rolling_upgrade_policy: The configuration parameters used while
+     performing a rolling upgrade.
+    :type rolling_upgrade_policy:
+     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradePolicy
+    :param automatic_os_upgrade: Whether OS upgrades should automatically be
+     applied to scale set instances in a rolling fashion when a newer version
+     of the image becomes available.
+    :type automatic_os_upgrade: bool
+    :param auto_os_upgrade_policy: Configuration parameters used for
+     performing automatic OS Upgrade.
+    :type auto_os_upgrade_policy:
+     ~azure.mgmt.compute.v2018_04_01.models.AutoOSUpgradePolicy
+    """
+
+    _attribute_map = {
+        'mode': {'key': 'mode', 'type': 'UpgradeMode'},
+        'rolling_upgrade_policy': {'key': 'rollingUpgradePolicy', 'type': 'RollingUpgradePolicy'},
+        'automatic_os_upgrade': {'key': 'automaticOSUpgrade', 'type': 'bool'},
+        'auto_os_upgrade_policy': {'key': 'autoOSUpgradePolicy', 'type': 'AutoOSUpgradePolicy'},
+    }
+
+    def __init__(self, **kwargs):
+        super(UpgradePolicy, self).__init__(**kwargs)
+        self.mode = kwargs.get('mode', None)
+        self.rolling_upgrade_policy = kwargs.get('rolling_upgrade_policy', None)
+        self.automatic_os_upgrade = kwargs.get('automatic_os_upgrade', None)
+        self.auto_os_upgrade_policy = kwargs.get('auto_os_upgrade_policy', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_policy_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_policy_py3.py
new file mode 100644
index 000000000000..526357dfaf1c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/upgrade_policy_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 UpgradePolicy(Model):
+    """Describes an upgrade policy - automatic, manual, or rolling.
+
+    :param mode: Specifies the mode of an upgrade to virtual machines in the
+     scale set.<br /><br /> Possible values are:<br /><br /> **Manual** - You
+     control the application of updates to virtual machines in the scale set.
+     You do this by using the manualUpgrade action.<br /><br /> **Automatic** -
+     All virtual machines in the scale set are  automatically updated at the
+     same time. Possible values include: 'Automatic', 'Manual', 'Rolling'
+    :type mode: str or ~azure.mgmt.compute.v2018_04_01.models.UpgradeMode
+    :param rolling_upgrade_policy: The configuration parameters used while
+     performing a rolling upgrade.
+    :type rolling_upgrade_policy:
+     ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradePolicy
+    :param automatic_os_upgrade: Whether OS upgrades should automatically be
+     applied to scale set instances in a rolling fashion when a newer version
+     of the image becomes available.
+    :type automatic_os_upgrade: bool
+    :param auto_os_upgrade_policy: Configuration parameters used for
+     performing automatic OS Upgrade.
+    :type auto_os_upgrade_policy:
+     ~azure.mgmt.compute.v2018_04_01.models.AutoOSUpgradePolicy
+    """
+
+    _attribute_map = {
+        'mode': {'key': 'mode', 'type': 'UpgradeMode'},
+        'rolling_upgrade_policy': {'key': 'rollingUpgradePolicy', 'type': 'RollingUpgradePolicy'},
+        'automatic_os_upgrade': {'key': 'automaticOSUpgrade', 'type': 'bool'},
+        'auto_os_upgrade_policy': {'key': 'autoOSUpgradePolicy', 'type': 'AutoOSUpgradePolicy'},
+    }
+
+    def __init__(self, *, mode=None, rolling_upgrade_policy=None, automatic_os_upgrade: bool=None, auto_os_upgrade_policy=None, **kwargs) -> None:
+        super(UpgradePolicy, self).__init__(**kwargs)
+        self.mode = mode
+        self.rolling_upgrade_policy = rolling_upgrade_policy
+        self.automatic_os_upgrade = automatic_os_upgrade
+        self.auto_os_upgrade_policy = auto_os_upgrade_policy
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage.py
new file mode 100644
index 000000000000..eae36ebf0dc2
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage.py
@@ -0,0 +1,54 @@
+# 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 Usage(Model):
+    """Describes Compute Resource Usage.
+
+    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 unit: Required. An enum describing the unit of usage measurement.
+     Default value: "Count" .
+    :vartype unit: str
+    :param current_value: Required. The current usage of the resource.
+    :type current_value: int
+    :param limit: Required. The maximum permitted usage of the resource.
+    :type limit: long
+    :param name: Required. The name of the type of usage.
+    :type name: ~azure.mgmt.compute.v2018_04_01.models.UsageName
+    """
+
+    _validation = {
+        'unit': {'required': True, 'constant': True},
+        'current_value': {'required': True},
+        'limit': {'required': True},
+        'name': {'required': True},
+    }
+
+    _attribute_map = {
+        'unit': {'key': 'unit', 'type': 'str'},
+        'current_value': {'key': 'currentValue', 'type': 'int'},
+        'limit': {'key': 'limit', 'type': 'long'},
+        'name': {'key': 'name', 'type': 'UsageName'},
+    }
+
+    unit = "Count"
+
+    def __init__(self, **kwargs):
+        super(Usage, self).__init__(**kwargs)
+        self.current_value = kwargs.get('current_value', None)
+        self.limit = kwargs.get('limit', None)
+        self.name = kwargs.get('name', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_name.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_name.py
new file mode 100644
index 000000000000..e2560936493e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_name.py
@@ -0,0 +1,32 @@
+# 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 UsageName(Model):
+    """The Usage Names.
+
+    :param value: The name of the resource.
+    :type value: str
+    :param localized_value: The localized name of the resource.
+    :type localized_value: str
+    """
+
+    _attribute_map = {
+        'value': {'key': 'value', 'type': 'str'},
+        'localized_value': {'key': 'localizedValue', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(UsageName, self).__init__(**kwargs)
+        self.value = kwargs.get('value', None)
+        self.localized_value = kwargs.get('localized_value', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_name_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_name_py3.py
new file mode 100644
index 000000000000..ad0b77459f75
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_name_py3.py
@@ -0,0 +1,32 @@
+# 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 UsageName(Model):
+    """The Usage Names.
+
+    :param value: The name of the resource.
+    :type value: str
+    :param localized_value: The localized name of the resource.
+    :type localized_value: str
+    """
+
+    _attribute_map = {
+        'value': {'key': 'value', 'type': 'str'},
+        'localized_value': {'key': 'localizedValue', 'type': 'str'},
+    }
+
+    def __init__(self, *, value: str=None, localized_value: str=None, **kwargs) -> None:
+        super(UsageName, self).__init__(**kwargs)
+        self.value = value
+        self.localized_value = localized_value
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_paged.py
new file mode 100644
index 000000000000..d3533ab09848
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_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 UsagePaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`Usage <azure.mgmt.compute.v2018_04_01.models.Usage>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[Usage]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(UsagePaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_py3.py
new file mode 100644
index 000000000000..7a2ae5cbd250
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/usage_py3.py
@@ -0,0 +1,54 @@
+# 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 Usage(Model):
+    """Describes Compute Resource Usage.
+
+    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 unit: Required. An enum describing the unit of usage measurement.
+     Default value: "Count" .
+    :vartype unit: str
+    :param current_value: Required. The current usage of the resource.
+    :type current_value: int
+    :param limit: Required. The maximum permitted usage of the resource.
+    :type limit: long
+    :param name: Required. The name of the type of usage.
+    :type name: ~azure.mgmt.compute.v2018_04_01.models.UsageName
+    """
+
+    _validation = {
+        'unit': {'required': True, 'constant': True},
+        'current_value': {'required': True},
+        'limit': {'required': True},
+        'name': {'required': True},
+    }
+
+    _attribute_map = {
+        'unit': {'key': 'unit', 'type': 'str'},
+        'current_value': {'key': 'currentValue', 'type': 'int'},
+        'limit': {'key': 'limit', 'type': 'long'},
+        'name': {'key': 'name', 'type': 'UsageName'},
+    }
+
+    unit = "Count"
+
+    def __init__(self, *, current_value: int, limit: int, name, **kwargs) -> None:
+        super(Usage, self).__init__(**kwargs)
+        self.current_value = current_value
+        self.limit = limit
+        self.name = name
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_certificate.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_certificate.py
new file mode 100644
index 000000000000..b173def6f820
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_certificate.py
@@ -0,0 +1,46 @@
+# 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 VaultCertificate(Model):
+    """Describes a single certificate reference in a Key Vault, and where the
+    certificate should reside on the VM.
+
+    :param certificate_url: This is the URL of a certificate that has been
+     uploaded to Key Vault as a secret. For adding a secret to the Key Vault,
+     see [Add a key or secret to the key
+     vault](https://docs.microsoft.com/azure/key-vault/key-vault-get-started/#add).
+     In this case, your certificate needs to be It is the Base64 encoding of
+     the following JSON Object which is encoded in UTF-8: <br><br> {<br>
+     "data":"<Base64-encoded-certificate>",<br>  "dataType":"pfx",<br>
+     "password":"<pfx-file-password>"<br>}
+    :type certificate_url: str
+    :param certificate_store: For Windows VMs, specifies the certificate store
+     on the Virtual Machine to which the certificate should be added. The
+     specified certificate store is implicitly in the LocalMachine account.
+     <br><br>For Linux VMs, the certificate file is placed under the
+     /var/lib/waagent directory, with the file name <UppercaseThumbprint>.crt
+     for the X509 certificate file and <UppercaseThumbpring>.prv for private
+     key. Both of these files are .pem formatted.
+    :type certificate_store: str
+    """
+
+    _attribute_map = {
+        'certificate_url': {'key': 'certificateUrl', 'type': 'str'},
+        'certificate_store': {'key': 'certificateStore', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VaultCertificate, self).__init__(**kwargs)
+        self.certificate_url = kwargs.get('certificate_url', None)
+        self.certificate_store = kwargs.get('certificate_store', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_certificate_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_certificate_py3.py
new file mode 100644
index 000000000000..eda5ba1c3f1d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_certificate_py3.py
@@ -0,0 +1,46 @@
+# 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 VaultCertificate(Model):
+    """Describes a single certificate reference in a Key Vault, and where the
+    certificate should reside on the VM.
+
+    :param certificate_url: This is the URL of a certificate that has been
+     uploaded to Key Vault as a secret. For adding a secret to the Key Vault,
+     see [Add a key or secret to the key
+     vault](https://docs.microsoft.com/azure/key-vault/key-vault-get-started/#add).
+     In this case, your certificate needs to be It is the Base64 encoding of
+     the following JSON Object which is encoded in UTF-8: <br><br> {<br>
+     "data":"<Base64-encoded-certificate>",<br>  "dataType":"pfx",<br>
+     "password":"<pfx-file-password>"<br>}
+    :type certificate_url: str
+    :param certificate_store: For Windows VMs, specifies the certificate store
+     on the Virtual Machine to which the certificate should be added. The
+     specified certificate store is implicitly in the LocalMachine account.
+     <br><br>For Linux VMs, the certificate file is placed under the
+     /var/lib/waagent directory, with the file name <UppercaseThumbprint>.crt
+     for the X509 certificate file and <UppercaseThumbpring>.prv for private
+     key. Both of these files are .pem formatted.
+    :type certificate_store: str
+    """
+
+    _attribute_map = {
+        'certificate_url': {'key': 'certificateUrl', 'type': 'str'},
+        'certificate_store': {'key': 'certificateStore', 'type': 'str'},
+    }
+
+    def __init__(self, *, certificate_url: str=None, certificate_store: str=None, **kwargs) -> None:
+        super(VaultCertificate, self).__init__(**kwargs)
+        self.certificate_url = certificate_url
+        self.certificate_store = certificate_store
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_secret_group.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_secret_group.py
new file mode 100644
index 000000000000..182f200952fc
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_secret_group.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 VaultSecretGroup(Model):
+    """Describes a set of certificates which are all in the same Key Vault.
+
+    :param source_vault: The relative URL of the Key Vault containing all of
+     the certificates in VaultCertificates.
+    :type source_vault: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param vault_certificates: The list of key vault references in SourceVault
+     which contain certificates.
+    :type vault_certificates:
+     list[~azure.mgmt.compute.v2018_04_01.models.VaultCertificate]
+    """
+
+    _attribute_map = {
+        'source_vault': {'key': 'sourceVault', 'type': 'SubResource'},
+        'vault_certificates': {'key': 'vaultCertificates', 'type': '[VaultCertificate]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VaultSecretGroup, self).__init__(**kwargs)
+        self.source_vault = kwargs.get('source_vault', None)
+        self.vault_certificates = kwargs.get('vault_certificates', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_secret_group_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_secret_group_py3.py
new file mode 100644
index 000000000000..c92697778df0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/vault_secret_group_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 VaultSecretGroup(Model):
+    """Describes a set of certificates which are all in the same Key Vault.
+
+    :param source_vault: The relative URL of the Key Vault containing all of
+     the certificates in VaultCertificates.
+    :type source_vault: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param vault_certificates: The list of key vault references in SourceVault
+     which contain certificates.
+    :type vault_certificates:
+     list[~azure.mgmt.compute.v2018_04_01.models.VaultCertificate]
+    """
+
+    _attribute_map = {
+        'source_vault': {'key': 'sourceVault', 'type': 'SubResource'},
+        'vault_certificates': {'key': 'vaultCertificates', 'type': '[VaultCertificate]'},
+    }
+
+    def __init__(self, *, source_vault=None, vault_certificates=None, **kwargs) -> None:
+        super(VaultSecretGroup, self).__init__(**kwargs)
+        self.source_vault = source_vault
+        self.vault_certificates = vault_certificates
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_hard_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_hard_disk.py
new file mode 100644
index 000000000000..5e3ad9dea7d4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_hard_disk.py
@@ -0,0 +1,28 @@
+# 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 VirtualHardDisk(Model):
+    """Describes the uri of a disk.
+
+    :param uri: Specifies the virtual hard disk's uri.
+    :type uri: str
+    """
+
+    _attribute_map = {
+        'uri': {'key': 'uri', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualHardDisk, self).__init__(**kwargs)
+        self.uri = kwargs.get('uri', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_hard_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_hard_disk_py3.py
new file mode 100644
index 000000000000..9c069b95f084
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_hard_disk_py3.py
@@ -0,0 +1,28 @@
+# 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 VirtualHardDisk(Model):
+    """Describes the uri of a disk.
+
+    :param uri: Specifies the virtual hard disk's uri.
+    :type uri: str
+    """
+
+    _attribute_map = {
+        'uri': {'key': 'uri', 'type': 'str'},
+    }
+
+    def __init__(self, *, uri: str=None, **kwargs) -> None:
+        super(VirtualHardDisk, self).__init__(**kwargs)
+        self.uri = uri
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine.py
new file mode 100644
index 000000000000..2a6eb930517d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine.py
@@ -0,0 +1,150 @@
+# 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 VirtualMachine(Resource):
+    """Describes a Virtual Machine.
+
+    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]
+    :param plan: Specifies information about the marketplace image used to
+     create the virtual machine. This element is only used for marketplace
+     images. Before you can use a marketplace image from an API, you must
+     enable the image for programmatic use.  In the Azure portal, find the
+     marketplace image that you want to use and then click **Want to deploy
+     programmatically, Get Started ->**. Enter any required information and
+     then click **Save**.
+    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
+    :param hardware_profile: Specifies the hardware settings for the virtual
+     machine.
+    :type hardware_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.HardwareProfile
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.StorageProfile
+    :param os_profile: Specifies the operating system settings for the virtual
+     machine.
+    :type os_profile: ~azure.mgmt.compute.v2018_04_01.models.OSProfile
+    :param network_profile: Specifies the network interfaces of the virtual
+     machine.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.NetworkProfile
+    :param diagnostics_profile: Specifies the boot diagnostic settings state.
+     <br><br>Minimum api-version: 2015-06-15.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
+    :param availability_set: Specifies information about the availability set
+     that the virtual machine should be assigned to. Virtual machines specified
+     in the same availability set are allocated to different nodes to maximize
+     availability. For more information about availability sets, see [Manage
+     the availability of virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+     <br><br> For more information on Azure planned maintainance, see [Planned
+     maintenance for virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Currently, a VM can only be added to availability set at creation
+     time. An existing VM cannot be added to an availability set.
+    :type availability_set: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :ivar instance_view: The virtual machine instance view.
+    :vartype instance_view:
+     ~azure.mgmt.compute.v2018_04_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:
+     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
+     is included in a request for an update, the value must match the initial
+     value. This value cannot be updated. <br><br> For more information, see
+     [Azure Hybrid Use Benefit for Windows
+     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Minimum api-version: 2015-06-15
+    :type license_type: str
+    :ivar vm_id: Specifies the VM unique ID which is a 128-bits identifier
+     that is encoded and stored in all Azure IaaS VMs SMBIOS and can be read
+     using platform BIOS commands.
+    :vartype vm_id: str
+    :ivar resources: The virtual machine child extension resources.
+    :vartype resources:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]
+    :param identity: The identity of the virtual machine, if configured.
+    :type identity:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineIdentity
+    :param zones: The virtual machine zones.
+    :type zones: list[str]
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'provisioning_state': {'readonly': True},
+        'instance_view': {'readonly': True},
+        'vm_id': {'readonly': True},
+        'resources': {'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}'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
+        'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
+        'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
+        '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': 'VirtualMachineInstanceView'},
+        'license_type': {'key': 'properties.licenseType', 'type': 'str'},
+        'vm_id': {'key': 'properties.vmId', 'type': 'str'},
+        'resources': {'key': 'resources', 'type': '[VirtualMachineExtension]'},
+        'identity': {'key': 'identity', 'type': 'VirtualMachineIdentity'},
+        'zones': {'key': 'zones', 'type': '[str]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachine, self).__init__(**kwargs)
+        self.plan = kwargs.get('plan', None)
+        self.hardware_profile = kwargs.get('hardware_profile', None)
+        self.storage_profile = kwargs.get('storage_profile', 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)
+        self.availability_set = kwargs.get('availability_set', None)
+        self.provisioning_state = None
+        self.instance_view = None
+        self.license_type = kwargs.get('license_type', None)
+        self.vm_id = None
+        self.resources = None
+        self.identity = kwargs.get('identity', None)
+        self.zones = kwargs.get('zones', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_agent_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_agent_instance_view.py
new file mode 100644
index 000000000000..a2ad4c4f8bc8
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_agent_instance_view.py
@@ -0,0 +1,39 @@
+# 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 VirtualMachineAgentInstanceView(Model):
+    """The instance view of the VM Agent running on the virtual machine.
+
+    :param vm_agent_version: The VM Agent full version.
+    :type vm_agent_version: str
+    :param extension_handlers: The virtual machine extension handler instance
+     view.
+    :type extension_handlers:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionHandlerInstanceView]
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    """
+
+    _attribute_map = {
+        'vm_agent_version': {'key': 'vmAgentVersion', 'type': 'str'},
+        'extension_handlers': {'key': 'extensionHandlers', 'type': '[VirtualMachineExtensionHandlerInstanceView]'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineAgentInstanceView, self).__init__(**kwargs)
+        self.vm_agent_version = kwargs.get('vm_agent_version', None)
+        self.extension_handlers = kwargs.get('extension_handlers', None)
+        self.statuses = kwargs.get('statuses', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_agent_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_agent_instance_view_py3.py
new file mode 100644
index 000000000000..dce8f0d40cc8
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_agent_instance_view_py3.py
@@ -0,0 +1,39 @@
+# 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 VirtualMachineAgentInstanceView(Model):
+    """The instance view of the VM Agent running on the virtual machine.
+
+    :param vm_agent_version: The VM Agent full version.
+    :type vm_agent_version: str
+    :param extension_handlers: The virtual machine extension handler instance
+     view.
+    :type extension_handlers:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionHandlerInstanceView]
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    """
+
+    _attribute_map = {
+        'vm_agent_version': {'key': 'vmAgentVersion', 'type': 'str'},
+        'extension_handlers': {'key': 'extensionHandlers', 'type': '[VirtualMachineExtensionHandlerInstanceView]'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, *, vm_agent_version: str=None, extension_handlers=None, statuses=None, **kwargs) -> None:
+        super(VirtualMachineAgentInstanceView, self).__init__(**kwargs)
+        self.vm_agent_version = vm_agent_version
+        self.extension_handlers = extension_handlers
+        self.statuses = statuses
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_parameters.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_parameters.py
new file mode 100644
index 000000000000..4e6ffbea7a4f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_parameters.py
@@ -0,0 +1,46 @@
+# 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 VirtualMachineCaptureParameters(Model):
+    """Capture Virtual Machine parameters.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param vhd_prefix: Required. The captured virtual hard disk's name prefix.
+    :type vhd_prefix: str
+    :param destination_container_name: Required. The destination container
+     name.
+    :type destination_container_name: str
+    :param overwrite_vhds: Required. Specifies whether to overwrite the
+     destination virtual hard disk, in case of conflict.
+    :type overwrite_vhds: bool
+    """
+
+    _validation = {
+        'vhd_prefix': {'required': True},
+        'destination_container_name': {'required': True},
+        'overwrite_vhds': {'required': True},
+    }
+
+    _attribute_map = {
+        'vhd_prefix': {'key': 'vhdPrefix', 'type': 'str'},
+        'destination_container_name': {'key': 'destinationContainerName', 'type': 'str'},
+        'overwrite_vhds': {'key': 'overwriteVhds', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineCaptureParameters, self).__init__(**kwargs)
+        self.vhd_prefix = kwargs.get('vhd_prefix', None)
+        self.destination_container_name = kwargs.get('destination_container_name', None)
+        self.overwrite_vhds = kwargs.get('overwrite_vhds', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_parameters_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_parameters_py3.py
new file mode 100644
index 000000000000..1866cdc23300
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_parameters_py3.py
@@ -0,0 +1,46 @@
+# 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 VirtualMachineCaptureParameters(Model):
+    """Capture Virtual Machine parameters.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param vhd_prefix: Required. The captured virtual hard disk's name prefix.
+    :type vhd_prefix: str
+    :param destination_container_name: Required. The destination container
+     name.
+    :type destination_container_name: str
+    :param overwrite_vhds: Required. Specifies whether to overwrite the
+     destination virtual hard disk, in case of conflict.
+    :type overwrite_vhds: bool
+    """
+
+    _validation = {
+        'vhd_prefix': {'required': True},
+        'destination_container_name': {'required': True},
+        'overwrite_vhds': {'required': True},
+    }
+
+    _attribute_map = {
+        'vhd_prefix': {'key': 'vhdPrefix', 'type': 'str'},
+        'destination_container_name': {'key': 'destinationContainerName', 'type': 'str'},
+        'overwrite_vhds': {'key': 'overwriteVhds', 'type': 'bool'},
+    }
+
+    def __init__(self, *, vhd_prefix: str, destination_container_name: str, overwrite_vhds: bool, **kwargs) -> None:
+        super(VirtualMachineCaptureParameters, self).__init__(**kwargs)
+        self.vhd_prefix = vhd_prefix
+        self.destination_container_name = destination_container_name
+        self.overwrite_vhds = overwrite_vhds
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_result.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_result.py
new file mode 100644
index 000000000000..2972e1f2fcda
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_result.py
@@ -0,0 +1,53 @@
+# 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 .sub_resource import SubResource
+
+
+class VirtualMachineCaptureResult(SubResource):
+    """Output of virtual machine capture operation.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param id: Resource Id
+    :type id: str
+    :ivar schema: the schema of the captured virtual machine
+    :vartype schema: str
+    :ivar content_version: the version of the content
+    :vartype content_version: str
+    :ivar parameters: parameters of the captured virtual machine
+    :vartype parameters: object
+    :ivar resources: a list of resource items of the captured virtual machine
+    :vartype resources: list[object]
+    """
+
+    _validation = {
+        'schema': {'readonly': True},
+        'content_version': {'readonly': True},
+        'parameters': {'readonly': True},
+        'resources': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'schema': {'key': '$schema', 'type': 'str'},
+        'content_version': {'key': 'contentVersion', 'type': 'str'},
+        'parameters': {'key': 'parameters', 'type': 'object'},
+        'resources': {'key': 'resources', 'type': '[object]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineCaptureResult, self).__init__(**kwargs)
+        self.schema = None
+        self.content_version = None
+        self.parameters = None
+        self.resources = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_result_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_result_py3.py
new file mode 100644
index 000000000000..09e8afde1591
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_capture_result_py3.py
@@ -0,0 +1,53 @@
+# 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 .sub_resource_py3 import SubResource
+
+
+class VirtualMachineCaptureResult(SubResource):
+    """Output of virtual machine capture operation.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param id: Resource Id
+    :type id: str
+    :ivar schema: the schema of the captured virtual machine
+    :vartype schema: str
+    :ivar content_version: the version of the content
+    :vartype content_version: str
+    :ivar parameters: parameters of the captured virtual machine
+    :vartype parameters: object
+    :ivar resources: a list of resource items of the captured virtual machine
+    :vartype resources: list[object]
+    """
+
+    _validation = {
+        'schema': {'readonly': True},
+        'content_version': {'readonly': True},
+        'parameters': {'readonly': True},
+        'resources': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'schema': {'key': '$schema', 'type': 'str'},
+        'content_version': {'key': 'contentVersion', 'type': 'str'},
+        'parameters': {'key': 'parameters', 'type': 'object'},
+        'resources': {'key': 'resources', 'type': '[object]'},
+    }
+
+    def __init__(self, *, id: str=None, **kwargs) -> None:
+        super(VirtualMachineCaptureResult, self).__init__(id=id, **kwargs)
+        self.schema = None
+        self.content_version = None
+        self.parameters = None
+        self.resources = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension.py
new file mode 100644
index 000000000000..02db951458f4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension.py
@@ -0,0 +1,97 @@
+# 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 VirtualMachineExtension(Resource):
+    """Describes a Virtual Machine Extension.
+
+    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]
+    :param force_update_tag: How the extension handler should be forced to
+     update even if the extension configuration has not changed.
+    :type force_update_tag: str
+    :param publisher: The name of the extension handler publisher.
+    :type publisher: str
+    :param virtual_machine_extension_type: Specifies the type of the
+     extension; an example is "CustomScriptExtension".
+    :type virtual_machine_extension_type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param auto_upgrade_minor_version: Indicates whether the extension should
+     use a newer minor version if one is available at deployment time. Once
+     deployed, however, the extension will not upgrade minor versions unless
+     redeployed, even with this property set to true.
+    :type auto_upgrade_minor_version: bool
+    :param settings: Json formatted public settings for the extension.
+    :type settings: object
+    :param protected_settings: The extension can contain either
+     protectedSettings or protectedSettingsFromKeyVault or no protected
+     settings at all.
+    :type protected_settings: object
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :param instance_view: The virtual machine extension instance view.
+    :type instance_view:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionInstanceView
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'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}'},
+        'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'},
+        'publisher': {'key': 'properties.publisher', 'type': 'str'},
+        'virtual_machine_extension_type': {'key': 'properties.type', 'type': 'str'},
+        'type_handler_version': {'key': 'properties.typeHandlerVersion', 'type': 'str'},
+        'auto_upgrade_minor_version': {'key': 'properties.autoUpgradeMinorVersion', 'type': 'bool'},
+        'settings': {'key': 'properties.settings', 'type': 'object'},
+        'protected_settings': {'key': 'properties.protectedSettings', 'type': 'object'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineExtensionInstanceView'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineExtension, self).__init__(**kwargs)
+        self.force_update_tag = kwargs.get('force_update_tag', None)
+        self.publisher = kwargs.get('publisher', None)
+        self.virtual_machine_extension_type = kwargs.get('virtual_machine_extension_type', None)
+        self.type_handler_version = kwargs.get('type_handler_version', None)
+        self.auto_upgrade_minor_version = kwargs.get('auto_upgrade_minor_version', None)
+        self.settings = kwargs.get('settings', None)
+        self.protected_settings = kwargs.get('protected_settings', None)
+        self.provisioning_state = None
+        self.instance_view = kwargs.get('instance_view', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_handler_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_handler_instance_view.py
new file mode 100644
index 000000000000..2d7ec6ac6782
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_handler_instance_view.py
@@ -0,0 +1,37 @@
+# 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 VirtualMachineExtensionHandlerInstanceView(Model):
+    """The instance view of a virtual machine extension handler.
+
+    :param type: Specifies the type of the extension; an example is
+     "CustomScriptExtension".
+    :type type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param status: The extension handler status.
+    :type status: ~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus
+    """
+
+    _attribute_map = {
+        'type': {'key': 'type', 'type': 'str'},
+        'type_handler_version': {'key': 'typeHandlerVersion', 'type': 'str'},
+        'status': {'key': 'status', 'type': 'InstanceViewStatus'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineExtensionHandlerInstanceView, self).__init__(**kwargs)
+        self.type = kwargs.get('type', None)
+        self.type_handler_version = kwargs.get('type_handler_version', None)
+        self.status = kwargs.get('status', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_handler_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_handler_instance_view_py3.py
new file mode 100644
index 000000000000..ba82a5e876e4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_handler_instance_view_py3.py
@@ -0,0 +1,37 @@
+# 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 VirtualMachineExtensionHandlerInstanceView(Model):
+    """The instance view of a virtual machine extension handler.
+
+    :param type: Specifies the type of the extension; an example is
+     "CustomScriptExtension".
+    :type type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param status: The extension handler status.
+    :type status: ~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus
+    """
+
+    _attribute_map = {
+        'type': {'key': 'type', 'type': 'str'},
+        'type_handler_version': {'key': 'typeHandlerVersion', 'type': 'str'},
+        'status': {'key': 'status', 'type': 'InstanceViewStatus'},
+    }
+
+    def __init__(self, *, type: str=None, type_handler_version: str=None, status=None, **kwargs) -> None:
+        super(VirtualMachineExtensionHandlerInstanceView, self).__init__(**kwargs)
+        self.type = type
+        self.type_handler_version = type_handler_version
+        self.status = status
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_image.py
new file mode 100644
index 000000000000..7273e2b84754
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_image.py
@@ -0,0 +1,81 @@
+# 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 VirtualMachineExtensionImage(Resource):
+    """Describes a Virtual Machine Extension Image.
+
+    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]
+    :param operating_system: Required. The operating system this extension
+     supports.
+    :type operating_system: str
+    :param compute_role: Required. The type of role (IaaS or PaaS) this
+     extension supports.
+    :type compute_role: str
+    :param handler_schema: Required. The schema defined by publisher, where
+     extension consumers should provide settings in a matching schema.
+    :type handler_schema: str
+    :param vm_scale_set_enabled: Whether the extension can be used on xRP
+     VMScaleSets. By default existing extensions are usable on scalesets, but
+     there might be cases where a publisher wants to explicitly indicate the
+     extension is only enabled for CRP VMs but not VMSS.
+    :type vm_scale_set_enabled: bool
+    :param supports_multiple_extensions: Whether the handler can support
+     multiple extensions.
+    :type supports_multiple_extensions: bool
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'operating_system': {'required': True},
+        'compute_role': {'required': True},
+        'handler_schema': {'required': 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}'},
+        'operating_system': {'key': 'properties.operatingSystem', 'type': 'str'},
+        'compute_role': {'key': 'properties.computeRole', 'type': 'str'},
+        'handler_schema': {'key': 'properties.handlerSchema', 'type': 'str'},
+        'vm_scale_set_enabled': {'key': 'properties.vmScaleSetEnabled', 'type': 'bool'},
+        'supports_multiple_extensions': {'key': 'properties.supportsMultipleExtensions', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineExtensionImage, self).__init__(**kwargs)
+        self.operating_system = kwargs.get('operating_system', None)
+        self.compute_role = kwargs.get('compute_role', None)
+        self.handler_schema = kwargs.get('handler_schema', None)
+        self.vm_scale_set_enabled = kwargs.get('vm_scale_set_enabled', None)
+        self.supports_multiple_extensions = kwargs.get('supports_multiple_extensions', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_image_py3.py
new file mode 100644
index 000000000000..3d48c3a87fb0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_image_py3.py
@@ -0,0 +1,81 @@
+# 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 VirtualMachineExtensionImage(Resource):
+    """Describes a Virtual Machine Extension Image.
+
+    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]
+    :param operating_system: Required. The operating system this extension
+     supports.
+    :type operating_system: str
+    :param compute_role: Required. The type of role (IaaS or PaaS) this
+     extension supports.
+    :type compute_role: str
+    :param handler_schema: Required. The schema defined by publisher, where
+     extension consumers should provide settings in a matching schema.
+    :type handler_schema: str
+    :param vm_scale_set_enabled: Whether the extension can be used on xRP
+     VMScaleSets. By default existing extensions are usable on scalesets, but
+     there might be cases where a publisher wants to explicitly indicate the
+     extension is only enabled for CRP VMs but not VMSS.
+    :type vm_scale_set_enabled: bool
+    :param supports_multiple_extensions: Whether the handler can support
+     multiple extensions.
+    :type supports_multiple_extensions: bool
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'operating_system': {'required': True},
+        'compute_role': {'required': True},
+        'handler_schema': {'required': 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}'},
+        'operating_system': {'key': 'properties.operatingSystem', 'type': 'str'},
+        'compute_role': {'key': 'properties.computeRole', 'type': 'str'},
+        'handler_schema': {'key': 'properties.handlerSchema', 'type': 'str'},
+        'vm_scale_set_enabled': {'key': 'properties.vmScaleSetEnabled', 'type': 'bool'},
+        'supports_multiple_extensions': {'key': 'properties.supportsMultipleExtensions', 'type': 'bool'},
+    }
+
+    def __init__(self, *, location: str, operating_system: str, compute_role: str, handler_schema: str, tags=None, vm_scale_set_enabled: bool=None, supports_multiple_extensions: bool=None, **kwargs) -> None:
+        super(VirtualMachineExtensionImage, self).__init__(location=location, tags=tags, **kwargs)
+        self.operating_system = operating_system
+        self.compute_role = compute_role
+        self.handler_schema = handler_schema
+        self.vm_scale_set_enabled = vm_scale_set_enabled
+        self.supports_multiple_extensions = supports_multiple_extensions
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_instance_view.py
new file mode 100644
index 000000000000..d79fad9754ac
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_instance_view.py
@@ -0,0 +1,47 @@
+# 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 VirtualMachineExtensionInstanceView(Model):
+    """The instance view of a virtual machine extension.
+
+    :param name: The virtual machine extension name.
+    :type name: str
+    :param type: Specifies the type of the extension; an example is
+     "CustomScriptExtension".
+    :type type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param substatuses: The resource status information.
+    :type substatuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'type_handler_version': {'key': 'typeHandlerVersion', 'type': 'str'},
+        'substatuses': {'key': 'substatuses', 'type': '[InstanceViewStatus]'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineExtensionInstanceView, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.type = kwargs.get('type', None)
+        self.type_handler_version = kwargs.get('type_handler_version', None)
+        self.substatuses = kwargs.get('substatuses', None)
+        self.statuses = kwargs.get('statuses', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_instance_view_py3.py
new file mode 100644
index 000000000000..4de254438718
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_instance_view_py3.py
@@ -0,0 +1,47 @@
+# 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 VirtualMachineExtensionInstanceView(Model):
+    """The instance view of a virtual machine extension.
+
+    :param name: The virtual machine extension name.
+    :type name: str
+    :param type: Specifies the type of the extension; an example is
+     "CustomScriptExtension".
+    :type type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param substatuses: The resource status information.
+    :type substatuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'type_handler_version': {'key': 'typeHandlerVersion', 'type': 'str'},
+        'substatuses': {'key': 'substatuses', 'type': '[InstanceViewStatus]'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, *, name: str=None, type: str=None, type_handler_version: str=None, substatuses=None, statuses=None, **kwargs) -> None:
+        super(VirtualMachineExtensionInstanceView, self).__init__(**kwargs)
+        self.name = name
+        self.type = type
+        self.type_handler_version = type_handler_version
+        self.substatuses = substatuses
+        self.statuses = statuses
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_py3.py
new file mode 100644
index 000000000000..8fa667369a33
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_py3.py
@@ -0,0 +1,97 @@
+# 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 VirtualMachineExtension(Resource):
+    """Describes a Virtual Machine Extension.
+
+    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]
+    :param force_update_tag: How the extension handler should be forced to
+     update even if the extension configuration has not changed.
+    :type force_update_tag: str
+    :param publisher: The name of the extension handler publisher.
+    :type publisher: str
+    :param virtual_machine_extension_type: Specifies the type of the
+     extension; an example is "CustomScriptExtension".
+    :type virtual_machine_extension_type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param auto_upgrade_minor_version: Indicates whether the extension should
+     use a newer minor version if one is available at deployment time. Once
+     deployed, however, the extension will not upgrade minor versions unless
+     redeployed, even with this property set to true.
+    :type auto_upgrade_minor_version: bool
+    :param settings: Json formatted public settings for the extension.
+    :type settings: object
+    :param protected_settings: The extension can contain either
+     protectedSettings or protectedSettingsFromKeyVault or no protected
+     settings at all.
+    :type protected_settings: object
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :param instance_view: The virtual machine extension instance view.
+    :type instance_view:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionInstanceView
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'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}'},
+        'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'},
+        'publisher': {'key': 'properties.publisher', 'type': 'str'},
+        'virtual_machine_extension_type': {'key': 'properties.type', 'type': 'str'},
+        'type_handler_version': {'key': 'properties.typeHandlerVersion', 'type': 'str'},
+        'auto_upgrade_minor_version': {'key': 'properties.autoUpgradeMinorVersion', 'type': 'bool'},
+        'settings': {'key': 'properties.settings', 'type': 'object'},
+        'protected_settings': {'key': 'properties.protectedSettings', 'type': 'object'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineExtensionInstanceView'},
+    }
+
+    def __init__(self, *, location: str, tags=None, force_update_tag: str=None, publisher: str=None, virtual_machine_extension_type: str=None, type_handler_version: str=None, auto_upgrade_minor_version: bool=None, settings=None, protected_settings=None, instance_view=None, **kwargs) -> None:
+        super(VirtualMachineExtension, self).__init__(location=location, tags=tags, **kwargs)
+        self.force_update_tag = force_update_tag
+        self.publisher = publisher
+        self.virtual_machine_extension_type = virtual_machine_extension_type
+        self.type_handler_version = type_handler_version
+        self.auto_upgrade_minor_version = auto_upgrade_minor_version
+        self.settings = settings
+        self.protected_settings = protected_settings
+        self.provisioning_state = None
+        self.instance_view = instance_view
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_update.py
new file mode 100644
index 000000000000..b920ff57ff96
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_update.py
@@ -0,0 +1,62 @@
+# 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 .update_resource import UpdateResource
+
+
+class VirtualMachineExtensionUpdate(UpdateResource):
+    """Describes a Virtual Machine Extension.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param force_update_tag: How the extension handler should be forced to
+     update even if the extension configuration has not changed.
+    :type force_update_tag: str
+    :param publisher: The name of the extension handler publisher.
+    :type publisher: str
+    :param type: Specifies the type of the extension; an example is
+     "CustomScriptExtension".
+    :type type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param auto_upgrade_minor_version: Indicates whether the extension should
+     use a newer minor version if one is available at deployment time. Once
+     deployed, however, the extension will not upgrade minor versions unless
+     redeployed, even with this property set to true.
+    :type auto_upgrade_minor_version: bool
+    :param settings: Json formatted public settings for the extension.
+    :type settings: object
+    :param protected_settings: The extension can contain either
+     protectedSettings or protectedSettingsFromKeyVault or no protected
+     settings at all.
+    :type protected_settings: object
+    """
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'},
+        'publisher': {'key': 'properties.publisher', 'type': 'str'},
+        'type': {'key': 'properties.type', 'type': 'str'},
+        'type_handler_version': {'key': 'properties.typeHandlerVersion', 'type': 'str'},
+        'auto_upgrade_minor_version': {'key': 'properties.autoUpgradeMinorVersion', 'type': 'bool'},
+        'settings': {'key': 'properties.settings', 'type': 'object'},
+        'protected_settings': {'key': 'properties.protectedSettings', 'type': 'object'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineExtensionUpdate, self).__init__(**kwargs)
+        self.force_update_tag = kwargs.get('force_update_tag', None)
+        self.publisher = kwargs.get('publisher', None)
+        self.type = kwargs.get('type', None)
+        self.type_handler_version = kwargs.get('type_handler_version', None)
+        self.auto_upgrade_minor_version = kwargs.get('auto_upgrade_minor_version', None)
+        self.settings = kwargs.get('settings', None)
+        self.protected_settings = kwargs.get('protected_settings', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_update_py3.py
new file mode 100644
index 000000000000..c32c18d32759
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extension_update_py3.py
@@ -0,0 +1,62 @@
+# 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 .update_resource_py3 import UpdateResource
+
+
+class VirtualMachineExtensionUpdate(UpdateResource):
+    """Describes a Virtual Machine Extension.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param force_update_tag: How the extension handler should be forced to
+     update even if the extension configuration has not changed.
+    :type force_update_tag: str
+    :param publisher: The name of the extension handler publisher.
+    :type publisher: str
+    :param type: Specifies the type of the extension; an example is
+     "CustomScriptExtension".
+    :type type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param auto_upgrade_minor_version: Indicates whether the extension should
+     use a newer minor version if one is available at deployment time. Once
+     deployed, however, the extension will not upgrade minor versions unless
+     redeployed, even with this property set to true.
+    :type auto_upgrade_minor_version: bool
+    :param settings: Json formatted public settings for the extension.
+    :type settings: object
+    :param protected_settings: The extension can contain either
+     protectedSettings or protectedSettingsFromKeyVault or no protected
+     settings at all.
+    :type protected_settings: object
+    """
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'},
+        'publisher': {'key': 'properties.publisher', 'type': 'str'},
+        'type': {'key': 'properties.type', 'type': 'str'},
+        'type_handler_version': {'key': 'properties.typeHandlerVersion', 'type': 'str'},
+        'auto_upgrade_minor_version': {'key': 'properties.autoUpgradeMinorVersion', 'type': 'bool'},
+        'settings': {'key': 'properties.settings', 'type': 'object'},
+        'protected_settings': {'key': 'properties.protectedSettings', 'type': 'object'},
+    }
+
+    def __init__(self, *, tags=None, force_update_tag: str=None, publisher: str=None, type: str=None, type_handler_version: str=None, auto_upgrade_minor_version: bool=None, settings=None, protected_settings=None, **kwargs) -> None:
+        super(VirtualMachineExtensionUpdate, self).__init__(tags=tags, **kwargs)
+        self.force_update_tag = force_update_tag
+        self.publisher = publisher
+        self.type = type
+        self.type_handler_version = type_handler_version
+        self.auto_upgrade_minor_version = auto_upgrade_minor_version
+        self.settings = settings
+        self.protected_settings = protected_settings
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extensions_list_result.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extensions_list_result.py
new file mode 100644
index 000000000000..a00529b436fb
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extensions_list_result.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 VirtualMachineExtensionsListResult(Model):
+    """The List Extension operation response.
+
+    :param value: The list of extensions
+    :type value:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]
+    """
+
+    _attribute_map = {
+        'value': {'key': 'value', 'type': '[VirtualMachineExtension]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineExtensionsListResult, self).__init__(**kwargs)
+        self.value = kwargs.get('value', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extensions_list_result_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extensions_list_result_py3.py
new file mode 100644
index 000000000000..0b64c0d2cd38
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_extensions_list_result_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 VirtualMachineExtensionsListResult(Model):
+    """The List Extension operation response.
+
+    :param value: The list of extensions
+    :type value:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]
+    """
+
+    _attribute_map = {
+        'value': {'key': 'value', 'type': '[VirtualMachineExtension]'},
+    }
+
+    def __init__(self, *, value=None, **kwargs) -> None:
+        super(VirtualMachineExtensionsListResult, self).__init__(**kwargs)
+        self.value = value
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_health_status.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_health_status.py
new file mode 100644
index 000000000000..28c49e91d1e1
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_health_status.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 VirtualMachineHealthStatus(Model):
+    """The health status of the VM.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar status: The health status information for the VM.
+    :vartype status: ~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus
+    """
+
+    _validation = {
+        'status': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'status': {'key': 'status', 'type': 'InstanceViewStatus'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineHealthStatus, self).__init__(**kwargs)
+        self.status = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_health_status_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_health_status_py3.py
new file mode 100644
index 000000000000..b6311ea93d34
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_health_status_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 VirtualMachineHealthStatus(Model):
+    """The health status of the VM.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar status: The health status information for the VM.
+    :vartype status: ~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus
+    """
+
+    _validation = {
+        'status': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'status': {'key': 'status', 'type': 'InstanceViewStatus'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(VirtualMachineHealthStatus, self).__init__(**kwargs)
+        self.status = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_identity.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_identity.py
new file mode 100644
index 000000000000..3c9fa46adfb9
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_identity.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 VirtualMachineIdentity(Model):
+    """Identity for the virtual machine.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar principal_id: The principal id of virtual machine identity. This
+     property will only be provided for a system assigned identity.
+    :vartype principal_id: str
+    :ivar tenant_id: The tenant id associated with the virtual machine. This
+     property will only be provided for a system assigned identity.
+    :vartype tenant_id: str
+    :param type: The type of identity used for the virtual machine. The type
+     'SystemAssigned, UserAssigned' includes both an implicitly created
+     identity and a set of user assigned identities. The type 'None' will
+     remove any identities from the virtual machine. Possible values include:
+     'SystemAssigned', 'UserAssigned', 'SystemAssigned, UserAssigned', 'None'
+    :type type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.ResourceIdentityType
+    :param identity_ids: The list of user identities associated with the
+     Virtual Machine. The user identity references will be ARM resource ids in
+     the form:
+     '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/identities/{identityName}'.
+    :type identity_ids: list[str]
+    """
+
+    _validation = {
+        'principal_id': {'readonly': True},
+        'tenant_id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'principal_id': {'key': 'principalId', 'type': 'str'},
+        'tenant_id': {'key': 'tenantId', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'ResourceIdentityType'},
+        'identity_ids': {'key': 'identityIds', 'type': '[str]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineIdentity, self).__init__(**kwargs)
+        self.principal_id = None
+        self.tenant_id = None
+        self.type = kwargs.get('type', None)
+        self.identity_ids = kwargs.get('identity_ids', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_identity_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_identity_py3.py
new file mode 100644
index 000000000000..96d2849dfd9d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_identity_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 VirtualMachineIdentity(Model):
+    """Identity for the virtual machine.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar principal_id: The principal id of virtual machine identity. This
+     property will only be provided for a system assigned identity.
+    :vartype principal_id: str
+    :ivar tenant_id: The tenant id associated with the virtual machine. This
+     property will only be provided for a system assigned identity.
+    :vartype tenant_id: str
+    :param type: The type of identity used for the virtual machine. The type
+     'SystemAssigned, UserAssigned' includes both an implicitly created
+     identity and a set of user assigned identities. The type 'None' will
+     remove any identities from the virtual machine. Possible values include:
+     'SystemAssigned', 'UserAssigned', 'SystemAssigned, UserAssigned', 'None'
+    :type type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.ResourceIdentityType
+    :param identity_ids: The list of user identities associated with the
+     Virtual Machine. The user identity references will be ARM resource ids in
+     the form:
+     '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/identities/{identityName}'.
+    :type identity_ids: list[str]
+    """
+
+    _validation = {
+        'principal_id': {'readonly': True},
+        'tenant_id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'principal_id': {'key': 'principalId', 'type': 'str'},
+        'tenant_id': {'key': 'tenantId', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'ResourceIdentityType'},
+        'identity_ids': {'key': 'identityIds', 'type': '[str]'},
+    }
+
+    def __init__(self, *, type=None, identity_ids=None, **kwargs) -> None:
+        super(VirtualMachineIdentity, self).__init__(**kwargs)
+        self.principal_id = None
+        self.tenant_id = None
+        self.type = type
+        self.identity_ids = identity_ids
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image.py
new file mode 100644
index 000000000000..ea35eefb5ad4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image.py
@@ -0,0 +1,59 @@
+# 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 .virtual_machine_image_resource import VirtualMachineImageResource
+
+
+class VirtualMachineImage(VirtualMachineImageResource):
+    """Describes a Virtual Machine Image.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: Required. The name of the resource.
+    :type name: str
+    :param location: Required. The supported Azure location of the resource.
+    :type location: str
+    :param tags: Specifies the tags that are assigned to the virtual machine.
+     For more information about using tags, see [Using tags to organize your
+     Azure
+     resources](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-using-tags.md).
+    :type tags: dict[str, str]
+    :param plan:
+    :type plan: ~azure.mgmt.compute.v2018_04_01.models.PurchasePlan
+    :param os_disk_image:
+    :type os_disk_image: ~azure.mgmt.compute.v2018_04_01.models.OSDiskImage
+    :param data_disk_images:
+    :type data_disk_images:
+     list[~azure.mgmt.compute.v2018_04_01.models.DataDiskImage]
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'location': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'plan': {'key': 'properties.plan', 'type': 'PurchasePlan'},
+        'os_disk_image': {'key': 'properties.osDiskImage', 'type': 'OSDiskImage'},
+        'data_disk_images': {'key': 'properties.dataDiskImages', 'type': '[DataDiskImage]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineImage, self).__init__(**kwargs)
+        self.plan = kwargs.get('plan', None)
+        self.os_disk_image = kwargs.get('os_disk_image', None)
+        self.data_disk_images = kwargs.get('data_disk_images', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_py3.py
new file mode 100644
index 000000000000..655c2909f7aa
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_py3.py
@@ -0,0 +1,59 @@
+# 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 .virtual_machine_image_resource_py3 import VirtualMachineImageResource
+
+
+class VirtualMachineImage(VirtualMachineImageResource):
+    """Describes a Virtual Machine Image.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: Required. The name of the resource.
+    :type name: str
+    :param location: Required. The supported Azure location of the resource.
+    :type location: str
+    :param tags: Specifies the tags that are assigned to the virtual machine.
+     For more information about using tags, see [Using tags to organize your
+     Azure
+     resources](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-using-tags.md).
+    :type tags: dict[str, str]
+    :param plan:
+    :type plan: ~azure.mgmt.compute.v2018_04_01.models.PurchasePlan
+    :param os_disk_image:
+    :type os_disk_image: ~azure.mgmt.compute.v2018_04_01.models.OSDiskImage
+    :param data_disk_images:
+    :type data_disk_images:
+     list[~azure.mgmt.compute.v2018_04_01.models.DataDiskImage]
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'location': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'plan': {'key': 'properties.plan', 'type': 'PurchasePlan'},
+        'os_disk_image': {'key': 'properties.osDiskImage', 'type': 'OSDiskImage'},
+        'data_disk_images': {'key': 'properties.dataDiskImages', 'type': '[DataDiskImage]'},
+    }
+
+    def __init__(self, *, name: str, location: str, id: str=None, tags=None, plan=None, os_disk_image=None, data_disk_images=None, **kwargs) -> None:
+        super(VirtualMachineImage, self).__init__(id=id, name=name, location=location, tags=tags, **kwargs)
+        self.plan = plan
+        self.os_disk_image = os_disk_image
+        self.data_disk_images = data_disk_images
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_resource.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_resource.py
new file mode 100644
index 000000000000..8807cc8f391b
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_resource.py
@@ -0,0 +1,49 @@
+# 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 .sub_resource import SubResource
+
+
+class VirtualMachineImageResource(SubResource):
+    """Virtual machine image resource information.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: Required. The name of the resource.
+    :type name: str
+    :param location: Required. The supported Azure location of the resource.
+    :type location: str
+    :param tags: Specifies the tags that are assigned to the virtual machine.
+     For more information about using tags, see [Using tags to organize your
+     Azure
+     resources](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-using-tags.md).
+    :type tags: dict[str, str]
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'location': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+        'tags': {'key': 'tags', 'type': '{str}'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineImageResource, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.location = kwargs.get('location', None)
+        self.tags = kwargs.get('tags', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_resource_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_resource_py3.py
new file mode 100644
index 000000000000..b9d63a8bc9e0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_image_resource_py3.py
@@ -0,0 +1,49 @@
+# 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 .sub_resource_py3 import SubResource
+
+
+class VirtualMachineImageResource(SubResource):
+    """Virtual machine image resource information.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: Required. The name of the resource.
+    :type name: str
+    :param location: Required. The supported Azure location of the resource.
+    :type location: str
+    :param tags: Specifies the tags that are assigned to the virtual machine.
+     For more information about using tags, see [Using tags to organize your
+     Azure
+     resources](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-using-tags.md).
+    :type tags: dict[str, str]
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'location': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+        'tags': {'key': 'tags', 'type': '{str}'},
+    }
+
+    def __init__(self, *, name: str, location: str, id: str=None, tags=None, **kwargs) -> None:
+        super(VirtualMachineImageResource, self).__init__(id=id, **kwargs)
+        self.name = name
+        self.location = location
+        self.tags = tags
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_instance_view.py
new file mode 100644
index 000000000000..8ba2eaf2f52a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_instance_view.py
@@ -0,0 +1,85 @@
+# 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 VirtualMachineInstanceView(Model):
+    """The instance view of a virtual machine.
+
+    :param platform_update_domain: Specifies the update domain of the virtual
+     machine.
+    :type platform_update_domain: int
+    :param platform_fault_domain: Specifies the fault domain of the virtual
+     machine.
+    :type platform_fault_domain: int
+    :param computer_name: The computer name assigned to the virtual machine.
+    :type computer_name: str
+    :param os_name: The Operating System running on the virtual machine.
+    :type os_name: str
+    :param os_version: The version of Operating System running on the virtual
+     machine.
+    :type os_version: str
+    :param rdp_thumb_print: The Remote desktop certificate thumbprint.
+    :type rdp_thumb_print: str
+    :param vm_agent: The VM Agent running on the virtual machine.
+    :type vm_agent:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineAgentInstanceView
+    :param maintenance_redeploy_status: The Maintenance Operation status on
+     the virtual machine.
+    :type maintenance_redeploy_status:
+     ~azure.mgmt.compute.v2018_04_01.models.MaintenanceRedeployStatus
+    :param disks: The virtual machine disk information.
+    :type disks: list[~azure.mgmt.compute.v2018_04_01.models.DiskInstanceView]
+    :param extensions: The extensions information.
+    :type extensions:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionInstanceView]
+    :param boot_diagnostics: Boot Diagnostics is a debugging feature which
+     allows you to view Console Output and Screenshot to diagnose VM status.
+     <br><br> For Linux Virtual Machines, you can easily view the output of
+     your console log. <br><br> For both Windows and Linux virtual machines,
+     Azure also enables you to see a screenshot of the VM from the hypervisor.
+    :type boot_diagnostics:
+     ~azure.mgmt.compute.v2018_04_01.models.BootDiagnosticsInstanceView
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    """
+
+    _attribute_map = {
+        'platform_update_domain': {'key': 'platformUpdateDomain', 'type': 'int'},
+        'platform_fault_domain': {'key': 'platformFaultDomain', 'type': 'int'},
+        'computer_name': {'key': 'computerName', 'type': 'str'},
+        'os_name': {'key': 'osName', 'type': 'str'},
+        'os_version': {'key': 'osVersion', 'type': 'str'},
+        'rdp_thumb_print': {'key': 'rdpThumbPrint', 'type': 'str'},
+        'vm_agent': {'key': 'vmAgent', 'type': 'VirtualMachineAgentInstanceView'},
+        'maintenance_redeploy_status': {'key': 'maintenanceRedeployStatus', 'type': 'MaintenanceRedeployStatus'},
+        'disks': {'key': 'disks', 'type': '[DiskInstanceView]'},
+        'extensions': {'key': 'extensions', 'type': '[VirtualMachineExtensionInstanceView]'},
+        'boot_diagnostics': {'key': 'bootDiagnostics', 'type': 'BootDiagnosticsInstanceView'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineInstanceView, self).__init__(**kwargs)
+        self.platform_update_domain = kwargs.get('platform_update_domain', None)
+        self.platform_fault_domain = kwargs.get('platform_fault_domain', None)
+        self.computer_name = kwargs.get('computer_name', None)
+        self.os_name = kwargs.get('os_name', None)
+        self.os_version = kwargs.get('os_version', None)
+        self.rdp_thumb_print = kwargs.get('rdp_thumb_print', None)
+        self.vm_agent = kwargs.get('vm_agent', None)
+        self.maintenance_redeploy_status = kwargs.get('maintenance_redeploy_status', None)
+        self.disks = kwargs.get('disks', None)
+        self.extensions = kwargs.get('extensions', None)
+        self.boot_diagnostics = kwargs.get('boot_diagnostics', None)
+        self.statuses = kwargs.get('statuses', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_instance_view_py3.py
new file mode 100644
index 000000000000..8c9fcff69f26
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_instance_view_py3.py
@@ -0,0 +1,85 @@
+# 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 VirtualMachineInstanceView(Model):
+    """The instance view of a virtual machine.
+
+    :param platform_update_domain: Specifies the update domain of the virtual
+     machine.
+    :type platform_update_domain: int
+    :param platform_fault_domain: Specifies the fault domain of the virtual
+     machine.
+    :type platform_fault_domain: int
+    :param computer_name: The computer name assigned to the virtual machine.
+    :type computer_name: str
+    :param os_name: The Operating System running on the virtual machine.
+    :type os_name: str
+    :param os_version: The version of Operating System running on the virtual
+     machine.
+    :type os_version: str
+    :param rdp_thumb_print: The Remote desktop certificate thumbprint.
+    :type rdp_thumb_print: str
+    :param vm_agent: The VM Agent running on the virtual machine.
+    :type vm_agent:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineAgentInstanceView
+    :param maintenance_redeploy_status: The Maintenance Operation status on
+     the virtual machine.
+    :type maintenance_redeploy_status:
+     ~azure.mgmt.compute.v2018_04_01.models.MaintenanceRedeployStatus
+    :param disks: The virtual machine disk information.
+    :type disks: list[~azure.mgmt.compute.v2018_04_01.models.DiskInstanceView]
+    :param extensions: The extensions information.
+    :type extensions:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionInstanceView]
+    :param boot_diagnostics: Boot Diagnostics is a debugging feature which
+     allows you to view Console Output and Screenshot to diagnose VM status.
+     <br><br> For Linux Virtual Machines, you can easily view the output of
+     your console log. <br><br> For both Windows and Linux virtual machines,
+     Azure also enables you to see a screenshot of the VM from the hypervisor.
+    :type boot_diagnostics:
+     ~azure.mgmt.compute.v2018_04_01.models.BootDiagnosticsInstanceView
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    """
+
+    _attribute_map = {
+        'platform_update_domain': {'key': 'platformUpdateDomain', 'type': 'int'},
+        'platform_fault_domain': {'key': 'platformFaultDomain', 'type': 'int'},
+        'computer_name': {'key': 'computerName', 'type': 'str'},
+        'os_name': {'key': 'osName', 'type': 'str'},
+        'os_version': {'key': 'osVersion', 'type': 'str'},
+        'rdp_thumb_print': {'key': 'rdpThumbPrint', 'type': 'str'},
+        'vm_agent': {'key': 'vmAgent', 'type': 'VirtualMachineAgentInstanceView'},
+        'maintenance_redeploy_status': {'key': 'maintenanceRedeployStatus', 'type': 'MaintenanceRedeployStatus'},
+        'disks': {'key': 'disks', 'type': '[DiskInstanceView]'},
+        'extensions': {'key': 'extensions', 'type': '[VirtualMachineExtensionInstanceView]'},
+        'boot_diagnostics': {'key': 'bootDiagnostics', 'type': 'BootDiagnosticsInstanceView'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, *, platform_update_domain: int=None, platform_fault_domain: int=None, computer_name: str=None, os_name: str=None, os_version: str=None, rdp_thumb_print: str=None, vm_agent=None, maintenance_redeploy_status=None, disks=None, extensions=None, boot_diagnostics=None, statuses=None, **kwargs) -> None:
+        super(VirtualMachineInstanceView, self).__init__(**kwargs)
+        self.platform_update_domain = platform_update_domain
+        self.platform_fault_domain = platform_fault_domain
+        self.computer_name = computer_name
+        self.os_name = os_name
+        self.os_version = os_version
+        self.rdp_thumb_print = rdp_thumb_print
+        self.vm_agent = vm_agent
+        self.maintenance_redeploy_status = maintenance_redeploy_status
+        self.disks = disks
+        self.extensions = extensions
+        self.boot_diagnostics = boot_diagnostics
+        self.statuses = statuses
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_paged.py
new file mode 100644
index 000000000000..387e4c3f253f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_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 VirtualMachinePaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`VirtualMachine <azure.mgmt.compute.v2018_04_01.models.VirtualMachine>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[VirtualMachine]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(VirtualMachinePaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_py3.py
new file mode 100644
index 000000000000..8b8bfcc1bcee
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_py3.py
@@ -0,0 +1,150 @@
+# 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 VirtualMachine(Resource):
+    """Describes a Virtual Machine.
+
+    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]
+    :param plan: Specifies information about the marketplace image used to
+     create the virtual machine. This element is only used for marketplace
+     images. Before you can use a marketplace image from an API, you must
+     enable the image for programmatic use.  In the Azure portal, find the
+     marketplace image that you want to use and then click **Want to deploy
+     programmatically, Get Started ->**. Enter any required information and
+     then click **Save**.
+    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
+    :param hardware_profile: Specifies the hardware settings for the virtual
+     machine.
+    :type hardware_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.HardwareProfile
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.StorageProfile
+    :param os_profile: Specifies the operating system settings for the virtual
+     machine.
+    :type os_profile: ~azure.mgmt.compute.v2018_04_01.models.OSProfile
+    :param network_profile: Specifies the network interfaces of the virtual
+     machine.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.NetworkProfile
+    :param diagnostics_profile: Specifies the boot diagnostic settings state.
+     <br><br>Minimum api-version: 2015-06-15.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
+    :param availability_set: Specifies information about the availability set
+     that the virtual machine should be assigned to. Virtual machines specified
+     in the same availability set are allocated to different nodes to maximize
+     availability. For more information about availability sets, see [Manage
+     the availability of virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+     <br><br> For more information on Azure planned maintainance, see [Planned
+     maintenance for virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Currently, a VM can only be added to availability set at creation
+     time. An existing VM cannot be added to an availability set.
+    :type availability_set: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :ivar instance_view: The virtual machine instance view.
+    :vartype instance_view:
+     ~azure.mgmt.compute.v2018_04_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:
+     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
+     is included in a request for an update, the value must match the initial
+     value. This value cannot be updated. <br><br> For more information, see
+     [Azure Hybrid Use Benefit for Windows
+     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Minimum api-version: 2015-06-15
+    :type license_type: str
+    :ivar vm_id: Specifies the VM unique ID which is a 128-bits identifier
+     that is encoded and stored in all Azure IaaS VMs SMBIOS and can be read
+     using platform BIOS commands.
+    :vartype vm_id: str
+    :ivar resources: The virtual machine child extension resources.
+    :vartype resources:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]
+    :param identity: The identity of the virtual machine, if configured.
+    :type identity:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineIdentity
+    :param zones: The virtual machine zones.
+    :type zones: list[str]
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'provisioning_state': {'readonly': True},
+        'instance_view': {'readonly': True},
+        'vm_id': {'readonly': True},
+        'resources': {'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}'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
+        'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
+        'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
+        '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': 'VirtualMachineInstanceView'},
+        'license_type': {'key': 'properties.licenseType', 'type': 'str'},
+        'vm_id': {'key': 'properties.vmId', 'type': 'str'},
+        'resources': {'key': 'resources', 'type': '[VirtualMachineExtension]'},
+        'identity': {'key': 'identity', 'type': 'VirtualMachineIdentity'},
+        '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:
+        super(VirtualMachine, self).__init__(location=location, tags=tags, **kwargs)
+        self.plan = plan
+        self.hardware_profile = hardware_profile
+        self.storage_profile = storage_profile
+        self.os_profile = os_profile
+        self.network_profile = network_profile
+        self.diagnostics_profile = diagnostics_profile
+        self.availability_set = availability_set
+        self.provisioning_state = None
+        self.instance_view = None
+        self.license_type = license_type
+        self.vm_id = None
+        self.resources = None
+        self.identity = identity
+        self.zones = zones
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set.py
new file mode 100644
index 000000000000..17f274dd926f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set.py
@@ -0,0 +1,116 @@
+# 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 VirtualMachineScaleSet(Resource):
+    """Describes a Virtual Machine Scale Set.
+
+    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]
+    :param sku: The virtual machine scale set sku.
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
+    :param plan: Specifies information about the marketplace image used to
+     create the virtual machine. This element is only used for marketplace
+     images. Before you can use a marketplace image from an API, you must
+     enable the image for programmatic use.  In the Azure portal, find the
+     marketplace image that you want to use and then click **Want to deploy
+     programmatically, Get Started ->**. Enter any required information and
+     then click **Save**.
+    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
+    :param upgrade_policy: The upgrade policy.
+    :type upgrade_policy: ~azure.mgmt.compute.v2018_04_01.models.UpgradePolicy
+    :param virtual_machine_profile: The virtual machine profile.
+    :type virtual_machine_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVMProfile
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :param overprovision: Specifies whether the Virtual Machine Scale Set
+     should be overprovisioned.
+    :type overprovision: bool
+    :ivar unique_id: Specifies the ID which uniquely identifies a Virtual
+     Machine Scale Set.
+    :vartype unique_id: str
+    :param single_placement_group: When true this limits the scale set to a
+     single placement group, of max size 100 virtual machines.
+    :type single_placement_group: bool
+    :param zone_balance: Whether to force stictly even Virtual Machine
+     distribution cross x-zones in case there is zone outage.
+    :type zone_balance: bool
+    :param platform_fault_domain_count: Fault Domain count for each placement
+     group.
+    :type platform_fault_domain_count: int
+    :param identity: The identity of the virtual machine scale set, if
+     configured.
+    :type identity:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetIdentity
+    :param zones: The virtual machine scale set zones.
+    :type zones: list[str]
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'provisioning_state': {'readonly': True},
+        'unique_id': {'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}'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'upgrade_policy': {'key': 'properties.upgradePolicy', 'type': 'UpgradePolicy'},
+        'virtual_machine_profile': {'key': 'properties.virtualMachineProfile', 'type': 'VirtualMachineScaleSetVMProfile'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'overprovision': {'key': 'properties.overprovision', 'type': 'bool'},
+        'unique_id': {'key': 'properties.uniqueId', 'type': 'str'},
+        'single_placement_group': {'key': 'properties.singlePlacementGroup', 'type': 'bool'},
+        'zone_balance': {'key': 'properties.zoneBalance', 'type': 'bool'},
+        'platform_fault_domain_count': {'key': 'properties.platformFaultDomainCount', 'type': 'int'},
+        'identity': {'key': 'identity', 'type': 'VirtualMachineScaleSetIdentity'},
+        'zones': {'key': 'zones', 'type': '[str]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSet, self).__init__(**kwargs)
+        self.sku = kwargs.get('sku', None)
+        self.plan = kwargs.get('plan', None)
+        self.upgrade_policy = kwargs.get('upgrade_policy', None)
+        self.virtual_machine_profile = kwargs.get('virtual_machine_profile', None)
+        self.provisioning_state = None
+        self.overprovision = kwargs.get('overprovision', None)
+        self.unique_id = None
+        self.single_placement_group = kwargs.get('single_placement_group', None)
+        self.zone_balance = kwargs.get('zone_balance', None)
+        self.platform_fault_domain_count = kwargs.get('platform_fault_domain_count', None)
+        self.identity = kwargs.get('identity', None)
+        self.zones = kwargs.get('zones', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_data_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_data_disk.py
new file mode 100644
index 000000000000..945726144fd2
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_data_disk.py
@@ -0,0 +1,70 @@
+# 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 VirtualMachineScaleSetDataDisk(Model):
+    """Describes a virtual machine scale set data disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: The disk name.
+    :type name: str
+    :param lun: Required. Specifies the logical unit number of the data disk.
+     This value is used to identify data disks within the VM and therefore must
+     be unique for each data disk attached to a VM.
+    :type lun: int
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :param create_option: Required. The create option. Possible values
+     include: 'FromImage', 'Empty', 'Attach'
+    :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
+     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.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetManagedDiskParameters
+    """
+
+    _validation = {
+        'lun': {'required': True},
+        'create_option': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'lun': {'key': 'lun', 'type': 'int'},
+        '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'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'VirtualMachineScaleSetManagedDiskParameters'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetDataDisk, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.lun = kwargs.get('lun', None)
+        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.managed_disk = kwargs.get('managed_disk', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_data_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_data_disk_py3.py
new file mode 100644
index 000000000000..8ff1b974e334
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_data_disk_py3.py
@@ -0,0 +1,70 @@
+# 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 VirtualMachineScaleSetDataDisk(Model):
+    """Describes a virtual machine scale set data disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: The disk name.
+    :type name: str
+    :param lun: Required. Specifies the logical unit number of the data disk.
+     This value is used to identify data disks within the VM and therefore must
+     be unique for each data disk attached to a VM.
+    :type lun: int
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :param create_option: Required. The create option. Possible values
+     include: 'FromImage', 'Empty', 'Attach'
+    :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
+     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.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetManagedDiskParameters
+    """
+
+    _validation = {
+        'lun': {'required': True},
+        'create_option': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'lun': {'key': 'lun', 'type': 'int'},
+        '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'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'VirtualMachineScaleSetManagedDiskParameters'},
+    }
+
+    def __init__(self, *, lun: int, create_option, name: str=None, caching=None, write_accelerator_enabled: bool=None, disk_size_gb: int=None, managed_disk=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetDataDisk, self).__init__(**kwargs)
+        self.name = name
+        self.lun = lun
+        self.caching = caching
+        self.write_accelerator_enabled = write_accelerator_enabled
+        self.create_option = create_option
+        self.disk_size_gb = disk_size_gb
+        self.managed_disk = managed_disk
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension.py
new file mode 100644
index 000000000000..24a487547a2a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension.py
@@ -0,0 +1,80 @@
+# 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 .sub_resource_read_only import SubResourceReadOnly
+
+
+class VirtualMachineScaleSetExtension(SubResourceReadOnly):
+    """Describes a Virtual Machine Scale Set Extension.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    :param name: The name of the extension.
+    :type name: str
+    :param force_update_tag: If a value is provided and is different from the
+     previous value, the extension handler will be forced to update even if the
+     extension configuration has not changed.
+    :type force_update_tag: str
+    :param publisher: The name of the extension handler publisher.
+    :type publisher: str
+    :param type: Specifies the type of the extension; an example is
+     "CustomScriptExtension".
+    :type type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param auto_upgrade_minor_version: Indicates whether the extension should
+     use a newer minor version if one is available at deployment time. Once
+     deployed, however, the extension will not upgrade minor versions unless
+     redeployed, even with this property set to true.
+    :type auto_upgrade_minor_version: bool
+    :param settings: Json formatted public settings for the extension.
+    :type settings: object
+    :param protected_settings: The extension can contain either
+     protectedSettings or protectedSettingsFromKeyVault or no protected
+     settings at all.
+    :type protected_settings: object
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'provisioning_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'},
+        'publisher': {'key': 'properties.publisher', 'type': 'str'},
+        'type': {'key': 'properties.type', 'type': 'str'},
+        'type_handler_version': {'key': 'properties.typeHandlerVersion', 'type': 'str'},
+        'auto_upgrade_minor_version': {'key': 'properties.autoUpgradeMinorVersion', 'type': 'bool'},
+        'settings': {'key': 'properties.settings', 'type': 'object'},
+        'protected_settings': {'key': 'properties.protectedSettings', 'type': 'object'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetExtension, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.force_update_tag = kwargs.get('force_update_tag', None)
+        self.publisher = kwargs.get('publisher', None)
+        self.type = kwargs.get('type', None)
+        self.type_handler_version = kwargs.get('type_handler_version', None)
+        self.auto_upgrade_minor_version = kwargs.get('auto_upgrade_minor_version', None)
+        self.settings = kwargs.get('settings', None)
+        self.protected_settings = kwargs.get('protected_settings', None)
+        self.provisioning_state = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_paged.py
new file mode 100644
index 000000000000..36a70d58d957
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_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 VirtualMachineScaleSetExtensionPaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`VirtualMachineScaleSetExtension <azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtension>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[VirtualMachineScaleSetExtension]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(VirtualMachineScaleSetExtensionPaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_profile.py
new file mode 100644
index 000000000000..918951d9fe26
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_profile.py
@@ -0,0 +1,30 @@
+# 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 VirtualMachineScaleSetExtensionProfile(Model):
+    """Describes a virtual machine scale set extension profile.
+
+    :param extensions: The virtual machine scale set child extension
+     resources.
+    :type extensions:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtension]
+    """
+
+    _attribute_map = {
+        'extensions': {'key': 'extensions', 'type': '[VirtualMachineScaleSetExtension]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetExtensionProfile, self).__init__(**kwargs)
+        self.extensions = kwargs.get('extensions', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_profile_py3.py
new file mode 100644
index 000000000000..c00f190696d9
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_profile_py3.py
@@ -0,0 +1,30 @@
+# 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 VirtualMachineScaleSetExtensionProfile(Model):
+    """Describes a virtual machine scale set extension profile.
+
+    :param extensions: The virtual machine scale set child extension
+     resources.
+    :type extensions:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtension]
+    """
+
+    _attribute_map = {
+        'extensions': {'key': 'extensions', 'type': '[VirtualMachineScaleSetExtension]'},
+    }
+
+    def __init__(self, *, extensions=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetExtensionProfile, self).__init__(**kwargs)
+        self.extensions = extensions
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_py3.py
new file mode 100644
index 000000000000..27392a2de9fd
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_extension_py3.py
@@ -0,0 +1,80 @@
+# 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 .sub_resource_read_only_py3 import SubResourceReadOnly
+
+
+class VirtualMachineScaleSetExtension(SubResourceReadOnly):
+    """Describes a Virtual Machine Scale Set Extension.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    :param name: The name of the extension.
+    :type name: str
+    :param force_update_tag: If a value is provided and is different from the
+     previous value, the extension handler will be forced to update even if the
+     extension configuration has not changed.
+    :type force_update_tag: str
+    :param publisher: The name of the extension handler publisher.
+    :type publisher: str
+    :param type: Specifies the type of the extension; an example is
+     "CustomScriptExtension".
+    :type type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param auto_upgrade_minor_version: Indicates whether the extension should
+     use a newer minor version if one is available at deployment time. Once
+     deployed, however, the extension will not upgrade minor versions unless
+     redeployed, even with this property set to true.
+    :type auto_upgrade_minor_version: bool
+    :param settings: Json formatted public settings for the extension.
+    :type settings: object
+    :param protected_settings: The extension can contain either
+     protectedSettings or protectedSettingsFromKeyVault or no protected
+     settings at all.
+    :type protected_settings: object
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'provisioning_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'},
+        'publisher': {'key': 'properties.publisher', 'type': 'str'},
+        'type': {'key': 'properties.type', 'type': 'str'},
+        'type_handler_version': {'key': 'properties.typeHandlerVersion', 'type': 'str'},
+        'auto_upgrade_minor_version': {'key': 'properties.autoUpgradeMinorVersion', 'type': 'bool'},
+        'settings': {'key': 'properties.settings', 'type': 'object'},
+        'protected_settings': {'key': 'properties.protectedSettings', 'type': 'object'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+    }
+
+    def __init__(self, *, name: str=None, force_update_tag: str=None, publisher: str=None, type: str=None, type_handler_version: str=None, auto_upgrade_minor_version: bool=None, settings=None, protected_settings=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetExtension, self).__init__(**kwargs)
+        self.name = name
+        self.force_update_tag = force_update_tag
+        self.publisher = publisher
+        self.type = type
+        self.type_handler_version = type_handler_version
+        self.auto_upgrade_minor_version = auto_upgrade_minor_version
+        self.settings = settings
+        self.protected_settings = protected_settings
+        self.provisioning_state = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_identity.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_identity.py
new file mode 100644
index 000000000000..0d3064e622d2
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_identity.py
@@ -0,0 +1,60 @@
+# 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 VirtualMachineScaleSetIdentity(Model):
+    """Identity for the virtual machine scale set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar principal_id: The principal id of virtual machine scale set
+     identity. This property will only be provided for a system assigned
+     identity.
+    :vartype principal_id: str
+    :ivar tenant_id: The tenant id associated with the virtual machine scale
+     set. This property will only be provided for a system assigned identity.
+    :vartype tenant_id: str
+    :param type: The type of identity used for the virtual machine scale set.
+     The type 'SystemAssigned, UserAssigned' includes both an implicitly
+     created identity and a set of user assigned identities. The type 'None'
+     will remove any identities from the virtual machine scale set. Possible
+     values include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned,
+     UserAssigned', 'None'
+    :type type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.ResourceIdentityType
+    :param identity_ids: The list of user identities associated with the
+     virtual machine scale set. The user identity references will be ARM
+     resource ids in the form:
+     '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/identities/{identityName}'.
+    :type identity_ids: list[str]
+    """
+
+    _validation = {
+        'principal_id': {'readonly': True},
+        'tenant_id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'principal_id': {'key': 'principalId', 'type': 'str'},
+        'tenant_id': {'key': 'tenantId', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'ResourceIdentityType'},
+        'identity_ids': {'key': 'identityIds', 'type': '[str]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetIdentity, self).__init__(**kwargs)
+        self.principal_id = None
+        self.tenant_id = None
+        self.type = kwargs.get('type', None)
+        self.identity_ids = kwargs.get('identity_ids', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_identity_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_identity_py3.py
new file mode 100644
index 000000000000..0d4c71f5c2e4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_identity_py3.py
@@ -0,0 +1,60 @@
+# 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 VirtualMachineScaleSetIdentity(Model):
+    """Identity for the virtual machine scale set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar principal_id: The principal id of virtual machine scale set
+     identity. This property will only be provided for a system assigned
+     identity.
+    :vartype principal_id: str
+    :ivar tenant_id: The tenant id associated with the virtual machine scale
+     set. This property will only be provided for a system assigned identity.
+    :vartype tenant_id: str
+    :param type: The type of identity used for the virtual machine scale set.
+     The type 'SystemAssigned, UserAssigned' includes both an implicitly
+     created identity and a set of user assigned identities. The type 'None'
+     will remove any identities from the virtual machine scale set. Possible
+     values include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned,
+     UserAssigned', 'None'
+    :type type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.ResourceIdentityType
+    :param identity_ids: The list of user identities associated with the
+     virtual machine scale set. The user identity references will be ARM
+     resource ids in the form:
+     '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/identities/{identityName}'.
+    :type identity_ids: list[str]
+    """
+
+    _validation = {
+        'principal_id': {'readonly': True},
+        'tenant_id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'principal_id': {'key': 'principalId', 'type': 'str'},
+        'tenant_id': {'key': 'tenantId', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'ResourceIdentityType'},
+        'identity_ids': {'key': 'identityIds', 'type': '[str]'},
+    }
+
+    def __init__(self, *, type=None, identity_ids=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetIdentity, self).__init__(**kwargs)
+        self.principal_id = None
+        self.tenant_id = None
+        self.type = type
+        self.identity_ids = identity_ids
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view.py
new file mode 100644
index 000000000000..1622490f7033
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view.py
@@ -0,0 +1,48 @@
+# 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 VirtualMachineScaleSetInstanceView(Model):
+    """The instance view of a virtual machine scale set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar virtual_machine: The instance view status summary for the virtual
+     machine scale set.
+    :vartype virtual_machine:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetInstanceViewStatusesSummary
+    :ivar extensions: The extensions information.
+    :vartype extensions:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVMExtensionsSummary]
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    """
+
+    _validation = {
+        'virtual_machine': {'readonly': True},
+        'extensions': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'virtual_machine': {'key': 'virtualMachine', 'type': 'VirtualMachineScaleSetInstanceViewStatusesSummary'},
+        'extensions': {'key': 'extensions', 'type': '[VirtualMachineScaleSetVMExtensionsSummary]'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetInstanceView, self).__init__(**kwargs)
+        self.virtual_machine = None
+        self.extensions = None
+        self.statuses = kwargs.get('statuses', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_py3.py
new file mode 100644
index 000000000000..b32213a53b1e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_py3.py
@@ -0,0 +1,48 @@
+# 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 VirtualMachineScaleSetInstanceView(Model):
+    """The instance view of a virtual machine scale set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar virtual_machine: The instance view status summary for the virtual
+     machine scale set.
+    :vartype virtual_machine:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetInstanceViewStatusesSummary
+    :ivar extensions: The extensions information.
+    :vartype extensions:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVMExtensionsSummary]
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    """
+
+    _validation = {
+        'virtual_machine': {'readonly': True},
+        'extensions': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'virtual_machine': {'key': 'virtualMachine', 'type': 'VirtualMachineScaleSetInstanceViewStatusesSummary'},
+        'extensions': {'key': 'extensions', 'type': '[VirtualMachineScaleSetVMExtensionsSummary]'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, *, statuses=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetInstanceView, self).__init__(**kwargs)
+        self.virtual_machine = None
+        self.extensions = None
+        self.statuses = statuses
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_statuses_summary.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_statuses_summary.py
new file mode 100644
index 000000000000..b0166ebb5800
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_statuses_summary.py
@@ -0,0 +1,37 @@
+# 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 VirtualMachineScaleSetInstanceViewStatusesSummary(Model):
+    """Instance view statuses summary for virtual machines of a virtual machine
+    scale set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar statuses_summary: The extensions information.
+    :vartype statuses_summary:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineStatusCodeCount]
+    """
+
+    _validation = {
+        'statuses_summary': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'statuses_summary': {'key': 'statusesSummary', 'type': '[VirtualMachineStatusCodeCount]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetInstanceViewStatusesSummary, self).__init__(**kwargs)
+        self.statuses_summary = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_statuses_summary_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_statuses_summary_py3.py
new file mode 100644
index 000000000000..40b07db6f65e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_instance_view_statuses_summary_py3.py
@@ -0,0 +1,37 @@
+# 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 VirtualMachineScaleSetInstanceViewStatusesSummary(Model):
+    """Instance view statuses summary for virtual machines of a virtual machine
+    scale set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar statuses_summary: The extensions information.
+    :vartype statuses_summary:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineStatusCodeCount]
+    """
+
+    _validation = {
+        'statuses_summary': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'statuses_summary': {'key': 'statusesSummary', 'type': '[VirtualMachineStatusCodeCount]'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(VirtualMachineScaleSetInstanceViewStatusesSummary, self).__init__(**kwargs)
+        self.statuses_summary = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_configuration.py
new file mode 100644
index 000000000000..cab729ab5dba
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_configuration.py
@@ -0,0 +1,83 @@
+# 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 .sub_resource import SubResource
+
+
+class VirtualMachineScaleSetIPConfiguration(SubResource):
+    """Describes a virtual machine scale set network profile's IP configuration.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: Required. The IP configuration name.
+    :type name: str
+    :param subnet: Specifies the identifier of the subnet.
+    :type subnet: ~azure.mgmt.compute.v2018_04_01.models.ApiEntityReference
+    :param primary: Specifies the primary network interface in case the
+     virtual machine has more than 1 network interface.
+    :type primary: bool
+    :param public_ip_address_configuration: The publicIPAddressConfiguration.
+    :type public_ip_address_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetPublicIPAddressConfiguration
+    :param private_ip_address_version: Available from Api-Version 2017-03-30
+     onwards, it represents whether the specific ipconfiguration is IPv4 or
+     IPv6. Default is taken as IPv4.  Possible values are: 'IPv4' and 'IPv6'.
+     Possible values include: 'IPv4', 'IPv6'
+    :type private_ip_address_version: str or
+     ~azure.mgmt.compute.v2018_04_01.models.IPVersion
+    :param application_gateway_backend_address_pools: Specifies an array of
+     references to backend address pools of application gateways. A scale set
+     can reference backend address pools of multiple application gateways.
+     Multiple scale sets cannot use the same application gateway.
+    :type application_gateway_backend_address_pools:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    :param load_balancer_backend_address_pools: Specifies an array of
+     references to backend address pools of load balancers. A scale set can
+     reference backend address pools of one public and one internal load
+     balancer. Multiple scale sets cannot use the same load balancer.
+    :type load_balancer_backend_address_pools:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    :param load_balancer_inbound_nat_pools: Specifies an array of references
+     to inbound Nat pools of the load balancers. A scale set can reference
+     inbound nat pools of one public and one internal load balancer. Multiple
+     scale sets cannot use the same load balancer
+    :type load_balancer_inbound_nat_pools:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    """
+
+    _validation = {
+        'name': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'subnet': {'key': 'properties.subnet', 'type': 'ApiEntityReference'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+        'public_ip_address_configuration': {'key': 'properties.publicIPAddressConfiguration', 'type': 'VirtualMachineScaleSetPublicIPAddressConfiguration'},
+        'private_ip_address_version': {'key': 'properties.privateIPAddressVersion', 'type': 'str'},
+        'application_gateway_backend_address_pools': {'key': 'properties.applicationGatewayBackendAddressPools', 'type': '[SubResource]'},
+        'load_balancer_backend_address_pools': {'key': 'properties.loadBalancerBackendAddressPools', 'type': '[SubResource]'},
+        'load_balancer_inbound_nat_pools': {'key': 'properties.loadBalancerInboundNatPools', 'type': '[SubResource]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetIPConfiguration, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.subnet = kwargs.get('subnet', None)
+        self.primary = kwargs.get('primary', None)
+        self.public_ip_address_configuration = kwargs.get('public_ip_address_configuration', None)
+        self.private_ip_address_version = kwargs.get('private_ip_address_version', None)
+        self.application_gateway_backend_address_pools = kwargs.get('application_gateway_backend_address_pools', None)
+        self.load_balancer_backend_address_pools = kwargs.get('load_balancer_backend_address_pools', None)
+        self.load_balancer_inbound_nat_pools = kwargs.get('load_balancer_inbound_nat_pools', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_configuration_py3.py
new file mode 100644
index 000000000000..1c73ea10f6fd
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_configuration_py3.py
@@ -0,0 +1,83 @@
+# 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 .sub_resource_py3 import SubResource
+
+
+class VirtualMachineScaleSetIPConfiguration(SubResource):
+    """Describes a virtual machine scale set network profile's IP configuration.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: Required. The IP configuration name.
+    :type name: str
+    :param subnet: Specifies the identifier of the subnet.
+    :type subnet: ~azure.mgmt.compute.v2018_04_01.models.ApiEntityReference
+    :param primary: Specifies the primary network interface in case the
+     virtual machine has more than 1 network interface.
+    :type primary: bool
+    :param public_ip_address_configuration: The publicIPAddressConfiguration.
+    :type public_ip_address_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetPublicIPAddressConfiguration
+    :param private_ip_address_version: Available from Api-Version 2017-03-30
+     onwards, it represents whether the specific ipconfiguration is IPv4 or
+     IPv6. Default is taken as IPv4.  Possible values are: 'IPv4' and 'IPv6'.
+     Possible values include: 'IPv4', 'IPv6'
+    :type private_ip_address_version: str or
+     ~azure.mgmt.compute.v2018_04_01.models.IPVersion
+    :param application_gateway_backend_address_pools: Specifies an array of
+     references to backend address pools of application gateways. A scale set
+     can reference backend address pools of multiple application gateways.
+     Multiple scale sets cannot use the same application gateway.
+    :type application_gateway_backend_address_pools:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    :param load_balancer_backend_address_pools: Specifies an array of
+     references to backend address pools of load balancers. A scale set can
+     reference backend address pools of one public and one internal load
+     balancer. Multiple scale sets cannot use the same load balancer.
+    :type load_balancer_backend_address_pools:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    :param load_balancer_inbound_nat_pools: Specifies an array of references
+     to inbound Nat pools of the load balancers. A scale set can reference
+     inbound nat pools of one public and one internal load balancer. Multiple
+     scale sets cannot use the same load balancer
+    :type load_balancer_inbound_nat_pools:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    """
+
+    _validation = {
+        'name': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'subnet': {'key': 'properties.subnet', 'type': 'ApiEntityReference'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+        'public_ip_address_configuration': {'key': 'properties.publicIPAddressConfiguration', 'type': 'VirtualMachineScaleSetPublicIPAddressConfiguration'},
+        'private_ip_address_version': {'key': 'properties.privateIPAddressVersion', 'type': 'str'},
+        'application_gateway_backend_address_pools': {'key': 'properties.applicationGatewayBackendAddressPools', 'type': '[SubResource]'},
+        'load_balancer_backend_address_pools': {'key': 'properties.loadBalancerBackendAddressPools', 'type': '[SubResource]'},
+        'load_balancer_inbound_nat_pools': {'key': 'properties.loadBalancerInboundNatPools', 'type': '[SubResource]'},
+    }
+
+    def __init__(self, *, name: str, id: str=None, subnet=None, primary: bool=None, public_ip_address_configuration=None, private_ip_address_version=None, application_gateway_backend_address_pools=None, load_balancer_backend_address_pools=None, load_balancer_inbound_nat_pools=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetIPConfiguration, self).__init__(id=id, **kwargs)
+        self.name = name
+        self.subnet = subnet
+        self.primary = primary
+        self.public_ip_address_configuration = public_ip_address_configuration
+        self.private_ip_address_version = private_ip_address_version
+        self.application_gateway_backend_address_pools = application_gateway_backend_address_pools
+        self.load_balancer_backend_address_pools = load_balancer_backend_address_pools
+        self.load_balancer_inbound_nat_pools = load_balancer_inbound_nat_pools
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_tag.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_tag.py
new file mode 100644
index 000000000000..36b70260d646
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_tag.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 VirtualMachineScaleSetIpTag(Model):
+    """Contains the IP tag associated with the public IP address.
+
+    :param ip_tag_type: IP tag type. Example: FirstPartyUsage.
+    :type ip_tag_type: str
+    :param tag: IP tag associated with the public IP. Example: SQL, Storage
+     etc.
+    :type tag: str
+    """
+
+    _attribute_map = {
+        'ip_tag_type': {'key': 'ipTagType', 'type': 'str'},
+        'tag': {'key': 'tag', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetIpTag, self).__init__(**kwargs)
+        self.ip_tag_type = kwargs.get('ip_tag_type', None)
+        self.tag = kwargs.get('tag', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_tag_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_tag_py3.py
new file mode 100644
index 000000000000..aaf788c9d772
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_ip_tag_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 VirtualMachineScaleSetIpTag(Model):
+    """Contains the IP tag associated with the public IP address.
+
+    :param ip_tag_type: IP tag type. Example: FirstPartyUsage.
+    :type ip_tag_type: str
+    :param tag: IP tag associated with the public IP. Example: SQL, Storage
+     etc.
+    :type tag: str
+    """
+
+    _attribute_map = {
+        'ip_tag_type': {'key': 'ipTagType', 'type': 'str'},
+        'tag': {'key': 'tag', 'type': 'str'},
+    }
+
+    def __init__(self, *, ip_tag_type: str=None, tag: str=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetIpTag, self).__init__(**kwargs)
+        self.ip_tag_type = ip_tag_type
+        self.tag = tag
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py
new file mode 100644
index 000000000000..495309b9b2cf
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py
@@ -0,0 +1,31 @@
+# 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 VirtualMachineScaleSetManagedDiskParameters(Model):
+    """Describes the parameters of a ScaleSet managed disk.
+
+    :param storage_account_type: Specifies the storage account type for the
+     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
+    :type storage_account_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
+    """
+
+    _attribute_map = {
+        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetManagedDiskParameters, self).__init__(**kwargs)
+        self.storage_account_type = kwargs.get('storage_account_type', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py
new file mode 100644
index 000000000000..68f66be2e34e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py
@@ -0,0 +1,31 @@
+# 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 VirtualMachineScaleSetManagedDiskParameters(Model):
+    """Describes the parameters of a ScaleSet managed disk.
+
+    :param storage_account_type: Specifies the storage account type for the
+     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
+    :type storage_account_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
+    """
+
+    _attribute_map = {
+        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
+    }
+
+    def __init__(self, *, storage_account_type=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetManagedDiskParameters, self).__init__(**kwargs)
+        self.storage_account_type = storage_account_type
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration.py
new file mode 100644
index 000000000000..232955519b0f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration.py
@@ -0,0 +1,70 @@
+# 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 .sub_resource import SubResource
+
+
+class VirtualMachineScaleSetNetworkConfiguration(SubResource):
+    """Describes a virtual machine scale set network profile's network
+    configurations.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: Required. The network configuration name.
+    :type name: str
+    :param primary: Specifies the primary network interface in case the
+     virtual machine has more than 1 network interface.
+    :type primary: bool
+    :param enable_accelerated_networking: Specifies whether the network
+     interface is accelerated networking-enabled.
+    :type enable_accelerated_networking: bool
+    :param network_security_group: The network security group.
+    :type network_security_group:
+     ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param dns_settings: The dns settings to be applied on the network
+     interfaces.
+    :type dns_settings:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetNetworkConfigurationDnsSettings
+    :param ip_configurations: Required. Specifies the IP configurations of the
+     network interface.
+    :type ip_configurations:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetIPConfiguration]
+    :param enable_ip_forwarding: Whether IP forwarding enabled on this NIC.
+    :type enable_ip_forwarding: bool
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'ip_configurations': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+        'enable_accelerated_networking': {'key': 'properties.enableAcceleratedNetworking', 'type': 'bool'},
+        'network_security_group': {'key': 'properties.networkSecurityGroup', 'type': 'SubResource'},
+        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetNetworkConfigurationDnsSettings'},
+        'ip_configurations': {'key': 'properties.ipConfigurations', 'type': '[VirtualMachineScaleSetIPConfiguration]'},
+        'enable_ip_forwarding': {'key': 'properties.enableIPForwarding', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetNetworkConfiguration, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.primary = kwargs.get('primary', None)
+        self.enable_accelerated_networking = kwargs.get('enable_accelerated_networking', None)
+        self.network_security_group = kwargs.get('network_security_group', None)
+        self.dns_settings = kwargs.get('dns_settings', None)
+        self.ip_configurations = kwargs.get('ip_configurations', None)
+        self.enable_ip_forwarding = kwargs.get('enable_ip_forwarding', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_dns_settings.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_dns_settings.py
new file mode 100644
index 000000000000..04e1c619383f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_dns_settings.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 VirtualMachineScaleSetNetworkConfigurationDnsSettings(Model):
+    """Describes a virtual machines scale sets network configuration's DNS
+    settings.
+
+    :param dns_servers: List of DNS servers IP addresses
+    :type dns_servers: list[str]
+    """
+
+    _attribute_map = {
+        'dns_servers': {'key': 'dnsServers', 'type': '[str]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetNetworkConfigurationDnsSettings, self).__init__(**kwargs)
+        self.dns_servers = kwargs.get('dns_servers', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_dns_settings_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_dns_settings_py3.py
new file mode 100644
index 000000000000..5607f74d3c6a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_dns_settings_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 VirtualMachineScaleSetNetworkConfigurationDnsSettings(Model):
+    """Describes a virtual machines scale sets network configuration's DNS
+    settings.
+
+    :param dns_servers: List of DNS servers IP addresses
+    :type dns_servers: list[str]
+    """
+
+    _attribute_map = {
+        'dns_servers': {'key': 'dnsServers', 'type': '[str]'},
+    }
+
+    def __init__(self, *, dns_servers=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetNetworkConfigurationDnsSettings, self).__init__(**kwargs)
+        self.dns_servers = dns_servers
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_py3.py
new file mode 100644
index 000000000000..d8847da6356d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_configuration_py3.py
@@ -0,0 +1,70 @@
+# 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 .sub_resource_py3 import SubResource
+
+
+class VirtualMachineScaleSetNetworkConfiguration(SubResource):
+    """Describes a virtual machine scale set network profile's network
+    configurations.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: Required. The network configuration name.
+    :type name: str
+    :param primary: Specifies the primary network interface in case the
+     virtual machine has more than 1 network interface.
+    :type primary: bool
+    :param enable_accelerated_networking: Specifies whether the network
+     interface is accelerated networking-enabled.
+    :type enable_accelerated_networking: bool
+    :param network_security_group: The network security group.
+    :type network_security_group:
+     ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param dns_settings: The dns settings to be applied on the network
+     interfaces.
+    :type dns_settings:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetNetworkConfigurationDnsSettings
+    :param ip_configurations: Required. Specifies the IP configurations of the
+     network interface.
+    :type ip_configurations:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetIPConfiguration]
+    :param enable_ip_forwarding: Whether IP forwarding enabled on this NIC.
+    :type enable_ip_forwarding: bool
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'ip_configurations': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+        'enable_accelerated_networking': {'key': 'properties.enableAcceleratedNetworking', 'type': 'bool'},
+        'network_security_group': {'key': 'properties.networkSecurityGroup', 'type': 'SubResource'},
+        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetNetworkConfigurationDnsSettings'},
+        'ip_configurations': {'key': 'properties.ipConfigurations', 'type': '[VirtualMachineScaleSetIPConfiguration]'},
+        'enable_ip_forwarding': {'key': 'properties.enableIPForwarding', 'type': 'bool'},
+    }
+
+    def __init__(self, *, name: str, ip_configurations, id: str=None, primary: bool=None, enable_accelerated_networking: bool=None, network_security_group=None, dns_settings=None, enable_ip_forwarding: bool=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetNetworkConfiguration, self).__init__(id=id, **kwargs)
+        self.name = name
+        self.primary = primary
+        self.enable_accelerated_networking = enable_accelerated_networking
+        self.network_security_group = network_security_group
+        self.dns_settings = dns_settings
+        self.ip_configurations = ip_configurations
+        self.enable_ip_forwarding = enable_ip_forwarding
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_profile.py
new file mode 100644
index 000000000000..b7b3854e671e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_profile.py
@@ -0,0 +1,38 @@
+# 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 VirtualMachineScaleSetNetworkProfile(Model):
+    """Describes a virtual machine scale set network profile.
+
+    :param health_probe: A reference to a load balancer probe used to
+     determine the health of an instance in the virtual machine scale set. The
+     reference will be in the form:
+     '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/probes/{probeName}'.
+    :type health_probe:
+     ~azure.mgmt.compute.v2018_04_01.models.ApiEntityReference
+    :param network_interface_configurations: The list of network
+     configurations.
+    :type network_interface_configurations:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetNetworkConfiguration]
+    """
+
+    _attribute_map = {
+        'health_probe': {'key': 'healthProbe', 'type': 'ApiEntityReference'},
+        'network_interface_configurations': {'key': 'networkInterfaceConfigurations', 'type': '[VirtualMachineScaleSetNetworkConfiguration]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetNetworkProfile, self).__init__(**kwargs)
+        self.health_probe = kwargs.get('health_probe', None)
+        self.network_interface_configurations = kwargs.get('network_interface_configurations', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_profile_py3.py
new file mode 100644
index 000000000000..4fd85adaca7a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_network_profile_py3.py
@@ -0,0 +1,38 @@
+# 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 VirtualMachineScaleSetNetworkProfile(Model):
+    """Describes a virtual machine scale set network profile.
+
+    :param health_probe: A reference to a load balancer probe used to
+     determine the health of an instance in the virtual machine scale set. The
+     reference will be in the form:
+     '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/probes/{probeName}'.
+    :type health_probe:
+     ~azure.mgmt.compute.v2018_04_01.models.ApiEntityReference
+    :param network_interface_configurations: The list of network
+     configurations.
+    :type network_interface_configurations:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetNetworkConfiguration]
+    """
+
+    _attribute_map = {
+        'health_probe': {'key': 'healthProbe', 'type': 'ApiEntityReference'},
+        'network_interface_configurations': {'key': 'networkInterfaceConfigurations', 'type': '[VirtualMachineScaleSetNetworkConfiguration]'},
+    }
+
+    def __init__(self, *, health_probe=None, network_interface_configurations=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetNetworkProfile, self).__init__(**kwargs)
+        self.health_probe = health_probe
+        self.network_interface_configurations = network_interface_configurations
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_disk.py
new file mode 100644
index 000000000000..3c27a4373376
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_disk.py
@@ -0,0 +1,80 @@
+# 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 VirtualMachineScaleSetOSDisk(Model):
+    """Describes a virtual machine scale set operating system disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: The disk name.
+    :type name: str
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :param create_option: Required. Specifies how the virtual machines in the
+     scale set should be created.<br><br> The only allowed value is:
+     **FromImage** \\u2013 This value is used when you are using an image to
+     create the virtual machine. If you are using a platform image, you also
+     use the imageReference element described above. If you are using a
+     marketplace image, you  also use the plan element previously described.
+     Possible values include: 'FromImage', 'Empty', 'Attach'
+    :type create_option: str or
+     ~azure.mgmt.compute.v2018_04_01.models.DiskCreateOptionTypes
+    :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**
+     <br><br> **Linux**. Possible values include: 'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
+    :param image: Specifies information about the unmanaged user image to base
+     the scale set on.
+    :type image: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
+    :param vhd_containers: Specifies the container urls that are used to store
+     operating system disks for the scale set.
+    :type vhd_containers: list[str]
+    :param managed_disk: The managed disk parameters.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetManagedDiskParameters
+    """
+
+    _validation = {
+        'create_option': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'caching': {'key': 'caching', 'type': 'CachingTypes'},
+        'write_accelerator_enabled': {'key': 'writeAcceleratorEnabled', 'type': 'bool'},
+        'create_option': {'key': 'createOption', 'type': 'str'},
+        '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, **kwargs):
+        super(VirtualMachineScaleSetOSDisk, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        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.os_type = kwargs.get('os_type', 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_04_01/models/virtual_machine_scale_set_os_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_disk_py3.py
new file mode 100644
index 000000000000..a9e21e153d4d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_disk_py3.py
@@ -0,0 +1,80 @@
+# 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 VirtualMachineScaleSetOSDisk(Model):
+    """Describes a virtual machine scale set operating system disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: The disk name.
+    :type name: str
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :param create_option: Required. Specifies how the virtual machines in the
+     scale set should be created.<br><br> The only allowed value is:
+     **FromImage** \\u2013 This value is used when you are using an image to
+     create the virtual machine. If you are using a platform image, you also
+     use the imageReference element described above. If you are using a
+     marketplace image, you  also use the plan element previously described.
+     Possible values include: 'FromImage', 'Empty', 'Attach'
+    :type create_option: str or
+     ~azure.mgmt.compute.v2018_04_01.models.DiskCreateOptionTypes
+    :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**
+     <br><br> **Linux**. Possible values include: 'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.OperatingSystemTypes
+    :param image: Specifies information about the unmanaged user image to base
+     the scale set on.
+    :type image: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
+    :param vhd_containers: Specifies the container urls that are used to store
+     operating system disks for the scale set.
+    :type vhd_containers: list[str]
+    :param managed_disk: The managed disk parameters.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetManagedDiskParameters
+    """
+
+    _validation = {
+        'create_option': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'caching': {'key': 'caching', 'type': 'CachingTypes'},
+        'write_accelerator_enabled': {'key': 'writeAcceleratorEnabled', 'type': 'bool'},
+        'create_option': {'key': 'createOption', 'type': 'str'},
+        '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:
+        super(VirtualMachineScaleSetOSDisk, self).__init__(**kwargs)
+        self.name = name
+        self.caching = caching
+        self.write_accelerator_enabled = write_accelerator_enabled
+        self.create_option = create_option
+        self.os_type = os_type
+        self.image = image
+        self.vhd_containers = vhd_containers
+        self.managed_disk = managed_disk
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_profile.py
new file mode 100644
index 000000000000..fc813cc7a45f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_profile.py
@@ -0,0 +1,97 @@
+# 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 VirtualMachineScaleSetOSProfile(Model):
+    """Describes a virtual machine scale set OS profile.
+
+    :param computer_name_prefix: Specifies the computer name prefix for all of
+     the virtual machines in the scale set. Computer name prefixes must be 1 to
+     15 characters long.
+    :type computer_name_prefix: str
+    :param admin_username: Specifies the name of the administrator account.
+     <br><br> **Windows-only restriction:** Cannot end in "." <br><br>
+     **Disallowed values:** "administrator", "admin", "user", "user1", "test",
+     "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm",
+     "admin2", "aspnet", "backup", "console", "david", "guest", "john",
+     "owner", "root", "server", "sql", "support", "support_388945a0", "sys",
+     "test2", "test3", "user4", "user5". <br><br> **Minimum-length (Linux):** 1
+     character <br><br> **Max-length (Linux):** 64 characters <br><br>
+     **Max-length (Windows):** 20 characters  <br><br><li> For root access to
+     the Linux VM, see [Using root privileges on Linux virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-use-root-privileges?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)<br><li>
+     For a list of built-in system users on Linux that should not be used in
+     this field, see [Selecting User Names for Linux on
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-usernames?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    :type admin_username: str
+    :param admin_password: Specifies the password of the administrator
+     account. <br><br> **Minimum-length (Windows):** 8 characters <br><br>
+     **Minimum-length (Linux):** 6 characters <br><br> **Max-length
+     (Windows):** 123 characters <br><br> **Max-length (Linux):** 72 characters
+     <br><br> **Complexity requirements:** 3 out of 4 conditions below need to
+     be fulfilled <br> Has lower characters <br>Has upper characters <br> Has a
+     digit <br> Has a special character (Regex match [\\W_]) <br><br>
+     **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123",
+     "Pa$$word", "pass@word1", "Password!", "Password1", "Password22",
+     "iloveyou!" <br><br> For resetting the password, see [How to reset the
+     Remote Desktop service or its login password in a Windows
+     VM](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-reset-rdp?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> For resetting root password, see [Manage users, SSH, and check or
+     repair disks on Azure Linux VMs using the VMAccess
+     Extension](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-vmaccess-extension?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#reset-root-password)
+    :type admin_password: str
+    :param custom_data: Specifies a base-64 encoded string of custom data. The
+     base-64 encoded string is decoded to a binary array that is saved as a
+     file on the Virtual Machine. The maximum length of the binary array is
+     65535 bytes. <br><br> For using cloud-init for your VM, see [Using
+     cloud-init to customize a Linux VM during
+     creation](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-cloud-init?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    :type custom_data: str
+    :param windows_configuration: Specifies Windows operating system settings
+     on the virtual machine.
+    :type windows_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.WindowsConfiguration
+    :param linux_configuration: Specifies the Linux operating system settings
+     on the virtual machine. <br><br>For a list of supported Linux
+     distributions, see [Linux on Azure-Endorsed
+     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+     <br><br> For running non-endorsed distributions, see [Information for
+     Non-Endorsed
+     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
+    :type linux_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.LinuxConfiguration
+    :param secrets: Specifies set of certificates that should be installed
+     onto the virtual machines in the scale set.
+    :type secrets:
+     list[~azure.mgmt.compute.v2018_04_01.models.VaultSecretGroup]
+    """
+
+    _attribute_map = {
+        'computer_name_prefix': {'key': 'computerNamePrefix', 'type': 'str'},
+        'admin_username': {'key': 'adminUsername', 'type': 'str'},
+        'admin_password': {'key': 'adminPassword', 'type': 'str'},
+        'custom_data': {'key': 'customData', 'type': 'str'},
+        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'WindowsConfiguration'},
+        'linux_configuration': {'key': 'linuxConfiguration', 'type': 'LinuxConfiguration'},
+        'secrets': {'key': 'secrets', 'type': '[VaultSecretGroup]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetOSProfile, self).__init__(**kwargs)
+        self.computer_name_prefix = kwargs.get('computer_name_prefix', None)
+        self.admin_username = kwargs.get('admin_username', None)
+        self.admin_password = kwargs.get('admin_password', None)
+        self.custom_data = kwargs.get('custom_data', None)
+        self.windows_configuration = kwargs.get('windows_configuration', None)
+        self.linux_configuration = kwargs.get('linux_configuration', None)
+        self.secrets = kwargs.get('secrets', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_profile_py3.py
new file mode 100644
index 000000000000..f6f5abf8eb58
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_profile_py3.py
@@ -0,0 +1,97 @@
+# 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 VirtualMachineScaleSetOSProfile(Model):
+    """Describes a virtual machine scale set OS profile.
+
+    :param computer_name_prefix: Specifies the computer name prefix for all of
+     the virtual machines in the scale set. Computer name prefixes must be 1 to
+     15 characters long.
+    :type computer_name_prefix: str
+    :param admin_username: Specifies the name of the administrator account.
+     <br><br> **Windows-only restriction:** Cannot end in "." <br><br>
+     **Disallowed values:** "administrator", "admin", "user", "user1", "test",
+     "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm",
+     "admin2", "aspnet", "backup", "console", "david", "guest", "john",
+     "owner", "root", "server", "sql", "support", "support_388945a0", "sys",
+     "test2", "test3", "user4", "user5". <br><br> **Minimum-length (Linux):** 1
+     character <br><br> **Max-length (Linux):** 64 characters <br><br>
+     **Max-length (Windows):** 20 characters  <br><br><li> For root access to
+     the Linux VM, see [Using root privileges on Linux virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-use-root-privileges?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)<br><li>
+     For a list of built-in system users on Linux that should not be used in
+     this field, see [Selecting User Names for Linux on
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-usernames?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    :type admin_username: str
+    :param admin_password: Specifies the password of the administrator
+     account. <br><br> **Minimum-length (Windows):** 8 characters <br><br>
+     **Minimum-length (Linux):** 6 characters <br><br> **Max-length
+     (Windows):** 123 characters <br><br> **Max-length (Linux):** 72 characters
+     <br><br> **Complexity requirements:** 3 out of 4 conditions below need to
+     be fulfilled <br> Has lower characters <br>Has upper characters <br> Has a
+     digit <br> Has a special character (Regex match [\\W_]) <br><br>
+     **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123",
+     "Pa$$word", "pass@word1", "Password!", "Password1", "Password22",
+     "iloveyou!" <br><br> For resetting the password, see [How to reset the
+     Remote Desktop service or its login password in a Windows
+     VM](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-reset-rdp?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> For resetting root password, see [Manage users, SSH, and check or
+     repair disks on Azure Linux VMs using the VMAccess
+     Extension](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-vmaccess-extension?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#reset-root-password)
+    :type admin_password: str
+    :param custom_data: Specifies a base-64 encoded string of custom data. The
+     base-64 encoded string is decoded to a binary array that is saved as a
+     file on the Virtual Machine. The maximum length of the binary array is
+     65535 bytes. <br><br> For using cloud-init for your VM, see [Using
+     cloud-init to customize a Linux VM during
+     creation](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-cloud-init?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    :type custom_data: str
+    :param windows_configuration: Specifies Windows operating system settings
+     on the virtual machine.
+    :type windows_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.WindowsConfiguration
+    :param linux_configuration: Specifies the Linux operating system settings
+     on the virtual machine. <br><br>For a list of supported Linux
+     distributions, see [Linux on Azure-Endorsed
+     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+     <br><br> For running non-endorsed distributions, see [Information for
+     Non-Endorsed
+     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
+    :type linux_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.LinuxConfiguration
+    :param secrets: Specifies set of certificates that should be installed
+     onto the virtual machines in the scale set.
+    :type secrets:
+     list[~azure.mgmt.compute.v2018_04_01.models.VaultSecretGroup]
+    """
+
+    _attribute_map = {
+        'computer_name_prefix': {'key': 'computerNamePrefix', 'type': 'str'},
+        'admin_username': {'key': 'adminUsername', 'type': 'str'},
+        'admin_password': {'key': 'adminPassword', 'type': 'str'},
+        'custom_data': {'key': 'customData', 'type': 'str'},
+        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'WindowsConfiguration'},
+        'linux_configuration': {'key': 'linuxConfiguration', 'type': 'LinuxConfiguration'},
+        'secrets': {'key': 'secrets', 'type': '[VaultSecretGroup]'},
+    }
+
+    def __init__(self, *, computer_name_prefix: str=None, admin_username: str=None, admin_password: str=None, custom_data: str=None, windows_configuration=None, linux_configuration=None, secrets=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetOSProfile, self).__init__(**kwargs)
+        self.computer_name_prefix = computer_name_prefix
+        self.admin_username = admin_username
+        self.admin_password = admin_password
+        self.custom_data = custom_data
+        self.windows_configuration = windows_configuration
+        self.linux_configuration = linux_configuration
+        self.secrets = secrets
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_paged.py
new file mode 100644
index 000000000000..5492e1f69e53
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_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 VirtualMachineScaleSetPaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`VirtualMachineScaleSet <azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSet>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[VirtualMachineScaleSet]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(VirtualMachineScaleSetPaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration.py
new file mode 100644
index 000000000000..373b43a6af6d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration.py
@@ -0,0 +1,50 @@
+# 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 VirtualMachineScaleSetPublicIPAddressConfiguration(Model):
+    """Describes a virtual machines scale set IP Configuration's PublicIPAddress
+    configuration.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: Required. The publicIP address configuration name.
+    :type name: str
+    :param idle_timeout_in_minutes: The idle timeout of the public IP address.
+    :type idle_timeout_in_minutes: int
+    :param dns_settings: The dns settings to be applied on the publicIP
+     addresses .
+    :type dns_settings:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings
+    :param ip_tags: The list of IP tags associated with the public IP address.
+    :type ip_tags:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetIpTag]
+    """
+
+    _validation = {
+        'name': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'idle_timeout_in_minutes': {'key': 'properties.idleTimeoutInMinutes', 'type': 'int'},
+        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings'},
+        'ip_tags': {'key': 'properties.ipTags', 'type': '[VirtualMachineScaleSetIpTag]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetPublicIPAddressConfiguration, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings.py
new file mode 100644
index 000000000000..2fe562244372
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings.py
@@ -0,0 +1,37 @@
+# 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 VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings(Model):
+    """Describes a virtual machines scale sets network configuration's DNS
+    settings.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param domain_name_label: Required. The Domain name label.The
+     concatenation of the domain name label and vm index will be the domain
+     name labels of the PublicIPAddress resources that will be created
+    :type domain_name_label: str
+    """
+
+    _validation = {
+        'domain_name_label': {'required': True},
+    }
+
+    _attribute_map = {
+        'domain_name_label': {'key': 'domainNameLabel', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings, self).__init__(**kwargs)
+        self.domain_name_label = kwargs.get('domain_name_label', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings_py3.py
new file mode 100644
index 000000000000..326a36708ff4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings_py3.py
@@ -0,0 +1,37 @@
+# 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 VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings(Model):
+    """Describes a virtual machines scale sets network configuration's DNS
+    settings.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param domain_name_label: Required. The Domain name label.The
+     concatenation of the domain name label and vm index will be the domain
+     name labels of the PublicIPAddress resources that will be created
+    :type domain_name_label: str
+    """
+
+    _validation = {
+        'domain_name_label': {'required': True},
+    }
+
+    _attribute_map = {
+        'domain_name_label': {'key': 'domainNameLabel', 'type': 'str'},
+    }
+
+    def __init__(self, *, domain_name_label: str, **kwargs) -> None:
+        super(VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings, self).__init__(**kwargs)
+        self.domain_name_label = domain_name_label
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_py3.py
new file mode 100644
index 000000000000..76a82b78db87
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_public_ip_address_configuration_py3.py
@@ -0,0 +1,50 @@
+# 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 VirtualMachineScaleSetPublicIPAddressConfiguration(Model):
+    """Describes a virtual machines scale set IP Configuration's PublicIPAddress
+    configuration.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: Required. The publicIP address configuration name.
+    :type name: str
+    :param idle_timeout_in_minutes: The idle timeout of the public IP address.
+    :type idle_timeout_in_minutes: int
+    :param dns_settings: The dns settings to be applied on the publicIP
+     addresses .
+    :type dns_settings:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings
+    :param ip_tags: The list of IP tags associated with the public IP address.
+    :type ip_tags:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetIpTag]
+    """
+
+    _validation = {
+        'name': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'idle_timeout_in_minutes': {'key': 'properties.idleTimeoutInMinutes', 'type': 'int'},
+        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings'},
+        'ip_tags': {'key': 'properties.ipTags', 'type': '[VirtualMachineScaleSetIpTag]'},
+    }
+
+    def __init__(self, *, name: str, idle_timeout_in_minutes: int=None, dns_settings=None, ip_tags=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
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_py3.py
new file mode 100644
index 000000000000..a618d08a4ee6
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_py3.py
@@ -0,0 +1,116 @@
+# 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 VirtualMachineScaleSet(Resource):
+    """Describes a Virtual Machine Scale Set.
+
+    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]
+    :param sku: The virtual machine scale set sku.
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
+    :param plan: Specifies information about the marketplace image used to
+     create the virtual machine. This element is only used for marketplace
+     images. Before you can use a marketplace image from an API, you must
+     enable the image for programmatic use.  In the Azure portal, find the
+     marketplace image that you want to use and then click **Want to deploy
+     programmatically, Get Started ->**. Enter any required information and
+     then click **Save**.
+    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
+    :param upgrade_policy: The upgrade policy.
+    :type upgrade_policy: ~azure.mgmt.compute.v2018_04_01.models.UpgradePolicy
+    :param virtual_machine_profile: The virtual machine profile.
+    :type virtual_machine_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVMProfile
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :param overprovision: Specifies whether the Virtual Machine Scale Set
+     should be overprovisioned.
+    :type overprovision: bool
+    :ivar unique_id: Specifies the ID which uniquely identifies a Virtual
+     Machine Scale Set.
+    :vartype unique_id: str
+    :param single_placement_group: When true this limits the scale set to a
+     single placement group, of max size 100 virtual machines.
+    :type single_placement_group: bool
+    :param zone_balance: Whether to force stictly even Virtual Machine
+     distribution cross x-zones in case there is zone outage.
+    :type zone_balance: bool
+    :param platform_fault_domain_count: Fault Domain count for each placement
+     group.
+    :type platform_fault_domain_count: int
+    :param identity: The identity of the virtual machine scale set, if
+     configured.
+    :type identity:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetIdentity
+    :param zones: The virtual machine scale set zones.
+    :type zones: list[str]
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'provisioning_state': {'readonly': True},
+        'unique_id': {'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}'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'upgrade_policy': {'key': 'properties.upgradePolicy', 'type': 'UpgradePolicy'},
+        'virtual_machine_profile': {'key': 'properties.virtualMachineProfile', 'type': 'VirtualMachineScaleSetVMProfile'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'overprovision': {'key': 'properties.overprovision', 'type': 'bool'},
+        'unique_id': {'key': 'properties.uniqueId', 'type': 'str'},
+        'single_placement_group': {'key': 'properties.singlePlacementGroup', 'type': 'bool'},
+        'zone_balance': {'key': 'properties.zoneBalance', 'type': 'bool'},
+        'platform_fault_domain_count': {'key': 'properties.platformFaultDomainCount', 'type': 'int'},
+        'identity': {'key': 'identity', 'type': 'VirtualMachineScaleSetIdentity'},
+        'zones': {'key': 'zones', 'type': '[str]'},
+    }
+
+    def __init__(self, *, location: str, tags=None, sku=None, plan=None, upgrade_policy=None, virtual_machine_profile=None, overprovision: bool=None, single_placement_group: bool=None, zone_balance: bool=None, platform_fault_domain_count: int=None, identity=None, zones=None, **kwargs) -> None:
+        super(VirtualMachineScaleSet, self).__init__(location=location, tags=tags, **kwargs)
+        self.sku = sku
+        self.plan = plan
+        self.upgrade_policy = upgrade_policy
+        self.virtual_machine_profile = virtual_machine_profile
+        self.provisioning_state = None
+        self.overprovision = overprovision
+        self.unique_id = None
+        self.single_placement_group = single_placement_group
+        self.zone_balance = zone_balance
+        self.platform_fault_domain_count = platform_fault_domain_count
+        self.identity = identity
+        self.zones = zones
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku.py
new file mode 100644
index 000000000000..3c601b81ecda
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku.py
@@ -0,0 +1,46 @@
+# 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 VirtualMachineScaleSetSku(Model):
+    """Describes an available virtual machine scale set sku.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar resource_type: The type of resource the sku applies to.
+    :vartype resource_type: str
+    :ivar sku: The Sku.
+    :vartype sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
+    :ivar capacity: Specifies the number of virtual machines in the scale set.
+    :vartype capacity:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetSkuCapacity
+    """
+
+    _validation = {
+        'resource_type': {'readonly': True},
+        'sku': {'readonly': True},
+        'capacity': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'resource_type': {'key': 'resourceType', 'type': 'str'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+        'capacity': {'key': 'capacity', 'type': 'VirtualMachineScaleSetSkuCapacity'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetSku, self).__init__(**kwargs)
+        self.resource_type = None
+        self.sku = None
+        self.capacity = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_capacity.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_capacity.py
new file mode 100644
index 000000000000..a54bfd2b20b1
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_capacity.py
@@ -0,0 +1,52 @@
+# 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 VirtualMachineScaleSetSkuCapacity(Model):
+    """Describes scaling information of a sku.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar minimum: The minimum capacity.
+    :vartype minimum: long
+    :ivar maximum: The maximum capacity that can be set.
+    :vartype maximum: long
+    :ivar default_capacity: The default capacity.
+    :vartype default_capacity: long
+    :ivar scale_type: The scale type applicable to the sku. Possible values
+     include: 'Automatic', 'None'
+    :vartype scale_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetSkuScaleType
+    """
+
+    _validation = {
+        'minimum': {'readonly': True},
+        'maximum': {'readonly': True},
+        'default_capacity': {'readonly': True},
+        'scale_type': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'minimum': {'key': 'minimum', 'type': 'long'},
+        'maximum': {'key': 'maximum', 'type': 'long'},
+        'default_capacity': {'key': 'defaultCapacity', 'type': 'long'},
+        'scale_type': {'key': 'scaleType', 'type': 'VirtualMachineScaleSetSkuScaleType'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetSkuCapacity, self).__init__(**kwargs)
+        self.minimum = None
+        self.maximum = None
+        self.default_capacity = None
+        self.scale_type = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_capacity_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_capacity_py3.py
new file mode 100644
index 000000000000..e3906808d039
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_capacity_py3.py
@@ -0,0 +1,52 @@
+# 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 VirtualMachineScaleSetSkuCapacity(Model):
+    """Describes scaling information of a sku.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar minimum: The minimum capacity.
+    :vartype minimum: long
+    :ivar maximum: The maximum capacity that can be set.
+    :vartype maximum: long
+    :ivar default_capacity: The default capacity.
+    :vartype default_capacity: long
+    :ivar scale_type: The scale type applicable to the sku. Possible values
+     include: 'Automatic', 'None'
+    :vartype scale_type: str or
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetSkuScaleType
+    """
+
+    _validation = {
+        'minimum': {'readonly': True},
+        'maximum': {'readonly': True},
+        'default_capacity': {'readonly': True},
+        'scale_type': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'minimum': {'key': 'minimum', 'type': 'long'},
+        'maximum': {'key': 'maximum', 'type': 'long'},
+        'default_capacity': {'key': 'defaultCapacity', 'type': 'long'},
+        'scale_type': {'key': 'scaleType', 'type': 'VirtualMachineScaleSetSkuScaleType'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(VirtualMachineScaleSetSkuCapacity, self).__init__(**kwargs)
+        self.minimum = None
+        self.maximum = None
+        self.default_capacity = None
+        self.scale_type = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_paged.py
new file mode 100644
index 000000000000..e4ea6350b52c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_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 VirtualMachineScaleSetSkuPaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`VirtualMachineScaleSetSku <azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetSku>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[VirtualMachineScaleSetSku]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(VirtualMachineScaleSetSkuPaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_py3.py
new file mode 100644
index 000000000000..2c0303850bc0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_sku_py3.py
@@ -0,0 +1,46 @@
+# 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 VirtualMachineScaleSetSku(Model):
+    """Describes an available virtual machine scale set sku.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar resource_type: The type of resource the sku applies to.
+    :vartype resource_type: str
+    :ivar sku: The Sku.
+    :vartype sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
+    :ivar capacity: Specifies the number of virtual machines in the scale set.
+    :vartype capacity:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetSkuCapacity
+    """
+
+    _validation = {
+        'resource_type': {'readonly': True},
+        'sku': {'readonly': True},
+        'capacity': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'resource_type': {'key': 'resourceType', 'type': 'str'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+        'capacity': {'key': 'capacity', 'type': 'VirtualMachineScaleSetSkuCapacity'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(VirtualMachineScaleSetSku, self).__init__(**kwargs)
+        self.resource_type = None
+        self.sku = None
+        self.capacity = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_storage_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_storage_profile.py
new file mode 100644
index 000000000000..c80219cb987d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_storage_profile.py
@@ -0,0 +1,49 @@
+# 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 VirtualMachineScaleSetStorageProfile(Model):
+    """Describes a virtual machine scale set storage profile.
+
+    :param image_reference: Specifies information about the image to use. You
+     can specify information about platform images, marketplace images, or
+     virtual machine images. This element is required when you want to use a
+     platform image, marketplace image, or virtual machine image, but is not
+     used in other creation operations.
+    :type image_reference:
+     ~azure.mgmt.compute.v2018_04_01.models.ImageReference
+    :param os_disk: Specifies information about the operating system disk used
+     by the virtual machines in the scale set. <br><br> For more information
+     about disks, see [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type os_disk:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetOSDisk
+    :param data_disks: Specifies the parameters that are used to add data
+     disks to the virtual machines in the scale set. <br><br> For more
+     information about disks, see [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type data_disks:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetDataDisk]
+    """
+
+    _attribute_map = {
+        'image_reference': {'key': 'imageReference', 'type': 'ImageReference'},
+        'os_disk': {'key': 'osDisk', 'type': 'VirtualMachineScaleSetOSDisk'},
+        'data_disks': {'key': 'dataDisks', 'type': '[VirtualMachineScaleSetDataDisk]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetStorageProfile, self).__init__(**kwargs)
+        self.image_reference = kwargs.get('image_reference', None)
+        self.os_disk = kwargs.get('os_disk', None)
+        self.data_disks = kwargs.get('data_disks', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_storage_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_storage_profile_py3.py
new file mode 100644
index 000000000000..e10ef0ecaed2
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_storage_profile_py3.py
@@ -0,0 +1,49 @@
+# 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 VirtualMachineScaleSetStorageProfile(Model):
+    """Describes a virtual machine scale set storage profile.
+
+    :param image_reference: Specifies information about the image to use. You
+     can specify information about platform images, marketplace images, or
+     virtual machine images. This element is required when you want to use a
+     platform image, marketplace image, or virtual machine image, but is not
+     used in other creation operations.
+    :type image_reference:
+     ~azure.mgmt.compute.v2018_04_01.models.ImageReference
+    :param os_disk: Specifies information about the operating system disk used
+     by the virtual machines in the scale set. <br><br> For more information
+     about disks, see [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type os_disk:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetOSDisk
+    :param data_disks: Specifies the parameters that are used to add data
+     disks to the virtual machines in the scale set. <br><br> For more
+     information about disks, see [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type data_disks:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetDataDisk]
+    """
+
+    _attribute_map = {
+        'image_reference': {'key': 'imageReference', 'type': 'ImageReference'},
+        'os_disk': {'key': 'osDisk', 'type': 'VirtualMachineScaleSetOSDisk'},
+        'data_disks': {'key': 'dataDisks', 'type': '[VirtualMachineScaleSetDataDisk]'},
+    }
+
+    def __init__(self, *, image_reference=None, os_disk=None, data_disks=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetStorageProfile, self).__init__(**kwargs)
+        self.image_reference = image_reference
+        self.os_disk = os_disk
+        self.data_disks = data_disks
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update.py
new file mode 100644
index 000000000000..150098be5e3a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update.py
@@ -0,0 +1,61 @@
+# 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 .update_resource import UpdateResource
+
+
+class VirtualMachineScaleSetUpdate(UpdateResource):
+    """Describes a Virtual Machine Scale Set.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param sku: The virtual machine scale set sku.
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
+    :param plan: The purchase plan when deploying a virtual machine scale set
+     from VM Marketplace images.
+    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
+    :param upgrade_policy: The upgrade policy.
+    :type upgrade_policy: ~azure.mgmt.compute.v2018_04_01.models.UpgradePolicy
+    :param virtual_machine_profile: The virtual machine profile.
+    :type virtual_machine_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateVMProfile
+    :param overprovision: Specifies whether the Virtual Machine Scale Set
+     should be overprovisioned.
+    :type overprovision: bool
+    :param single_placement_group: When true this limits the scale set to a
+     single placement group, of max size 100 virtual machines.
+    :type single_placement_group: bool
+    :param identity: The identity of the virtual machine scale set, if
+     configured.
+    :type identity:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetIdentity
+    """
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'upgrade_policy': {'key': 'properties.upgradePolicy', 'type': 'UpgradePolicy'},
+        'virtual_machine_profile': {'key': 'properties.virtualMachineProfile', 'type': 'VirtualMachineScaleSetUpdateVMProfile'},
+        'overprovision': {'key': 'properties.overprovision', 'type': 'bool'},
+        'single_placement_group': {'key': 'properties.singlePlacementGroup', 'type': 'bool'},
+        'identity': {'key': 'identity', 'type': 'VirtualMachineScaleSetIdentity'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetUpdate, self).__init__(**kwargs)
+        self.sku = kwargs.get('sku', None)
+        self.plan = kwargs.get('plan', None)
+        self.upgrade_policy = kwargs.get('upgrade_policy', None)
+        self.virtual_machine_profile = kwargs.get('virtual_machine_profile', None)
+        self.overprovision = kwargs.get('overprovision', None)
+        self.single_placement_group = kwargs.get('single_placement_group', None)
+        self.identity = kwargs.get('identity', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_ip_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_ip_configuration.py
new file mode 100644
index 000000000000..6b71a481c5a0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_ip_configuration.py
@@ -0,0 +1,71 @@
+# 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 .sub_resource import SubResource
+
+
+class VirtualMachineScaleSetUpdateIPConfiguration(SubResource):
+    """Describes a virtual machine scale set network profile's IP configuration.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: The IP configuration name.
+    :type name: str
+    :param subnet: The subnet.
+    :type subnet: ~azure.mgmt.compute.v2018_04_01.models.ApiEntityReference
+    :param primary: Specifies the primary IP Configuration in case the network
+     interface has more than one IP Configuration.
+    :type primary: bool
+    :param public_ip_address_configuration: The publicIPAddressConfiguration.
+    :type public_ip_address_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdatePublicIPAddressConfiguration
+    :param private_ip_address_version: Available from Api-Version 2017-03-30
+     onwards, it represents whether the specific ipconfiguration is IPv4 or
+     IPv6. Default is taken as IPv4.  Possible values are: 'IPv4' and 'IPv6'.
+     Possible values include: 'IPv4', 'IPv6'
+    :type private_ip_address_version: str or
+     ~azure.mgmt.compute.v2018_04_01.models.IPVersion
+    :param application_gateway_backend_address_pools: The application gateway
+     backend address pools.
+    :type application_gateway_backend_address_pools:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    :param load_balancer_backend_address_pools: The load balancer backend
+     address pools.
+    :type load_balancer_backend_address_pools:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    :param load_balancer_inbound_nat_pools: The load balancer inbound nat
+     pools.
+    :type load_balancer_inbound_nat_pools:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'subnet': {'key': 'properties.subnet', 'type': 'ApiEntityReference'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+        'public_ip_address_configuration': {'key': 'properties.publicIPAddressConfiguration', 'type': 'VirtualMachineScaleSetUpdatePublicIPAddressConfiguration'},
+        'private_ip_address_version': {'key': 'properties.privateIPAddressVersion', 'type': 'str'},
+        'application_gateway_backend_address_pools': {'key': 'properties.applicationGatewayBackendAddressPools', 'type': '[SubResource]'},
+        'load_balancer_backend_address_pools': {'key': 'properties.loadBalancerBackendAddressPools', 'type': '[SubResource]'},
+        'load_balancer_inbound_nat_pools': {'key': 'properties.loadBalancerInboundNatPools', 'type': '[SubResource]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetUpdateIPConfiguration, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.subnet = kwargs.get('subnet', None)
+        self.primary = kwargs.get('primary', None)
+        self.public_ip_address_configuration = kwargs.get('public_ip_address_configuration', None)
+        self.private_ip_address_version = kwargs.get('private_ip_address_version', None)
+        self.application_gateway_backend_address_pools = kwargs.get('application_gateway_backend_address_pools', None)
+        self.load_balancer_backend_address_pools = kwargs.get('load_balancer_backend_address_pools', None)
+        self.load_balancer_inbound_nat_pools = kwargs.get('load_balancer_inbound_nat_pools', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_ip_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_ip_configuration_py3.py
new file mode 100644
index 000000000000..25a443480dba
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_ip_configuration_py3.py
@@ -0,0 +1,71 @@
+# 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 .sub_resource_py3 import SubResource
+
+
+class VirtualMachineScaleSetUpdateIPConfiguration(SubResource):
+    """Describes a virtual machine scale set network profile's IP configuration.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: The IP configuration name.
+    :type name: str
+    :param subnet: The subnet.
+    :type subnet: ~azure.mgmt.compute.v2018_04_01.models.ApiEntityReference
+    :param primary: Specifies the primary IP Configuration in case the network
+     interface has more than one IP Configuration.
+    :type primary: bool
+    :param public_ip_address_configuration: The publicIPAddressConfiguration.
+    :type public_ip_address_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdatePublicIPAddressConfiguration
+    :param private_ip_address_version: Available from Api-Version 2017-03-30
+     onwards, it represents whether the specific ipconfiguration is IPv4 or
+     IPv6. Default is taken as IPv4.  Possible values are: 'IPv4' and 'IPv6'.
+     Possible values include: 'IPv4', 'IPv6'
+    :type private_ip_address_version: str or
+     ~azure.mgmt.compute.v2018_04_01.models.IPVersion
+    :param application_gateway_backend_address_pools: The application gateway
+     backend address pools.
+    :type application_gateway_backend_address_pools:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    :param load_balancer_backend_address_pools: The load balancer backend
+     address pools.
+    :type load_balancer_backend_address_pools:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    :param load_balancer_inbound_nat_pools: The load balancer inbound nat
+     pools.
+    :type load_balancer_inbound_nat_pools:
+     list[~azure.mgmt.compute.v2018_04_01.models.SubResource]
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'subnet': {'key': 'properties.subnet', 'type': 'ApiEntityReference'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+        'public_ip_address_configuration': {'key': 'properties.publicIPAddressConfiguration', 'type': 'VirtualMachineScaleSetUpdatePublicIPAddressConfiguration'},
+        'private_ip_address_version': {'key': 'properties.privateIPAddressVersion', 'type': 'str'},
+        'application_gateway_backend_address_pools': {'key': 'properties.applicationGatewayBackendAddressPools', 'type': '[SubResource]'},
+        'load_balancer_backend_address_pools': {'key': 'properties.loadBalancerBackendAddressPools', 'type': '[SubResource]'},
+        'load_balancer_inbound_nat_pools': {'key': 'properties.loadBalancerInboundNatPools', 'type': '[SubResource]'},
+    }
+
+    def __init__(self, *, id: str=None, name: str=None, subnet=None, primary: bool=None, public_ip_address_configuration=None, private_ip_address_version=None, application_gateway_backend_address_pools=None, load_balancer_backend_address_pools=None, load_balancer_inbound_nat_pools=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetUpdateIPConfiguration, self).__init__(id=id, **kwargs)
+        self.name = name
+        self.subnet = subnet
+        self.primary = primary
+        self.public_ip_address_configuration = public_ip_address_configuration
+        self.private_ip_address_version = private_ip_address_version
+        self.application_gateway_backend_address_pools = application_gateway_backend_address_pools
+        self.load_balancer_backend_address_pools = load_balancer_backend_address_pools
+        self.load_balancer_inbound_nat_pools = load_balancer_inbound_nat_pools
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_configuration.py
new file mode 100644
index 000000000000..d0fcbff4ffb9
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_configuration.py
@@ -0,0 +1,61 @@
+# 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 .sub_resource import SubResource
+
+
+class VirtualMachineScaleSetUpdateNetworkConfiguration(SubResource):
+    """Describes a virtual machine scale set network profile's network
+    configurations.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: The network configuration name.
+    :type name: str
+    :param primary: Whether this is a primary NIC on a virtual machine.
+    :type primary: bool
+    :param enable_accelerated_networking: Specifies whether the network
+     interface is accelerated networking-enabled.
+    :type enable_accelerated_networking: bool
+    :param network_security_group: The network security group.
+    :type network_security_group:
+     ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param dns_settings: The dns settings to be applied on the network
+     interfaces.
+    :type dns_settings:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetNetworkConfigurationDnsSettings
+    :param ip_configurations: The virtual machine scale set IP Configuration.
+    :type ip_configurations:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateIPConfiguration]
+    :param enable_ip_forwarding: Whether IP forwarding enabled on this NIC.
+    :type enable_ip_forwarding: bool
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+        'enable_accelerated_networking': {'key': 'properties.enableAcceleratedNetworking', 'type': 'bool'},
+        'network_security_group': {'key': 'properties.networkSecurityGroup', 'type': 'SubResource'},
+        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetNetworkConfigurationDnsSettings'},
+        'ip_configurations': {'key': 'properties.ipConfigurations', 'type': '[VirtualMachineScaleSetUpdateIPConfiguration]'},
+        'enable_ip_forwarding': {'key': 'properties.enableIPForwarding', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetUpdateNetworkConfiguration, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.primary = kwargs.get('primary', None)
+        self.enable_accelerated_networking = kwargs.get('enable_accelerated_networking', None)
+        self.network_security_group = kwargs.get('network_security_group', None)
+        self.dns_settings = kwargs.get('dns_settings', None)
+        self.ip_configurations = kwargs.get('ip_configurations', None)
+        self.enable_ip_forwarding = kwargs.get('enable_ip_forwarding', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_configuration_py3.py
new file mode 100644
index 000000000000..131729e4532c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_configuration_py3.py
@@ -0,0 +1,61 @@
+# 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 .sub_resource_py3 import SubResource
+
+
+class VirtualMachineScaleSetUpdateNetworkConfiguration(SubResource):
+    """Describes a virtual machine scale set network profile's network
+    configurations.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: The network configuration name.
+    :type name: str
+    :param primary: Whether this is a primary NIC on a virtual machine.
+    :type primary: bool
+    :param enable_accelerated_networking: Specifies whether the network
+     interface is accelerated networking-enabled.
+    :type enable_accelerated_networking: bool
+    :param network_security_group: The network security group.
+    :type network_security_group:
+     ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :param dns_settings: The dns settings to be applied on the network
+     interfaces.
+    :type dns_settings:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetNetworkConfigurationDnsSettings
+    :param ip_configurations: The virtual machine scale set IP Configuration.
+    :type ip_configurations:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateIPConfiguration]
+    :param enable_ip_forwarding: Whether IP forwarding enabled on this NIC.
+    :type enable_ip_forwarding: bool
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+        'enable_accelerated_networking': {'key': 'properties.enableAcceleratedNetworking', 'type': 'bool'},
+        'network_security_group': {'key': 'properties.networkSecurityGroup', 'type': 'SubResource'},
+        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetNetworkConfigurationDnsSettings'},
+        'ip_configurations': {'key': 'properties.ipConfigurations', 'type': '[VirtualMachineScaleSetUpdateIPConfiguration]'},
+        'enable_ip_forwarding': {'key': 'properties.enableIPForwarding', 'type': 'bool'},
+    }
+
+    def __init__(self, *, id: str=None, name: str=None, primary: bool=None, enable_accelerated_networking: bool=None, network_security_group=None, dns_settings=None, ip_configurations=None, enable_ip_forwarding: bool=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetUpdateNetworkConfiguration, self).__init__(id=id, **kwargs)
+        self.name = name
+        self.primary = primary
+        self.enable_accelerated_networking = enable_accelerated_networking
+        self.network_security_group = network_security_group
+        self.dns_settings = dns_settings
+        self.ip_configurations = ip_configurations
+        self.enable_ip_forwarding = enable_ip_forwarding
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_profile.py
new file mode 100644
index 000000000000..cd4f5f839764
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_profile.py
@@ -0,0 +1,30 @@
+# 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 VirtualMachineScaleSetUpdateNetworkProfile(Model):
+    """Describes a virtual machine scale set network profile.
+
+    :param network_interface_configurations: The list of network
+     configurations.
+    :type network_interface_configurations:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateNetworkConfiguration]
+    """
+
+    _attribute_map = {
+        'network_interface_configurations': {'key': 'networkInterfaceConfigurations', 'type': '[VirtualMachineScaleSetUpdateNetworkConfiguration]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetUpdateNetworkProfile, self).__init__(**kwargs)
+        self.network_interface_configurations = kwargs.get('network_interface_configurations', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_profile_py3.py
new file mode 100644
index 000000000000..5dcc3e1dd1f2
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_network_profile_py3.py
@@ -0,0 +1,30 @@
+# 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 VirtualMachineScaleSetUpdateNetworkProfile(Model):
+    """Describes a virtual machine scale set network profile.
+
+    :param network_interface_configurations: The list of network
+     configurations.
+    :type network_interface_configurations:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateNetworkConfiguration]
+    """
+
+    _attribute_map = {
+        'network_interface_configurations': {'key': 'networkInterfaceConfigurations', 'type': '[VirtualMachineScaleSetUpdateNetworkConfiguration]'},
+    }
+
+    def __init__(self, *, network_interface_configurations=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetUpdateNetworkProfile, self).__init__(**kwargs)
+        self.network_interface_configurations = network_interface_configurations
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_disk.py
new file mode 100644
index 000000000000..1f48890ba840
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_disk.py
@@ -0,0 +1,50 @@
+# 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 VirtualMachineScaleSetUpdateOSDisk(Model):
+    """Describes virtual machine scale set operating system disk Update Object.
+    This should be used for Updating VMSS OS Disk.
+
+    :param caching: The caching type. Possible values include: 'None',
+     'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :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.
+    :type image: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
+    :param vhd_containers: The list of virtual hard disk container uris.
+    :type vhd_containers: list[str]
+    :param managed_disk: The managed disk parameters.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetManagedDiskParameters
+    """
+
+    _attribute_map = {
+        'caching': {'key': 'caching', 'type': 'CachingTypes'},
+        'write_accelerator_enabled': {'key': 'writeAcceleratorEnabled', 'type': 'bool'},
+        'image': {'key': 'image', 'type': 'VirtualHardDisk'},
+        'vhd_containers': {'key': 'vhdContainers', 'type': '[str]'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'VirtualMachineScaleSetManagedDiskParameters'},
+    }
+
+    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.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_04_01/models/virtual_machine_scale_set_update_os_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_disk_py3.py
new file mode 100644
index 000000000000..420daf4f2dcf
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_disk_py3.py
@@ -0,0 +1,50 @@
+# 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 VirtualMachineScaleSetUpdateOSDisk(Model):
+    """Describes virtual machine scale set operating system disk Update Object.
+    This should be used for Updating VMSS OS Disk.
+
+    :param caching: The caching type. Possible values include: 'None',
+     'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_04_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :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.
+    :type image: ~azure.mgmt.compute.v2018_04_01.models.VirtualHardDisk
+    :param vhd_containers: The list of virtual hard disk container uris.
+    :type vhd_containers: list[str]
+    :param managed_disk: The managed disk parameters.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetManagedDiskParameters
+    """
+
+    _attribute_map = {
+        'caching': {'key': 'caching', 'type': 'CachingTypes'},
+        'write_accelerator_enabled': {'key': 'writeAcceleratorEnabled', 'type': 'bool'},
+        '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:
+        super(VirtualMachineScaleSetUpdateOSDisk, self).__init__(**kwargs)
+        self.caching = caching
+        self.write_accelerator_enabled = write_accelerator_enabled
+        self.image = image
+        self.vhd_containers = vhd_containers
+        self.managed_disk = managed_disk
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_profile.py
new file mode 100644
index 000000000000..2ebc2b14b292
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_profile.py
@@ -0,0 +1,43 @@
+# 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 VirtualMachineScaleSetUpdateOSProfile(Model):
+    """Describes a virtual machine scale set OS profile.
+
+    :param custom_data: A base-64 encoded string of custom data.
+    :type custom_data: str
+    :param windows_configuration: The Windows Configuration of the OS profile.
+    :type windows_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.WindowsConfiguration
+    :param linux_configuration: The Linux Configuration of the OS profile.
+    :type linux_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.LinuxConfiguration
+    :param secrets: The List of certificates for addition to the VM.
+    :type secrets:
+     list[~azure.mgmt.compute.v2018_04_01.models.VaultSecretGroup]
+    """
+
+    _attribute_map = {
+        'custom_data': {'key': 'customData', 'type': 'str'},
+        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'WindowsConfiguration'},
+        'linux_configuration': {'key': 'linuxConfiguration', 'type': 'LinuxConfiguration'},
+        'secrets': {'key': 'secrets', 'type': '[VaultSecretGroup]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetUpdateOSProfile, self).__init__(**kwargs)
+        self.custom_data = kwargs.get('custom_data', None)
+        self.windows_configuration = kwargs.get('windows_configuration', None)
+        self.linux_configuration = kwargs.get('linux_configuration', None)
+        self.secrets = kwargs.get('secrets', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_profile_py3.py
new file mode 100644
index 000000000000..b54bfc2b563a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_profile_py3.py
@@ -0,0 +1,43 @@
+# 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 VirtualMachineScaleSetUpdateOSProfile(Model):
+    """Describes a virtual machine scale set OS profile.
+
+    :param custom_data: A base-64 encoded string of custom data.
+    :type custom_data: str
+    :param windows_configuration: The Windows Configuration of the OS profile.
+    :type windows_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.WindowsConfiguration
+    :param linux_configuration: The Linux Configuration of the OS profile.
+    :type linux_configuration:
+     ~azure.mgmt.compute.v2018_04_01.models.LinuxConfiguration
+    :param secrets: The List of certificates for addition to the VM.
+    :type secrets:
+     list[~azure.mgmt.compute.v2018_04_01.models.VaultSecretGroup]
+    """
+
+    _attribute_map = {
+        'custom_data': {'key': 'customData', 'type': 'str'},
+        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'WindowsConfiguration'},
+        'linux_configuration': {'key': 'linuxConfiguration', 'type': 'LinuxConfiguration'},
+        'secrets': {'key': 'secrets', 'type': '[VaultSecretGroup]'},
+    }
+
+    def __init__(self, *, custom_data: str=None, windows_configuration=None, linux_configuration=None, secrets=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetUpdateOSProfile, self).__init__(**kwargs)
+        self.custom_data = custom_data
+        self.windows_configuration = windows_configuration
+        self.linux_configuration = linux_configuration
+        self.secrets = secrets
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_public_ip_address_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_public_ip_address_configuration.py
new file mode 100644
index 000000000000..0fc8d8517fcf
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_public_ip_address_configuration.py
@@ -0,0 +1,39 @@
+# 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 VirtualMachineScaleSetUpdatePublicIPAddressConfiguration(Model):
+    """Describes a virtual machines scale set IP Configuration's PublicIPAddress
+    configuration.
+
+    :param name: The publicIP address configuration name.
+    :type name: str
+    :param idle_timeout_in_minutes: The idle timeout of the public IP address.
+    :type idle_timeout_in_minutes: int
+    :param dns_settings: The dns settings to be applied on the publicIP
+     addresses .
+    :type dns_settings:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'idle_timeout_in_minutes': {'key': 'properties.idleTimeoutInMinutes', 'type': 'int'},
+        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetUpdatePublicIPAddressConfiguration, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.idle_timeout_in_minutes = kwargs.get('idle_timeout_in_minutes', None)
+        self.dns_settings = kwargs.get('dns_settings', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_public_ip_address_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_public_ip_address_configuration_py3.py
new file mode 100644
index 000000000000..6675e7831652
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_public_ip_address_configuration_py3.py
@@ -0,0 +1,39 @@
+# 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 VirtualMachineScaleSetUpdatePublicIPAddressConfiguration(Model):
+    """Describes a virtual machines scale set IP Configuration's PublicIPAddress
+    configuration.
+
+    :param name: The publicIP address configuration name.
+    :type name: str
+    :param idle_timeout_in_minutes: The idle timeout of the public IP address.
+    :type idle_timeout_in_minutes: int
+    :param dns_settings: The dns settings to be applied on the publicIP
+     addresses .
+    :type dns_settings:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'idle_timeout_in_minutes': {'key': 'properties.idleTimeoutInMinutes', 'type': 'int'},
+        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings'},
+    }
+
+    def __init__(self, *, name: str=None, idle_timeout_in_minutes: int=None, dns_settings=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetUpdatePublicIPAddressConfiguration, self).__init__(**kwargs)
+        self.name = name
+        self.idle_timeout_in_minutes = idle_timeout_in_minutes
+        self.dns_settings = dns_settings
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_py3.py
new file mode 100644
index 000000000000..48bb74fb1948
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_py3.py
@@ -0,0 +1,61 @@
+# 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 .update_resource_py3 import UpdateResource
+
+
+class VirtualMachineScaleSetUpdate(UpdateResource):
+    """Describes a Virtual Machine Scale Set.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param sku: The virtual machine scale set sku.
+    :type sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
+    :param plan: The purchase plan when deploying a virtual machine scale set
+     from VM Marketplace images.
+    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
+    :param upgrade_policy: The upgrade policy.
+    :type upgrade_policy: ~azure.mgmt.compute.v2018_04_01.models.UpgradePolicy
+    :param virtual_machine_profile: The virtual machine profile.
+    :type virtual_machine_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateVMProfile
+    :param overprovision: Specifies whether the Virtual Machine Scale Set
+     should be overprovisioned.
+    :type overprovision: bool
+    :param single_placement_group: When true this limits the scale set to a
+     single placement group, of max size 100 virtual machines.
+    :type single_placement_group: bool
+    :param identity: The identity of the virtual machine scale set, if
+     configured.
+    :type identity:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetIdentity
+    """
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'upgrade_policy': {'key': 'properties.upgradePolicy', 'type': 'UpgradePolicy'},
+        'virtual_machine_profile': {'key': 'properties.virtualMachineProfile', 'type': 'VirtualMachineScaleSetUpdateVMProfile'},
+        'overprovision': {'key': 'properties.overprovision', 'type': 'bool'},
+        'single_placement_group': {'key': 'properties.singlePlacementGroup', 'type': 'bool'},
+        'identity': {'key': 'identity', 'type': 'VirtualMachineScaleSetIdentity'},
+    }
+
+    def __init__(self, *, tags=None, sku=None, plan=None, upgrade_policy=None, virtual_machine_profile=None, overprovision: bool=None, single_placement_group: bool=None, identity=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetUpdate, self).__init__(tags=tags, **kwargs)
+        self.sku = sku
+        self.plan = plan
+        self.upgrade_policy = upgrade_policy
+        self.virtual_machine_profile = virtual_machine_profile
+        self.overprovision = overprovision
+        self.single_placement_group = single_placement_group
+        self.identity = identity
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_storage_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_storage_profile.py
new file mode 100644
index 000000000000..037ebc157fc8
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_storage_profile.py
@@ -0,0 +1,39 @@
+# 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 VirtualMachineScaleSetUpdateStorageProfile(Model):
+    """Describes a virtual machine scale set storage profile.
+
+    :param image_reference: The image reference.
+    :type image_reference:
+     ~azure.mgmt.compute.v2018_04_01.models.ImageReference
+    :param os_disk: The OS disk.
+    :type os_disk:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateOSDisk
+    :param data_disks: The data disks.
+    :type data_disks:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetDataDisk]
+    """
+
+    _attribute_map = {
+        'image_reference': {'key': 'imageReference', 'type': 'ImageReference'},
+        'os_disk': {'key': 'osDisk', 'type': 'VirtualMachineScaleSetUpdateOSDisk'},
+        'data_disks': {'key': 'dataDisks', 'type': '[VirtualMachineScaleSetDataDisk]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetUpdateStorageProfile, self).__init__(**kwargs)
+        self.image_reference = kwargs.get('image_reference', None)
+        self.os_disk = kwargs.get('os_disk', None)
+        self.data_disks = kwargs.get('data_disks', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_storage_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_storage_profile_py3.py
new file mode 100644
index 000000000000..b442b5196c4e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_storage_profile_py3.py
@@ -0,0 +1,39 @@
+# 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 VirtualMachineScaleSetUpdateStorageProfile(Model):
+    """Describes a virtual machine scale set storage profile.
+
+    :param image_reference: The image reference.
+    :type image_reference:
+     ~azure.mgmt.compute.v2018_04_01.models.ImageReference
+    :param os_disk: The OS disk.
+    :type os_disk:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateOSDisk
+    :param data_disks: The data disks.
+    :type data_disks:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetDataDisk]
+    """
+
+    _attribute_map = {
+        'image_reference': {'key': 'imageReference', 'type': 'ImageReference'},
+        'os_disk': {'key': 'osDisk', 'type': 'VirtualMachineScaleSetUpdateOSDisk'},
+        'data_disks': {'key': 'dataDisks', 'type': '[VirtualMachineScaleSetDataDisk]'},
+    }
+
+    def __init__(self, *, image_reference=None, os_disk=None, data_disks=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetUpdateStorageProfile, self).__init__(**kwargs)
+        self.image_reference = image_reference
+        self.os_disk = os_disk
+        self.data_disks = data_disks
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_vm_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_vm_profile.py
new file mode 100644
index 000000000000..88d5c0c10149
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_vm_profile.py
@@ -0,0 +1,55 @@
+# 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 VirtualMachineScaleSetUpdateVMProfile(Model):
+    """Describes a virtual machine scale set virtual machine profile.
+
+    :param os_profile: The virtual machine scale set OS profile.
+    :type os_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateOSProfile
+    :param storage_profile: The virtual machine scale set storage profile.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateStorageProfile
+    :param network_profile: The virtual machine scale set network profile.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateNetworkProfile
+    :param diagnostics_profile: The virtual machine scale set diagnostics
+     profile.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
+    :param extension_profile: The virtual machine scale set extension profile.
+    :type extension_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtensionProfile
+    :param license_type: The license type, which is for bring your own license
+     scenario.
+    :type license_type: str
+    """
+
+    _attribute_map = {
+        'os_profile': {'key': 'osProfile', 'type': 'VirtualMachineScaleSetUpdateOSProfile'},
+        'storage_profile': {'key': 'storageProfile', 'type': 'VirtualMachineScaleSetUpdateStorageProfile'},
+        'network_profile': {'key': 'networkProfile', 'type': 'VirtualMachineScaleSetUpdateNetworkProfile'},
+        'diagnostics_profile': {'key': 'diagnosticsProfile', 'type': 'DiagnosticsProfile'},
+        'extension_profile': {'key': 'extensionProfile', 'type': 'VirtualMachineScaleSetExtensionProfile'},
+        'license_type': {'key': 'licenseType', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetUpdateVMProfile, self).__init__(**kwargs)
+        self.os_profile = kwargs.get('os_profile', None)
+        self.storage_profile = kwargs.get('storage_profile', 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)
+        self.license_type = kwargs.get('license_type', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_vm_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_vm_profile_py3.py
new file mode 100644
index 000000000000..83cab7cf6fd0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_vm_profile_py3.py
@@ -0,0 +1,55 @@
+# 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 VirtualMachineScaleSetUpdateVMProfile(Model):
+    """Describes a virtual machine scale set virtual machine profile.
+
+    :param os_profile: The virtual machine scale set OS profile.
+    :type os_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateOSProfile
+    :param storage_profile: The virtual machine scale set storage profile.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateStorageProfile
+    :param network_profile: The virtual machine scale set network profile.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdateNetworkProfile
+    :param diagnostics_profile: The virtual machine scale set diagnostics
+     profile.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
+    :param extension_profile: The virtual machine scale set extension profile.
+    :type extension_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtensionProfile
+    :param license_type: The license type, which is for bring your own license
+     scenario.
+    :type license_type: str
+    """
+
+    _attribute_map = {
+        'os_profile': {'key': 'osProfile', 'type': 'VirtualMachineScaleSetUpdateOSProfile'},
+        'storage_profile': {'key': 'storageProfile', 'type': 'VirtualMachineScaleSetUpdateStorageProfile'},
+        'network_profile': {'key': 'networkProfile', 'type': 'VirtualMachineScaleSetUpdateNetworkProfile'},
+        'diagnostics_profile': {'key': 'diagnosticsProfile', 'type': 'DiagnosticsProfile'},
+        'extension_profile': {'key': 'extensionProfile', 'type': 'VirtualMachineScaleSetExtensionProfile'},
+        'license_type': {'key': 'licenseType', 'type': 'str'},
+    }
+
+    def __init__(self, *, os_profile=None, storage_profile=None, network_profile=None, diagnostics_profile=None, extension_profile=None, license_type: str=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetUpdateVMProfile, self).__init__(**kwargs)
+        self.os_profile = os_profile
+        self.storage_profile = storage_profile
+        self.network_profile = network_profile
+        self.diagnostics_profile = diagnostics_profile
+        self.extension_profile = extension_profile
+        self.license_type = license_type
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm.py
new file mode 100644
index 000000000000..204a62f62a0c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm.py
@@ -0,0 +1,155 @@
+# 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 VirtualMachineScaleSetVM(Resource):
+    """Describes a virtual machine scale set virtual machine.
+
+    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 instance_id: The virtual machine instance ID.
+    :vartype instance_id: str
+    :ivar sku: The virtual machine SKU.
+    :vartype sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
+    :ivar latest_model_applied: Specifies whether the latest model has been
+     applied to the virtual machine.
+    :vartype latest_model_applied: bool
+    :ivar vm_id: Azure VM unique ID.
+    :vartype vm_id: str
+    :ivar instance_view: The virtual machine instance view.
+    :vartype instance_view:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineInstanceView
+    :param hardware_profile: Specifies the hardware settings for the virtual
+     machine.
+    :type hardware_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.HardwareProfile
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.StorageProfile
+    :param os_profile: Specifies the operating system settings for the virtual
+     machine.
+    :type os_profile: ~azure.mgmt.compute.v2018_04_01.models.OSProfile
+    :param network_profile: Specifies the network interfaces of the virtual
+     machine.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.NetworkProfile
+    :param diagnostics_profile: Specifies the boot diagnostic settings state.
+     <br><br>Minimum api-version: 2015-06-15.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
+    :param availability_set: Specifies information about the availability set
+     that the virtual machine should be assigned to. Virtual machines specified
+     in the same availability set are allocated to different nodes to maximize
+     availability. For more information about availability sets, see [Manage
+     the availability of virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+     <br><br> For more information on Azure planned maintainance, see [Planned
+     maintenance for virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Currently, a VM can only be added to availability set at creation
+     time. An existing VM cannot be added to an availability set.
+    :type availability_set: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :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:
+     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
+     is included in a request for an update, the value must match the initial
+     value. This value cannot be updated. <br><br> For more information, see
+     [Azure Hybrid Use Benefit for Windows
+     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Minimum api-version: 2015-06-15
+    :type license_type: str
+    :param plan: Specifies information about the marketplace image used to
+     create the virtual machine. This element is only used for marketplace
+     images. Before you can use a marketplace image from an API, you must
+     enable the image for programmatic use.  In the Azure portal, find the
+     marketplace image that you want to use and then click **Want to deploy
+     programmatically, Get Started ->**. Enter any required information and
+     then click **Save**.
+    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
+    :ivar resources: The virtual machine child extension resources.
+    :vartype resources:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'instance_id': {'readonly': True},
+        'sku': {'readonly': True},
+        'latest_model_applied': {'readonly': True},
+        'vm_id': {'readonly': True},
+        'instance_view': {'readonly': True},
+        'provisioning_state': {'readonly': True},
+        'resources': {'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}'},
+        'instance_id': {'key': 'instanceId', 'type': 'str'},
+        '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'},
+        'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
+        'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
+        'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
+        'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'},
+        'availability_set': {'key': 'properties.availabilitySet', 'type': 'SubResource'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'license_type': {'key': 'properties.licenseType', 'type': 'str'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'resources': {'key': 'resources', 'type': '[VirtualMachineExtension]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetVM, self).__init__(**kwargs)
+        self.instance_id = None
+        self.sku = None
+        self.latest_model_applied = None
+        self.vm_id = None
+        self.instance_view = None
+        self.hardware_profile = kwargs.get('hardware_profile', None)
+        self.storage_profile = kwargs.get('storage_profile', 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)
+        self.availability_set = kwargs.get('availability_set', None)
+        self.provisioning_state = None
+        self.license_type = kwargs.get('license_type', None)
+        self.plan = kwargs.get('plan', None)
+        self.resources = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_extensions_summary.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_extensions_summary.py
new file mode 100644
index 000000000000..e9e19adfc1b6
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_extensions_summary.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 VirtualMachineScaleSetVMExtensionsSummary(Model):
+    """Extensions summary for virtual machines of a virtual machine scale set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar name: The extension name.
+    :vartype name: str
+    :ivar statuses_summary: The extensions information.
+    :vartype statuses_summary:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineStatusCodeCount]
+    """
+
+    _validation = {
+        'name': {'readonly': True},
+        'statuses_summary': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'statuses_summary': {'key': 'statusesSummary', 'type': '[VirtualMachineStatusCodeCount]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetVMExtensionsSummary, self).__init__(**kwargs)
+        self.name = None
+        self.statuses_summary = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_extensions_summary_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_extensions_summary_py3.py
new file mode 100644
index 000000000000..c88df418881b
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_extensions_summary_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 VirtualMachineScaleSetVMExtensionsSummary(Model):
+    """Extensions summary for virtual machines of a virtual machine scale set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar name: The extension name.
+    :vartype name: str
+    :ivar statuses_summary: The extensions information.
+    :vartype statuses_summary:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineStatusCodeCount]
+    """
+
+    _validation = {
+        'name': {'readonly': True},
+        'statuses_summary': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'statuses_summary': {'key': 'statusesSummary', 'type': '[VirtualMachineStatusCodeCount]'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(VirtualMachineScaleSetVMExtensionsSummary, self).__init__(**kwargs)
+        self.name = None
+        self.statuses_summary = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_ids.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_ids.py
new file mode 100644
index 000000000000..772c66dad326
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_ids.py
@@ -0,0 +1,30 @@
+# 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 VirtualMachineScaleSetVMInstanceIDs(Model):
+    """Specifies a list of virtual machine instance IDs from the VM scale set.
+
+    :param instance_ids: The virtual machine scale set instance ids. Omitting
+     the virtual machine scale set instance ids will result in the operation
+     being performed on all virtual machines in the virtual machine scale set.
+    :type instance_ids: list[str]
+    """
+
+    _attribute_map = {
+        'instance_ids': {'key': 'instanceIds', 'type': '[str]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetVMInstanceIDs, self).__init__(**kwargs)
+        self.instance_ids = kwargs.get('instance_ids', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_ids_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_ids_py3.py
new file mode 100644
index 000000000000..658a8ccb87d5
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_ids_py3.py
@@ -0,0 +1,30 @@
+# 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 VirtualMachineScaleSetVMInstanceIDs(Model):
+    """Specifies a list of virtual machine instance IDs from the VM scale set.
+
+    :param instance_ids: The virtual machine scale set instance ids. Omitting
+     the virtual machine scale set instance ids will result in the operation
+     being performed on all virtual machines in the virtual machine scale set.
+    :type instance_ids: list[str]
+    """
+
+    _attribute_map = {
+        'instance_ids': {'key': 'instanceIds', 'type': '[str]'},
+    }
+
+    def __init__(self, *, instance_ids=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetVMInstanceIDs, self).__init__(**kwargs)
+        self.instance_ids = instance_ids
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_required_ids.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_required_ids.py
new file mode 100644
index 000000000000..ece250dd4fd4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_required_ids.py
@@ -0,0 +1,34 @@
+# 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 VirtualMachineScaleSetVMInstanceRequiredIDs(Model):
+    """Specifies a list of virtual machine instance IDs from the VM scale set.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param instance_ids: Required. The virtual machine scale set instance ids.
+    :type instance_ids: list[str]
+    """
+
+    _validation = {
+        'instance_ids': {'required': True},
+    }
+
+    _attribute_map = {
+        'instance_ids': {'key': 'instanceIds', 'type': '[str]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetVMInstanceRequiredIDs, self).__init__(**kwargs)
+        self.instance_ids = kwargs.get('instance_ids', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_required_ids_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_required_ids_py3.py
new file mode 100644
index 000000000000..f32c6181467d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_required_ids_py3.py
@@ -0,0 +1,34 @@
+# 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 VirtualMachineScaleSetVMInstanceRequiredIDs(Model):
+    """Specifies a list of virtual machine instance IDs from the VM scale set.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param instance_ids: Required. The virtual machine scale set instance ids.
+    :type instance_ids: list[str]
+    """
+
+    _validation = {
+        'instance_ids': {'required': True},
+    }
+
+    _attribute_map = {
+        'instance_ids': {'key': 'instanceIds', 'type': '[str]'},
+    }
+
+    def __init__(self, *, instance_ids, **kwargs) -> None:
+        super(VirtualMachineScaleSetVMInstanceRequiredIDs, self).__init__(**kwargs)
+        self.instance_ids = instance_ids
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_view.py
new file mode 100644
index 000000000000..46c835c4dfd5
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_view.py
@@ -0,0 +1,87 @@
+# 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 VirtualMachineScaleSetVMInstanceView(Model):
+    """The instance view of a virtual machine scale set VM.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param platform_update_domain: The Update Domain count.
+    :type platform_update_domain: int
+    :param platform_fault_domain: The Fault Domain count.
+    :type platform_fault_domain: int
+    :param rdp_thumb_print: The Remote desktop certificate thumbprint.
+    :type rdp_thumb_print: str
+    :param vm_agent: The VM Agent running on the virtual machine.
+    :type vm_agent:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineAgentInstanceView
+    :param maintenance_redeploy_status: The Maintenance Operation status on
+     the virtual machine.
+    :type maintenance_redeploy_status:
+     ~azure.mgmt.compute.v2018_04_01.models.MaintenanceRedeployStatus
+    :param disks: The disks information.
+    :type disks: list[~azure.mgmt.compute.v2018_04_01.models.DiskInstanceView]
+    :param extensions: The extensions information.
+    :type extensions:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionInstanceView]
+    :ivar vm_health: The health status for the VM.
+    :vartype vm_health:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineHealthStatus
+    :param boot_diagnostics: Boot Diagnostics is a debugging feature which
+     allows you to view Console Output and Screenshot to diagnose VM status.
+     <br><br> For Linux Virtual Machines, you can easily view the output of
+     your console log. <br><br> For both Windows and Linux virtual machines,
+     Azure also enables you to see a screenshot of the VM from the hypervisor.
+    :type boot_diagnostics:
+     ~azure.mgmt.compute.v2018_04_01.models.BootDiagnosticsInstanceView
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    :param placement_group_id: The placement group in which the VM is running.
+     If the VM is deallocated it will not have a placementGroupId.
+    :type placement_group_id: str
+    """
+
+    _validation = {
+        'vm_health': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'platform_update_domain': {'key': 'platformUpdateDomain', 'type': 'int'},
+        'platform_fault_domain': {'key': 'platformFaultDomain', 'type': 'int'},
+        'rdp_thumb_print': {'key': 'rdpThumbPrint', 'type': 'str'},
+        'vm_agent': {'key': 'vmAgent', 'type': 'VirtualMachineAgentInstanceView'},
+        'maintenance_redeploy_status': {'key': 'maintenanceRedeployStatus', 'type': 'MaintenanceRedeployStatus'},
+        'disks': {'key': 'disks', 'type': '[DiskInstanceView]'},
+        'extensions': {'key': 'extensions', 'type': '[VirtualMachineExtensionInstanceView]'},
+        'vm_health': {'key': 'vmHealth', 'type': 'VirtualMachineHealthStatus'},
+        'boot_diagnostics': {'key': 'bootDiagnostics', 'type': 'BootDiagnosticsInstanceView'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+        'placement_group_id': {'key': 'placementGroupId', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetVMInstanceView, self).__init__(**kwargs)
+        self.platform_update_domain = kwargs.get('platform_update_domain', None)
+        self.platform_fault_domain = kwargs.get('platform_fault_domain', None)
+        self.rdp_thumb_print = kwargs.get('rdp_thumb_print', None)
+        self.vm_agent = kwargs.get('vm_agent', None)
+        self.maintenance_redeploy_status = kwargs.get('maintenance_redeploy_status', None)
+        self.disks = kwargs.get('disks', None)
+        self.extensions = kwargs.get('extensions', None)
+        self.vm_health = None
+        self.boot_diagnostics = kwargs.get('boot_diagnostics', None)
+        self.statuses = kwargs.get('statuses', None)
+        self.placement_group_id = kwargs.get('placement_group_id', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_view_py3.py
new file mode 100644
index 000000000000..6854c21d4706
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_instance_view_py3.py
@@ -0,0 +1,87 @@
+# 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 VirtualMachineScaleSetVMInstanceView(Model):
+    """The instance view of a virtual machine scale set VM.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param platform_update_domain: The Update Domain count.
+    :type platform_update_domain: int
+    :param platform_fault_domain: The Fault Domain count.
+    :type platform_fault_domain: int
+    :param rdp_thumb_print: The Remote desktop certificate thumbprint.
+    :type rdp_thumb_print: str
+    :param vm_agent: The VM Agent running on the virtual machine.
+    :type vm_agent:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineAgentInstanceView
+    :param maintenance_redeploy_status: The Maintenance Operation status on
+     the virtual machine.
+    :type maintenance_redeploy_status:
+     ~azure.mgmt.compute.v2018_04_01.models.MaintenanceRedeployStatus
+    :param disks: The disks information.
+    :type disks: list[~azure.mgmt.compute.v2018_04_01.models.DiskInstanceView]
+    :param extensions: The extensions information.
+    :type extensions:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionInstanceView]
+    :ivar vm_health: The health status for the VM.
+    :vartype vm_health:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineHealthStatus
+    :param boot_diagnostics: Boot Diagnostics is a debugging feature which
+     allows you to view Console Output and Screenshot to diagnose VM status.
+     <br><br> For Linux Virtual Machines, you can easily view the output of
+     your console log. <br><br> For both Windows and Linux virtual machines,
+     Azure also enables you to see a screenshot of the VM from the hypervisor.
+    :type boot_diagnostics:
+     ~azure.mgmt.compute.v2018_04_01.models.BootDiagnosticsInstanceView
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
+    :param placement_group_id: The placement group in which the VM is running.
+     If the VM is deallocated it will not have a placementGroupId.
+    :type placement_group_id: str
+    """
+
+    _validation = {
+        'vm_health': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'platform_update_domain': {'key': 'platformUpdateDomain', 'type': 'int'},
+        'platform_fault_domain': {'key': 'platformFaultDomain', 'type': 'int'},
+        'rdp_thumb_print': {'key': 'rdpThumbPrint', 'type': 'str'},
+        'vm_agent': {'key': 'vmAgent', 'type': 'VirtualMachineAgentInstanceView'},
+        'maintenance_redeploy_status': {'key': 'maintenanceRedeployStatus', 'type': 'MaintenanceRedeployStatus'},
+        'disks': {'key': 'disks', 'type': '[DiskInstanceView]'},
+        'extensions': {'key': 'extensions', 'type': '[VirtualMachineExtensionInstanceView]'},
+        'vm_health': {'key': 'vmHealth', 'type': 'VirtualMachineHealthStatus'},
+        'boot_diagnostics': {'key': 'bootDiagnostics', 'type': 'BootDiagnosticsInstanceView'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+        'placement_group_id': {'key': 'placementGroupId', 'type': 'str'},
+    }
+
+    def __init__(self, *, platform_update_domain: int=None, platform_fault_domain: int=None, rdp_thumb_print: str=None, vm_agent=None, maintenance_redeploy_status=None, disks=None, extensions=None, boot_diagnostics=None, statuses=None, placement_group_id: str=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetVMInstanceView, self).__init__(**kwargs)
+        self.platform_update_domain = platform_update_domain
+        self.platform_fault_domain = platform_fault_domain
+        self.rdp_thumb_print = rdp_thumb_print
+        self.vm_agent = vm_agent
+        self.maintenance_redeploy_status = maintenance_redeploy_status
+        self.disks = disks
+        self.extensions = extensions
+        self.vm_health = None
+        self.boot_diagnostics = boot_diagnostics
+        self.statuses = statuses
+        self.placement_group_id = placement_group_id
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_paged.py
new file mode 100644
index 000000000000..52a46c26fd23
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_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 VirtualMachineScaleSetVMPaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`VirtualMachineScaleSetVM <azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVM>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[VirtualMachineScaleSetVM]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(VirtualMachineScaleSetVMPaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_profile.py
new file mode 100644
index 000000000000..177efbb43373
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_profile.py
@@ -0,0 +1,80 @@
+# 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 VirtualMachineScaleSetVMProfile(Model):
+    """Describes a virtual machine scale set virtual machine profile.
+
+    :param os_profile: Specifies the operating system settings for the virtual
+     machines in the scale set.
+    :type os_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetOSProfile
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetStorageProfile
+    :param network_profile: Specifies properties of the network interfaces of
+     the virtual machines in the scale set.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetNetworkProfile
+    :param diagnostics_profile: Specifies the boot diagnostic settings state.
+     <br><br>Minimum api-version: 2015-06-15.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
+    :param extension_profile: Specifies a collection of settings for
+     extensions installed on virtual machines in the scale set.
+    :type extension_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtensionProfile
+    :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:
+     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
+     is included in a request for an update, the value must match the initial
+     value. This value cannot be updated. <br><br> For more information, see
+     [Azure Hybrid Use Benefit for Windows
+     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Minimum api-version: 2015-06-15
+    :type license_type: str
+    :param priority: Specifies the priority for the virtual machines in the
+     scale set. <br><br>Minimum api-version: 2017-10-30-preview. Possible
+     values include: 'Regular', 'Low'
+    :type priority: str or
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachinePriorityTypes
+    :param eviction_policy: Specifies the eviction policy for virtual machines
+     in a low priority scale set. <br><br>Minimum api-version:
+     2017-10-30-preview. Possible values include: 'Deallocate', 'Delete'
+    :type eviction_policy: str or
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineEvictionPolicyTypes
+    """
+
+    _attribute_map = {
+        'os_profile': {'key': 'osProfile', 'type': 'VirtualMachineScaleSetOSProfile'},
+        'storage_profile': {'key': 'storageProfile', 'type': 'VirtualMachineScaleSetStorageProfile'},
+        'network_profile': {'key': 'networkProfile', 'type': 'VirtualMachineScaleSetNetworkProfile'},
+        'diagnostics_profile': {'key': 'diagnosticsProfile', 'type': 'DiagnosticsProfile'},
+        'extension_profile': {'key': 'extensionProfile', 'type': 'VirtualMachineScaleSetExtensionProfile'},
+        'license_type': {'key': 'licenseType', 'type': 'str'},
+        'priority': {'key': 'priority', 'type': 'str'},
+        'eviction_policy': {'key': 'evictionPolicy', 'type': 'str'},
+    }
+
+    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.network_profile = kwargs.get('network_profile', None)
+        self.diagnostics_profile = kwargs.get('diagnostics_profile', None)
+        self.extension_profile = kwargs.get('extension_profile', None)
+        self.license_type = kwargs.get('license_type', None)
+        self.priority = kwargs.get('priority', None)
+        self.eviction_policy = kwargs.get('eviction_policy', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_profile_py3.py
new file mode 100644
index 000000000000..d7e74bb365b2
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_profile_py3.py
@@ -0,0 +1,80 @@
+# 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 VirtualMachineScaleSetVMProfile(Model):
+    """Describes a virtual machine scale set virtual machine profile.
+
+    :param os_profile: Specifies the operating system settings for the virtual
+     machines in the scale set.
+    :type os_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetOSProfile
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetStorageProfile
+    :param network_profile: Specifies properties of the network interfaces of
+     the virtual machines in the scale set.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetNetworkProfile
+    :param diagnostics_profile: Specifies the boot diagnostic settings state.
+     <br><br>Minimum api-version: 2015-06-15.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
+    :param extension_profile: Specifies a collection of settings for
+     extensions installed on virtual machines in the scale set.
+    :type extension_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtensionProfile
+    :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:
+     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
+     is included in a request for an update, the value must match the initial
+     value. This value cannot be updated. <br><br> For more information, see
+     [Azure Hybrid Use Benefit for Windows
+     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Minimum api-version: 2015-06-15
+    :type license_type: str
+    :param priority: Specifies the priority for the virtual machines in the
+     scale set. <br><br>Minimum api-version: 2017-10-30-preview. Possible
+     values include: 'Regular', 'Low'
+    :type priority: str or
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachinePriorityTypes
+    :param eviction_policy: Specifies the eviction policy for virtual machines
+     in a low priority scale set. <br><br>Minimum api-version:
+     2017-10-30-preview. Possible values include: 'Deallocate', 'Delete'
+    :type eviction_policy: str or
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineEvictionPolicyTypes
+    """
+
+    _attribute_map = {
+        'os_profile': {'key': 'osProfile', 'type': 'VirtualMachineScaleSetOSProfile'},
+        'storage_profile': {'key': 'storageProfile', 'type': 'VirtualMachineScaleSetStorageProfile'},
+        'network_profile': {'key': 'networkProfile', 'type': 'VirtualMachineScaleSetNetworkProfile'},
+        'diagnostics_profile': {'key': 'diagnosticsProfile', 'type': 'DiagnosticsProfile'},
+        'extension_profile': {'key': 'extensionProfile', 'type': 'VirtualMachineScaleSetExtensionProfile'},
+        'license_type': {'key': 'licenseType', 'type': 'str'},
+        'priority': {'key': 'priority', 'type': 'str'},
+        '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:
+        super(VirtualMachineScaleSetVMProfile, self).__init__(**kwargs)
+        self.os_profile = os_profile
+        self.storage_profile = storage_profile
+        self.network_profile = network_profile
+        self.diagnostics_profile = diagnostics_profile
+        self.extension_profile = extension_profile
+        self.license_type = license_type
+        self.priority = priority
+        self.eviction_policy = eviction_policy
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_py3.py
new file mode 100644
index 000000000000..bf822844f993
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_py3.py
@@ -0,0 +1,155 @@
+# 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 VirtualMachineScaleSetVM(Resource):
+    """Describes a virtual machine scale set virtual machine.
+
+    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 instance_id: The virtual machine instance ID.
+    :vartype instance_id: str
+    :ivar sku: The virtual machine SKU.
+    :vartype sku: ~azure.mgmt.compute.v2018_04_01.models.Sku
+    :ivar latest_model_applied: Specifies whether the latest model has been
+     applied to the virtual machine.
+    :vartype latest_model_applied: bool
+    :ivar vm_id: Azure VM unique ID.
+    :vartype vm_id: str
+    :ivar instance_view: The virtual machine instance view.
+    :vartype instance_view:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineInstanceView
+    :param hardware_profile: Specifies the hardware settings for the virtual
+     machine.
+    :type hardware_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.HardwareProfile
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.StorageProfile
+    :param os_profile: Specifies the operating system settings for the virtual
+     machine.
+    :type os_profile: ~azure.mgmt.compute.v2018_04_01.models.OSProfile
+    :param network_profile: Specifies the network interfaces of the virtual
+     machine.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.NetworkProfile
+    :param diagnostics_profile: Specifies the boot diagnostic settings state.
+     <br><br>Minimum api-version: 2015-06-15.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
+    :param availability_set: Specifies information about the availability set
+     that the virtual machine should be assigned to. Virtual machines specified
+     in the same availability set are allocated to different nodes to maximize
+     availability. For more information about availability sets, see [Manage
+     the availability of virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+     <br><br> For more information on Azure planned maintainance, see [Planned
+     maintenance for virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Currently, a VM can only be added to availability set at creation
+     time. An existing VM cannot be added to an availability set.
+    :type availability_set: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :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:
+     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
+     is included in a request for an update, the value must match the initial
+     value. This value cannot be updated. <br><br> For more information, see
+     [Azure Hybrid Use Benefit for Windows
+     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Minimum api-version: 2015-06-15
+    :type license_type: str
+    :param plan: Specifies information about the marketplace image used to
+     create the virtual machine. This element is only used for marketplace
+     images. Before you can use a marketplace image from an API, you must
+     enable the image for programmatic use.  In the Azure portal, find the
+     marketplace image that you want to use and then click **Want to deploy
+     programmatically, Get Started ->**. Enter any required information and
+     then click **Save**.
+    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
+    :ivar resources: The virtual machine child extension resources.
+    :vartype resources:
+     list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'instance_id': {'readonly': True},
+        'sku': {'readonly': True},
+        'latest_model_applied': {'readonly': True},
+        'vm_id': {'readonly': True},
+        'instance_view': {'readonly': True},
+        'provisioning_state': {'readonly': True},
+        'resources': {'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}'},
+        'instance_id': {'key': 'instanceId', 'type': 'str'},
+        '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'},
+        'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
+        'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
+        'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
+        'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'},
+        'availability_set': {'key': 'properties.availabilitySet', 'type': 'SubResource'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'license_type': {'key': 'properties.licenseType', 'type': 'str'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'resources': {'key': 'resources', 'type': '[VirtualMachineExtension]'},
+    }
+
+    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:
+        super(VirtualMachineScaleSetVM, self).__init__(location=location, tags=tags, **kwargs)
+        self.instance_id = None
+        self.sku = None
+        self.latest_model_applied = None
+        self.vm_id = None
+        self.instance_view = None
+        self.hardware_profile = hardware_profile
+        self.storage_profile = storage_profile
+        self.os_profile = os_profile
+        self.network_profile = network_profile
+        self.diagnostics_profile = diagnostics_profile
+        self.availability_set = availability_set
+        self.provisioning_state = None
+        self.license_type = license_type
+        self.plan = plan
+        self.resources = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size.py
new file mode 100644
index 000000000000..0fef3efd6c8e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size.py
@@ -0,0 +1,53 @@
+# 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 VirtualMachineSize(Model):
+    """Describes the properties of a VM size.
+
+    :param name: The name of the virtual machine size.
+    :type name: str
+    :param number_of_cores: The number of cores supported by the virtual
+     machine size.
+    :type number_of_cores: int
+    :param os_disk_size_in_mb: The OS disk size, in MB, allowed by the virtual
+     machine size.
+    :type os_disk_size_in_mb: int
+    :param resource_disk_size_in_mb: The resource disk size, in MB, allowed by
+     the virtual machine size.
+    :type resource_disk_size_in_mb: int
+    :param memory_in_mb: The amount of memory, in MB, supported by the virtual
+     machine size.
+    :type memory_in_mb: int
+    :param max_data_disk_count: The maximum number of data disks that can be
+     attached to the virtual machine size.
+    :type max_data_disk_count: int
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'number_of_cores': {'key': 'numberOfCores', 'type': 'int'},
+        'os_disk_size_in_mb': {'key': 'osDiskSizeInMB', 'type': 'int'},
+        'resource_disk_size_in_mb': {'key': 'resourceDiskSizeInMB', 'type': 'int'},
+        'memory_in_mb': {'key': 'memoryInMB', 'type': 'int'},
+        'max_data_disk_count': {'key': 'maxDataDiskCount', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineSize, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.number_of_cores = kwargs.get('number_of_cores', None)
+        self.os_disk_size_in_mb = kwargs.get('os_disk_size_in_mb', None)
+        self.resource_disk_size_in_mb = kwargs.get('resource_disk_size_in_mb', None)
+        self.memory_in_mb = kwargs.get('memory_in_mb', None)
+        self.max_data_disk_count = kwargs.get('max_data_disk_count', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size_paged.py
new file mode 100644
index 000000000000..d8dc313a5c4a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size_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 VirtualMachineSizePaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`VirtualMachineSize <azure.mgmt.compute.v2018_04_01.models.VirtualMachineSize>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[VirtualMachineSize]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(VirtualMachineSizePaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size_py3.py
new file mode 100644
index 000000000000..9f99ba20ce42
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_size_py3.py
@@ -0,0 +1,53 @@
+# 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 VirtualMachineSize(Model):
+    """Describes the properties of a VM size.
+
+    :param name: The name of the virtual machine size.
+    :type name: str
+    :param number_of_cores: The number of cores supported by the virtual
+     machine size.
+    :type number_of_cores: int
+    :param os_disk_size_in_mb: The OS disk size, in MB, allowed by the virtual
+     machine size.
+    :type os_disk_size_in_mb: int
+    :param resource_disk_size_in_mb: The resource disk size, in MB, allowed by
+     the virtual machine size.
+    :type resource_disk_size_in_mb: int
+    :param memory_in_mb: The amount of memory, in MB, supported by the virtual
+     machine size.
+    :type memory_in_mb: int
+    :param max_data_disk_count: The maximum number of data disks that can be
+     attached to the virtual machine size.
+    :type max_data_disk_count: int
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'number_of_cores': {'key': 'numberOfCores', 'type': 'int'},
+        'os_disk_size_in_mb': {'key': 'osDiskSizeInMB', 'type': 'int'},
+        'resource_disk_size_in_mb': {'key': 'resourceDiskSizeInMB', 'type': 'int'},
+        'memory_in_mb': {'key': 'memoryInMB', 'type': 'int'},
+        'max_data_disk_count': {'key': 'maxDataDiskCount', 'type': 'int'},
+    }
+
+    def __init__(self, *, name: str=None, number_of_cores: int=None, os_disk_size_in_mb: int=None, resource_disk_size_in_mb: int=None, memory_in_mb: int=None, max_data_disk_count: int=None, **kwargs) -> None:
+        super(VirtualMachineSize, self).__init__(**kwargs)
+        self.name = name
+        self.number_of_cores = number_of_cores
+        self.os_disk_size_in_mb = os_disk_size_in_mb
+        self.resource_disk_size_in_mb = resource_disk_size_in_mb
+        self.memory_in_mb = memory_in_mb
+        self.max_data_disk_count = max_data_disk_count
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_status_code_count.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_status_code_count.py
new file mode 100644
index 000000000000..7df7b702acd7
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_status_code_count.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 VirtualMachineStatusCodeCount(Model):
+    """The status code and count of the virtual machine scale set instance view
+    status summary.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar code: The instance view status code.
+    :vartype code: str
+    :ivar count: The number of instances having a particular status code.
+    :vartype count: int
+    """
+
+    _validation = {
+        'code': {'readonly': True},
+        'count': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'str'},
+        'count': {'key': 'count', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineStatusCodeCount, self).__init__(**kwargs)
+        self.code = None
+        self.count = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_status_code_count_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_status_code_count_py3.py
new file mode 100644
index 000000000000..c38800073a95
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_status_code_count_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 VirtualMachineStatusCodeCount(Model):
+    """The status code and count of the virtual machine scale set instance view
+    status summary.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar code: The instance view status code.
+    :vartype code: str
+    :ivar count: The number of instances having a particular status code.
+    :vartype count: int
+    """
+
+    _validation = {
+        'code': {'readonly': True},
+        'count': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'str'},
+        'count': {'key': 'count', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(VirtualMachineStatusCodeCount, self).__init__(**kwargs)
+        self.code = None
+        self.count = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_update.py
new file mode 100644
index 000000000000..2b254de4ccaf
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_update.py
@@ -0,0 +1,126 @@
+# 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 .update_resource import UpdateResource
+
+
+class VirtualMachineUpdate(UpdateResource):
+    """Describes a Virtual Machine Update.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param plan: Specifies information about the marketplace image used to
+     create the virtual machine. This element is only used for marketplace
+     images. Before you can use a marketplace image from an API, you must
+     enable the image for programmatic use.  In the Azure portal, find the
+     marketplace image that you want to use and then click **Want to deploy
+     programmatically, Get Started ->**. Enter any required information and
+     then click **Save**.
+    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
+    :param hardware_profile: Specifies the hardware settings for the virtual
+     machine.
+    :type hardware_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.HardwareProfile
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.StorageProfile
+    :param os_profile: Specifies the operating system settings for the virtual
+     machine.
+    :type os_profile: ~azure.mgmt.compute.v2018_04_01.models.OSProfile
+    :param network_profile: Specifies the network interfaces of the virtual
+     machine.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.NetworkProfile
+    :param diagnostics_profile: Specifies the boot diagnostic settings state.
+     <br><br>Minimum api-version: 2015-06-15.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
+    :param availability_set: Specifies information about the availability set
+     that the virtual machine should be assigned to. Virtual machines specified
+     in the same availability set are allocated to different nodes to maximize
+     availability. For more information about availability sets, see [Manage
+     the availability of virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+     <br><br> For more information on Azure planned maintainance, see [Planned
+     maintenance for virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Currently, a VM can only be added to availability set at creation
+     time. An existing VM cannot be added to an availability set.
+    :type availability_set: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :ivar instance_view: The virtual machine instance view.
+    :vartype instance_view:
+     ~azure.mgmt.compute.v2018_04_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:
+     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
+     is included in a request for an update, the value must match the initial
+     value. This value cannot be updated. <br><br> For more information, see
+     [Azure Hybrid Use Benefit for Windows
+     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Minimum api-version: 2015-06-15
+    :type license_type: str
+    :ivar vm_id: Specifies the VM unique ID which is a 128-bits identifier
+     that is encoded and stored in all Azure IaaS VMs SMBIOS and can be read
+     using platform BIOS commands.
+    :vartype vm_id: str
+    :param identity: The identity of the virtual machine, if configured.
+    :type identity:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineIdentity
+    :param zones: The virtual machine zones.
+    :type zones: list[str]
+    """
+
+    _validation = {
+        'provisioning_state': {'readonly': True},
+        'instance_view': {'readonly': True},
+        'vm_id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
+        'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
+        'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
+        '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': 'VirtualMachineInstanceView'},
+        'license_type': {'key': 'properties.licenseType', 'type': 'str'},
+        'vm_id': {'key': 'properties.vmId', 'type': 'str'},
+        'identity': {'key': 'identity', 'type': 'VirtualMachineIdentity'},
+        'zones': {'key': 'zones', 'type': '[str]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineUpdate, self).__init__(**kwargs)
+        self.plan = kwargs.get('plan', None)
+        self.hardware_profile = kwargs.get('hardware_profile', None)
+        self.storage_profile = kwargs.get('storage_profile', 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)
+        self.availability_set = kwargs.get('availability_set', None)
+        self.provisioning_state = None
+        self.instance_view = None
+        self.license_type = kwargs.get('license_type', None)
+        self.vm_id = None
+        self.identity = kwargs.get('identity', None)
+        self.zones = kwargs.get('zones', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_update_py3.py
new file mode 100644
index 000000000000..be9a3fc3e904
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_update_py3.py
@@ -0,0 +1,126 @@
+# 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 .update_resource_py3 import UpdateResource
+
+
+class VirtualMachineUpdate(UpdateResource):
+    """Describes a Virtual Machine Update.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param plan: Specifies information about the marketplace image used to
+     create the virtual machine. This element is only used for marketplace
+     images. Before you can use a marketplace image from an API, you must
+     enable the image for programmatic use.  In the Azure portal, find the
+     marketplace image that you want to use and then click **Want to deploy
+     programmatically, Get Started ->**. Enter any required information and
+     then click **Save**.
+    :type plan: ~azure.mgmt.compute.v2018_04_01.models.Plan
+    :param hardware_profile: Specifies the hardware settings for the virtual
+     machine.
+    :type hardware_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.HardwareProfile
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.StorageProfile
+    :param os_profile: Specifies the operating system settings for the virtual
+     machine.
+    :type os_profile: ~azure.mgmt.compute.v2018_04_01.models.OSProfile
+    :param network_profile: Specifies the network interfaces of the virtual
+     machine.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.NetworkProfile
+    :param diagnostics_profile: Specifies the boot diagnostic settings state.
+     <br><br>Minimum api-version: 2015-06-15.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_04_01.models.DiagnosticsProfile
+    :param availability_set: Specifies information about the availability set
+     that the virtual machine should be assigned to. Virtual machines specified
+     in the same availability set are allocated to different nodes to maximize
+     availability. For more information about availability sets, see [Manage
+     the availability of virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+     <br><br> For more information on Azure planned maintainance, see [Planned
+     maintenance for virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Currently, a VM can only be added to availability set at creation
+     time. An existing VM cannot be added to an availability set.
+    :type availability_set: ~azure.mgmt.compute.v2018_04_01.models.SubResource
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :ivar instance_view: The virtual machine instance view.
+    :vartype instance_view:
+     ~azure.mgmt.compute.v2018_04_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:
+     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
+     is included in a request for an update, the value must match the initial
+     value. This value cannot be updated. <br><br> For more information, see
+     [Azure Hybrid Use Benefit for Windows
+     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Minimum api-version: 2015-06-15
+    :type license_type: str
+    :ivar vm_id: Specifies the VM unique ID which is a 128-bits identifier
+     that is encoded and stored in all Azure IaaS VMs SMBIOS and can be read
+     using platform BIOS commands.
+    :vartype vm_id: str
+    :param identity: The identity of the virtual machine, if configured.
+    :type identity:
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineIdentity
+    :param zones: The virtual machine zones.
+    :type zones: list[str]
+    """
+
+    _validation = {
+        'provisioning_state': {'readonly': True},
+        'instance_view': {'readonly': True},
+        'vm_id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
+        'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
+        'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
+        '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': 'VirtualMachineInstanceView'},
+        'license_type': {'key': 'properties.licenseType', 'type': 'str'},
+        'vm_id': {'key': 'properties.vmId', 'type': 'str'},
+        'identity': {'key': 'identity', 'type': 'VirtualMachineIdentity'},
+        '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:
+        super(VirtualMachineUpdate, self).__init__(tags=tags, **kwargs)
+        self.plan = plan
+        self.hardware_profile = hardware_profile
+        self.storage_profile = storage_profile
+        self.os_profile = os_profile
+        self.network_profile = network_profile
+        self.diagnostics_profile = diagnostics_profile
+        self.availability_set = availability_set
+        self.provisioning_state = None
+        self.instance_view = None
+        self.license_type = license_type
+        self.vm_id = None
+        self.identity = identity
+        self.zones = zones
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_configuration.py
new file mode 100644
index 000000000000..0d429a3c06eb
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_configuration.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 WinRMConfiguration(Model):
+    """Describes Windows Remote Management configuration of the VM.
+
+    :param listeners: The list of Windows Remote Management listeners
+    :type listeners:
+     list[~azure.mgmt.compute.v2018_04_01.models.WinRMListener]
+    """
+
+    _attribute_map = {
+        'listeners': {'key': 'listeners', 'type': '[WinRMListener]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(WinRMConfiguration, self).__init__(**kwargs)
+        self.listeners = kwargs.get('listeners', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_configuration_py3.py
new file mode 100644
index 000000000000..4a3c13531623
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_configuration_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 WinRMConfiguration(Model):
+    """Describes Windows Remote Management configuration of the VM.
+
+    :param listeners: The list of Windows Remote Management listeners
+    :type listeners:
+     list[~azure.mgmt.compute.v2018_04_01.models.WinRMListener]
+    """
+
+    _attribute_map = {
+        'listeners': {'key': 'listeners', 'type': '[WinRMListener]'},
+    }
+
+    def __init__(self, *, listeners=None, **kwargs) -> None:
+        super(WinRMConfiguration, self).__init__(**kwargs)
+        self.listeners = listeners
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_listener.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_listener.py
new file mode 100644
index 000000000000..dd80b495e328
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_listener.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 WinRMListener(Model):
+    """Describes Protocol and thumbprint of Windows Remote Management listener.
+
+    :param protocol: Specifies the protocol of listener. <br><br> Possible
+     values are: <br>**http** <br><br> **https**. Possible values include:
+     'Http', 'Https'
+    :type protocol: str or
+     ~azure.mgmt.compute.v2018_04_01.models.ProtocolTypes
+    :param certificate_url: This is the URL of a certificate that has been
+     uploaded to Key Vault as a secret. For adding a secret to the Key Vault,
+     see [Add a key or secret to the key
+     vault](https://docs.microsoft.com/azure/key-vault/key-vault-get-started/#add).
+     In this case, your certificate needs to be It is the Base64 encoding of
+     the following JSON Object which is encoded in UTF-8: <br><br> {<br>
+     "data":"<Base64-encoded-certificate>",<br>  "dataType":"pfx",<br>
+     "password":"<pfx-file-password>"<br>}
+    :type certificate_url: str
+    """
+
+    _attribute_map = {
+        'protocol': {'key': 'protocol', 'type': 'ProtocolTypes'},
+        'certificate_url': {'key': 'certificateUrl', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(WinRMListener, self).__init__(**kwargs)
+        self.protocol = kwargs.get('protocol', None)
+        self.certificate_url = kwargs.get('certificate_url', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_listener_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_listener_py3.py
new file mode 100644
index 000000000000..a4aae022b007
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/win_rm_listener_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 WinRMListener(Model):
+    """Describes Protocol and thumbprint of Windows Remote Management listener.
+
+    :param protocol: Specifies the protocol of listener. <br><br> Possible
+     values are: <br>**http** <br><br> **https**. Possible values include:
+     'Http', 'Https'
+    :type protocol: str or
+     ~azure.mgmt.compute.v2018_04_01.models.ProtocolTypes
+    :param certificate_url: This is the URL of a certificate that has been
+     uploaded to Key Vault as a secret. For adding a secret to the Key Vault,
+     see [Add a key or secret to the key
+     vault](https://docs.microsoft.com/azure/key-vault/key-vault-get-started/#add).
+     In this case, your certificate needs to be It is the Base64 encoding of
+     the following JSON Object which is encoded in UTF-8: <br><br> {<br>
+     "data":"<Base64-encoded-certificate>",<br>  "dataType":"pfx",<br>
+     "password":"<pfx-file-password>"<br>}
+    :type certificate_url: str
+    """
+
+    _attribute_map = {
+        'protocol': {'key': 'protocol', 'type': 'ProtocolTypes'},
+        'certificate_url': {'key': 'certificateUrl', 'type': 'str'},
+    }
+
+    def __init__(self, *, protocol=None, certificate_url: str=None, **kwargs) -> None:
+        super(WinRMListener, self).__init__(**kwargs)
+        self.protocol = protocol
+        self.certificate_url = certificate_url
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/windows_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/windows_configuration.py
new file mode 100644
index 000000000000..a8341ce9d8bb
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/windows_configuration.py
@@ -0,0 +1,54 @@
+# 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 WindowsConfiguration(Model):
+    """Specifies Windows operating system settings on the virtual machine.
+
+    :param provision_vm_agent: Indicates whether virtual machine agent should
+     be provisioned on the virtual machine. <br><br> When this property is not
+     specified in the request body, default behavior is to set it to true.
+     This will ensure that VM Agent is installed on the VM so that extensions
+     can be added to the VM later.
+    :type provision_vm_agent: bool
+    :param enable_automatic_updates: Indicates whether virtual machine is
+     enabled for automatic updates.
+    :type enable_automatic_updates: bool
+    :param time_zone: Specifies the time zone of the virtual machine. e.g.
+     "Pacific Standard Time"
+    :type time_zone: str
+    :param additional_unattend_content: Specifies additional base-64 encoded
+     XML formatted information that can be included in the Unattend.xml file,
+     which is used by Windows Setup.
+    :type additional_unattend_content:
+     list[~azure.mgmt.compute.v2018_04_01.models.AdditionalUnattendContent]
+    :param win_rm: Specifies the Windows Remote Management listeners. This
+     enables remote Windows PowerShell.
+    :type win_rm: ~azure.mgmt.compute.v2018_04_01.models.WinRMConfiguration
+    """
+
+    _attribute_map = {
+        'provision_vm_agent': {'key': 'provisionVMAgent', 'type': 'bool'},
+        'enable_automatic_updates': {'key': 'enableAutomaticUpdates', 'type': 'bool'},
+        'time_zone': {'key': 'timeZone', 'type': 'str'},
+        'additional_unattend_content': {'key': 'additionalUnattendContent', 'type': '[AdditionalUnattendContent]'},
+        'win_rm': {'key': 'winRM', 'type': 'WinRMConfiguration'},
+    }
+
+    def __init__(self, **kwargs):
+        super(WindowsConfiguration, self).__init__(**kwargs)
+        self.provision_vm_agent = kwargs.get('provision_vm_agent', None)
+        self.enable_automatic_updates = kwargs.get('enable_automatic_updates', None)
+        self.time_zone = kwargs.get('time_zone', None)
+        self.additional_unattend_content = kwargs.get('additional_unattend_content', None)
+        self.win_rm = kwargs.get('win_rm', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/windows_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/windows_configuration_py3.py
new file mode 100644
index 000000000000..fe5fc14e963f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/windows_configuration_py3.py
@@ -0,0 +1,54 @@
+# 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 WindowsConfiguration(Model):
+    """Specifies Windows operating system settings on the virtual machine.
+
+    :param provision_vm_agent: Indicates whether virtual machine agent should
+     be provisioned on the virtual machine. <br><br> When this property is not
+     specified in the request body, default behavior is to set it to true.
+     This will ensure that VM Agent is installed on the VM so that extensions
+     can be added to the VM later.
+    :type provision_vm_agent: bool
+    :param enable_automatic_updates: Indicates whether virtual machine is
+     enabled for automatic updates.
+    :type enable_automatic_updates: bool
+    :param time_zone: Specifies the time zone of the virtual machine. e.g.
+     "Pacific Standard Time"
+    :type time_zone: str
+    :param additional_unattend_content: Specifies additional base-64 encoded
+     XML formatted information that can be included in the Unattend.xml file,
+     which is used by Windows Setup.
+    :type additional_unattend_content:
+     list[~azure.mgmt.compute.v2018_04_01.models.AdditionalUnattendContent]
+    :param win_rm: Specifies the Windows Remote Management listeners. This
+     enables remote Windows PowerShell.
+    :type win_rm: ~azure.mgmt.compute.v2018_04_01.models.WinRMConfiguration
+    """
+
+    _attribute_map = {
+        'provision_vm_agent': {'key': 'provisionVMAgent', 'type': 'bool'},
+        'enable_automatic_updates': {'key': 'enableAutomaticUpdates', 'type': 'bool'},
+        'time_zone': {'key': 'timeZone', 'type': 'str'},
+        'additional_unattend_content': {'key': 'additionalUnattendContent', 'type': '[AdditionalUnattendContent]'},
+        'win_rm': {'key': 'winRM', 'type': 'WinRMConfiguration'},
+    }
+
+    def __init__(self, *, provision_vm_agent: bool=None, enable_automatic_updates: bool=None, time_zone: str=None, additional_unattend_content=None, win_rm=None, **kwargs) -> None:
+        super(WindowsConfiguration, self).__init__(**kwargs)
+        self.provision_vm_agent = provision_vm_agent
+        self.enable_automatic_updates = enable_automatic_updates
+        self.time_zone = time_zone
+        self.additional_unattend_content = additional_unattend_content
+        self.win_rm = win_rm
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/__init__.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/__init__.py
index aceddf83543c..48abff4beece 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/__init__.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/__init__.py
@@ -9,10 +9,40 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
+from .operations import Operations
+from .availability_sets_operations import AvailabilitySetsOperations
+from .virtual_machine_extension_images_operations import VirtualMachineExtensionImagesOperations
+from .virtual_machine_extensions_operations import VirtualMachineExtensionsOperations
+from .virtual_machine_images_operations import VirtualMachineImagesOperations
+from .usage_operations import UsageOperations
+from .virtual_machine_sizes_operations import VirtualMachineSizesOperations
+from .images_operations import ImagesOperations
+from .virtual_machines_operations import VirtualMachinesOperations
+from .virtual_machine_scale_sets_operations import VirtualMachineScaleSetsOperations
+from .virtual_machine_scale_set_extensions_operations import VirtualMachineScaleSetExtensionsOperations
+from .virtual_machine_scale_set_rolling_upgrades_operations import VirtualMachineScaleSetRollingUpgradesOperations
+from .virtual_machine_scale_set_vms_operations import VirtualMachineScaleSetVMsOperations
+from .log_analytics_operations import LogAnalyticsOperations
+from .virtual_machine_run_commands_operations import VirtualMachineRunCommandsOperations
 from .disks_operations import DisksOperations
 from .snapshots_operations import SnapshotsOperations
 
 __all__ = [
+    'Operations',
+    'AvailabilitySetsOperations',
+    'VirtualMachineExtensionImagesOperations',
+    'VirtualMachineExtensionsOperations',
+    'VirtualMachineImagesOperations',
+    'UsageOperations',
+    'VirtualMachineSizesOperations',
+    'ImagesOperations',
+    'VirtualMachinesOperations',
+    'VirtualMachineScaleSetsOperations',
+    'VirtualMachineScaleSetExtensionsOperations',
+    'VirtualMachineScaleSetRollingUpgradesOperations',
+    'VirtualMachineScaleSetVMsOperations',
+    'LogAnalyticsOperations',
+    'VirtualMachineRunCommandsOperations',
     'DisksOperations',
     'SnapshotsOperations',
 ]
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py
new file mode 100644
index 000000000000..ba8e21445a27
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py
@@ -0,0 +1,434 @@
+# 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 .. import models
+
+
+class AvailabilitySetsOperations(object):
+    """AvailabilitySetsOperations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+    def create_or_update(
+            self, resource_group_name, availability_set_name, parameters, custom_headers=None, raw=False, **operation_config):
+        """Create or update an availability set.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param availability_set_name: The name of the availability set.
+        :type availability_set_name: str
+        :param parameters: Parameters supplied to the Create Availability Set
+         operation.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_04_01.models.AvailabilitySet
+        :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: AvailabilitySet or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_04_01.models.AvailabilitySet or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.create_or_update.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'availabilitySetName': self._serialize.url("availability_set_name", availability_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 = {}
+        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(parameters, 'AvailabilitySet')
+
+        # Construct and send request
+        request = self._client.put(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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('AvailabilitySet', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
+
+    def update(
+            self, resource_group_name, availability_set_name, parameters, custom_headers=None, raw=False, **operation_config):
+        """Update an availability set.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param availability_set_name: The name of the availability set.
+        :type availability_set_name: str
+        :param parameters: Parameters supplied to the Update Availability Set
+         operation.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_04_01.models.AvailabilitySetUpdate
+        :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: AvailabilitySet or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_04_01.models.AvailabilitySet or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.update.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'availabilitySetName': self._serialize.url("availability_set_name", availability_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 = {}
+        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(parameters, 'AvailabilitySetUpdate')
+
+        # Construct and send request
+        request = self._client.patch(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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('AvailabilitySet', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
+
+    def delete(
+            self, resource_group_name, availability_set_name, custom_headers=None, raw=False, **operation_config):
+        """Delete an availability set.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param availability_set_name: The name of the availability set.
+        :type availability_set_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: None or ClientRawResponse if raw=true
+        :rtype: None or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.delete.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'availabilitySetName': self._serialize.url("availability_set_name", availability_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 = {}
+        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 and send request
+        request = self._client.delete(url, query_parameters)
+        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+
+        if response.status_code not in [200, 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
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
+
+    def get(
+            self, resource_group_name, availability_set_name, custom_headers=None, raw=False, **operation_config):
+        """Retrieves information about an availability set.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param availability_set_name: The name of the availability set.
+        :type availability_set_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: AvailabilitySet or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_04_01.models.AvailabilitySet or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'availabilitySetName': self._serialize.url("availability_set_name", availability_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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('AvailabilitySet', 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/availabilitySets/{availabilitySetName}'}
+
+    def list(
+            self, resource_group_name, custom_headers=None, raw=False, **operation_config):
+        """Lists all availability sets in 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 AvailabilitySet
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.AvailabilitySetPaged[~azure.mgmt.compute.v2018_04_01.models.AvailabilitySet]
+        :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 = {
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_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')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets'}
+
+    def list_available_sizes(
+            self, resource_group_name, availability_set_name, custom_headers=None, raw=False, **operation_config):
+        """Lists all available virtual machine sizes that can be used to create a
+        new virtual machine in an existing availability set.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param availability_set_name: The name of the availability set.
+        :type availability_set_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 VirtualMachineSize
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineSizePaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineSize]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        def internal_paging(next_link=None, raw=False):
+
+            if not next_link:
+                # Construct URL
+                url = self.list_available_sizes.metadata['url']
+                path_format_arguments = {
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+                    'availabilitySetName': self._serialize.url("availability_set_name", availability_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')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachineSizePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachineSizePaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_available_sizes.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}/vmSizes'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/images_operations.py
new file mode 100644
index 000000000000..030bf14e5115
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/images_operations.py
@@ -0,0 +1,525 @@
+# 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 ImagesOperations(object):
+    """ImagesOperations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+
+    def _create_or_update_initial(
+            self, resource_group_name, image_name, parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.create_or_update.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'imageName': self._serialize.url("image_name", image_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 = {}
+        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(parameters, 'Image')
+
+        # Construct and send request
+        request = self._client.put(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, stream=False, **operation_config)
+
+        if response.status_code not in [200, 201]:
+            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('Image', response)
+        if response.status_code == 201:
+            deserialized = self._deserialize('Image', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def create_or_update(
+            self, resource_group_name, image_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Create or update an image.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param image_name: The name of the image.
+        :type image_name: str
+        :param parameters: Parameters supplied to the Create Image operation.
+        :type parameters: ~azure.mgmt.compute.v2018_04_01.models.Image
+        :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 Image or
+         ClientRawResponse<Image> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.Image]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.Image]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._create_or_update_initial(
+            resource_group_name=resource_group_name,
+            image_name=image_name,
+            parameters=parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('Image', 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/images/{imageName}'}
+
+
+    def _update_initial(
+            self, resource_group_name, image_name, parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.update.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'imageName': self._serialize.url("image_name", image_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 = {}
+        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(parameters, 'ImageUpdate')
+
+        # Construct and send request
+        request = self._client.patch(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, stream=False, **operation_config)
+
+        if response.status_code not in [200, 201]:
+            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('Image', response)
+        if response.status_code == 201:
+            deserialized = self._deserialize('Image', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def update(
+            self, resource_group_name, image_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Update an image.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param image_name: The name of the image.
+        :type image_name: str
+        :param parameters: Parameters supplied to the Update Image operation.
+        :type parameters: ~azure.mgmt.compute.v2018_04_01.models.ImageUpdate
+        :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 Image or
+         ClientRawResponse<Image> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.Image]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.Image]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._update_initial(
+            resource_group_name=resource_group_name,
+            image_name=image_name,
+            parameters=parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('Image', 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/images/{imageName}'}
+
+
+    def _delete_initial(
+            self, resource_group_name, image_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.delete.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'imageName': self._serialize.url("image_name", image_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 = {}
+        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 and send request
+        request = self._client.delete(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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, image_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Deletes an Image.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param image_name: The name of the image.
+        :type image_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,
+            image_name=image_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/images/{imageName}'}
+
+    def get(
+            self, resource_group_name, image_name, expand=None, custom_headers=None, raw=False, **operation_config):
+        """Gets an image.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param image_name: The name of the image.
+        :type image_name: str
+        :param expand: The expand expression to apply on the operation.
+        :type expand: 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: Image or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_04_01.models.Image or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'imageName': self._serialize.url("image_name", image_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 = {}
+        if expand is not None:
+            query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('Image', 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/images/{imageName}'}
+
+    def list_by_resource_group(
+            self, resource_group_name, custom_headers=None, raw=False, **operation_config):
+        """Gets the list of images 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 Image
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.ImagePaged[~azure.mgmt.compute.v2018_04_01.models.Image]
+        :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 = {
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_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')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.ImagePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.ImagePaged(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/images'}
+
+    def list(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Gets the list of Images in the subscription. Use nextLink property in
+        the response to get the next page of Images. Do this till nextLink is
+        null to fetch all the Images.
+
+        :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 Image
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.ImagePaged[~azure.mgmt.compute.v2018_04_01.models.Image]
+        :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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.ImagePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.ImagePaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/images'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/log_analytics_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/log_analytics_operations.py
new file mode 100644
index 000000000000..0471d6db9c03
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/log_analytics_operations.py
@@ -0,0 +1,242 @@
+# 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 LogAnalyticsOperations(object):
+    """LogAnalyticsOperations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+
+    def _export_request_rate_by_interval_initial(
+            self, parameters, location, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.export_request_rate_by_interval.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str', pattern=r'^[-\w\._]+$'),
+            '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 = {}
+        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(parameters, 'RequestRateByIntervalInput')
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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('LogAnalyticsOperationResult', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def export_request_rate_by_interval(
+            self, parameters, location, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Export logs that show Api requests made by this subscription in the
+        given time window to show throttling activities.
+
+        :param parameters: Parameters supplied to the LogAnalytics
+         getRequestRateByInterval Api.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_04_01.models.RequestRateByIntervalInput
+        :param location: The location upon which virtual-machine-sizes is
+         queried.
+        :type location: 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
+         LogAnalyticsOperationResult or
+         ClientRawResponse<LogAnalyticsOperationResult> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.LogAnalyticsOperationResult]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.LogAnalyticsOperationResult]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._export_request_rate_by_interval_initial(
+            parameters=parameters,
+            location=location,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('LogAnalyticsOperationResult', 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)
+    export_request_rate_by_interval.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/logAnalytics/apiAccess/getRequestRateByInterval'}
+
+
+    def _export_throttled_requests_initial(
+            self, parameters, location, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.export_throttled_requests.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str', pattern=r'^[-\w\._]+$'),
+            '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 = {}
+        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(parameters, 'ThrottledRequestsInput')
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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('LogAnalyticsOperationResult', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def export_throttled_requests(
+            self, parameters, location, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Export logs that show total throttled Api requests for this
+        subscription in the given time window.
+
+        :param parameters: Parameters supplied to the LogAnalytics
+         getThrottledRequests Api.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_04_01.models.ThrottledRequestsInput
+        :param location: The location upon which virtual-machine-sizes is
+         queried.
+        :type location: 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
+         LogAnalyticsOperationResult or
+         ClientRawResponse<LogAnalyticsOperationResult> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.LogAnalyticsOperationResult]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.LogAnalyticsOperationResult]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._export_throttled_requests_initial(
+            parameters=parameters,
+            location=location,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('LogAnalyticsOperationResult', 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)
+    export_throttled_requests.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/logAnalytics/apiAccess/getThrottledRequests'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/operations.py
new file mode 100644
index 000000000000..a392e2cea622
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/operations.py
@@ -0,0 +1,99 @@
+# 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 .. import models
+
+
+class Operations(object):
+    """Operations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+    def list(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of compute operations.
+
+        :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 ComputeOperationValue
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.ComputeOperationValuePaged[~azure.mgmt.compute.v2018_04_01.models.ComputeOperationValue]
+        :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']
+
+                # 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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.ComputeOperationValuePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.ComputeOperationValuePaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/providers/Microsoft.Compute/operations'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/usage_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/usage_operations.py
new file mode 100644
index 000000000000..607b8419477c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/usage_operations.py
@@ -0,0 +1,108 @@
+# 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 .. import models
+
+
+class UsageOperations(object):
+    """UsageOperations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+    def list(
+            self, location, custom_headers=None, raw=False, **operation_config):
+        """Gets, for the specified location, the current compute resource usage
+        information as well as the limits for compute resources under the
+        subscription.
+
+        :param location: The location for which resource usage is queried.
+        :type location: 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 Usage
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.UsagePaged[~azure.mgmt.compute.v2018_04_01.models.Usage]
+        :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 = {
+                    'location': self._serialize.url("location", location, 'str', pattern=r'^[-\w\._]+$'),
+                    '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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.UsagePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.UsagePaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/usages'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extension_images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extension_images_operations.py
new file mode 100644
index 000000000000..f190183923a8
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extension_images_operations.py
@@ -0,0 +1,248 @@
+# 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 .. import models
+
+
+class VirtualMachineExtensionImagesOperations(object):
+    """VirtualMachineExtensionImagesOperations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+    def get(
+            self, location, publisher_name, type, version, custom_headers=None, raw=False, **operation_config):
+        """Gets a virtual machine extension image.
+
+        :param location: The name of a supported Azure region.
+        :type location: str
+        :param publisher_name:
+        :type publisher_name: str
+        :param type:
+        :type type: str
+        :param version:
+        :type version: 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: VirtualMachineExtensionImage or ClientRawResponse if raw=true
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionImage or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str'),
+            'publisherName': self._serialize.url("publisher_name", publisher_name, 'str'),
+            'type': self._serialize.url("type", type, 'str'),
+            'version': self._serialize.url("version", version, '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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineExtensionImage', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmextension/types/{type}/versions/{version}'}
+
+    def list_types(
+            self, location, publisher_name, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of virtual machine extension image types.
+
+        :param location: The name of a supported Azure region.
+        :type location: str
+        :param publisher_name:
+        :type publisher_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: list or ClientRawResponse if raw=true
+        :rtype:
+         list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionImage]
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.list_types.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str'),
+            'publisherName': self._serialize.url("publisher_name", publisher_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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('[VirtualMachineExtensionImage]', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    list_types.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmextension/types'}
+
+    def list_versions(
+            self, location, publisher_name, type, filter=None, top=None, orderby=None, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of virtual machine extension image versions.
+
+        :param location: The name of a supported Azure region.
+        :type location: str
+        :param publisher_name:
+        :type publisher_name: str
+        :param type:
+        :type type: str
+        :param filter: The filter to apply on the operation.
+        :type filter: str
+        :param top:
+        :type top: int
+        :param orderby:
+        :type orderby: 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: list or ClientRawResponse if raw=true
+        :rtype:
+         list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionImage]
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.list_versions.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str'),
+            'publisherName': self._serialize.url("publisher_name", publisher_name, 'str'),
+            'type': self._serialize.url("type", type, '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 = {}
+        if filter is not None:
+            query_parameters['$filter'] = self._serialize.query("filter", filter, 'str')
+        if top is not None:
+            query_parameters['$top'] = self._serialize.query("top", top, 'int')
+        if orderby is not None:
+            query_parameters['$orderby'] = self._serialize.query("orderby", orderby, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('[VirtualMachineExtensionImage]', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    list_versions.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmextension/types/{type}/versions'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extensions_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extensions_operations.py
new file mode 100644
index 000000000000..5acd2642f6e4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extensions_operations.py
@@ -0,0 +1,480 @@
+# 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 VirtualMachineExtensionsOperations(object):
+    """VirtualMachineExtensionsOperations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+
+    def _create_or_update_initial(
+            self, resource_group_name, vm_name, vm_extension_name, extension_parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.create_or_update.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_name, 'str'),
+            'vmExtensionName': self._serialize.url("vm_extension_name", vm_extension_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 = {}
+        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(extension_parameters, 'VirtualMachineExtension')
+
+        # Construct and send request
+        request = self._client.put(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, stream=False, **operation_config)
+
+        if response.status_code not in [200, 201]:
+            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('VirtualMachineExtension', response)
+        if response.status_code == 201:
+            deserialized = self._deserialize('VirtualMachineExtension', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def create_or_update(
+            self, resource_group_name, vm_name, vm_extension_name, extension_parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to create or update the extension.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine where the extension
+         should be created or updated.
+        :type vm_name: str
+        :param vm_extension_name: The name of the virtual machine extension.
+        :type vm_extension_name: str
+        :param extension_parameters: Parameters supplied to the Create Virtual
+         Machine Extension operation.
+        :type extension_parameters:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension
+        :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 VirtualMachineExtension
+         or ClientRawResponse<VirtualMachineExtension> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._create_or_update_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_name,
+            vm_extension_name=vm_extension_name,
+            extension_parameters=extension_parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('VirtualMachineExtension', 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/virtualMachines/{vmName}/extensions/{vmExtensionName}'}
+
+
+    def _update_initial(
+            self, resource_group_name, vm_name, vm_extension_name, extension_parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.update.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_name, 'str'),
+            'vmExtensionName': self._serialize.url("vm_extension_name", vm_extension_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 = {}
+        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(extension_parameters, 'VirtualMachineExtensionUpdate')
+
+        # Construct and send request
+        request = self._client.patch(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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('VirtualMachineExtension', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def update(
+            self, resource_group_name, vm_name, vm_extension_name, extension_parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to update the extension.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine where the extension
+         should be updated.
+        :type vm_name: str
+        :param vm_extension_name: The name of the virtual machine extension.
+        :type vm_extension_name: str
+        :param extension_parameters: Parameters supplied to the Update Virtual
+         Machine Extension operation.
+        :type extension_parameters:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionUpdate
+        :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 VirtualMachineExtension
+         or ClientRawResponse<VirtualMachineExtension> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._update_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_name,
+            vm_extension_name=vm_extension_name,
+            extension_parameters=extension_parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('VirtualMachineExtension', 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/virtualMachines/{vmName}/extensions/{vmExtensionName}'}
+
+
+    def _delete_initial(
+            self, resource_group_name, vm_name, vm_extension_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.delete.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_name, 'str'),
+            'vmExtensionName': self._serialize.url("vm_extension_name", vm_extension_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 = {}
+        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 and send request
+        request = self._client.delete(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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, vm_name, vm_extension_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to delete the extension.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine where the extension
+         should be deleted.
+        :type vm_name: str
+        :param vm_extension_name: The name of the virtual machine extension.
+        :type vm_extension_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,
+            vm_name=vm_name,
+            vm_extension_name=vm_extension_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/virtualMachines/{vmName}/extensions/{vmExtensionName}'}
+
+    def get(
+            self, resource_group_name, vm_name, vm_extension_name, expand=None, custom_headers=None, raw=False, **operation_config):
+        """The operation to get the extension.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine containing the
+         extension.
+        :type vm_name: str
+        :param vm_extension_name: The name of the virtual machine extension.
+        :type vm_extension_name: str
+        :param expand: The expand expression to apply on the operation.
+        :type expand: 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: VirtualMachineExtension or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_name, 'str'),
+            'vmExtensionName': self._serialize.url("vm_extension_name", vm_extension_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 = {}
+        if expand is not None:
+            query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineExtension', 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/virtualMachines/{vmName}/extensions/{vmExtensionName}'}
+
+    def list(
+            self, resource_group_name, vm_name, expand=None, custom_headers=None, raw=False, **operation_config):
+        """The operation to get all extensions of a Virtual Machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine containing the
+         extension.
+        :type vm_name: str
+        :param expand: The expand expression to apply on the operation.
+        :type expand: 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: VirtualMachineExtensionsListResult or ClientRawResponse if
+         raw=true
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtensionsListResult
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.list.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        if expand is not None:
+            query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineExtensionsListResult', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/extensions'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_images_operations.py
new file mode 100644
index 000000000000..a58d2e394655
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_images_operations.py
@@ -0,0 +1,383 @@
+# 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 .. import models
+
+
+class VirtualMachineImagesOperations(object):
+    """VirtualMachineImagesOperations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+    def get(
+            self, location, publisher_name, offer, skus, version, custom_headers=None, raw=False, **operation_config):
+        """Gets a virtual machine image.
+
+        :param location: The name of a supported Azure region.
+        :type location: str
+        :param publisher_name: A valid image publisher.
+        :type publisher_name: str
+        :param offer: A valid image publisher offer.
+        :type offer: str
+        :param skus: A valid image SKU.
+        :type skus: str
+        :param version: A valid image SKU version.
+        :type version: 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: VirtualMachineImage or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineImage or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str'),
+            'publisherName': self._serialize.url("publisher_name", publisher_name, 'str'),
+            'offer': self._serialize.url("offer", offer, 'str'),
+            'skus': self._serialize.url("skus", skus, 'str'),
+            'version': self._serialize.url("version", version, '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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineImage', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmimage/offers/{offer}/skus/{skus}/versions/{version}'}
+
+    def list(
+            self, location, publisher_name, offer, skus, filter=None, top=None, orderby=None, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of all virtual machine image versions for the specified
+        location, publisher, offer, and SKU.
+
+        :param location: The name of a supported Azure region.
+        :type location: str
+        :param publisher_name: A valid image publisher.
+        :type publisher_name: str
+        :param offer: A valid image publisher offer.
+        :type offer: str
+        :param skus: A valid image SKU.
+        :type skus: str
+        :param filter: The filter to apply on the operation.
+        :type filter: str
+        :param top:
+        :type top: int
+        :param orderby:
+        :type orderby: 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: list or ClientRawResponse if raw=true
+        :rtype:
+         list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineImageResource]
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.list.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str'),
+            'publisherName': self._serialize.url("publisher_name", publisher_name, 'str'),
+            'offer': self._serialize.url("offer", offer, 'str'),
+            'skus': self._serialize.url("skus", skus, '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 = {}
+        if filter is not None:
+            query_parameters['$filter'] = self._serialize.query("filter", filter, 'str')
+        if top is not None:
+            query_parameters['$top'] = self._serialize.query("top", top, 'int')
+        if orderby is not None:
+            query_parameters['$orderby'] = self._serialize.query("orderby", orderby, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('[VirtualMachineImageResource]', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmimage/offers/{offer}/skus/{skus}/versions'}
+
+    def list_offers(
+            self, location, publisher_name, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of virtual machine image offers for the specified location
+        and publisher.
+
+        :param location: The name of a supported Azure region.
+        :type location: str
+        :param publisher_name: A valid image publisher.
+        :type publisher_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: list or ClientRawResponse if raw=true
+        :rtype:
+         list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineImageResource]
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.list_offers.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str'),
+            'publisherName': self._serialize.url("publisher_name", publisher_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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('[VirtualMachineImageResource]', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    list_offers.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmimage/offers'}
+
+    def list_publishers(
+            self, location, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of virtual machine image publishers for the specified Azure
+        location.
+
+        :param location: The name of a supported Azure region.
+        :type location: 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: list or ClientRawResponse if raw=true
+        :rtype:
+         list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineImageResource]
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.list_publishers.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, '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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('[VirtualMachineImageResource]', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    list_publishers.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers'}
+
+    def list_skus(
+            self, location, publisher_name, offer, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of virtual machine image SKUs for the specified location,
+        publisher, and offer.
+
+        :param location: The name of a supported Azure region.
+        :type location: str
+        :param publisher_name: A valid image publisher.
+        :type publisher_name: str
+        :param offer: A valid image publisher offer.
+        :type offer: 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: list or ClientRawResponse if raw=true
+        :rtype:
+         list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineImageResource]
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.list_skus.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str'),
+            'publisherName': self._serialize.url("publisher_name", publisher_name, 'str'),
+            'offer': self._serialize.url("offer", offer, '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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('[VirtualMachineImageResource]', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    list_skus.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmimage/offers/{offer}/skus'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_run_commands_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_run_commands_operations.py
new file mode 100644
index 000000000000..9d04988797f7
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_run_commands_operations.py
@@ -0,0 +1,168 @@
+# 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 .. import models
+
+
+class VirtualMachineRunCommandsOperations(object):
+    """VirtualMachineRunCommandsOperations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+    def list(
+            self, location, custom_headers=None, raw=False, **operation_config):
+        """Lists all available run commands for a subscription in a location.
+
+        :param location: The location upon which run commands is queried.
+        :type location: 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 RunCommandDocumentBase
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.RunCommandDocumentBasePaged[~azure.mgmt.compute.v2018_04_01.models.RunCommandDocumentBase]
+        :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 = {
+                    'location': self._serialize.url("location", location, 'str', pattern=r'^[-\w\._]+$'),
+                    '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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.RunCommandDocumentBasePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.RunCommandDocumentBasePaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/runCommands'}
+
+    def get(
+            self, location, command_id, custom_headers=None, raw=False, **operation_config):
+        """Gets specific run command for a subscription in a location.
+
+        :param location: The location upon which run commands is queried.
+        :type location: str
+        :param command_id: The command id.
+        :type command_id: 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: RunCommandDocument or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_04_01.models.RunCommandDocument or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str', pattern=r'^[-\w\._]+$'),
+            'commandId': self._serialize.url("command_id", command_id, '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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('RunCommandDocument', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/runCommands/{commandId}'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_extensions_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_extensions_operations.py
new file mode 100644
index 000000000000..5d5476f92263
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_extensions_operations.py
@@ -0,0 +1,379 @@
+# 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 VirtualMachineScaleSetExtensionsOperations(object):
+    """VirtualMachineScaleSetExtensionsOperations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+
+    def _create_or_update_initial(
+            self, resource_group_name, vm_scale_set_name, vmss_extension_name, extension_parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.create_or_update.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'),
+            'vmssExtensionName': self._serialize.url("vmss_extension_name", vmss_extension_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 = {}
+        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(extension_parameters, 'VirtualMachineScaleSetExtension')
+
+        # Construct and send request
+        request = self._client.put(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, stream=False, **operation_config)
+
+        if response.status_code not in [200, 201]:
+            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('VirtualMachineScaleSetExtension', response)
+        if response.status_code == 201:
+            deserialized = self._deserialize('VirtualMachineScaleSetExtension', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def create_or_update(
+            self, resource_group_name, vm_scale_set_name, vmss_extension_name, extension_parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to create or update an extension.
+
+        :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 where the
+         extension should be create or updated.
+        :type vm_scale_set_name: str
+        :param vmss_extension_name: The name of the VM scale set extension.
+        :type vmss_extension_name: str
+        :param extension_parameters: Parameters supplied to the Create VM
+         scale set Extension operation.
+        :type extension_parameters:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtension
+        :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
+         VirtualMachineScaleSetExtension or
+         ClientRawResponse<VirtualMachineScaleSetExtension> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtension]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtension]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._create_or_update_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            vmss_extension_name=vmss_extension_name,
+            extension_parameters=extension_parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('VirtualMachineScaleSetExtension', 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/virtualMachineScaleSets/{vmScaleSetName}/extensions/{vmssExtensionName}'}
+
+
+    def _delete_initial(
+            self, resource_group_name, vm_scale_set_name, vmss_extension_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.delete.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'),
+            'vmssExtensionName': self._serialize.url("vmss_extension_name", vmss_extension_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 = {}
+        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 and send request
+        request = self._client.delete(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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, vm_scale_set_name, vmss_extension_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to delete the extension.
+
+        :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 where the
+         extension should be deleted.
+        :type vm_scale_set_name: str
+        :param vmss_extension_name: The name of the VM scale set extension.
+        :type vmss_extension_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,
+            vm_scale_set_name=vm_scale_set_name,
+            vmss_extension_name=vmss_extension_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/virtualMachineScaleSets/{vmScaleSetName}/extensions/{vmssExtensionName}'}
+
+    def get(
+            self, resource_group_name, vm_scale_set_name, vmss_extension_name, expand=None, custom_headers=None, raw=False, **operation_config):
+        """The operation to get the extension.
+
+        :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 containing the
+         extension.
+        :type vm_scale_set_name: str
+        :param vmss_extension_name: The name of the VM scale set extension.
+        :type vmss_extension_name: str
+        :param expand: The expand expression to apply on the operation.
+        :type expand: 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: VirtualMachineScaleSetExtension or ClientRawResponse if
+         raw=true
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtension
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.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'),
+            'vmssExtensionName': self._serialize.url("vmss_extension_name", vmss_extension_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 = {}
+        if expand is not None:
+            query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineScaleSetExtension', 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/virtualMachineScaleSets/{vmScaleSetName}/extensions/{vmssExtensionName}'}
+
+    def list(
+            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of all extensions in a VM scale set.
+
+        :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 containing the
+         extension.
+        :type vm_scale_set_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 VirtualMachineScaleSetExtension
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtensionPaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetExtension]
+        :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 = {
+                    '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')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachineScaleSetExtensionPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachineScaleSetExtensionPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/extensions'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_rolling_upgrades_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_rolling_upgrades_operations.py
new file mode 100644
index 000000000000..81ffdda5f87e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_rolling_upgrades_operations.py
@@ -0,0 +1,267 @@
+# 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 VirtualMachineScaleSetRollingUpgradesOperations(object):
+    """VirtualMachineScaleSetRollingUpgradesOperations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+
+    def _cancel_initial(
+            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.cancel.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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 cancel(
+            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Cancels the current virtual machine scale set rolling upgrade.
+
+        :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._cancel_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)
+    cancel.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/rollingUpgrades/cancel'}
+
+
+    def _start_os_upgrade_initial(
+            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.start_os_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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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_os_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 virtual machine scale set
+        instances to the latest available Platform Image OS version. Instances
+        which are already running the latest available OS version 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_os_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_os_upgrade.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/osRollingUpgrade'}
+
+    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
+        upgrade.
+
+        :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: returns the direct response alongside the
+         deserialized response
+        :param operation_config: :ref:`Operation configuration
+         overrides<msrest:optionsforoperations>`.
+        :return: RollingUpgradeStatusInfo or ClientRawResponse if raw=true
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.RollingUpgradeStatusInfo or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get_latest.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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('RollingUpgradeStatusInfo', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    get_latest.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/rollingUpgrades/latest'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_vms_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_vms_operations.py
new file mode 100644
index 000000000000..8ebd8a2fd266
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_vms_operations.py
@@ -0,0 +1,1131 @@
+# 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 VirtualMachineScaleSetVMsOperations(object):
+    """VirtualMachineScaleSetVMsOperations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+
+    def _reimage_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.reimage.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 reimage(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Reimages (upgrade the operating system) a specific virtual machine in a
+        VM scale set.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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._reimage_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            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)
+    reimage.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/reimage'}
+
+
+    def _reimage_all_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.reimage_all.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 reimage_all(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Allows you to re-image all the disks ( including data disks ) in the a
+        VM scale set instance. This operation is only supported for managed
+        disks.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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._reimage_all_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            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)
+    reimage_all.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/reimageall'}
+
+
+    def _deallocate_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.deallocate.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 deallocate(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Deallocates a specific virtual machine in a VM scale set. Shuts down
+        the virtual machine and releases the compute resources it uses. You are
+        not billed for the compute resources of this virtual machine once it is
+        deallocated.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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._deallocate_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            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)
+    deallocate.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/deallocate'}
+
+
+    def _update_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.update.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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(parameters, 'VirtualMachineScaleSetVM')
+
+        # Construct and send request
+        request = self._client.put(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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('VirtualMachineScaleSetVM', response)
+        if response.status_code == 202:
+            deserialized = self._deserialize('VirtualMachineScaleSetVM', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def update(
+            self, resource_group_name, vm_scale_set_name, instance_id, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Updates a virtual machine of a VM scale set.
+
+        :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 where the
+         extension should be create or updated.
+        :type vm_scale_set_name: str
+        :param instance_id: The instance ID of the virtual machine.
+        :type instance_id: str
+        :param parameters: Parameters supplied to the Update Virtual Machine
+         Scale Sets VM operation.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVM
+        :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
+         VirtualMachineScaleSetVM or
+         ClientRawResponse<VirtualMachineScaleSetVM> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVM]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVM]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._update_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            parameters=parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('VirtualMachineScaleSetVM', 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/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}'}
+
+
+    def _delete_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.delete.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.delete(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Deletes a virtual machine from a VM scale set.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            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/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}'}
+
+    def get(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        """Gets a virtual machine from a VM scale set.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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: VirtualMachineScaleSetVM or ClientRawResponse if raw=true
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVM or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineScaleSetVM', 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/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}'}
+
+    def get_instance_view(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        """Gets the status of a virtual machine from a VM scale set.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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: VirtualMachineScaleSetVMInstanceView or ClientRawResponse if
+         raw=true
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVMInstanceView
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get_instance_view.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineScaleSetVMInstanceView', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    get_instance_view.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/instanceView'}
+
+    def list(
+            self, resource_group_name, virtual_machine_scale_set_name, filter=None, select=None, expand=None, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of all virtual machines in a VM scale sets.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param virtual_machine_scale_set_name: The name of the VM scale set.
+        :type virtual_machine_scale_set_name: str
+        :param filter: The filter to apply to the operation.
+        :type filter: str
+        :param select: The list parameters.
+        :type select: str
+        :param expand: The expand expression to apply to the operation.
+        :type expand: 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 VirtualMachineScaleSetVM
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVMPaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVM]
+        :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 = {
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+                    'virtualMachineScaleSetName': self._serialize.url("virtual_machine_scale_set_name", virtual_machine_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 = {}
+                if filter is not None:
+                    query_parameters['$filter'] = self._serialize.query("filter", filter, 'str')
+                if select is not None:
+                    query_parameters['$select'] = self._serialize.query("select", select, 'str')
+                if expand is not None:
+                    query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
+                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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachineScaleSetVMPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachineScaleSetVMPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{virtualMachineScaleSetName}/virtualMachines'}
+
+
+    def _power_off_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.power_off.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 power_off(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Power off (stop) a virtual machine in a VM scale set. Note that
+        resources are still attached and you are getting charged for the
+        resources. Instead, use deallocate to release resources and avoid
+        charges.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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._power_off_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            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)
+    power_off.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/poweroff'}
+
+
+    def _restart_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.restart.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 restart(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Restarts a virtual machine in a VM scale set.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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._restart_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            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)
+    restart.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/restart'}
+
+
+    def _start_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.start.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Starts a virtual machine in a VM scale set.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            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.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/start'}
+
+
+    def _redeploy_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.redeploy.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 redeploy(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Redeploys a virtual machine in a VM scale set.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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._redeploy_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            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)
+    redeploy.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/redeploy'}
+
+
+    def _perform_maintenance_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.perform_maintenance.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 perform_maintenance(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Performs maintenance on a virtual machine in a VM scale set.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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._perform_maintenance_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            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)
+    perform_maintenance.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/performMaintenance'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_sets_operations.py
new file mode 100644
index 000000000000..0b8f451521c5
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_sets_operations.py
@@ -0,0 +1,1762 @@
+# 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 VirtualMachineScaleSetsOperations(object):
+    """VirtualMachineScaleSetsOperations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+
+    def _create_or_update_initial(
+            self, resource_group_name, vm_scale_set_name, parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.create_or_update.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 = {}
+        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(parameters, 'VirtualMachineScaleSet')
+
+        # Construct and send request
+        request = self._client.put(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, stream=False, **operation_config)
+
+        if response.status_code not in [200, 201]:
+            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('VirtualMachineScaleSet', response)
+        if response.status_code == 201:
+            deserialized = self._deserialize('VirtualMachineScaleSet', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def create_or_update(
+            self, resource_group_name, vm_scale_set_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Create or update a VM scale set.
+
+        :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 to create or
+         update.
+        :type vm_scale_set_name: str
+        :param parameters: The scale set object.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSet
+        :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 VirtualMachineScaleSet
+         or ClientRawResponse<VirtualMachineScaleSet> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSet]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSet]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._create_or_update_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            parameters=parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('VirtualMachineScaleSet', 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/virtualMachineScaleSets/{vmScaleSetName}'}
+
+
+    def _update_initial(
+            self, resource_group_name, vm_scale_set_name, parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.update.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 = {}
+        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(parameters, 'VirtualMachineScaleSetUpdate')
+
+        # Construct and send request
+        request = self._client.patch(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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('VirtualMachineScaleSet', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def update(
+            self, resource_group_name, vm_scale_set_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Update a VM scale set.
+
+        :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 to create or
+         update.
+        :type vm_scale_set_name: str
+        :param parameters: The scale set object.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetUpdate
+        :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 VirtualMachineScaleSet
+         or ClientRawResponse<VirtualMachineScaleSet> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSet]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSet]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._update_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            parameters=parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('VirtualMachineScaleSet', 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/virtualMachineScaleSets/{vmScaleSetName}'}
+
+
+    def _delete_initial(
+            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.delete.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 = {}
+        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 and send request
+        request = self._client.delete(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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, vm_scale_set_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Deletes a VM scale set.
+
+        :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._delete_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)
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}'}
+
+    def get(
+            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
+        """Display information about a virtual machine scale set.
+
+        :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: returns the direct response alongside the
+         deserialized response
+        :param operation_config: :ref:`Operation configuration
+         overrides<msrest:optionsforoperations>`.
+        :return: VirtualMachineScaleSet or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSet
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineScaleSet', 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/virtualMachineScaleSets/{vmScaleSetName}'}
+
+
+    def _deallocate_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = None
+        if instance_ids is not None:
+            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.deallocate.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 = {}
+        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
+        if vm_instance_ids is not None:
+            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
+        else:
+            body_content = None
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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 deallocate(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Deallocates specific virtual machines in a VM scale set. Shuts down the
+        virtual machines and releases the compute resources. You are not billed
+        for the compute resources that this virtual machine scale set
+        deallocates.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+         Omitting the virtual machine scale set instance ids will result in the
+         operation being performed on all virtual machines in the virtual
+         machine scale set.
+        :type instance_ids: list[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._deallocate_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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)
+    deallocate.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/deallocate'}
+
+
+    def _delete_instances_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = models.VirtualMachineScaleSetVMInstanceRequiredIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.delete_instances.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 = {}
+        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(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceRequiredIDs')
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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 delete_instances(
+            self, resource_group_name, vm_scale_set_name, instance_ids, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Deletes virtual machines in a VM scale set.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+        :type instance_ids: list[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_instances_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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_instances.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/delete'}
+
+    def get_instance_view(
+            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
+        """Gets the status of a VM scale set instance.
+
+        :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: returns the direct response alongside the
+         deserialized response
+        :param operation_config: :ref:`Operation configuration
+         overrides<msrest:optionsforoperations>`.
+        :return: VirtualMachineScaleSetInstanceView or ClientRawResponse if
+         raw=true
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetInstanceView
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get_instance_view.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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineScaleSetInstanceView', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    get_instance_view.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/instanceView'}
+
+    def list(
+            self, resource_group_name, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of all VM scale sets 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 VirtualMachineScaleSet
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetPaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSet]
+        :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 = {
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_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')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachineScaleSetPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachineScaleSetPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets'}
+
+    def list_all(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of all VM Scale Sets in the subscription, regardless of the
+        associated resource group. Use nextLink property in the response to get
+        the next page of VM Scale Sets. Do this till nextLink is null to fetch
+        all the VM Scale Sets.
+
+        :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 VirtualMachineScaleSet
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetPaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSet]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        def internal_paging(next_link=None, raw=False):
+
+            if not next_link:
+                # Construct URL
+                url = self.list_all.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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachineScaleSetPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachineScaleSetPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_all.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/virtualMachineScaleSets'}
+
+    def list_skus(
+            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of SKUs available for your VM scale set, including the
+        minimum and maximum VM instances allowed for each SKU.
+
+        :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: returns the direct response alongside the
+         deserialized response
+        :param operation_config: :ref:`Operation configuration
+         overrides<msrest:optionsforoperations>`.
+        :return: An iterator like instance of VirtualMachineScaleSetSku
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetSkuPaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetSku]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        def internal_paging(next_link=None, raw=False):
+
+            if not next_link:
+                # Construct URL
+                url = self.list_skus.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')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachineScaleSetSkuPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachineScaleSetSkuPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_skus.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/skus'}
+
+    def get_os_upgrade_history(
+            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
+        """Gets list of OS upgrades on a VM scale set instance.
+
+        :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: returns the direct response alongside the
+         deserialized response
+        :param operation_config: :ref:`Operation configuration
+         overrides<msrest:optionsforoperations>`.
+        :return: An iterator like instance of
+         UpgradeOperationHistoricalStatusInfo
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.UpgradeOperationHistoricalStatusInfoPaged[~azure.mgmt.compute.v2018_04_01.models.UpgradeOperationHistoricalStatusInfo]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        def internal_paging(next_link=None, raw=False):
+
+            if not next_link:
+                # Construct URL
+                url = self.get_os_upgrade_history.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')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.UpgradeOperationHistoricalStatusInfoPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.UpgradeOperationHistoricalStatusInfoPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    get_os_upgrade_history.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/osUpgradeHistory'}
+
+
+    def _power_off_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = None
+        if instance_ids is not None:
+            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.power_off.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 = {}
+        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
+        if vm_instance_ids is not None:
+            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
+        else:
+            body_content = None
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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 power_off(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Power off (stop) one or more virtual machines in a VM scale set. Note
+        that resources are still attached and you are getting charged for the
+        resources. Instead, use deallocate to release resources and avoid
+        charges.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+         Omitting the virtual machine scale set instance ids will result in the
+         operation being performed on all virtual machines in the virtual
+         machine scale set.
+        :type instance_ids: list[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._power_off_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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)
+    power_off.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/poweroff'}
+
+
+    def _restart_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = None
+        if instance_ids is not None:
+            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.restart.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 = {}
+        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
+        if vm_instance_ids is not None:
+            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
+        else:
+            body_content = None
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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 restart(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Restarts one or more virtual machines in a VM scale set.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+         Omitting the virtual machine scale set instance ids will result in the
+         operation being performed on all virtual machines in the virtual
+         machine scale set.
+        :type instance_ids: list[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._restart_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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)
+    restart.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/restart'}
+
+
+    def _start_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = None
+        if instance_ids is not None:
+            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.start.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 = {}
+        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
+        if vm_instance_ids is not None:
+            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
+        else:
+            body_content = None
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Starts one or more virtual machines in a VM scale set.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+         Omitting the virtual machine scale set instance ids will result in the
+         operation being performed on all virtual machines in the virtual
+         machine scale set.
+        :type instance_ids: list[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_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/start'}
+
+
+    def _redeploy_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = None
+        if instance_ids is not None:
+            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.redeploy.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 = {}
+        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
+        if vm_instance_ids is not None:
+            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
+        else:
+            body_content = None
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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 redeploy(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Redeploy one or more virtual machines in a VM scale set.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+         Omitting the virtual machine scale set instance ids will result in the
+         operation being performed on all virtual machines in the virtual
+         machine scale set.
+        :type instance_ids: list[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._redeploy_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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)
+    redeploy.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/redeploy'}
+
+
+    def _perform_maintenance_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = None
+        if instance_ids is not None:
+            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.perform_maintenance.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 = {}
+        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
+        if vm_instance_ids is not None:
+            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
+        else:
+            body_content = None
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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 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.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+         Omitting the virtual machine scale set instance ids will result in the
+         operation being performed on all virtual machines in the virtual
+         machine scale set.
+        :type instance_ids: list[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._perform_maintenance_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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)
+    perform_maintenance.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/performMaintenance'}
+
+
+    def _update_instances_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = models.VirtualMachineScaleSetVMInstanceRequiredIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.update_instances.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 = {}
+        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(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceRequiredIDs')
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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 update_instances(
+            self, resource_group_name, vm_scale_set_name, instance_ids, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Upgrades one or more virtual machines to the latest SKU set in the VM
+        scale set model.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+        :type instance_ids: list[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._update_instances_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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)
+    update_instances.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/manualupgrade'}
+
+
+    def _reimage_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = None
+        if instance_ids is not None:
+            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.reimage.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 = {}
+        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
+        if vm_instance_ids is not None:
+            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
+        else:
+            body_content = None
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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 reimage(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Reimages (upgrade the operating system) one or more virtual machines in
+        a VM scale set.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+         Omitting the virtual machine scale set instance ids will result in the
+         operation being performed on all virtual machines in the virtual
+         machine scale set.
+        :type instance_ids: list[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._reimage_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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)
+    reimage.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/reimage'}
+
+
+    def _reimage_all_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = None
+        if instance_ids is not None:
+            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.reimage_all.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 = {}
+        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
+        if vm_instance_ids is not None:
+            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
+        else:
+            body_content = None
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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 reimage_all(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Reimages all the disks ( including data disks ) in the virtual machines
+        in a VM scale set. This operation is only supported for managed disks.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+         Omitting the virtual machine scale set instance ids will result in the
+         operation being performed on all virtual machines in the virtual
+         machine scale set.
+        :type instance_ids: list[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._reimage_all_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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)
+    reimage_all.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/reimageall'}
+
+    def force_recovery_service_fabric_platform_update_domain_walk(
+            self, resource_group_name, vm_scale_set_name, platform_update_domain, custom_headers=None, raw=False, **operation_config):
+        """Manual platform update domain walk to update virtual machines in a
+        service fabric virtual machine scale set.
+
+        :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 platform_update_domain: The platform update domain for which a
+         manual recovery walk is requested
+        :type platform_update_domain: int
+        :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: RecoveryWalkResponse or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_04_01.models.RecoveryWalkResponse or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.force_recovery_service_fabric_platform_update_domain_walk.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')
+        query_parameters['platformUpdateDomain'] = self._serialize.query("platform_update_domain", platform_update_domain, 'int')
+
+        # Construct headers
+        header_parameters = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('RecoveryWalkResponse', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    force_recovery_service_fabric_platform_update_domain_walk.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/forceRecoveryServiceFabricPlatformUpdateDomainWalk'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_sizes_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_sizes_operations.py
new file mode 100644
index 000000000000..0eef7f65066c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_sizes_operations.py
@@ -0,0 +1,108 @@
+# 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 .. import models
+
+
+class VirtualMachineSizesOperations(object):
+    """VirtualMachineSizesOperations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+    def list(
+            self, location, custom_headers=None, raw=False, **operation_config):
+        """Lists all available virtual machine sizes for a subscription in a
+        location.
+
+        :param location: The location upon which virtual-machine-sizes is
+         queried.
+        :type location: 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 VirtualMachineSize
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineSizePaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineSize]
+        :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 = {
+                    'location': self._serialize.url("location", location, 'str', pattern=r'^[-\w\._]+$'),
+                    '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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachineSizePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachineSizePaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/vmSizes'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machines_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machines_operations.py
new file mode 100644
index 000000000000..ebe8cbd87fd8
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machines_operations.py
@@ -0,0 +1,1494 @@
+# 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 VirtualMachinesOperations(object):
+    """VirtualMachinesOperations 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-04-01".
+    """
+
+    models = models
+
+    def __init__(self, client, config, serializer, deserializer):
+
+        self._client = client
+        self._serialize = serializer
+        self._deserialize = deserializer
+        self.api_version = "2018-04-01"
+
+        self.config = config
+
+
+    def _capture_initial(
+            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.capture.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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(parameters, 'VirtualMachineCaptureParameters')
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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('VirtualMachineCaptureResult', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def capture(
+            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Captures the VM by copying virtual hard disks of the VM and outputs a
+        template that can be used to create similar VMs.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_name: str
+        :param parameters: Parameters supplied to the Capture Virtual Machine
+         operation.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineCaptureParameters
+        :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
+         VirtualMachineCaptureResult or
+         ClientRawResponse<VirtualMachineCaptureResult> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineCaptureResult]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineCaptureResult]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._capture_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_name,
+            parameters=parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('VirtualMachineCaptureResult', 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)
+    capture.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/capture'}
+
+
+    def _create_or_update_initial(
+            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.create_or_update.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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(parameters, 'VirtualMachine')
+
+        # Construct and send request
+        request = self._client.put(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, stream=False, **operation_config)
+
+        if response.status_code not in [200, 201]:
+            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('VirtualMachine', response)
+        if response.status_code == 201:
+            deserialized = self._deserialize('VirtualMachine', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def create_or_update(
+            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to create or update a virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_name: str
+        :param parameters: Parameters supplied to the Create Virtual Machine
+         operation.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachine
+        :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 VirtualMachine or
+         ClientRawResponse<VirtualMachine> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.VirtualMachine]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.VirtualMachine]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._create_or_update_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_name,
+            parameters=parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('VirtualMachine', 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/virtualMachines/{vmName}'}
+
+
+    def _update_initial(
+            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.update.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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(parameters, 'VirtualMachineUpdate')
+
+        # Construct and send request
+        request = self._client.patch(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, stream=False, **operation_config)
+
+        if response.status_code not in [200, 201]:
+            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('VirtualMachine', response)
+        if response.status_code == 201:
+            deserialized = self._deserialize('VirtualMachine', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def update(
+            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to update a virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_name: str
+        :param parameters: Parameters supplied to the Update Virtual Machine
+         operation.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineUpdate
+        :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 VirtualMachine or
+         ClientRawResponse<VirtualMachine> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.VirtualMachine]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.VirtualMachine]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._update_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_name,
+            parameters=parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('VirtualMachine', 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/virtualMachines/{vmName}'}
+
+
+    def _delete_initial(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.delete.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.delete(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to delete a virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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,
+            vm_name=vm_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/virtualMachines/{vmName}'}
+
+    def get(
+            self, resource_group_name, vm_name, expand=None, custom_headers=None, raw=False, **operation_config):
+        """Retrieves information about the model view or the instance view of a
+        virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_name: str
+        :param expand: The expand expression to apply on the operation.
+         Possible values include: 'instanceView'
+        :type expand: str or
+         ~azure.mgmt.compute.v2018_04_01.models.InstanceViewTypes
+        :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: VirtualMachine or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_04_01.models.VirtualMachine or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        if expand is not None:
+            query_parameters['$expand'] = self._serialize.query("expand", expand, 'InstanceViewTypes')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachine', 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/virtualMachines/{vmName}'}
+
+    def instance_view(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        """Retrieves information about the run-time state of a virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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: VirtualMachineInstanceView or ClientRawResponse if raw=true
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineInstanceView or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.instance_view.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineInstanceView', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    instance_view.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/instanceView'}
+
+
+    def _convert_to_managed_disks_initial(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.convert_to_managed_disks.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 convert_to_managed_disks(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Converts virtual machine disks from blob-based to managed disks.
+        Virtual machine must be stop-deallocated before invoking this
+        operation.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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._convert_to_managed_disks_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_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)
+    convert_to_managed_disks.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/convertToManagedDisks'}
+
+
+    def _deallocate_initial(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.deallocate.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 deallocate(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Shuts down the virtual machine and releases the compute resources. You
+        are not billed for the compute resources that this virtual machine
+        uses.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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._deallocate_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_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)
+    deallocate.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/deallocate'}
+
+    def generalize(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        """Sets the state of the virtual machine to generalized.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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: None or ClientRawResponse if raw=true
+        :rtype: None or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.generalize.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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
+
+        if raw:
+            client_raw_response = ClientRawResponse(None, response)
+            return client_raw_response
+    generalize.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/generalize'}
+
+    def list(
+            self, resource_group_name, custom_headers=None, raw=False, **operation_config):
+        """Lists all of the virtual machines in the specified resource group. Use
+        the nextLink property in the response to get the next page of virtual
+        machines.
+
+        :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 VirtualMachine
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachinePaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachine]
+        :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 = {
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_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')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachinePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachinePaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines'}
+
+    def list_all(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Lists all of the virtual machines in the specified subscription. Use
+        the nextLink property in the response to get the next page of virtual
+        machines.
+
+        :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 VirtualMachine
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachinePaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachine]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        def internal_paging(next_link=None, raw=False):
+
+            if not next_link:
+                # Construct URL
+                url = self.list_all.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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachinePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachinePaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_all.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/virtualMachines'}
+
+    def list_available_sizes(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        """Lists all available virtual machine sizes to which the specified
+        virtual machine can be resized.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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 VirtualMachineSize
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineSizePaged[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineSize]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        def internal_paging(next_link=None, raw=False):
+
+            if not next_link:
+                # Construct URL
+                url = self.list_available_sizes.metadata['url']
+                path_format_arguments = {
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+                    'vmName': self._serialize.url("vm_name", vm_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')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachineSizePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachineSizePaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_available_sizes.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/vmSizes'}
+
+
+    def _power_off_initial(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.power_off.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 power_off(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to power off (stop) a virtual machine. The virtual
+        machine can be restarted with the same provisioned resources. You are
+        still charged for this virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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._power_off_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_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)
+    power_off.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/powerOff'}
+
+
+    def _restart_initial(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.restart.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 restart(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to restart a virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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._restart_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_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)
+    restart.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/restart'}
+
+
+    def _start_initial(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.start.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to start a virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_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.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/start'}
+
+
+    def _redeploy_initial(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.redeploy.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 redeploy(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to redeploy a virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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._redeploy_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_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)
+    redeploy.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/redeploy'}
+
+
+    def _perform_maintenance_initial(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.perform_maintenance.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 perform_maintenance(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to perform maintenance on a virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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._perform_maintenance_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_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)
+    perform_maintenance.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/performMaintenance'}
+
+
+    def _run_command_initial(
+            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.run_command.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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(parameters, 'RunCommandInput')
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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('[InstanceViewStatus]', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def run_command(
+            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Run command on the VM.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_name: str
+        :param parameters: Parameters supplied to the Run command operation.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_04_01.models.RunCommandInput
+        :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 list or
+         ClientRawResponse<list> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._run_command_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_name,
+            parameters=parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('[InstanceViewStatus]', 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)
+    run_command.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/runCommand'}

From f1235da4651848fe7fc8880985a384e5ebd89709 Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Fri, 29 Jun 2018 17:20:12 -0700
Subject: [PATCH 11/29] Generated from 41175e4e605bb5ed0329cdfa91ae14cfbd6a6739
 (#2829)

Addressed comments - added missing StandardSSD_LRS in 2018-04-01, updated name to ListAll, and removed the change from 2015-06-15
---
 .../availability_sets_operations.py           | 65 +++++++++++++++++++
 .../availability_sets_operations.py           | 65 +++++++++++++++++++
 .../availability_sets_operations.py           | 65 +++++++++++++++++++
 .../availability_sets_operations.py           | 65 +++++++++++++++++++
 .../models/compute_management_client_enums.py |  1 +
 .../compute/v2018_04_01/models/disk_sku.py    |  4 +-
 .../v2018_04_01/models/disk_sku_py3.py        |  4 +-
 .../v2018_04_01/models/image_data_disk.py     |  5 +-
 .../v2018_04_01/models/image_data_disk_py3.py |  5 +-
 .../v2018_04_01/models/image_os_disk.py       |  5 +-
 .../v2018_04_01/models/image_os_disk_py3.py   |  5 +-
 .../models/managed_disk_parameters.py         |  5 +-
 .../models/managed_disk_parameters_py3.py     |  5 +-
 ...chine_scale_set_managed_disk_parameters.py |  5 +-
 ...e_scale_set_managed_disk_parameters_py3.py |  5 +-
 .../availability_sets_operations.py           | 65 +++++++++++++++++++
 .../compute/v2018_06_01/models/__init__.py    |  5 +-
 .../models/compute_management_client_enums.py |  6 ++
 .../models/gallery_data_disk_image.py         | 29 ++++++---
 .../models/gallery_data_disk_image_py3.py     | 33 ++++++----
 .../v2018_06_01/models/gallery_disk_image.py  | 26 +++++---
 .../models/gallery_disk_image_py3.py          | 28 +++++---
 .../v2018_06_01/models/gallery_identifier.py  |  2 +-
 .../models/gallery_identifier_py3.py          |  2 +-
 .../v2018_06_01/models/gallery_image.py       |  4 +-
 .../v2018_06_01/models/gallery_image_py3.py   |  4 +-
 .../models/gallery_image_version.py           | 14 ++--
 ...allery_image_version_publishing_profile.py | 13 ++--
 ...ry_image_version_publishing_profile_py3.py | 15 +++--
 .../models/gallery_image_version_py3.py       | 16 +++--
 .../gallery_image_version_storage_profile.py  | 20 ++++--
 ...llery_image_version_storage_profile_py3.py | 22 +++++--
 .../models/gallery_os_disk_image.py           | 22 +++++--
 .../models/gallery_os_disk_image_py3.py       | 26 +++++---
 .../models/operation_status_response.py       | 55 ----------------
 .../models/operation_status_response_py3.py   | 55 ----------------
 .../models/regional_replication_status.py     | 36 ++++++----
 .../models/regional_replication_status_py3.py | 38 +++++++----
 .../v2018_06_01/models/replication_status.py  | 24 ++++---
 .../models/replication_status_py3.py          | 26 +++++---
 .../operations/galleries_operations.py        | 35 ++++------
 .../gallery_image_versions_operations.py      | 41 +++++-------
 .../operations/gallery_images_operations.py   | 35 ++++------
 43 files changed, 660 insertions(+), 346 deletions(-)
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response_py3.py

diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/availability_sets_operations.py
index 48582fd18dc4..dd549283c784 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/availability_sets_operations.py
@@ -231,6 +231,71 @@ def get(
         return deserialized
     get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
 
+    def list_by_subscription(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Lists all availability sets in 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 AvailabilitySet
+        :rtype:
+         ~azure.mgmt.compute.v2016_03_30.models.AvailabilitySetPaged[~azure.mgmt.compute.v2016_03_30.models.AvailabilitySet]
+        :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_subscription.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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
+
     def list(
             self, resource_group_name, custom_headers=None, raw=False, **operation_config):
         """Lists all availability sets in a resource group.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/availability_sets_operations.py
index dda88859b1f5..8eb5f352915b 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/availability_sets_operations.py
@@ -232,6 +232,71 @@ def get(
         return deserialized
     get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
 
+    def list_by_subscription(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Lists all availability sets in 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 AvailabilitySet
+        :rtype:
+         ~azure.mgmt.compute.v2016_04_30_preview.models.AvailabilitySetPaged[~azure.mgmt.compute.v2016_04_30_preview.models.AvailabilitySet]
+        :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_subscription.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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
+
     def list(
             self, resource_group_name, custom_headers=None, raw=False, **operation_config):
         """Lists all availability sets in a resource group.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/availability_sets_operations.py
index ce2e741626f2..4e7b3494c55a 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/availability_sets_operations.py
@@ -231,6 +231,71 @@ def get(
         return deserialized
     get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
 
+    def list_by_subscription(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Lists all availability sets in 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 AvailabilitySet
+        :rtype:
+         ~azure.mgmt.compute.v2017_03_30.models.AvailabilitySetPaged[~azure.mgmt.compute.v2017_03_30.models.AvailabilitySet]
+        :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_subscription.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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
+
     def list(
             self, resource_group_name, custom_headers=None, raw=False, **operation_config):
         """Lists all availability sets in a resource group.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/availability_sets_operations.py
index 5e2cc0d7f116..5f03fa563156 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/availability_sets_operations.py
@@ -301,6 +301,71 @@ def get(
         return deserialized
     get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
 
+    def list_by_subscription(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Lists all availability sets in 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 AvailabilitySet
+        :rtype:
+         ~azure.mgmt.compute.v2017_12_01.models.AvailabilitySetPaged[~azure.mgmt.compute.v2017_12_01.models.AvailabilitySet]
+        :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_subscription.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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
+
     def list(
             self, resource_group_name, custom_headers=None, raw=False, **operation_config):
         """Lists all availability sets in a resource group.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py
index b66be29c4cf4..d72727b5e98e 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py
@@ -213,6 +213,7 @@ class StorageAccountTypes(str, Enum):
 
     standard_lrs = "Standard_LRS"
     premium_lrs = "Premium_LRS"
+    standard_ssd_lrs = "StandardSSD_LRS"
 
 
 class PassNames(str, Enum):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku.py
index f0bbc41f21e1..1123feabd42c 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku.py
@@ -13,13 +13,13 @@
 
 
 class DiskSku(Model):
-    """The disks sku name. Can be Standard_LRS or Premium_LRS.
+    """The disks sku name. Can be Standard_LRS, Premium_LRS, or StandardSSD_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'
+     'Premium_LRS', 'StandardSSD_LRS'
     :type name: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     :ivar tier: The sku tier. Default value: "Standard" .
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku_py3.py
index 99a2821b0aeb..df30d24c240a 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku_py3.py
@@ -13,13 +13,13 @@
 
 
 class DiskSku(Model):
-    """The disks sku name. Can be Standard_LRS or Premium_LRS.
+    """The disks sku name. Can be Standard_LRS, Premium_LRS, or StandardSSD_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'
+     'Premium_LRS', 'StandardSSD_LRS'
     :type name: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     :ivar tier: The sku tier. Default value: "Standard" .
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py
index ae905adba8c4..3d96a893bb63 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py
@@ -37,8 +37,9 @@ class ImageDataDisk(Model):
      machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param storage_account_type: Specifies the storage account type for the
-     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
+     managed disk. Possible values are: Standard_LRS, Premium_LRS, and
+     StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
+     'StandardSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py
index 7112f92f78c0..d7262b81ba6b 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py
@@ -37,8 +37,9 @@ class ImageDataDisk(Model):
      machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param storage_account_type: Specifies the storage account type for the
-     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
+     managed disk. Possible values are: Standard_LRS, Premium_LRS, and
+     StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
+     'StandardSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py
index 3ef3a0cd4414..7515a838e5cf 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py
@@ -43,8 +43,9 @@ class ImageOSDisk(Model):
      machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param storage_account_type: Specifies the storage account type for the
-     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
+     managed disk. Possible values are: Standard_LRS, Premium_LRS, and
+     StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
+     'StandardSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py
index 59c61abd3f0f..06cc994712fa 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py
@@ -43,8 +43,9 @@ class ImageOSDisk(Model):
      machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param storage_account_type: Specifies the storage account type for the
-     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
+     managed disk. Possible values are: Standard_LRS, Premium_LRS, and
+     StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
+     'StandardSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py
index a16aed3bbcbf..e3f0b5324e39 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py
@@ -18,8 +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 or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
+     managed disk. Possible values are: Standard_LRS, Premium_LRS, and
+     StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
+     'StandardSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py
index 50b8a76181d6..02d27c61f9d3 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py
@@ -18,8 +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 or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
+     managed disk. Possible values are: Standard_LRS, Premium_LRS, and
+     StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
+     'StandardSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py
index 495309b9b2cf..89b93a0524f2 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py
@@ -16,8 +16,9 @@ class VirtualMachineScaleSetManagedDiskParameters(Model):
     """Describes the parameters of a ScaleSet managed disk.
 
     :param storage_account_type: Specifies the storage account type for the
-     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
+     managed disk. Possible values are: Standard_LRS, Premium_LRS, and
+     StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
+     'StandardSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py
index 68f66be2e34e..a35e25fcba75 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py
@@ -16,8 +16,9 @@ class VirtualMachineScaleSetManagedDiskParameters(Model):
     """Describes the parameters of a ScaleSet managed disk.
 
     :param storage_account_type: Specifies the storage account type for the
-     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
+     managed disk. Possible values are: Standard_LRS, Premium_LRS, and
+     StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
+     'StandardSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py
index ba8e21445a27..2c6a7d2a0f18 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py
@@ -293,6 +293,71 @@ def get(
         return deserialized
     get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
 
+    def list_by_subscription(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Lists all availability sets in 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 AvailabilitySet
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.AvailabilitySetPaged[~azure.mgmt.compute.v2018_04_01.models.AvailabilitySet]
+        :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_subscription.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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
+
     def list(
             self, resource_group_name, custom_headers=None, raw=False, **operation_config):
         """Lists all availability sets in a resource group.
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 204dfcec1d1e..39442e272bac 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
@@ -32,7 +32,6 @@
     from .api_error_base_py3 import ApiErrorBase
     from .inner_error_py3 import InnerError
     from .api_error_py3 import ApiError
-    from .operation_status_response_py3 import OperationStatusResponse
     from .resource_py3 import Resource
 except (SyntaxError, ImportError):
     from .gallery_identifier import GalleryIdentifier
@@ -57,7 +56,6 @@
     from .api_error_base import ApiErrorBase
     from .inner_error import InnerError
     from .api_error import ApiError
-    from .operation_status_response import OperationStatusResponse
     from .resource import Resource
 from .gallery_paged import GalleryPaged
 from .gallery_image_paged import GalleryImagePaged
@@ -65,6 +63,7 @@
 from .compute_management_client_enums import (
     OperatingSystemTypes,
     OperatingSystemStateTypes,
+    ScaleTier,
     AggregatedReplicationState,
     ReplicationState,
     HostCaching,
@@ -94,13 +93,13 @@
     'ApiErrorBase',
     'InnerError',
     'ApiError',
-    'OperationStatusResponse',
     'Resource',
     'GalleryPaged',
     'GalleryImagePaged',
     'GalleryImageVersionPaged',
     'OperatingSystemTypes',
     'OperatingSystemStateTypes',
+    'ScaleTier',
     'AggregatedReplicationState',
     'ReplicationState',
     'HostCaching',
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 b8906c280b6e..c575a854046e 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
@@ -24,6 +24,12 @@ class OperatingSystemStateTypes(str, Enum):
     specialized = "Specialized"
 
 
+class ScaleTier(str, Enum):
+
+    s30 = "S30"
+    s100 = "S100"
+
+
 class AggregatedReplicationState(str, Enum):
 
     unknown = "Unknown"
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image.py
index a62ec5101821..88efa05270a0 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image.py
@@ -15,25 +15,34 @@
 class GalleryDataDiskImage(GalleryDiskImage):
     """This is the data disk image.
 
-    :param sized_in_gb: It indicates the size of the VHD to create.
-    :type sized_in_gb: int
-    :param host_caching: The host caching of the disk. Valid values are
-     'None', 'ReadOnly', and 'ReadWrite'. Possible values include: 'None',
-     'ReadOnly', 'ReadWrite'
-    :type host_caching: str or
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar size_in_gb: It indicates the size of the VHD to create.
+    :vartype size_in_gb: int
+    :ivar host_caching: The host caching of the disk. Valid values are 'None',
+     'ReadOnly', and 'ReadWrite'. Possible values include: 'None', 'ReadOnly',
+     'ReadWrite'
+    :vartype host_caching: str or
      ~azure.mgmt.compute.v2018_06_01.models.HostCaching
-    :param lun: Specifies the logical unit number of the data disk. This value
+    :ivar lun: Specifies the logical unit number of the data disk. This value
      is used to identify data disks within the VM and therefore must be unique
      for each data disk attached to a VM.
-    :type lun: int
+    :vartype lun: int
     """
 
+    _validation = {
+        'size_in_gb': {'readonly': True},
+        'host_caching': {'readonly': True},
+        'lun': {'readonly': True},
+    }
+
     _attribute_map = {
-        'sized_in_gb': {'key': 'sizedInGB', 'type': 'int'},
+        'size_in_gb': {'key': 'sizeInGB', 'type': 'int'},
         'host_caching': {'key': 'hostCaching', 'type': 'HostCaching'},
         'lun': {'key': 'lun', 'type': 'int'},
     }
 
     def __init__(self, **kwargs):
         super(GalleryDataDiskImage, self).__init__(**kwargs)
-        self.lun = kwargs.get('lun', None)
+        self.lun = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image_py3.py
index 0b698ea162db..06b2a569818b 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image_py3.py
@@ -15,25 +15,34 @@
 class GalleryDataDiskImage(GalleryDiskImage):
     """This is the data disk image.
 
-    :param sized_in_gb: It indicates the size of the VHD to create.
-    :type sized_in_gb: int
-    :param host_caching: The host caching of the disk. Valid values are
-     'None', 'ReadOnly', and 'ReadWrite'. Possible values include: 'None',
-     'ReadOnly', 'ReadWrite'
-    :type host_caching: str or
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar size_in_gb: It indicates the size of the VHD to create.
+    :vartype size_in_gb: int
+    :ivar host_caching: The host caching of the disk. Valid values are 'None',
+     'ReadOnly', and 'ReadWrite'. Possible values include: 'None', 'ReadOnly',
+     'ReadWrite'
+    :vartype host_caching: str or
      ~azure.mgmt.compute.v2018_06_01.models.HostCaching
-    :param lun: Specifies the logical unit number of the data disk. This value
+    :ivar lun: Specifies the logical unit number of the data disk. This value
      is used to identify data disks within the VM and therefore must be unique
      for each data disk attached to a VM.
-    :type lun: int
+    :vartype lun: int
     """
 
+    _validation = {
+        'size_in_gb': {'readonly': True},
+        'host_caching': {'readonly': True},
+        'lun': {'readonly': True},
+    }
+
     _attribute_map = {
-        'sized_in_gb': {'key': 'sizedInGB', 'type': 'int'},
+        'size_in_gb': {'key': 'sizeInGB', 'type': 'int'},
         'host_caching': {'key': 'hostCaching', 'type': 'HostCaching'},
         'lun': {'key': 'lun', 'type': 'int'},
     }
 
-    def __init__(self, *, sized_in_gb: int=None, host_caching=None, lun: int=None, **kwargs) -> None:
-        super(GalleryDataDiskImage, self).__init__(sized_in_gb=sized_in_gb, host_caching=host_caching, **kwargs)
-        self.lun = lun
+    def __init__(self, **kwargs) -> None:
+        super(GalleryDataDiskImage, self).__init__(**kwargs)
+        self.lun = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image.py
index b65868a89800..b99d727114c9 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image.py
@@ -15,21 +15,29 @@
 class GalleryDiskImage(Model):
     """This is the disk image base class.
 
-    :param sized_in_gb: It indicates the size of the VHD to create.
-    :type sized_in_gb: int
-    :param host_caching: The host caching of the disk. Valid values are
-     'None', 'ReadOnly', and 'ReadWrite'. Possible values include: 'None',
-     'ReadOnly', 'ReadWrite'
-    :type host_caching: str or
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar size_in_gb: It indicates the size of the VHD to create.
+    :vartype size_in_gb: int
+    :ivar host_caching: The host caching of the disk. Valid values are 'None',
+     'ReadOnly', and 'ReadWrite'. Possible values include: 'None', 'ReadOnly',
+     'ReadWrite'
+    :vartype host_caching: str or
      ~azure.mgmt.compute.v2018_06_01.models.HostCaching
     """
 
+    _validation = {
+        'size_in_gb': {'readonly': True},
+        'host_caching': {'readonly': True},
+    }
+
     _attribute_map = {
-        'sized_in_gb': {'key': 'sizedInGB', 'type': 'int'},
+        'size_in_gb': {'key': 'sizeInGB', 'type': 'int'},
         'host_caching': {'key': 'hostCaching', 'type': 'HostCaching'},
     }
 
     def __init__(self, **kwargs):
         super(GalleryDiskImage, self).__init__(**kwargs)
-        self.sized_in_gb = kwargs.get('sized_in_gb', None)
-        self.host_caching = kwargs.get('host_caching', None)
+        self.size_in_gb = None
+        self.host_caching = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image_py3.py
index 97f8b4780743..c27888c9a07e 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image_py3.py
@@ -15,21 +15,29 @@
 class GalleryDiskImage(Model):
     """This is the disk image base class.
 
-    :param sized_in_gb: It indicates the size of the VHD to create.
-    :type sized_in_gb: int
-    :param host_caching: The host caching of the disk. Valid values are
-     'None', 'ReadOnly', and 'ReadWrite'. Possible values include: 'None',
-     'ReadOnly', 'ReadWrite'
-    :type host_caching: str or
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar size_in_gb: It indicates the size of the VHD to create.
+    :vartype size_in_gb: int
+    :ivar host_caching: The host caching of the disk. Valid values are 'None',
+     'ReadOnly', and 'ReadWrite'. Possible values include: 'None', 'ReadOnly',
+     'ReadWrite'
+    :vartype host_caching: str or
      ~azure.mgmt.compute.v2018_06_01.models.HostCaching
     """
 
+    _validation = {
+        'size_in_gb': {'readonly': True},
+        'host_caching': {'readonly': True},
+    }
+
     _attribute_map = {
-        'sized_in_gb': {'key': 'sizedInGB', 'type': 'int'},
+        'size_in_gb': {'key': 'sizeInGB', 'type': 'int'},
         'host_caching': {'key': 'hostCaching', 'type': 'HostCaching'},
     }
 
-    def __init__(self, *, sized_in_gb: int=None, host_caching=None, **kwargs) -> None:
+    def __init__(self, **kwargs) -> None:
         super(GalleryDiskImage, self).__init__(**kwargs)
-        self.sized_in_gb = sized_in_gb
-        self.host_caching = host_caching
+        self.size_in_gb = None
+        self.host_caching = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier.py
index a5099bc73cd0..015fc199542e 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier.py
@@ -13,7 +13,7 @@
 
 
 class GalleryIdentifier(Model):
-    """GalleryIdentifier.
+    """Describes the gallery unique name.
 
     Variables are only populated by the server, and will be ignored when
     sending a request.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier_py3.py
index 680d47368cd5..2b7f4e6555a6 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier_py3.py
@@ -13,7 +13,7 @@
 
 
 class GalleryIdentifier(Model):
-    """GalleryIdentifier.
+    """Describes the gallery unique name.
 
     Variables are only populated by the server, and will be ignored when
     sending a request.
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 b5e470292d58..21af4252c4bf 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
@@ -50,7 +50,7 @@ class GalleryImage(Resource):
     :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: date
+    :type end_of_life_date: datetime
     :param identifier:
     :type identifier:
      ~azure.mgmt.compute.v2018_06_01.models.GalleryImageIdentifier
@@ -90,7 +90,7 @@ class GalleryImage(Resource):
         'release_note_uri': {'key': 'properties.releaseNoteUri', 'type': 'str'},
         'os_type': {'key': 'properties.osType', 'type': 'OperatingSystemTypes'},
         'os_state': {'key': 'properties.osState', 'type': 'OperatingSystemStateTypes'},
-        'end_of_life_date': {'key': 'properties.endOfLifeDate', 'type': 'date'},
+        'end_of_life_date': {'key': 'properties.endOfLifeDate', 'type': 'iso-8601'},
         'identifier': {'key': 'properties.identifier', 'type': 'GalleryImageIdentifier'},
         'recommended': {'key': 'properties.recommended', 'type': 'RecommendedMachineConfiguration'},
         'disallowed': {'key': 'properties.disallowed', 'type': 'Disallowed'},
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 e9d172fe981e..ea37cbf9541b 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
@@ -50,7 +50,7 @@ class GalleryImage(Resource):
     :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: date
+    :type end_of_life_date: datetime
     :param identifier:
     :type identifier:
      ~azure.mgmt.compute.v2018_06_01.models.GalleryImageIdentifier
@@ -90,7 +90,7 @@ class GalleryImage(Resource):
         'release_note_uri': {'key': 'properties.releaseNoteUri', 'type': 'str'},
         'os_type': {'key': 'properties.osType', 'type': 'OperatingSystemTypes'},
         'os_state': {'key': 'properties.osState', 'type': 'OperatingSystemStateTypes'},
-        'end_of_life_date': {'key': 'properties.endOfLifeDate', 'type': 'date'},
+        'end_of_life_date': {'key': 'properties.endOfLifeDate', 'type': 'iso-8601'},
         'identifier': {'key': 'properties.identifier', 'type': 'GalleryImageIdentifier'},
         'recommended': {'key': 'properties.recommended', 'type': 'RecommendedMachineConfiguration'},
         'disallowed': {'key': 'properties.disallowed', 'type': 'Disallowed'},
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 34b3ff35e8a6..69cdf916c67b 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
@@ -40,11 +40,11 @@ class GalleryImageVersion(Resource):
      'Migrating'
     :vartype provisioning_state: str or
      ~azure.mgmt.compute.v2018_06_01.models.enum
-    :param storage_profile:
-    :type storage_profile:
+    :ivar storage_profile:
+    :vartype storage_profile:
      ~azure.mgmt.compute.v2018_06_01.models.GalleryImageVersionStorageProfile
-    :param replication_status:
-    :type replication_status:
+    :ivar replication_status:
+    :vartype replication_status:
      ~azure.mgmt.compute.v2018_06_01.models.ReplicationStatus
     """
 
@@ -54,6 +54,8 @@ class GalleryImageVersion(Resource):
         'type': {'readonly': True},
         'location': {'required': True},
         'provisioning_state': {'readonly': True},
+        'storage_profile': {'readonly': True},
+        'replication_status': {'readonly': True},
     }
 
     _attribute_map = {
@@ -72,5 +74,5 @@ def __init__(self, **kwargs):
         super(GalleryImageVersion, self).__init__(**kwargs)
         self.publishing_profile = kwargs.get('publishing_profile', None)
         self.provisioning_state = None
-        self.storage_profile = kwargs.get('storage_profile', None)
-        self.replication_status = kwargs.get('replication_status', None)
+        self.storage_profile = None
+        self.replication_status = None
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 4ca5bae74c72..e475a6192ec7 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
@@ -22,15 +22,18 @@ class GalleryImageVersionPublishingProfile(GalleryArtifactPublishingProfileBase)
     :type regions: list[str]
     :param source:
     :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 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
     :ivar published_date: The time when the gallery image version is
      published.
-    :vartype published_date: date
+    :vartype published_date: datetime
     :param end_of_life_date: The end of life date of the gallery image
      version.
-    :type end_of_life_date: date
+    :type end_of_life_date: datetime
     """
 
     _validation = {
@@ -40,13 +43,15 @@ class GalleryImageVersionPublishingProfile(GalleryArtifactPublishingProfileBase)
     _attribute_map = {
         'regions': {'key': 'regions', 'type': '[str]'},
         'source': {'key': 'source', 'type': 'GalleryArtifactSource'},
+        'scale_tier': {'key': 'scaleTier', 'type': 'str'},
         'exclude_from_latest': {'key': 'excludeFromLatest', 'type': 'bool'},
-        'published_date': {'key': 'publishedDate', 'type': 'date'},
-        'end_of_life_date': {'key': 'endOfLifeDate', 'type': 'date'},
+        'published_date': {'key': 'publishedDate', 'type': 'iso-8601'},
+        'end_of_life_date': {'key': 'endOfLifeDate', 'type': 'iso-8601'},
     }
 
     def __init__(self, **kwargs):
         super(GalleryImageVersionPublishingProfile, self).__init__(**kwargs)
+        self.scale_tier = kwargs.get('scale_tier', 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 478b8d780317..13b13fdd244f 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
@@ -22,15 +22,18 @@ class GalleryImageVersionPublishingProfile(GalleryArtifactPublishingProfileBase)
     :type regions: list[str]
     :param source:
     :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 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
     :ivar published_date: The time when the gallery image version is
      published.
-    :vartype published_date: date
+    :vartype published_date: datetime
     :param end_of_life_date: The end of life date of the gallery image
      version.
-    :type end_of_life_date: date
+    :type end_of_life_date: datetime
     """
 
     _validation = {
@@ -40,13 +43,15 @@ class GalleryImageVersionPublishingProfile(GalleryArtifactPublishingProfileBase)
     _attribute_map = {
         'regions': {'key': 'regions', 'type': '[str]'},
         'source': {'key': 'source', 'type': 'GalleryArtifactSource'},
+        'scale_tier': {'key': 'scaleTier', 'type': 'str'},
         'exclude_from_latest': {'key': 'excludeFromLatest', 'type': 'bool'},
-        'published_date': {'key': 'publishedDate', 'type': 'date'},
-        'end_of_life_date': {'key': 'endOfLifeDate', 'type': 'date'},
+        'published_date': {'key': 'publishedDate', 'type': 'iso-8601'},
+        'end_of_life_date': {'key': 'endOfLifeDate', 'type': 'iso-8601'},
     }
 
-    def __init__(self, *, regions=None, source=None, exclude_from_latest: bool=None, end_of_life_date=None, **kwargs) -> None:
+    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
         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 dd86bc5f911f..b01071bd2279 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
@@ -40,11 +40,11 @@ class GalleryImageVersion(Resource):
      'Migrating'
     :vartype provisioning_state: str or
      ~azure.mgmt.compute.v2018_06_01.models.enum
-    :param storage_profile:
-    :type storage_profile:
+    :ivar storage_profile:
+    :vartype storage_profile:
      ~azure.mgmt.compute.v2018_06_01.models.GalleryImageVersionStorageProfile
-    :param replication_status:
-    :type replication_status:
+    :ivar replication_status:
+    :vartype replication_status:
      ~azure.mgmt.compute.v2018_06_01.models.ReplicationStatus
     """
 
@@ -54,6 +54,8 @@ class GalleryImageVersion(Resource):
         'type': {'readonly': True},
         'location': {'required': True},
         'provisioning_state': {'readonly': True},
+        'storage_profile': {'readonly': True},
+        'replication_status': {'readonly': True},
     }
 
     _attribute_map = {
@@ -68,9 +70,9 @@ class GalleryImageVersion(Resource):
         'replication_status': {'key': 'properties.replicationStatus', 'type': 'ReplicationStatus'},
     }
 
-    def __init__(self, *, location: str, tags=None, publishing_profile=None, storage_profile=None, replication_status=None, **kwargs) -> None:
+    def __init__(self, *, location: str, tags=None, publishing_profile=None, **kwargs) -> None:
         super(GalleryImageVersion, self).__init__(location=location, tags=tags, **kwargs)
         self.publishing_profile = publishing_profile
         self.provisioning_state = None
-        self.storage_profile = storage_profile
-        self.replication_status = replication_status
+        self.storage_profile = None
+        self.replication_status = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile.py
index 20d969c702e8..0a213a2f051d 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile.py
@@ -15,14 +15,22 @@
 class GalleryImageVersionStorageProfile(Model):
     """This is the storage profile of a gallery image version.
 
-    :param os_disk_image:
-    :type os_disk_image:
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar os_disk_image:
+    :vartype os_disk_image:
      ~azure.mgmt.compute.v2018_06_01.models.GalleryOSDiskImage
-    :param data_disk_images: A list of data disk images.
-    :type data_disk_images:
+    :ivar data_disk_images: A list of data disk images.
+    :vartype data_disk_images:
      list[~azure.mgmt.compute.v2018_06_01.models.GalleryDataDiskImage]
     """
 
+    _validation = {
+        'os_disk_image': {'readonly': True},
+        'data_disk_images': {'readonly': True},
+    }
+
     _attribute_map = {
         'os_disk_image': {'key': 'osDiskImage', 'type': 'GalleryOSDiskImage'},
         'data_disk_images': {'key': 'dataDiskImages', 'type': '[GalleryDataDiskImage]'},
@@ -30,5 +38,5 @@ class GalleryImageVersionStorageProfile(Model):
 
     def __init__(self, **kwargs):
         super(GalleryImageVersionStorageProfile, self).__init__(**kwargs)
-        self.os_disk_image = kwargs.get('os_disk_image', None)
-        self.data_disk_images = kwargs.get('data_disk_images', None)
+        self.os_disk_image = None
+        self.data_disk_images = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile_py3.py
index 8d0814e207ed..ea45b454b07c 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile_py3.py
@@ -15,20 +15,28 @@
 class GalleryImageVersionStorageProfile(Model):
     """This is the storage profile of a gallery image version.
 
-    :param os_disk_image:
-    :type os_disk_image:
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar os_disk_image:
+    :vartype os_disk_image:
      ~azure.mgmt.compute.v2018_06_01.models.GalleryOSDiskImage
-    :param data_disk_images: A list of data disk images.
-    :type data_disk_images:
+    :ivar data_disk_images: A list of data disk images.
+    :vartype data_disk_images:
      list[~azure.mgmt.compute.v2018_06_01.models.GalleryDataDiskImage]
     """
 
+    _validation = {
+        'os_disk_image': {'readonly': True},
+        'data_disk_images': {'readonly': True},
+    }
+
     _attribute_map = {
         'os_disk_image': {'key': 'osDiskImage', 'type': 'GalleryOSDiskImage'},
         'data_disk_images': {'key': 'dataDiskImages', 'type': '[GalleryDataDiskImage]'},
     }
 
-    def __init__(self, *, os_disk_image=None, data_disk_images=None, **kwargs) -> None:
+    def __init__(self, **kwargs) -> None:
         super(GalleryImageVersionStorageProfile, self).__init__(**kwargs)
-        self.os_disk_image = os_disk_image
-        self.data_disk_images = data_disk_images
+        self.os_disk_image = None
+        self.data_disk_images = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image.py
index ee00cee1f1b9..75b6dde7e996 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image.py
@@ -15,17 +15,25 @@
 class GalleryOSDiskImage(GalleryDiskImage):
     """This is the OS disk image.
 
-    :param sized_in_gb: It indicates the size of the VHD to create.
-    :type sized_in_gb: int
-    :param host_caching: The host caching of the disk. Valid values are
-     'None', 'ReadOnly', and 'ReadWrite'. Possible values include: 'None',
-     'ReadOnly', 'ReadWrite'
-    :type host_caching: str or
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar size_in_gb: It indicates the size of the VHD to create.
+    :vartype size_in_gb: int
+    :ivar host_caching: The host caching of the disk. Valid values are 'None',
+     'ReadOnly', and 'ReadWrite'. Possible values include: 'None', 'ReadOnly',
+     'ReadWrite'
+    :vartype host_caching: str or
      ~azure.mgmt.compute.v2018_06_01.models.HostCaching
     """
 
+    _validation = {
+        'size_in_gb': {'readonly': True},
+        'host_caching': {'readonly': True},
+    }
+
     _attribute_map = {
-        'sized_in_gb': {'key': 'sizedInGB', 'type': 'int'},
+        'size_in_gb': {'key': 'sizeInGB', 'type': 'int'},
         'host_caching': {'key': 'hostCaching', 'type': 'HostCaching'},
     }
 
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image_py3.py
index e0907ddbf47e..8981e015c475 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image_py3.py
@@ -15,19 +15,27 @@
 class GalleryOSDiskImage(GalleryDiskImage):
     """This is the OS disk image.
 
-    :param sized_in_gb: It indicates the size of the VHD to create.
-    :type sized_in_gb: int
-    :param host_caching: The host caching of the disk. Valid values are
-     'None', 'ReadOnly', and 'ReadWrite'. Possible values include: 'None',
-     'ReadOnly', 'ReadWrite'
-    :type host_caching: str or
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar size_in_gb: It indicates the size of the VHD to create.
+    :vartype size_in_gb: int
+    :ivar host_caching: The host caching of the disk. Valid values are 'None',
+     'ReadOnly', and 'ReadWrite'. Possible values include: 'None', 'ReadOnly',
+     'ReadWrite'
+    :vartype host_caching: str or
      ~azure.mgmt.compute.v2018_06_01.models.HostCaching
     """
 
+    _validation = {
+        'size_in_gb': {'readonly': True},
+        'host_caching': {'readonly': True},
+    }
+
     _attribute_map = {
-        'sized_in_gb': {'key': 'sizedInGB', 'type': 'int'},
+        'size_in_gb': {'key': 'sizeInGB', 'type': 'int'},
         'host_caching': {'key': 'hostCaching', 'type': 'HostCaching'},
     }
 
-    def __init__(self, *, sized_in_gb: int=None, host_caching=None, **kwargs) -> None:
-        super(GalleryOSDiskImage, self).__init__(sized_in_gb=sized_in_gb, host_caching=host_caching, **kwargs)
+    def __init__(self, **kwargs) -> None:
+        super(GalleryOSDiskImage, self).__init__(**kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response.py
deleted file mode 100644
index 18065b7ec12f..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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 OperationStatusResponse(Model):
-    """Operation status response.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar name: Operation ID
-    :vartype name: str
-    :ivar status: Operation status
-    :vartype status: str
-    :ivar start_time: Start time of the operation
-    :vartype start_time: datetime
-    :ivar end_time: End time of the operation
-    :vartype end_time: datetime
-    :ivar error: Api error
-    :vartype error: ~azure.mgmt.compute.v2018_06_01.models.ApiError
-    """
-
-    _validation = {
-        'name': {'readonly': True},
-        'status': {'readonly': True},
-        'start_time': {'readonly': True},
-        'end_time': {'readonly': True},
-        'error': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'status': {'key': 'status', 'type': 'str'},
-        'start_time': {'key': 'startTime', 'type': 'iso-8601'},
-        'end_time': {'key': 'endTime', 'type': 'iso-8601'},
-        'error': {'key': 'error', 'type': 'ApiError'},
-    }
-
-    def __init__(self, **kwargs):
-        super(OperationStatusResponse, self).__init__(**kwargs)
-        self.name = None
-        self.status = None
-        self.start_time = None
-        self.end_time = None
-        self.error = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response_py3.py
deleted file mode 100644
index e36e5fb46916..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response_py3.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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 OperationStatusResponse(Model):
-    """Operation status response.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar name: Operation ID
-    :vartype name: str
-    :ivar status: Operation status
-    :vartype status: str
-    :ivar start_time: Start time of the operation
-    :vartype start_time: datetime
-    :ivar end_time: End time of the operation
-    :vartype end_time: datetime
-    :ivar error: Api error
-    :vartype error: ~azure.mgmt.compute.v2018_06_01.models.ApiError
-    """
-
-    _validation = {
-        'name': {'readonly': True},
-        'status': {'readonly': True},
-        'start_time': {'readonly': True},
-        'end_time': {'readonly': True},
-        'error': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'status': {'key': 'status', 'type': 'str'},
-        'start_time': {'key': 'startTime', 'type': 'iso-8601'},
-        'end_time': {'key': 'endTime', 'type': 'iso-8601'},
-        'error': {'key': 'error', 'type': 'ApiError'},
-    }
-
-    def __init__(self, **kwargs) -> None:
-        super(OperationStatusResponse, self).__init__(**kwargs)
-        self.name = None
-        self.status = None
-        self.start_time = None
-        self.end_time = None
-        self.error = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status.py
index be74a7fdeb00..ac541c4f4080 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status.py
@@ -15,28 +15,38 @@
 class RegionalReplicationStatus(Model):
     """This is the regional replication status.
 
-    :param region: The region where the gallery image version is published to.
-    :type region: str
-    :param state: This is the regional replication state. Possible values
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar region: The region where the gallery image version is published to.
+    :vartype region: str
+    :ivar state: This is the regional replication state. Possible values
      include: 'Unknown', 'Replicating', 'Completed', 'Failed'
-    :type state: str or
+    :vartype state: str or
      ~azure.mgmt.compute.v2018_06_01.models.ReplicationState
-    :param details: The details of the replication status.
-    :type details: str
-    :param progress: It indicates progress of the replication job.
-    :type progress: int
+    :ivar details: The details of the replication status.
+    :vartype details: str
+    :ivar progress: It indicates progress of the replication job.
+    :vartype progress: int
     """
 
+    _validation = {
+        'region': {'readonly': True},
+        'state': {'readonly': True},
+        'details': {'readonly': True},
+        'progress': {'readonly': True},
+    }
+
     _attribute_map = {
         'region': {'key': 'region', 'type': 'str'},
-        'state': {'key': 'state', 'type': 'ReplicationState'},
+        'state': {'key': 'state', 'type': 'str'},
         'details': {'key': 'details', 'type': 'str'},
         'progress': {'key': 'progress', 'type': 'int'},
     }
 
     def __init__(self, **kwargs):
         super(RegionalReplicationStatus, self).__init__(**kwargs)
-        self.region = kwargs.get('region', None)
-        self.state = kwargs.get('state', None)
-        self.details = kwargs.get('details', None)
-        self.progress = kwargs.get('progress', None)
+        self.region = None
+        self.state = None
+        self.details = None
+        self.progress = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status_py3.py
index ad9e0e83c4d2..4838b5542b8c 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status_py3.py
@@ -15,28 +15,38 @@
 class RegionalReplicationStatus(Model):
     """This is the regional replication status.
 
-    :param region: The region where the gallery image version is published to.
-    :type region: str
-    :param state: This is the regional replication state. Possible values
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar region: The region where the gallery image version is published to.
+    :vartype region: str
+    :ivar state: This is the regional replication state. Possible values
      include: 'Unknown', 'Replicating', 'Completed', 'Failed'
-    :type state: str or
+    :vartype state: str or
      ~azure.mgmt.compute.v2018_06_01.models.ReplicationState
-    :param details: The details of the replication status.
-    :type details: str
-    :param progress: It indicates progress of the replication job.
-    :type progress: int
+    :ivar details: The details of the replication status.
+    :vartype details: str
+    :ivar progress: It indicates progress of the replication job.
+    :vartype progress: int
     """
 
+    _validation = {
+        'region': {'readonly': True},
+        'state': {'readonly': True},
+        'details': {'readonly': True},
+        'progress': {'readonly': True},
+    }
+
     _attribute_map = {
         'region': {'key': 'region', 'type': 'str'},
-        'state': {'key': 'state', 'type': 'ReplicationState'},
+        'state': {'key': 'state', 'type': 'str'},
         'details': {'key': 'details', 'type': 'str'},
         'progress': {'key': 'progress', 'type': 'int'},
     }
 
-    def __init__(self, *, region: str=None, state=None, details: str=None, progress: int=None, **kwargs) -> None:
+    def __init__(self, **kwargs) -> None:
         super(RegionalReplicationStatus, self).__init__(**kwargs)
-        self.region = region
-        self.state = state
-        self.details = details
-        self.progress = progress
+        self.region = None
+        self.state = None
+        self.details = None
+        self.progress = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status.py
index dca3310506b8..5d20b80672e2 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status.py
@@ -15,22 +15,30 @@
 class ReplicationStatus(Model):
     """This is the replication status of the gallery image version.
 
-    :param aggregated_state: This is the aggregated replication status based
-     on the regional replication status. Possible values include: 'Unknown',
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar aggregated_state: This is the aggregated replication status based on
+     the regional replication status. Possible values include: 'Unknown',
      'InProgress', 'Completed', 'Failed'
-    :type aggregated_state: str or
+    :vartype aggregated_state: str or
      ~azure.mgmt.compute.v2018_06_01.models.AggregatedReplicationState
-    :param summary: This is a summary of replication status for each region.
-    :type summary:
+    :ivar summary: This is a summary of replication status for each region.
+    :vartype summary:
      list[~azure.mgmt.compute.v2018_06_01.models.RegionalReplicationStatus]
     """
 
+    _validation = {
+        'aggregated_state': {'readonly': True},
+        'summary': {'readonly': True},
+    }
+
     _attribute_map = {
-        'aggregated_state': {'key': 'aggregatedState', 'type': 'AggregatedReplicationState'},
+        'aggregated_state': {'key': 'aggregatedState', 'type': 'str'},
         'summary': {'key': 'summary', 'type': '[RegionalReplicationStatus]'},
     }
 
     def __init__(self, **kwargs):
         super(ReplicationStatus, self).__init__(**kwargs)
-        self.aggregated_state = kwargs.get('aggregated_state', None)
-        self.summary = kwargs.get('summary', None)
+        self.aggregated_state = None
+        self.summary = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status_py3.py
index 72bf40691d04..c492353698fd 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status_py3.py
@@ -15,22 +15,30 @@
 class ReplicationStatus(Model):
     """This is the replication status of the gallery image version.
 
-    :param aggregated_state: This is the aggregated replication status based
-     on the regional replication status. Possible values include: 'Unknown',
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar aggregated_state: This is the aggregated replication status based on
+     the regional replication status. Possible values include: 'Unknown',
      'InProgress', 'Completed', 'Failed'
-    :type aggregated_state: str or
+    :vartype aggregated_state: str or
      ~azure.mgmt.compute.v2018_06_01.models.AggregatedReplicationState
-    :param summary: This is a summary of replication status for each region.
-    :type summary:
+    :ivar summary: This is a summary of replication status for each region.
+    :vartype summary:
      list[~azure.mgmt.compute.v2018_06_01.models.RegionalReplicationStatus]
     """
 
+    _validation = {
+        'aggregated_state': {'readonly': True},
+        'summary': {'readonly': True},
+    }
+
     _attribute_map = {
-        'aggregated_state': {'key': 'aggregatedState', 'type': 'AggregatedReplicationState'},
+        'aggregated_state': {'key': 'aggregatedState', 'type': 'str'},
         'summary': {'key': 'summary', 'type': '[RegionalReplicationStatus]'},
     }
 
-    def __init__(self, *, aggregated_state=None, summary=None, **kwargs) -> None:
+    def __init__(self, **kwargs) -> None:
         super(ReplicationStatus, self).__init__(**kwargs)
-        self.aggregated_state = aggregated_state
-        self.summary = summary
+        self.aggregated_state = None
+        self.summary = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/galleries_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/galleries_operations.py
index 7d94dc409558..b05139317ddf 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/galleries_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/galleries_operations.py
@@ -73,7 +73,7 @@ def _create_or_update_initial(
         response = self._client.send(
             request, header_parameters, body_content, stream=False, **operation_config)
 
-        if response.status_code not in [200, 201]:
+        if response.status_code not in [200, 201, 202]:
             exp = CloudError(response)
             exp.request_id = response.headers.get('x-ms-request-id')
             raise exp
@@ -84,6 +84,8 @@ def _create_or_update_initial(
             deserialized = self._deserialize('Gallery', response)
         if response.status_code == 201:
             deserialized = self._deserialize('Gallery', response)
+        if response.status_code == 202:
+            deserialized = self._deserialize('Gallery', response)
 
         if raw:
             client_raw_response = ClientRawResponse(deserialized, response)
@@ -239,17 +241,10 @@ def _delete_initial(
             exp.request_id = response.headers.get('x-ms-request-id')
             raise exp
 
-        deserialized = None
-
-        if response.status_code == 200:
-            deserialized = self._deserialize('OperationStatusResponse', response)
-
         if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
+            client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
 
-        return deserialized
-
     def delete(
             self, resource_group_name, gallery_name, custom_headers=None, raw=False, polling=True, **operation_config):
         """Delete a gallery.
@@ -263,12 +258,10 @@ def delete(
          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 OperationStatusResponse
-         or ClientRawResponse<OperationStatusResponse> if raw==True
-        :rtype:
-         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.OperationStatusResponse]
-         or
-         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.OperationStatusResponse]]
+        :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(
@@ -280,14 +273,10 @@ def delete(
         )
 
         def get_long_running_output(response):
-            deserialized = self._deserialize('OperationStatusResponse', response)
-
             if raw:
-                client_raw_response = ClientRawResponse(deserialized, response)
+                client_raw_response = ClientRawResponse(None, response)
                 return client_raw_response
 
-            return deserialized
-
         lro_delay = operation_config.get(
             'long_running_operation_timeout',
             self.config.long_running_operation_timeout)
@@ -365,7 +354,7 @@ def internal_paging(next_link=None, raw=False):
         return deserialized
     list_by_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/galleries'}
 
-    def list_by_subscription(
+    def list(
             self, custom_headers=None, raw=False, **operation_config):
         """List galleries under a subscription.
 
@@ -383,7 +372,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = self.list_by_subscription.metadata['url']
+                url = self.list.metadata['url']
                 path_format_arguments = {
                     'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
                 }
@@ -428,4 +417,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
-    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/galleries'}
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/galleries'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_image_versions_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_image_versions_operations.py
index e0aa712f5c54..3acc16a4d1bc 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_image_versions_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_image_versions_operations.py
@@ -75,7 +75,7 @@ def _create_or_update_initial(
         response = self._client.send(
             request, header_parameters, body_content, stream=False, **operation_config)
 
-        if response.status_code not in [200, 201]:
+        if response.status_code not in [200, 201, 202]:
             exp = CloudError(response)
             exp.request_id = response.headers.get('x-ms-request-id')
             raise exp
@@ -86,6 +86,8 @@ def _create_or_update_initial(
             deserialized = self._deserialize('GalleryImageVersion', response)
         if response.status_code == 201:
             deserialized = self._deserialize('GalleryImageVersion', response)
+        if response.status_code == 202:
+            deserialized = self._deserialize('GalleryImageVersion', response)
 
         if raw:
             client_raw_response = ClientRawResponse(deserialized, response)
@@ -104,7 +106,9 @@ def create_or_update(
         :param gallery_image_name: The name of the gallery image.
         :type gallery_image_name: str
         :param gallery_image_version_name: The name of the gallery image
-         version.
+         version. Needs to follow semantic version name pattern: The allowed
+         characters are digit and period. Digits must be within the range of a
+         32-bit integer. Format: <MajorVersion>.<MinorVersion>.<Patch>
         :type gallery_image_version_name: str
         :param gallery_image_version: Parameters supplied to the create or
          update gallery image version operation.
@@ -193,7 +197,7 @@ def get(
         # Construct parameters
         query_parameters = {}
         if expand is not None:
-            query_parameters['$expand'] = self._serialize.query("expand", expand, 'ReplicationStatusTypes')
+            query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
         query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
 
         # Construct headers
@@ -264,17 +268,10 @@ def _delete_initial(
             exp.request_id = response.headers.get('x-ms-request-id')
             raise exp
 
-        deserialized = None
-
-        if response.status_code == 200:
-            deserialized = self._deserialize('OperationStatusResponse', response)
-
         if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
+            client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
 
-        return deserialized
-
     def delete(
             self, resource_group_name, gallery_name, gallery_image_name, gallery_image_version_name, custom_headers=None, raw=False, polling=True, **operation_config):
         """Delete a gallery image version.
@@ -293,12 +290,10 @@ def delete(
          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 OperationStatusResponse
-         or ClientRawResponse<OperationStatusResponse> if raw==True
-        :rtype:
-         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.OperationStatusResponse]
-         or
-         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.OperationStatusResponse]]
+        :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(
@@ -312,14 +307,10 @@ def delete(
         )
 
         def get_long_running_output(response):
-            deserialized = self._deserialize('OperationStatusResponse', response)
-
             if raw:
-                client_raw_response = ClientRawResponse(deserialized, response)
+                client_raw_response = ClientRawResponse(None, response)
                 return client_raw_response
 
-            return deserialized
-
         lro_delay = operation_config.get(
             'long_running_operation_timeout',
             self.config.long_running_operation_timeout)
@@ -329,7 +320,7 @@ def get_long_running_output(response):
         return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
     delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/galleries/{galleryName}/images/{galleryImageName}/versions/{galleryImageVersionName}'}
 
-    def list_gallery_image_versions_by_gallery_image(
+    def list_by_gallery_image(
             self, resource_group_name, gallery_name, gallery_image_name, custom_headers=None, raw=False, **operation_config):
         """List gallery image versions under a gallery image.
 
@@ -353,7 +344,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = self.list_gallery_image_versions_by_gallery_image.metadata['url']
+                url = self.list_by_gallery_image.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'),
@@ -401,4 +392,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
-    list_gallery_image_versions_by_gallery_image.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/galleries/{galleryName}/images/{galleryImageName}/versions'}
+    list_by_gallery_image.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/galleries/{galleryName}/images/{galleryImageName}/versions'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_images_operations.py
index e28d24dc1d58..fc8b6ff9f1ac 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_images_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_images_operations.py
@@ -74,7 +74,7 @@ def _create_or_update_initial(
         response = self._client.send(
             request, header_parameters, body_content, stream=False, **operation_config)
 
-        if response.status_code not in [200, 201]:
+        if response.status_code not in [200, 201, 202]:
             exp = CloudError(response)
             exp.request_id = response.headers.get('x-ms-request-id')
             raise exp
@@ -85,6 +85,8 @@ def _create_or_update_initial(
             deserialized = self._deserialize('GalleryImage', response)
         if response.status_code == 201:
             deserialized = self._deserialize('GalleryImage', response)
+        if response.status_code == 202:
+            deserialized = self._deserialize('GalleryImage', response)
 
         if raw:
             client_raw_response = ClientRawResponse(deserialized, response)
@@ -248,17 +250,10 @@ def _delete_initial(
             exp.request_id = response.headers.get('x-ms-request-id')
             raise exp
 
-        deserialized = None
-
-        if response.status_code == 200:
-            deserialized = self._deserialize('OperationStatusResponse', response)
-
         if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
+            client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
 
-        return deserialized
-
     def delete(
             self, resource_group_name, gallery_name, gallery_image_name, custom_headers=None, raw=False, polling=True, **operation_config):
         """Delete a gallery image.
@@ -274,12 +269,10 @@ def delete(
          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 OperationStatusResponse
-         or ClientRawResponse<OperationStatusResponse> if raw==True
-        :rtype:
-         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.OperationStatusResponse]
-         or
-         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.OperationStatusResponse]]
+        :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(
@@ -292,14 +285,10 @@ def delete(
         )
 
         def get_long_running_output(response):
-            deserialized = self._deserialize('OperationStatusResponse', response)
-
             if raw:
-                client_raw_response = ClientRawResponse(deserialized, response)
+                client_raw_response = ClientRawResponse(None, response)
                 return client_raw_response
 
-            return deserialized
-
         lro_delay = operation_config.get(
             'long_running_operation_timeout',
             self.config.long_running_operation_timeout)
@@ -309,7 +298,7 @@ def get_long_running_output(response):
         return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
     delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/galleries/{galleryName}/images/{galleryImageName}'}
 
-    def list_gallery_images_by_gallery(
+    def list_by_gallery(
             self, resource_group_name, gallery_name, custom_headers=None, raw=False, **operation_config):
         """List gallery images under a gallery.
 
@@ -331,7 +320,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = self.list_gallery_images_by_gallery.metadata['url']
+                url = self.list_by_gallery.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'),
@@ -378,4 +367,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
-    list_gallery_images_by_gallery.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/galleries/{galleryName}/images'}
+    list_by_gallery.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/galleries/{galleryName}/images'}

From 2ce5c7e4369521f49e2036eed458f455024b7695 Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Mon, 2 Jul 2018 11:06:13 -0700
Subject: [PATCH 12/29] Generated from 0a9ee3a2db06dff212c23f80c8b7bf1eec31613a
 (#2858)

User identities in a new dictionary property

Moving user identities support from the property "identityId" list to a new dictionary property named "userAssignedIdentities".
---
 .../availability_sets_operations.py           | 65 -------------------
 .../availability_sets_operations.py           | 65 -------------------
 .../availability_sets_operations.py           | 65 -------------------
 .../availability_sets_operations.py           | 65 -------------------
 .../models/compute_management_client_enums.py |  1 -
 .../compute/v2018_04_01/models/disk_sku.py    |  4 +-
 .../v2018_04_01/models/disk_sku_py3.py        |  4 +-
 .../v2018_04_01/models/image_data_disk.py     |  5 +-
 .../v2018_04_01/models/image_data_disk_py3.py |  5 +-
 .../v2018_04_01/models/image_os_disk.py       |  5 +-
 .../v2018_04_01/models/image_os_disk_py3.py   |  5 +-
 .../models/managed_disk_parameters.py         |  5 +-
 .../models/managed_disk_parameters_py3.py     |  5 +-
 ...chine_scale_set_managed_disk_parameters.py |  5 +-
 ...e_scale_set_managed_disk_parameters_py3.py |  5 +-
 .../availability_sets_operations.py           | 65 -------------------
 .../compute/v2018_06_01/models/__init__.py    |  5 +-
 .../models/compute_management_client_enums.py |  6 --
 .../models/gallery_data_disk_image.py         | 29 +++------
 .../models/gallery_data_disk_image_py3.py     | 33 ++++------
 .../v2018_06_01/models/gallery_disk_image.py  | 26 +++-----
 .../models/gallery_disk_image_py3.py          | 28 +++-----
 .../v2018_06_01/models/gallery_identifier.py  |  2 +-
 .../models/gallery_identifier_py3.py          |  2 +-
 .../v2018_06_01/models/gallery_image.py       |  4 +-
 .../v2018_06_01/models/gallery_image_py3.py   |  4 +-
 .../models/gallery_image_version.py           | 14 ++--
 ...allery_image_version_publishing_profile.py | 13 ++--
 ...ry_image_version_publishing_profile_py3.py | 15 ++---
 .../models/gallery_image_version_py3.py       | 16 ++---
 .../gallery_image_version_storage_profile.py  | 20 ++----
 ...llery_image_version_storage_profile_py3.py | 22 ++-----
 .../models/gallery_os_disk_image.py           | 22 ++-----
 .../models/gallery_os_disk_image_py3.py       | 26 +++-----
 .../models/operation_status_response.py       | 55 ++++++++++++++++
 .../models/operation_status_response_py3.py   | 55 ++++++++++++++++
 .../models/regional_replication_status.py     | 36 ++++------
 .../models/regional_replication_status_py3.py | 38 ++++-------
 .../v2018_06_01/models/replication_status.py  | 24 +++----
 .../models/replication_status_py3.py          | 26 +++-----
 .../operations/galleries_operations.py        | 35 ++++++----
 .../gallery_image_versions_operations.py      | 41 +++++++-----
 .../operations/gallery_images_operations.py   | 35 ++++++----
 43 files changed, 346 insertions(+), 660 deletions(-)
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response_py3.py

diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/availability_sets_operations.py
index dd549283c784..48582fd18dc4 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/availability_sets_operations.py
@@ -231,71 +231,6 @@ def get(
         return deserialized
     get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
 
-    def list_by_subscription(
-            self, custom_headers=None, raw=False, **operation_config):
-        """Lists all availability sets in 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 AvailabilitySet
-        :rtype:
-         ~azure.mgmt.compute.v2016_03_30.models.AvailabilitySetPaged[~azure.mgmt.compute.v2016_03_30.models.AvailabilitySet]
-        :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_subscription.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['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 and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
-            return client_raw_response
-
-        return deserialized
-    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
-
     def list(
             self, resource_group_name, custom_headers=None, raw=False, **operation_config):
         """Lists all availability sets in a resource group.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/availability_sets_operations.py
index 8eb5f352915b..dda88859b1f5 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/availability_sets_operations.py
@@ -232,71 +232,6 @@ def get(
         return deserialized
     get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
 
-    def list_by_subscription(
-            self, custom_headers=None, raw=False, **operation_config):
-        """Lists all availability sets in 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 AvailabilitySet
-        :rtype:
-         ~azure.mgmt.compute.v2016_04_30_preview.models.AvailabilitySetPaged[~azure.mgmt.compute.v2016_04_30_preview.models.AvailabilitySet]
-        :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_subscription.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['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 and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
-            return client_raw_response
-
-        return deserialized
-    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
-
     def list(
             self, resource_group_name, custom_headers=None, raw=False, **operation_config):
         """Lists all availability sets in a resource group.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/availability_sets_operations.py
index 4e7b3494c55a..ce2e741626f2 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/availability_sets_operations.py
@@ -231,71 +231,6 @@ def get(
         return deserialized
     get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
 
-    def list_by_subscription(
-            self, custom_headers=None, raw=False, **operation_config):
-        """Lists all availability sets in 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 AvailabilitySet
-        :rtype:
-         ~azure.mgmt.compute.v2017_03_30.models.AvailabilitySetPaged[~azure.mgmt.compute.v2017_03_30.models.AvailabilitySet]
-        :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_subscription.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['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 and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
-            return client_raw_response
-
-        return deserialized
-    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
-
     def list(
             self, resource_group_name, custom_headers=None, raw=False, **operation_config):
         """Lists all availability sets in a resource group.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/availability_sets_operations.py
index 5f03fa563156..5e2cc0d7f116 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/availability_sets_operations.py
@@ -301,71 +301,6 @@ def get(
         return deserialized
     get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
 
-    def list_by_subscription(
-            self, custom_headers=None, raw=False, **operation_config):
-        """Lists all availability sets in 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 AvailabilitySet
-        :rtype:
-         ~azure.mgmt.compute.v2017_12_01.models.AvailabilitySetPaged[~azure.mgmt.compute.v2017_12_01.models.AvailabilitySet]
-        :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_subscription.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['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 and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
-            return client_raw_response
-
-        return deserialized
-    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
-
     def list(
             self, resource_group_name, custom_headers=None, raw=False, **operation_config):
         """Lists all availability sets in a resource group.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py
index d72727b5e98e..b66be29c4cf4 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py
@@ -213,7 +213,6 @@ class StorageAccountTypes(str, Enum):
 
     standard_lrs = "Standard_LRS"
     premium_lrs = "Premium_LRS"
-    standard_ssd_lrs = "StandardSSD_LRS"
 
 
 class PassNames(str, Enum):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku.py
index 1123feabd42c..f0bbc41f21e1 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku.py
@@ -13,13 +13,13 @@
 
 
 class DiskSku(Model):
-    """The disks sku name. Can be Standard_LRS, Premium_LRS, or StandardSSD_LRS.
+    """The disks sku name. Can be Standard_LRS or Premium_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'
+     'Premium_LRS'
     :type name: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     :ivar tier: The sku tier. Default value: "Standard" .
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku_py3.py
index df30d24c240a..99a2821b0aeb 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku_py3.py
@@ -13,13 +13,13 @@
 
 
 class DiskSku(Model):
-    """The disks sku name. Can be Standard_LRS, Premium_LRS, or StandardSSD_LRS.
+    """The disks sku name. Can be Standard_LRS or Premium_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'
+     'Premium_LRS'
     :type name: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     :ivar tier: The sku tier. Default value: "Standard" .
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py
index 3d96a893bb63..ae905adba8c4 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py
@@ -37,9 +37,8 @@ class ImageDataDisk(Model):
      machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :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. Possible values are: Standard_LRS or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py
index d7262b81ba6b..7112f92f78c0 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py
@@ -37,9 +37,8 @@ class ImageDataDisk(Model):
      machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :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. Possible values are: Standard_LRS or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py
index 7515a838e5cf..3ef3a0cd4414 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py
@@ -43,9 +43,8 @@ class ImageOSDisk(Model):
      machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :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. Possible values are: Standard_LRS or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py
index 06cc994712fa..59c61abd3f0f 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py
@@ -43,9 +43,8 @@ class ImageOSDisk(Model):
      machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :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. Possible values are: Standard_LRS or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py
index e3f0b5324e39..a16aed3bbcbf 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py
@@ -18,9 +18,8 @@ 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. Possible values are: Standard_LRS or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py
index 02d27c61f9d3..50b8a76181d6 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py
@@ -18,9 +18,8 @@ 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. Possible values are: Standard_LRS or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py
index 89b93a0524f2..495309b9b2cf 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py
@@ -16,9 +16,8 @@ class VirtualMachineScaleSetManagedDiskParameters(Model):
     """Describes the parameters of a ScaleSet managed disk.
 
     :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. Possible values are: Standard_LRS or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py
index a35e25fcba75..68f66be2e34e 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py
@@ -16,9 +16,8 @@ class VirtualMachineScaleSetManagedDiskParameters(Model):
     """Describes the parameters of a ScaleSet managed disk.
 
     :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. Possible values are: Standard_LRS or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py
index 2c6a7d2a0f18..ba8e21445a27 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py
@@ -293,71 +293,6 @@ def get(
         return deserialized
     get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
 
-    def list_by_subscription(
-            self, custom_headers=None, raw=False, **operation_config):
-        """Lists all availability sets in 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 AvailabilitySet
-        :rtype:
-         ~azure.mgmt.compute.v2018_04_01.models.AvailabilitySetPaged[~azure.mgmt.compute.v2018_04_01.models.AvailabilitySet]
-        :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_subscription.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['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 and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
-            return client_raw_response
-
-        return deserialized
-    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
-
     def list(
             self, resource_group_name, custom_headers=None, raw=False, **operation_config):
         """Lists all availability sets in a resource group.
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 39442e272bac..204dfcec1d1e 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
@@ -32,6 +32,7 @@
     from .api_error_base_py3 import ApiErrorBase
     from .inner_error_py3 import InnerError
     from .api_error_py3 import ApiError
+    from .operation_status_response_py3 import OperationStatusResponse
     from .resource_py3 import Resource
 except (SyntaxError, ImportError):
     from .gallery_identifier import GalleryIdentifier
@@ -56,6 +57,7 @@
     from .api_error_base import ApiErrorBase
     from .inner_error import InnerError
     from .api_error import ApiError
+    from .operation_status_response import OperationStatusResponse
     from .resource import Resource
 from .gallery_paged import GalleryPaged
 from .gallery_image_paged import GalleryImagePaged
@@ -63,7 +65,6 @@
 from .compute_management_client_enums import (
     OperatingSystemTypes,
     OperatingSystemStateTypes,
-    ScaleTier,
     AggregatedReplicationState,
     ReplicationState,
     HostCaching,
@@ -93,13 +94,13 @@
     'ApiErrorBase',
     'InnerError',
     'ApiError',
+    'OperationStatusResponse',
     'Resource',
     'GalleryPaged',
     'GalleryImagePaged',
     'GalleryImageVersionPaged',
     'OperatingSystemTypes',
     'OperatingSystemStateTypes',
-    'ScaleTier',
     'AggregatedReplicationState',
     'ReplicationState',
     'HostCaching',
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 c575a854046e..b8906c280b6e 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
@@ -24,12 +24,6 @@ class OperatingSystemStateTypes(str, Enum):
     specialized = "Specialized"
 
 
-class ScaleTier(str, Enum):
-
-    s30 = "S30"
-    s100 = "S100"
-
-
 class AggregatedReplicationState(str, Enum):
 
     unknown = "Unknown"
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image.py
index 88efa05270a0..a62ec5101821 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image.py
@@ -15,34 +15,25 @@
 class GalleryDataDiskImage(GalleryDiskImage):
     """This is the data disk image.
 
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar size_in_gb: It indicates the size of the VHD to create.
-    :vartype size_in_gb: int
-    :ivar host_caching: The host caching of the disk. Valid values are 'None',
-     'ReadOnly', and 'ReadWrite'. Possible values include: 'None', 'ReadOnly',
-     'ReadWrite'
-    :vartype host_caching: str or
+    :param sized_in_gb: It indicates the size of the VHD to create.
+    :type sized_in_gb: int
+    :param host_caching: The host caching of the disk. Valid values are
+     'None', 'ReadOnly', and 'ReadWrite'. Possible values include: 'None',
+     'ReadOnly', 'ReadWrite'
+    :type host_caching: str or
      ~azure.mgmt.compute.v2018_06_01.models.HostCaching
-    :ivar lun: Specifies the logical unit number of the data disk. This value
+    :param lun: Specifies the logical unit number of the data disk. This value
      is used to identify data disks within the VM and therefore must be unique
      for each data disk attached to a VM.
-    :vartype lun: int
+    :type lun: int
     """
 
-    _validation = {
-        'size_in_gb': {'readonly': True},
-        'host_caching': {'readonly': True},
-        'lun': {'readonly': True},
-    }
-
     _attribute_map = {
-        'size_in_gb': {'key': 'sizeInGB', 'type': 'int'},
+        'sized_in_gb': {'key': 'sizedInGB', 'type': 'int'},
         'host_caching': {'key': 'hostCaching', 'type': 'HostCaching'},
         'lun': {'key': 'lun', 'type': 'int'},
     }
 
     def __init__(self, **kwargs):
         super(GalleryDataDiskImage, self).__init__(**kwargs)
-        self.lun = None
+        self.lun = kwargs.get('lun', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image_py3.py
index 06b2a569818b..0b698ea162db 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image_py3.py
@@ -15,34 +15,25 @@
 class GalleryDataDiskImage(GalleryDiskImage):
     """This is the data disk image.
 
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar size_in_gb: It indicates the size of the VHD to create.
-    :vartype size_in_gb: int
-    :ivar host_caching: The host caching of the disk. Valid values are 'None',
-     'ReadOnly', and 'ReadWrite'. Possible values include: 'None', 'ReadOnly',
-     'ReadWrite'
-    :vartype host_caching: str or
+    :param sized_in_gb: It indicates the size of the VHD to create.
+    :type sized_in_gb: int
+    :param host_caching: The host caching of the disk. Valid values are
+     'None', 'ReadOnly', and 'ReadWrite'. Possible values include: 'None',
+     'ReadOnly', 'ReadWrite'
+    :type host_caching: str or
      ~azure.mgmt.compute.v2018_06_01.models.HostCaching
-    :ivar lun: Specifies the logical unit number of the data disk. This value
+    :param lun: Specifies the logical unit number of the data disk. This value
      is used to identify data disks within the VM and therefore must be unique
      for each data disk attached to a VM.
-    :vartype lun: int
+    :type lun: int
     """
 
-    _validation = {
-        'size_in_gb': {'readonly': True},
-        'host_caching': {'readonly': True},
-        'lun': {'readonly': True},
-    }
-
     _attribute_map = {
-        'size_in_gb': {'key': 'sizeInGB', 'type': 'int'},
+        'sized_in_gb': {'key': 'sizedInGB', 'type': 'int'},
         'host_caching': {'key': 'hostCaching', 'type': 'HostCaching'},
         'lun': {'key': 'lun', 'type': 'int'},
     }
 
-    def __init__(self, **kwargs) -> None:
-        super(GalleryDataDiskImage, self).__init__(**kwargs)
-        self.lun = None
+    def __init__(self, *, sized_in_gb: int=None, host_caching=None, lun: int=None, **kwargs) -> None:
+        super(GalleryDataDiskImage, self).__init__(sized_in_gb=sized_in_gb, host_caching=host_caching, **kwargs)
+        self.lun = lun
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image.py
index b99d727114c9..b65868a89800 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image.py
@@ -15,29 +15,21 @@
 class GalleryDiskImage(Model):
     """This is the disk image base class.
 
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar size_in_gb: It indicates the size of the VHD to create.
-    :vartype size_in_gb: int
-    :ivar host_caching: The host caching of the disk. Valid values are 'None',
-     'ReadOnly', and 'ReadWrite'. Possible values include: 'None', 'ReadOnly',
-     'ReadWrite'
-    :vartype host_caching: str or
+    :param sized_in_gb: It indicates the size of the VHD to create.
+    :type sized_in_gb: int
+    :param host_caching: The host caching of the disk. Valid values are
+     'None', 'ReadOnly', and 'ReadWrite'. Possible values include: 'None',
+     'ReadOnly', 'ReadWrite'
+    :type host_caching: str or
      ~azure.mgmt.compute.v2018_06_01.models.HostCaching
     """
 
-    _validation = {
-        'size_in_gb': {'readonly': True},
-        'host_caching': {'readonly': True},
-    }
-
     _attribute_map = {
-        'size_in_gb': {'key': 'sizeInGB', 'type': 'int'},
+        'sized_in_gb': {'key': 'sizedInGB', 'type': 'int'},
         'host_caching': {'key': 'hostCaching', 'type': 'HostCaching'},
     }
 
     def __init__(self, **kwargs):
         super(GalleryDiskImage, self).__init__(**kwargs)
-        self.size_in_gb = None
-        self.host_caching = None
+        self.sized_in_gb = kwargs.get('sized_in_gb', None)
+        self.host_caching = kwargs.get('host_caching', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image_py3.py
index c27888c9a07e..97f8b4780743 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image_py3.py
@@ -15,29 +15,21 @@
 class GalleryDiskImage(Model):
     """This is the disk image base class.
 
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar size_in_gb: It indicates the size of the VHD to create.
-    :vartype size_in_gb: int
-    :ivar host_caching: The host caching of the disk. Valid values are 'None',
-     'ReadOnly', and 'ReadWrite'. Possible values include: 'None', 'ReadOnly',
-     'ReadWrite'
-    :vartype host_caching: str or
+    :param sized_in_gb: It indicates the size of the VHD to create.
+    :type sized_in_gb: int
+    :param host_caching: The host caching of the disk. Valid values are
+     'None', 'ReadOnly', and 'ReadWrite'. Possible values include: 'None',
+     'ReadOnly', 'ReadWrite'
+    :type host_caching: str or
      ~azure.mgmt.compute.v2018_06_01.models.HostCaching
     """
 
-    _validation = {
-        'size_in_gb': {'readonly': True},
-        'host_caching': {'readonly': True},
-    }
-
     _attribute_map = {
-        'size_in_gb': {'key': 'sizeInGB', 'type': 'int'},
+        'sized_in_gb': {'key': 'sizedInGB', 'type': 'int'},
         'host_caching': {'key': 'hostCaching', 'type': 'HostCaching'},
     }
 
-    def __init__(self, **kwargs) -> None:
+    def __init__(self, *, sized_in_gb: int=None, host_caching=None, **kwargs) -> None:
         super(GalleryDiskImage, self).__init__(**kwargs)
-        self.size_in_gb = None
-        self.host_caching = None
+        self.sized_in_gb = sized_in_gb
+        self.host_caching = host_caching
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier.py
index 015fc199542e..a5099bc73cd0 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier.py
@@ -13,7 +13,7 @@
 
 
 class GalleryIdentifier(Model):
-    """Describes the gallery unique name.
+    """GalleryIdentifier.
 
     Variables are only populated by the server, and will be ignored when
     sending a request.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier_py3.py
index 2b7f4e6555a6..680d47368cd5 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier_py3.py
@@ -13,7 +13,7 @@
 
 
 class GalleryIdentifier(Model):
-    """Describes the gallery unique name.
+    """GalleryIdentifier.
 
     Variables are only populated by the server, and will be ignored when
     sending a request.
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..b5e470292d58 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
@@ -50,7 +50,7 @@ class GalleryImage(Resource):
     :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
+    :type end_of_life_date: date
     :param identifier:
     :type identifier:
      ~azure.mgmt.compute.v2018_06_01.models.GalleryImageIdentifier
@@ -90,7 +90,7 @@ class GalleryImage(Resource):
         'release_note_uri': {'key': 'properties.releaseNoteUri', 'type': 'str'},
         'os_type': {'key': 'properties.osType', 'type': 'OperatingSystemTypes'},
         'os_state': {'key': 'properties.osState', 'type': 'OperatingSystemStateTypes'},
-        'end_of_life_date': {'key': 'properties.endOfLifeDate', 'type': 'iso-8601'},
+        'end_of_life_date': {'key': 'properties.endOfLifeDate', 'type': 'date'},
         'identifier': {'key': 'properties.identifier', 'type': 'GalleryImageIdentifier'},
         'recommended': {'key': 'properties.recommended', 'type': 'RecommendedMachineConfiguration'},
         'disallowed': {'key': 'properties.disallowed', 'type': 'Disallowed'},
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..e9d172fe981e 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
@@ -50,7 +50,7 @@ class GalleryImage(Resource):
     :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
+    :type end_of_life_date: date
     :param identifier:
     :type identifier:
      ~azure.mgmt.compute.v2018_06_01.models.GalleryImageIdentifier
@@ -90,7 +90,7 @@ class GalleryImage(Resource):
         'release_note_uri': {'key': 'properties.releaseNoteUri', 'type': 'str'},
         'os_type': {'key': 'properties.osType', 'type': 'OperatingSystemTypes'},
         'os_state': {'key': 'properties.osState', 'type': 'OperatingSystemStateTypes'},
-        'end_of_life_date': {'key': 'properties.endOfLifeDate', 'type': 'iso-8601'},
+        'end_of_life_date': {'key': 'properties.endOfLifeDate', 'type': 'date'},
         'identifier': {'key': 'properties.identifier', 'type': 'GalleryImageIdentifier'},
         'recommended': {'key': 'properties.recommended', 'type': 'RecommendedMachineConfiguration'},
         'disallowed': {'key': 'properties.disallowed', 'type': 'Disallowed'},
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..34b3ff35e8a6 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
@@ -40,11 +40,11 @@ class GalleryImageVersion(Resource):
      'Migrating'
     :vartype provisioning_state: str or
      ~azure.mgmt.compute.v2018_06_01.models.enum
-    :ivar storage_profile:
-    :vartype storage_profile:
+    :param storage_profile:
+    :type storage_profile:
      ~azure.mgmt.compute.v2018_06_01.models.GalleryImageVersionStorageProfile
-    :ivar replication_status:
-    :vartype replication_status:
+    :param replication_status:
+    :type replication_status:
      ~azure.mgmt.compute.v2018_06_01.models.ReplicationStatus
     """
 
@@ -54,8 +54,6 @@ class GalleryImageVersion(Resource):
         'type': {'readonly': True},
         'location': {'required': True},
         'provisioning_state': {'readonly': True},
-        'storage_profile': {'readonly': True},
-        'replication_status': {'readonly': True},
     }
 
     _attribute_map = {
@@ -74,5 +72,5 @@ def __init__(self, **kwargs):
         super(GalleryImageVersion, self).__init__(**kwargs)
         self.publishing_profile = kwargs.get('publishing_profile', None)
         self.provisioning_state = None
-        self.storage_profile = None
-        self.replication_status = None
+        self.storage_profile = kwargs.get('storage_profile', None)
+        self.replication_status = kwargs.get('replication_status', None)
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..4ca5bae74c72 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
@@ -22,18 +22,15 @@ class GalleryImageVersionPublishingProfile(GalleryArtifactPublishingProfileBase)
     :type regions: list[str]
     :param source:
     :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 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
     :ivar published_date: The time when the gallery image version is
      published.
-    :vartype published_date: datetime
+    :vartype published_date: date
     :param end_of_life_date: The end of life date of the gallery image
      version.
-    :type end_of_life_date: datetime
+    :type end_of_life_date: date
     """
 
     _validation = {
@@ -43,15 +40,13 @@ class GalleryImageVersionPublishingProfile(GalleryArtifactPublishingProfileBase)
     _attribute_map = {
         'regions': {'key': 'regions', 'type': '[str]'},
         'source': {'key': 'source', 'type': 'GalleryArtifactSource'},
-        'scale_tier': {'key': 'scaleTier', 'type': 'str'},
         'exclude_from_latest': {'key': 'excludeFromLatest', 'type': 'bool'},
-        'published_date': {'key': 'publishedDate', 'type': 'iso-8601'},
-        'end_of_life_date': {'key': 'endOfLifeDate', 'type': 'iso-8601'},
+        'published_date': {'key': 'publishedDate', 'type': 'date'},
+        'end_of_life_date': {'key': 'endOfLifeDate', 'type': 'date'},
     }
 
     def __init__(self, **kwargs):
         super(GalleryImageVersionPublishingProfile, self).__init__(**kwargs)
-        self.scale_tier = kwargs.get('scale_tier', 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..478b8d780317 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
@@ -22,18 +22,15 @@ class GalleryImageVersionPublishingProfile(GalleryArtifactPublishingProfileBase)
     :type regions: list[str]
     :param source:
     :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 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
     :ivar published_date: The time when the gallery image version is
      published.
-    :vartype published_date: datetime
+    :vartype published_date: date
     :param end_of_life_date: The end of life date of the gallery image
      version.
-    :type end_of_life_date: datetime
+    :type end_of_life_date: date
     """
 
     _validation = {
@@ -43,15 +40,13 @@ class GalleryImageVersionPublishingProfile(GalleryArtifactPublishingProfileBase)
     _attribute_map = {
         'regions': {'key': 'regions', 'type': '[str]'},
         'source': {'key': 'source', 'type': 'GalleryArtifactSource'},
-        'scale_tier': {'key': 'scaleTier', 'type': 'str'},
         'exclude_from_latest': {'key': 'excludeFromLatest', 'type': 'bool'},
-        'published_date': {'key': 'publishedDate', 'type': 'iso-8601'},
-        'end_of_life_date': {'key': 'endOfLifeDate', 'type': 'iso-8601'},
+        'published_date': {'key': 'publishedDate', 'type': 'date'},
+        'end_of_life_date': {'key': 'endOfLifeDate', 'type': 'date'},
     }
 
-    def __init__(self, *, regions=None, source=None, scale_tier=None, exclude_from_latest: bool=None, end_of_life_date=None, **kwargs) -> None:
+    def __init__(self, *, regions=None, source=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
         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..dd86bc5f911f 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
@@ -40,11 +40,11 @@ class GalleryImageVersion(Resource):
      'Migrating'
     :vartype provisioning_state: str or
      ~azure.mgmt.compute.v2018_06_01.models.enum
-    :ivar storage_profile:
-    :vartype storage_profile:
+    :param storage_profile:
+    :type storage_profile:
      ~azure.mgmt.compute.v2018_06_01.models.GalleryImageVersionStorageProfile
-    :ivar replication_status:
-    :vartype replication_status:
+    :param replication_status:
+    :type replication_status:
      ~azure.mgmt.compute.v2018_06_01.models.ReplicationStatus
     """
 
@@ -54,8 +54,6 @@ class GalleryImageVersion(Resource):
         'type': {'readonly': True},
         'location': {'required': True},
         'provisioning_state': {'readonly': True},
-        'storage_profile': {'readonly': True},
-        'replication_status': {'readonly': True},
     }
 
     _attribute_map = {
@@ -70,9 +68,9 @@ 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, tags=None, publishing_profile=None, storage_profile=None, replication_status=None, **kwargs) -> None:
         super(GalleryImageVersion, self).__init__(location=location, tags=tags, **kwargs)
         self.publishing_profile = publishing_profile
         self.provisioning_state = None
-        self.storage_profile = None
-        self.replication_status = None
+        self.storage_profile = storage_profile
+        self.replication_status = replication_status
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile.py
index 0a213a2f051d..20d969c702e8 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile.py
@@ -15,22 +15,14 @@
 class GalleryImageVersionStorageProfile(Model):
     """This is the storage profile of a gallery image version.
 
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar os_disk_image:
-    :vartype os_disk_image:
+    :param os_disk_image:
+    :type os_disk_image:
      ~azure.mgmt.compute.v2018_06_01.models.GalleryOSDiskImage
-    :ivar data_disk_images: A list of data disk images.
-    :vartype data_disk_images:
+    :param data_disk_images: A list of data disk images.
+    :type data_disk_images:
      list[~azure.mgmt.compute.v2018_06_01.models.GalleryDataDiskImage]
     """
 
-    _validation = {
-        'os_disk_image': {'readonly': True},
-        'data_disk_images': {'readonly': True},
-    }
-
     _attribute_map = {
         'os_disk_image': {'key': 'osDiskImage', 'type': 'GalleryOSDiskImage'},
         'data_disk_images': {'key': 'dataDiskImages', 'type': '[GalleryDataDiskImage]'},
@@ -38,5 +30,5 @@ class GalleryImageVersionStorageProfile(Model):
 
     def __init__(self, **kwargs):
         super(GalleryImageVersionStorageProfile, self).__init__(**kwargs)
-        self.os_disk_image = None
-        self.data_disk_images = None
+        self.os_disk_image = kwargs.get('os_disk_image', None)
+        self.data_disk_images = kwargs.get('data_disk_images', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile_py3.py
index ea45b454b07c..8d0814e207ed 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile_py3.py
@@ -15,28 +15,20 @@
 class GalleryImageVersionStorageProfile(Model):
     """This is the storage profile of a gallery image version.
 
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar os_disk_image:
-    :vartype os_disk_image:
+    :param os_disk_image:
+    :type os_disk_image:
      ~azure.mgmt.compute.v2018_06_01.models.GalleryOSDiskImage
-    :ivar data_disk_images: A list of data disk images.
-    :vartype data_disk_images:
+    :param data_disk_images: A list of data disk images.
+    :type data_disk_images:
      list[~azure.mgmt.compute.v2018_06_01.models.GalleryDataDiskImage]
     """
 
-    _validation = {
-        'os_disk_image': {'readonly': True},
-        'data_disk_images': {'readonly': True},
-    }
-
     _attribute_map = {
         'os_disk_image': {'key': 'osDiskImage', 'type': 'GalleryOSDiskImage'},
         'data_disk_images': {'key': 'dataDiskImages', 'type': '[GalleryDataDiskImage]'},
     }
 
-    def __init__(self, **kwargs) -> None:
+    def __init__(self, *, os_disk_image=None, data_disk_images=None, **kwargs) -> None:
         super(GalleryImageVersionStorageProfile, self).__init__(**kwargs)
-        self.os_disk_image = None
-        self.data_disk_images = None
+        self.os_disk_image = os_disk_image
+        self.data_disk_images = data_disk_images
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image.py
index 75b6dde7e996..ee00cee1f1b9 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image.py
@@ -15,25 +15,17 @@
 class GalleryOSDiskImage(GalleryDiskImage):
     """This is the OS disk image.
 
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar size_in_gb: It indicates the size of the VHD to create.
-    :vartype size_in_gb: int
-    :ivar host_caching: The host caching of the disk. Valid values are 'None',
-     'ReadOnly', and 'ReadWrite'. Possible values include: 'None', 'ReadOnly',
-     'ReadWrite'
-    :vartype host_caching: str or
+    :param sized_in_gb: It indicates the size of the VHD to create.
+    :type sized_in_gb: int
+    :param host_caching: The host caching of the disk. Valid values are
+     'None', 'ReadOnly', and 'ReadWrite'. Possible values include: 'None',
+     'ReadOnly', 'ReadWrite'
+    :type host_caching: str or
      ~azure.mgmt.compute.v2018_06_01.models.HostCaching
     """
 
-    _validation = {
-        'size_in_gb': {'readonly': True},
-        'host_caching': {'readonly': True},
-    }
-
     _attribute_map = {
-        'size_in_gb': {'key': 'sizeInGB', 'type': 'int'},
+        'sized_in_gb': {'key': 'sizedInGB', 'type': 'int'},
         'host_caching': {'key': 'hostCaching', 'type': 'HostCaching'},
     }
 
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image_py3.py
index 8981e015c475..e0907ddbf47e 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image_py3.py
@@ -15,27 +15,19 @@
 class GalleryOSDiskImage(GalleryDiskImage):
     """This is the OS disk image.
 
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar size_in_gb: It indicates the size of the VHD to create.
-    :vartype size_in_gb: int
-    :ivar host_caching: The host caching of the disk. Valid values are 'None',
-     'ReadOnly', and 'ReadWrite'. Possible values include: 'None', 'ReadOnly',
-     'ReadWrite'
-    :vartype host_caching: str or
+    :param sized_in_gb: It indicates the size of the VHD to create.
+    :type sized_in_gb: int
+    :param host_caching: The host caching of the disk. Valid values are
+     'None', 'ReadOnly', and 'ReadWrite'. Possible values include: 'None',
+     'ReadOnly', 'ReadWrite'
+    :type host_caching: str or
      ~azure.mgmt.compute.v2018_06_01.models.HostCaching
     """
 
-    _validation = {
-        'size_in_gb': {'readonly': True},
-        'host_caching': {'readonly': True},
-    }
-
     _attribute_map = {
-        'size_in_gb': {'key': 'sizeInGB', 'type': 'int'},
+        'sized_in_gb': {'key': 'sizedInGB', 'type': 'int'},
         'host_caching': {'key': 'hostCaching', 'type': 'HostCaching'},
     }
 
-    def __init__(self, **kwargs) -> None:
-        super(GalleryOSDiskImage, self).__init__(**kwargs)
+    def __init__(self, *, sized_in_gb: int=None, host_caching=None, **kwargs) -> None:
+        super(GalleryOSDiskImage, self).__init__(sized_in_gb=sized_in_gb, host_caching=host_caching, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response.py
new file mode 100644
index 000000000000..18065b7ec12f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response.py
@@ -0,0 +1,55 @@
+# 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 OperationStatusResponse(Model):
+    """Operation status response.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar name: Operation ID
+    :vartype name: str
+    :ivar status: Operation status
+    :vartype status: str
+    :ivar start_time: Start time of the operation
+    :vartype start_time: datetime
+    :ivar end_time: End time of the operation
+    :vartype end_time: datetime
+    :ivar error: Api error
+    :vartype error: ~azure.mgmt.compute.v2018_06_01.models.ApiError
+    """
+
+    _validation = {
+        'name': {'readonly': True},
+        'status': {'readonly': True},
+        'start_time': {'readonly': True},
+        'end_time': {'readonly': True},
+        'error': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'status': {'key': 'status', 'type': 'str'},
+        'start_time': {'key': 'startTime', 'type': 'iso-8601'},
+        'end_time': {'key': 'endTime', 'type': 'iso-8601'},
+        'error': {'key': 'error', 'type': 'ApiError'},
+    }
+
+    def __init__(self, **kwargs):
+        super(OperationStatusResponse, self).__init__(**kwargs)
+        self.name = None
+        self.status = None
+        self.start_time = None
+        self.end_time = None
+        self.error = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response_py3.py
new file mode 100644
index 000000000000..e36e5fb46916
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response_py3.py
@@ -0,0 +1,55 @@
+# 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 OperationStatusResponse(Model):
+    """Operation status response.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar name: Operation ID
+    :vartype name: str
+    :ivar status: Operation status
+    :vartype status: str
+    :ivar start_time: Start time of the operation
+    :vartype start_time: datetime
+    :ivar end_time: End time of the operation
+    :vartype end_time: datetime
+    :ivar error: Api error
+    :vartype error: ~azure.mgmt.compute.v2018_06_01.models.ApiError
+    """
+
+    _validation = {
+        'name': {'readonly': True},
+        'status': {'readonly': True},
+        'start_time': {'readonly': True},
+        'end_time': {'readonly': True},
+        'error': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'status': {'key': 'status', 'type': 'str'},
+        'start_time': {'key': 'startTime', 'type': 'iso-8601'},
+        'end_time': {'key': 'endTime', 'type': 'iso-8601'},
+        'error': {'key': 'error', 'type': 'ApiError'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(OperationStatusResponse, self).__init__(**kwargs)
+        self.name = None
+        self.status = None
+        self.start_time = None
+        self.end_time = None
+        self.error = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status.py
index ac541c4f4080..be74a7fdeb00 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status.py
@@ -15,38 +15,28 @@
 class RegionalReplicationStatus(Model):
     """This is the regional replication status.
 
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar region: The region where the gallery image version is published to.
-    :vartype region: str
-    :ivar state: This is the regional replication state. Possible values
+    :param region: The region where the gallery image version is published to.
+    :type region: str
+    :param state: This is the regional replication state. Possible values
      include: 'Unknown', 'Replicating', 'Completed', 'Failed'
-    :vartype state: str or
+    :type state: str or
      ~azure.mgmt.compute.v2018_06_01.models.ReplicationState
-    :ivar details: The details of the replication status.
-    :vartype details: str
-    :ivar progress: It indicates progress of the replication job.
-    :vartype progress: int
+    :param details: The details of the replication status.
+    :type details: str
+    :param progress: It indicates progress of the replication job.
+    :type progress: int
     """
 
-    _validation = {
-        'region': {'readonly': True},
-        'state': {'readonly': True},
-        'details': {'readonly': True},
-        'progress': {'readonly': True},
-    }
-
     _attribute_map = {
         'region': {'key': 'region', 'type': 'str'},
-        'state': {'key': 'state', 'type': 'str'},
+        'state': {'key': 'state', 'type': 'ReplicationState'},
         'details': {'key': 'details', 'type': 'str'},
         'progress': {'key': 'progress', 'type': 'int'},
     }
 
     def __init__(self, **kwargs):
         super(RegionalReplicationStatus, self).__init__(**kwargs)
-        self.region = None
-        self.state = None
-        self.details = None
-        self.progress = None
+        self.region = kwargs.get('region', None)
+        self.state = kwargs.get('state', None)
+        self.details = kwargs.get('details', None)
+        self.progress = kwargs.get('progress', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status_py3.py
index 4838b5542b8c..ad9e0e83c4d2 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status_py3.py
@@ -15,38 +15,28 @@
 class RegionalReplicationStatus(Model):
     """This is the regional replication status.
 
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar region: The region where the gallery image version is published to.
-    :vartype region: str
-    :ivar state: This is the regional replication state. Possible values
+    :param region: The region where the gallery image version is published to.
+    :type region: str
+    :param state: This is the regional replication state. Possible values
      include: 'Unknown', 'Replicating', 'Completed', 'Failed'
-    :vartype state: str or
+    :type state: str or
      ~azure.mgmt.compute.v2018_06_01.models.ReplicationState
-    :ivar details: The details of the replication status.
-    :vartype details: str
-    :ivar progress: It indicates progress of the replication job.
-    :vartype progress: int
+    :param details: The details of the replication status.
+    :type details: str
+    :param progress: It indicates progress of the replication job.
+    :type progress: int
     """
 
-    _validation = {
-        'region': {'readonly': True},
-        'state': {'readonly': True},
-        'details': {'readonly': True},
-        'progress': {'readonly': True},
-    }
-
     _attribute_map = {
         'region': {'key': 'region', 'type': 'str'},
-        'state': {'key': 'state', 'type': 'str'},
+        'state': {'key': 'state', 'type': 'ReplicationState'},
         'details': {'key': 'details', 'type': 'str'},
         'progress': {'key': 'progress', 'type': 'int'},
     }
 
-    def __init__(self, **kwargs) -> None:
+    def __init__(self, *, region: str=None, state=None, details: str=None, progress: int=None, **kwargs) -> None:
         super(RegionalReplicationStatus, self).__init__(**kwargs)
-        self.region = None
-        self.state = None
-        self.details = None
-        self.progress = None
+        self.region = region
+        self.state = state
+        self.details = details
+        self.progress = progress
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status.py
index 5d20b80672e2..dca3310506b8 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status.py
@@ -15,30 +15,22 @@
 class ReplicationStatus(Model):
     """This is the replication status of the gallery image version.
 
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar aggregated_state: This is the aggregated replication status based on
-     the regional replication status. Possible values include: 'Unknown',
+    :param aggregated_state: This is the aggregated replication status based
+     on the regional replication status. Possible values include: 'Unknown',
      'InProgress', 'Completed', 'Failed'
-    :vartype aggregated_state: str or
+    :type aggregated_state: str or
      ~azure.mgmt.compute.v2018_06_01.models.AggregatedReplicationState
-    :ivar summary: This is a summary of replication status for each region.
-    :vartype summary:
+    :param summary: This is a summary of replication status for each region.
+    :type summary:
      list[~azure.mgmt.compute.v2018_06_01.models.RegionalReplicationStatus]
     """
 
-    _validation = {
-        'aggregated_state': {'readonly': True},
-        'summary': {'readonly': True},
-    }
-
     _attribute_map = {
-        'aggregated_state': {'key': 'aggregatedState', 'type': 'str'},
+        'aggregated_state': {'key': 'aggregatedState', 'type': 'AggregatedReplicationState'},
         'summary': {'key': 'summary', 'type': '[RegionalReplicationStatus]'},
     }
 
     def __init__(self, **kwargs):
         super(ReplicationStatus, self).__init__(**kwargs)
-        self.aggregated_state = None
-        self.summary = None
+        self.aggregated_state = kwargs.get('aggregated_state', None)
+        self.summary = kwargs.get('summary', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status_py3.py
index c492353698fd..72bf40691d04 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status_py3.py
@@ -15,30 +15,22 @@
 class ReplicationStatus(Model):
     """This is the replication status of the gallery image version.
 
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar aggregated_state: This is the aggregated replication status based on
-     the regional replication status. Possible values include: 'Unknown',
+    :param aggregated_state: This is the aggregated replication status based
+     on the regional replication status. Possible values include: 'Unknown',
      'InProgress', 'Completed', 'Failed'
-    :vartype aggregated_state: str or
+    :type aggregated_state: str or
      ~azure.mgmt.compute.v2018_06_01.models.AggregatedReplicationState
-    :ivar summary: This is a summary of replication status for each region.
-    :vartype summary:
+    :param summary: This is a summary of replication status for each region.
+    :type summary:
      list[~azure.mgmt.compute.v2018_06_01.models.RegionalReplicationStatus]
     """
 
-    _validation = {
-        'aggregated_state': {'readonly': True},
-        'summary': {'readonly': True},
-    }
-
     _attribute_map = {
-        'aggregated_state': {'key': 'aggregatedState', 'type': 'str'},
+        'aggregated_state': {'key': 'aggregatedState', 'type': 'AggregatedReplicationState'},
         'summary': {'key': 'summary', 'type': '[RegionalReplicationStatus]'},
     }
 
-    def __init__(self, **kwargs) -> None:
+    def __init__(self, *, aggregated_state=None, summary=None, **kwargs) -> None:
         super(ReplicationStatus, self).__init__(**kwargs)
-        self.aggregated_state = None
-        self.summary = None
+        self.aggregated_state = aggregated_state
+        self.summary = summary
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/galleries_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/galleries_operations.py
index b05139317ddf..7d94dc409558 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/galleries_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/galleries_operations.py
@@ -73,7 +73,7 @@ def _create_or_update_initial(
         response = self._client.send(
             request, header_parameters, body_content, stream=False, **operation_config)
 
-        if response.status_code not in [200, 201, 202]:
+        if response.status_code not in [200, 201]:
             exp = CloudError(response)
             exp.request_id = response.headers.get('x-ms-request-id')
             raise exp
@@ -84,8 +84,6 @@ def _create_or_update_initial(
             deserialized = self._deserialize('Gallery', response)
         if response.status_code == 201:
             deserialized = self._deserialize('Gallery', response)
-        if response.status_code == 202:
-            deserialized = self._deserialize('Gallery', response)
 
         if raw:
             client_raw_response = ClientRawResponse(deserialized, response)
@@ -241,10 +239,17 @@ def _delete_initial(
             exp.request_id = response.headers.get('x-ms-request-id')
             raise exp
 
+        deserialized = None
+
+        if response.status_code == 200:
+            deserialized = self._deserialize('OperationStatusResponse', response)
+
         if raw:
-            client_raw_response = ClientRawResponse(None, response)
+            client_raw_response = ClientRawResponse(deserialized, response)
             return client_raw_response
 
+        return deserialized
+
     def delete(
             self, resource_group_name, gallery_name, custom_headers=None, raw=False, polling=True, **operation_config):
         """Delete a gallery.
@@ -258,10 +263,12 @@ def delete(
          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]]
+        :return: An instance of LROPoller that returns OperationStatusResponse
+         or ClientRawResponse<OperationStatusResponse> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.OperationStatusResponse]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.OperationStatusResponse]]
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
         raw_result = self._delete_initial(
@@ -273,10 +280,14 @@ def delete(
         )
 
         def get_long_running_output(response):
+            deserialized = self._deserialize('OperationStatusResponse', response)
+
             if raw:
-                client_raw_response = ClientRawResponse(None, response)
+                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)
@@ -354,7 +365,7 @@ def internal_paging(next_link=None, raw=False):
         return deserialized
     list_by_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/galleries'}
 
-    def list(
+    def list_by_subscription(
             self, custom_headers=None, raw=False, **operation_config):
         """List galleries under a subscription.
 
@@ -372,7 +383,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = self.list.metadata['url']
+                url = self.list_by_subscription.metadata['url']
                 path_format_arguments = {
                     'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
                 }
@@ -417,4 +428,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
-    list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/galleries'}
+    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/galleries'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_image_versions_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_image_versions_operations.py
index 3acc16a4d1bc..e0aa712f5c54 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_image_versions_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_image_versions_operations.py
@@ -75,7 +75,7 @@ def _create_or_update_initial(
         response = self._client.send(
             request, header_parameters, body_content, stream=False, **operation_config)
 
-        if response.status_code not in [200, 201, 202]:
+        if response.status_code not in [200, 201]:
             exp = CloudError(response)
             exp.request_id = response.headers.get('x-ms-request-id')
             raise exp
@@ -86,8 +86,6 @@ def _create_or_update_initial(
             deserialized = self._deserialize('GalleryImageVersion', response)
         if response.status_code == 201:
             deserialized = self._deserialize('GalleryImageVersion', response)
-        if response.status_code == 202:
-            deserialized = self._deserialize('GalleryImageVersion', response)
 
         if raw:
             client_raw_response = ClientRawResponse(deserialized, response)
@@ -106,9 +104,7 @@ def create_or_update(
         :param gallery_image_name: The name of the gallery image.
         :type gallery_image_name: str
         :param gallery_image_version_name: The name of the gallery image
-         version. Needs to follow semantic version name pattern: The allowed
-         characters are digit and period. Digits must be within the range of a
-         32-bit integer. Format: <MajorVersion>.<MinorVersion>.<Patch>
+         version.
         :type gallery_image_version_name: str
         :param gallery_image_version: Parameters supplied to the create or
          update gallery image version operation.
@@ -197,7 +193,7 @@ def get(
         # Construct parameters
         query_parameters = {}
         if expand is not None:
-            query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
+            query_parameters['$expand'] = self._serialize.query("expand", expand, 'ReplicationStatusTypes')
         query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
 
         # Construct headers
@@ -268,10 +264,17 @@ def _delete_initial(
             exp.request_id = response.headers.get('x-ms-request-id')
             raise exp
 
+        deserialized = None
+
+        if response.status_code == 200:
+            deserialized = self._deserialize('OperationStatusResponse', response)
+
         if raw:
-            client_raw_response = ClientRawResponse(None, response)
+            client_raw_response = ClientRawResponse(deserialized, response)
             return client_raw_response
 
+        return deserialized
+
     def delete(
             self, resource_group_name, gallery_name, gallery_image_name, gallery_image_version_name, custom_headers=None, raw=False, polling=True, **operation_config):
         """Delete a gallery image version.
@@ -290,10 +293,12 @@ def delete(
          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]]
+        :return: An instance of LROPoller that returns OperationStatusResponse
+         or ClientRawResponse<OperationStatusResponse> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.OperationStatusResponse]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.OperationStatusResponse]]
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
         raw_result = self._delete_initial(
@@ -307,10 +312,14 @@ def delete(
         )
 
         def get_long_running_output(response):
+            deserialized = self._deserialize('OperationStatusResponse', response)
+
             if raw:
-                client_raw_response = ClientRawResponse(None, response)
+                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)
@@ -320,7 +329,7 @@ def get_long_running_output(response):
         return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
     delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/galleries/{galleryName}/images/{galleryImageName}/versions/{galleryImageVersionName}'}
 
-    def list_by_gallery_image(
+    def list_gallery_image_versions_by_gallery_image(
             self, resource_group_name, gallery_name, gallery_image_name, custom_headers=None, raw=False, **operation_config):
         """List gallery image versions under a gallery image.
 
@@ -344,7 +353,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = self.list_by_gallery_image.metadata['url']
+                url = self.list_gallery_image_versions_by_gallery_image.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'),
@@ -392,4 +401,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
-    list_by_gallery_image.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/galleries/{galleryName}/images/{galleryImageName}/versions'}
+    list_gallery_image_versions_by_gallery_image.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/galleries/{galleryName}/images/{galleryImageName}/versions'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_images_operations.py
index fc8b6ff9f1ac..e28d24dc1d58 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_images_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_images_operations.py
@@ -74,7 +74,7 @@ def _create_or_update_initial(
         response = self._client.send(
             request, header_parameters, body_content, stream=False, **operation_config)
 
-        if response.status_code not in [200, 201, 202]:
+        if response.status_code not in [200, 201]:
             exp = CloudError(response)
             exp.request_id = response.headers.get('x-ms-request-id')
             raise exp
@@ -85,8 +85,6 @@ def _create_or_update_initial(
             deserialized = self._deserialize('GalleryImage', response)
         if response.status_code == 201:
             deserialized = self._deserialize('GalleryImage', response)
-        if response.status_code == 202:
-            deserialized = self._deserialize('GalleryImage', response)
 
         if raw:
             client_raw_response = ClientRawResponse(deserialized, response)
@@ -250,10 +248,17 @@ def _delete_initial(
             exp.request_id = response.headers.get('x-ms-request-id')
             raise exp
 
+        deserialized = None
+
+        if response.status_code == 200:
+            deserialized = self._deserialize('OperationStatusResponse', response)
+
         if raw:
-            client_raw_response = ClientRawResponse(None, response)
+            client_raw_response = ClientRawResponse(deserialized, response)
             return client_raw_response
 
+        return deserialized
+
     def delete(
             self, resource_group_name, gallery_name, gallery_image_name, custom_headers=None, raw=False, polling=True, **operation_config):
         """Delete a gallery image.
@@ -269,10 +274,12 @@ def delete(
          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]]
+        :return: An instance of LROPoller that returns OperationStatusResponse
+         or ClientRawResponse<OperationStatusResponse> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.OperationStatusResponse]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.OperationStatusResponse]]
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
         raw_result = self._delete_initial(
@@ -285,10 +292,14 @@ def delete(
         )
 
         def get_long_running_output(response):
+            deserialized = self._deserialize('OperationStatusResponse', response)
+
             if raw:
-                client_raw_response = ClientRawResponse(None, response)
+                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)
@@ -298,7 +309,7 @@ def get_long_running_output(response):
         return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
     delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/galleries/{galleryName}/images/{galleryImageName}'}
 
-    def list_by_gallery(
+    def list_gallery_images_by_gallery(
             self, resource_group_name, gallery_name, custom_headers=None, raw=False, **operation_config):
         """List gallery images under a gallery.
 
@@ -320,7 +331,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = self.list_by_gallery.metadata['url']
+                url = self.list_gallery_images_by_gallery.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'),
@@ -367,4 +378,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
-    list_by_gallery.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/galleries/{galleryName}/images'}
+    list_gallery_images_by_gallery.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/galleries/{galleryName}/images'}

From 946d5dc059f577ad0c32b55e8477e848f8db8eb1 Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Mon, 2 Jul 2018 15:05:05 -0700
Subject: [PATCH 13/29] Generated from c34f1fdacb2efacd4dccdd69213e83e4800ab76a
 (#2859)

Added listing all availability sets in a subscription and StandardSSD_LRS to 2018-06-01
---
 .../availability_sets_operations.py           | 65 +++++++++++++++++++
 .../availability_sets_operations.py           | 65 +++++++++++++++++++
 .../availability_sets_operations.py           | 65 +++++++++++++++++++
 .../availability_sets_operations.py           | 65 +++++++++++++++++++
 .../models/compute_management_client_enums.py |  1 +
 .../compute/v2018_04_01/models/disk_sku.py    |  4 +-
 .../v2018_04_01/models/disk_sku_py3.py        |  4 +-
 .../v2018_04_01/models/image_data_disk.py     |  5 +-
 .../v2018_04_01/models/image_data_disk_py3.py |  5 +-
 .../v2018_04_01/models/image_os_disk.py       |  5 +-
 .../v2018_04_01/models/image_os_disk_py3.py   |  5 +-
 .../models/managed_disk_parameters.py         |  5 +-
 .../models/managed_disk_parameters_py3.py     |  5 +-
 ...chine_scale_set_managed_disk_parameters.py |  5 +-
 ...e_scale_set_managed_disk_parameters_py3.py |  5 +-
 .../availability_sets_operations.py           | 65 +++++++++++++++++++
 .../compute/v2018_06_01/models/__init__.py    |  5 +-
 .../models/compute_management_client_enums.py |  6 ++
 .../models/gallery_data_disk_image.py         | 29 ++++++---
 .../models/gallery_data_disk_image_py3.py     | 33 ++++++----
 .../v2018_06_01/models/gallery_disk_image.py  | 26 +++++---
 .../models/gallery_disk_image_py3.py          | 28 +++++---
 .../v2018_06_01/models/gallery_identifier.py  |  2 +-
 .../models/gallery_identifier_py3.py          |  2 +-
 .../v2018_06_01/models/gallery_image.py       |  4 +-
 .../v2018_06_01/models/gallery_image_py3.py   |  4 +-
 .../models/gallery_image_version.py           | 14 ++--
 ...allery_image_version_publishing_profile.py | 13 ++--
 ...ry_image_version_publishing_profile_py3.py | 15 +++--
 .../models/gallery_image_version_py3.py       | 16 +++--
 .../gallery_image_version_storage_profile.py  | 20 ++++--
 ...llery_image_version_storage_profile_py3.py | 22 +++++--
 .../models/gallery_os_disk_image.py           | 22 +++++--
 .../models/gallery_os_disk_image_py3.py       | 26 +++++---
 .../models/operation_status_response.py       | 55 ----------------
 .../models/operation_status_response_py3.py   | 55 ----------------
 .../models/regional_replication_status.py     | 36 ++++++----
 .../models/regional_replication_status_py3.py | 38 +++++++----
 .../v2018_06_01/models/replication_status.py  | 24 ++++---
 .../models/replication_status_py3.py          | 26 +++++---
 .../operations/galleries_operations.py        | 35 ++++------
 .../gallery_image_versions_operations.py      | 41 +++++-------
 .../operations/gallery_images_operations.py   | 35 ++++------
 43 files changed, 660 insertions(+), 346 deletions(-)
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response.py
 delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response_py3.py

diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/availability_sets_operations.py
index 48582fd18dc4..dd549283c784 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/availability_sets_operations.py
@@ -231,6 +231,71 @@ def get(
         return deserialized
     get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
 
+    def list_by_subscription(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Lists all availability sets in 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 AvailabilitySet
+        :rtype:
+         ~azure.mgmt.compute.v2016_03_30.models.AvailabilitySetPaged[~azure.mgmt.compute.v2016_03_30.models.AvailabilitySet]
+        :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_subscription.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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
+
     def list(
             self, resource_group_name, custom_headers=None, raw=False, **operation_config):
         """Lists all availability sets in a resource group.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/availability_sets_operations.py
index dda88859b1f5..8eb5f352915b 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/availability_sets_operations.py
@@ -232,6 +232,71 @@ def get(
         return deserialized
     get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
 
+    def list_by_subscription(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Lists all availability sets in 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 AvailabilitySet
+        :rtype:
+         ~azure.mgmt.compute.v2016_04_30_preview.models.AvailabilitySetPaged[~azure.mgmt.compute.v2016_04_30_preview.models.AvailabilitySet]
+        :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_subscription.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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
+
     def list(
             self, resource_group_name, custom_headers=None, raw=False, **operation_config):
         """Lists all availability sets in a resource group.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/availability_sets_operations.py
index ce2e741626f2..4e7b3494c55a 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/availability_sets_operations.py
@@ -231,6 +231,71 @@ def get(
         return deserialized
     get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
 
+    def list_by_subscription(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Lists all availability sets in 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 AvailabilitySet
+        :rtype:
+         ~azure.mgmt.compute.v2017_03_30.models.AvailabilitySetPaged[~azure.mgmt.compute.v2017_03_30.models.AvailabilitySet]
+        :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_subscription.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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
+
     def list(
             self, resource_group_name, custom_headers=None, raw=False, **operation_config):
         """Lists all availability sets in a resource group.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/availability_sets_operations.py
index 5e2cc0d7f116..5f03fa563156 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/availability_sets_operations.py
@@ -301,6 +301,71 @@ def get(
         return deserialized
     get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
 
+    def list_by_subscription(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Lists all availability sets in 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 AvailabilitySet
+        :rtype:
+         ~azure.mgmt.compute.v2017_12_01.models.AvailabilitySetPaged[~azure.mgmt.compute.v2017_12_01.models.AvailabilitySet]
+        :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_subscription.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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
+
     def list(
             self, resource_group_name, custom_headers=None, raw=False, **operation_config):
         """Lists all availability sets in a resource group.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py
index b66be29c4cf4..d72727b5e98e 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py
@@ -213,6 +213,7 @@ class StorageAccountTypes(str, Enum):
 
     standard_lrs = "Standard_LRS"
     premium_lrs = "Premium_LRS"
+    standard_ssd_lrs = "StandardSSD_LRS"
 
 
 class PassNames(str, Enum):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku.py
index f0bbc41f21e1..1123feabd42c 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku.py
@@ -13,13 +13,13 @@
 
 
 class DiskSku(Model):
-    """The disks sku name. Can be Standard_LRS or Premium_LRS.
+    """The disks sku name. Can be Standard_LRS, Premium_LRS, or StandardSSD_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'
+     'Premium_LRS', 'StandardSSD_LRS'
     :type name: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     :ivar tier: The sku tier. Default value: "Standard" .
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku_py3.py
index 99a2821b0aeb..df30d24c240a 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku_py3.py
@@ -13,13 +13,13 @@
 
 
 class DiskSku(Model):
-    """The disks sku name. Can be Standard_LRS or Premium_LRS.
+    """The disks sku name. Can be Standard_LRS, Premium_LRS, or StandardSSD_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'
+     'Premium_LRS', 'StandardSSD_LRS'
     :type name: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     :ivar tier: The sku tier. Default value: "Standard" .
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py
index ae905adba8c4..3d96a893bb63 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py
@@ -37,8 +37,9 @@ class ImageDataDisk(Model):
      machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param storage_account_type: Specifies the storage account type for the
-     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
+     managed disk. Possible values are: Standard_LRS, Premium_LRS, and
+     StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
+     'StandardSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py
index 7112f92f78c0..d7262b81ba6b 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py
@@ -37,8 +37,9 @@ class ImageDataDisk(Model):
      machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param storage_account_type: Specifies the storage account type for the
-     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
+     managed disk. Possible values are: Standard_LRS, Premium_LRS, and
+     StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
+     'StandardSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py
index 3ef3a0cd4414..7515a838e5cf 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py
@@ -43,8 +43,9 @@ class ImageOSDisk(Model):
      machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param storage_account_type: Specifies the storage account type for the
-     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
+     managed disk. Possible values are: Standard_LRS, Premium_LRS, and
+     StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
+     'StandardSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py
index 59c61abd3f0f..06cc994712fa 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py
@@ -43,8 +43,9 @@ class ImageOSDisk(Model):
      machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param storage_account_type: Specifies the storage account type for the
-     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
+     managed disk. Possible values are: Standard_LRS, Premium_LRS, and
+     StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
+     'StandardSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py
index a16aed3bbcbf..e3f0b5324e39 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py
@@ -18,8 +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 or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
+     managed disk. Possible values are: Standard_LRS, Premium_LRS, and
+     StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
+     'StandardSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py
index 50b8a76181d6..02d27c61f9d3 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py
@@ -18,8 +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 or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
+     managed disk. Possible values are: Standard_LRS, Premium_LRS, and
+     StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
+     'StandardSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py
index 495309b9b2cf..89b93a0524f2 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py
@@ -16,8 +16,9 @@ class VirtualMachineScaleSetManagedDiskParameters(Model):
     """Describes the parameters of a ScaleSet managed disk.
 
     :param storage_account_type: Specifies the storage account type for the
-     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
+     managed disk. Possible values are: Standard_LRS, Premium_LRS, and
+     StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
+     'StandardSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py
index 68f66be2e34e..a35e25fcba75 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py
@@ -16,8 +16,9 @@ class VirtualMachineScaleSetManagedDiskParameters(Model):
     """Describes the parameters of a ScaleSet managed disk.
 
     :param storage_account_type: Specifies the storage account type for the
-     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
+     managed disk. Possible values are: Standard_LRS, Premium_LRS, and
+     StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
+     'StandardSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py
index ba8e21445a27..2c6a7d2a0f18 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py
@@ -293,6 +293,71 @@ def get(
         return deserialized
     get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
 
+    def list_by_subscription(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Lists all availability sets in 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 AvailabilitySet
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.AvailabilitySetPaged[~azure.mgmt.compute.v2018_04_01.models.AvailabilitySet]
+        :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_subscription.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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
+
     def list(
             self, resource_group_name, custom_headers=None, raw=False, **operation_config):
         """Lists all availability sets in a resource group.
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 204dfcec1d1e..39442e272bac 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
@@ -32,7 +32,6 @@
     from .api_error_base_py3 import ApiErrorBase
     from .inner_error_py3 import InnerError
     from .api_error_py3 import ApiError
-    from .operation_status_response_py3 import OperationStatusResponse
     from .resource_py3 import Resource
 except (SyntaxError, ImportError):
     from .gallery_identifier import GalleryIdentifier
@@ -57,7 +56,6 @@
     from .api_error_base import ApiErrorBase
     from .inner_error import InnerError
     from .api_error import ApiError
-    from .operation_status_response import OperationStatusResponse
     from .resource import Resource
 from .gallery_paged import GalleryPaged
 from .gallery_image_paged import GalleryImagePaged
@@ -65,6 +63,7 @@
 from .compute_management_client_enums import (
     OperatingSystemTypes,
     OperatingSystemStateTypes,
+    ScaleTier,
     AggregatedReplicationState,
     ReplicationState,
     HostCaching,
@@ -94,13 +93,13 @@
     'ApiErrorBase',
     'InnerError',
     'ApiError',
-    'OperationStatusResponse',
     'Resource',
     'GalleryPaged',
     'GalleryImagePaged',
     'GalleryImageVersionPaged',
     'OperatingSystemTypes',
     'OperatingSystemStateTypes',
+    'ScaleTier',
     'AggregatedReplicationState',
     'ReplicationState',
     'HostCaching',
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 b8906c280b6e..c575a854046e 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
@@ -24,6 +24,12 @@ class OperatingSystemStateTypes(str, Enum):
     specialized = "Specialized"
 
 
+class ScaleTier(str, Enum):
+
+    s30 = "S30"
+    s100 = "S100"
+
+
 class AggregatedReplicationState(str, Enum):
 
     unknown = "Unknown"
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image.py
index a62ec5101821..88efa05270a0 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image.py
@@ -15,25 +15,34 @@
 class GalleryDataDiskImage(GalleryDiskImage):
     """This is the data disk image.
 
-    :param sized_in_gb: It indicates the size of the VHD to create.
-    :type sized_in_gb: int
-    :param host_caching: The host caching of the disk. Valid values are
-     'None', 'ReadOnly', and 'ReadWrite'. Possible values include: 'None',
-     'ReadOnly', 'ReadWrite'
-    :type host_caching: str or
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar size_in_gb: It indicates the size of the VHD to create.
+    :vartype size_in_gb: int
+    :ivar host_caching: The host caching of the disk. Valid values are 'None',
+     'ReadOnly', and 'ReadWrite'. Possible values include: 'None', 'ReadOnly',
+     'ReadWrite'
+    :vartype host_caching: str or
      ~azure.mgmt.compute.v2018_06_01.models.HostCaching
-    :param lun: Specifies the logical unit number of the data disk. This value
+    :ivar lun: Specifies the logical unit number of the data disk. This value
      is used to identify data disks within the VM and therefore must be unique
      for each data disk attached to a VM.
-    :type lun: int
+    :vartype lun: int
     """
 
+    _validation = {
+        'size_in_gb': {'readonly': True},
+        'host_caching': {'readonly': True},
+        'lun': {'readonly': True},
+    }
+
     _attribute_map = {
-        'sized_in_gb': {'key': 'sizedInGB', 'type': 'int'},
+        'size_in_gb': {'key': 'sizeInGB', 'type': 'int'},
         'host_caching': {'key': 'hostCaching', 'type': 'HostCaching'},
         'lun': {'key': 'lun', 'type': 'int'},
     }
 
     def __init__(self, **kwargs):
         super(GalleryDataDiskImage, self).__init__(**kwargs)
-        self.lun = kwargs.get('lun', None)
+        self.lun = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image_py3.py
index 0b698ea162db..06b2a569818b 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_data_disk_image_py3.py
@@ -15,25 +15,34 @@
 class GalleryDataDiskImage(GalleryDiskImage):
     """This is the data disk image.
 
-    :param sized_in_gb: It indicates the size of the VHD to create.
-    :type sized_in_gb: int
-    :param host_caching: The host caching of the disk. Valid values are
-     'None', 'ReadOnly', and 'ReadWrite'. Possible values include: 'None',
-     'ReadOnly', 'ReadWrite'
-    :type host_caching: str or
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar size_in_gb: It indicates the size of the VHD to create.
+    :vartype size_in_gb: int
+    :ivar host_caching: The host caching of the disk. Valid values are 'None',
+     'ReadOnly', and 'ReadWrite'. Possible values include: 'None', 'ReadOnly',
+     'ReadWrite'
+    :vartype host_caching: str or
      ~azure.mgmt.compute.v2018_06_01.models.HostCaching
-    :param lun: Specifies the logical unit number of the data disk. This value
+    :ivar lun: Specifies the logical unit number of the data disk. This value
      is used to identify data disks within the VM and therefore must be unique
      for each data disk attached to a VM.
-    :type lun: int
+    :vartype lun: int
     """
 
+    _validation = {
+        'size_in_gb': {'readonly': True},
+        'host_caching': {'readonly': True},
+        'lun': {'readonly': True},
+    }
+
     _attribute_map = {
-        'sized_in_gb': {'key': 'sizedInGB', 'type': 'int'},
+        'size_in_gb': {'key': 'sizeInGB', 'type': 'int'},
         'host_caching': {'key': 'hostCaching', 'type': 'HostCaching'},
         'lun': {'key': 'lun', 'type': 'int'},
     }
 
-    def __init__(self, *, sized_in_gb: int=None, host_caching=None, lun: int=None, **kwargs) -> None:
-        super(GalleryDataDiskImage, self).__init__(sized_in_gb=sized_in_gb, host_caching=host_caching, **kwargs)
-        self.lun = lun
+    def __init__(self, **kwargs) -> None:
+        super(GalleryDataDiskImage, self).__init__(**kwargs)
+        self.lun = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image.py
index b65868a89800..b99d727114c9 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image.py
@@ -15,21 +15,29 @@
 class GalleryDiskImage(Model):
     """This is the disk image base class.
 
-    :param sized_in_gb: It indicates the size of the VHD to create.
-    :type sized_in_gb: int
-    :param host_caching: The host caching of the disk. Valid values are
-     'None', 'ReadOnly', and 'ReadWrite'. Possible values include: 'None',
-     'ReadOnly', 'ReadWrite'
-    :type host_caching: str or
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar size_in_gb: It indicates the size of the VHD to create.
+    :vartype size_in_gb: int
+    :ivar host_caching: The host caching of the disk. Valid values are 'None',
+     'ReadOnly', and 'ReadWrite'. Possible values include: 'None', 'ReadOnly',
+     'ReadWrite'
+    :vartype host_caching: str or
      ~azure.mgmt.compute.v2018_06_01.models.HostCaching
     """
 
+    _validation = {
+        'size_in_gb': {'readonly': True},
+        'host_caching': {'readonly': True},
+    }
+
     _attribute_map = {
-        'sized_in_gb': {'key': 'sizedInGB', 'type': 'int'},
+        'size_in_gb': {'key': 'sizeInGB', 'type': 'int'},
         'host_caching': {'key': 'hostCaching', 'type': 'HostCaching'},
     }
 
     def __init__(self, **kwargs):
         super(GalleryDiskImage, self).__init__(**kwargs)
-        self.sized_in_gb = kwargs.get('sized_in_gb', None)
-        self.host_caching = kwargs.get('host_caching', None)
+        self.size_in_gb = None
+        self.host_caching = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image_py3.py
index 97f8b4780743..c27888c9a07e 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_disk_image_py3.py
@@ -15,21 +15,29 @@
 class GalleryDiskImage(Model):
     """This is the disk image base class.
 
-    :param sized_in_gb: It indicates the size of the VHD to create.
-    :type sized_in_gb: int
-    :param host_caching: The host caching of the disk. Valid values are
-     'None', 'ReadOnly', and 'ReadWrite'. Possible values include: 'None',
-     'ReadOnly', 'ReadWrite'
-    :type host_caching: str or
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar size_in_gb: It indicates the size of the VHD to create.
+    :vartype size_in_gb: int
+    :ivar host_caching: The host caching of the disk. Valid values are 'None',
+     'ReadOnly', and 'ReadWrite'. Possible values include: 'None', 'ReadOnly',
+     'ReadWrite'
+    :vartype host_caching: str or
      ~azure.mgmt.compute.v2018_06_01.models.HostCaching
     """
 
+    _validation = {
+        'size_in_gb': {'readonly': True},
+        'host_caching': {'readonly': True},
+    }
+
     _attribute_map = {
-        'sized_in_gb': {'key': 'sizedInGB', 'type': 'int'},
+        'size_in_gb': {'key': 'sizeInGB', 'type': 'int'},
         'host_caching': {'key': 'hostCaching', 'type': 'HostCaching'},
     }
 
-    def __init__(self, *, sized_in_gb: int=None, host_caching=None, **kwargs) -> None:
+    def __init__(self, **kwargs) -> None:
         super(GalleryDiskImage, self).__init__(**kwargs)
-        self.sized_in_gb = sized_in_gb
-        self.host_caching = host_caching
+        self.size_in_gb = None
+        self.host_caching = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier.py
index a5099bc73cd0..015fc199542e 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier.py
@@ -13,7 +13,7 @@
 
 
 class GalleryIdentifier(Model):
-    """GalleryIdentifier.
+    """Describes the gallery unique name.
 
     Variables are only populated by the server, and will be ignored when
     sending a request.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier_py3.py
index 680d47368cd5..2b7f4e6555a6 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_identifier_py3.py
@@ -13,7 +13,7 @@
 
 
 class GalleryIdentifier(Model):
-    """GalleryIdentifier.
+    """Describes the gallery unique name.
 
     Variables are only populated by the server, and will be ignored when
     sending a request.
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 b5e470292d58..21af4252c4bf 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
@@ -50,7 +50,7 @@ class GalleryImage(Resource):
     :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: date
+    :type end_of_life_date: datetime
     :param identifier:
     :type identifier:
      ~azure.mgmt.compute.v2018_06_01.models.GalleryImageIdentifier
@@ -90,7 +90,7 @@ class GalleryImage(Resource):
         'release_note_uri': {'key': 'properties.releaseNoteUri', 'type': 'str'},
         'os_type': {'key': 'properties.osType', 'type': 'OperatingSystemTypes'},
         'os_state': {'key': 'properties.osState', 'type': 'OperatingSystemStateTypes'},
-        'end_of_life_date': {'key': 'properties.endOfLifeDate', 'type': 'date'},
+        'end_of_life_date': {'key': 'properties.endOfLifeDate', 'type': 'iso-8601'},
         'identifier': {'key': 'properties.identifier', 'type': 'GalleryImageIdentifier'},
         'recommended': {'key': 'properties.recommended', 'type': 'RecommendedMachineConfiguration'},
         'disallowed': {'key': 'properties.disallowed', 'type': 'Disallowed'},
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 e9d172fe981e..ea37cbf9541b 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
@@ -50,7 +50,7 @@ class GalleryImage(Resource):
     :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: date
+    :type end_of_life_date: datetime
     :param identifier:
     :type identifier:
      ~azure.mgmt.compute.v2018_06_01.models.GalleryImageIdentifier
@@ -90,7 +90,7 @@ class GalleryImage(Resource):
         'release_note_uri': {'key': 'properties.releaseNoteUri', 'type': 'str'},
         'os_type': {'key': 'properties.osType', 'type': 'OperatingSystemTypes'},
         'os_state': {'key': 'properties.osState', 'type': 'OperatingSystemStateTypes'},
-        'end_of_life_date': {'key': 'properties.endOfLifeDate', 'type': 'date'},
+        'end_of_life_date': {'key': 'properties.endOfLifeDate', 'type': 'iso-8601'},
         'identifier': {'key': 'properties.identifier', 'type': 'GalleryImageIdentifier'},
         'recommended': {'key': 'properties.recommended', 'type': 'RecommendedMachineConfiguration'},
         'disallowed': {'key': 'properties.disallowed', 'type': 'Disallowed'},
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 34b3ff35e8a6..69cdf916c67b 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
@@ -40,11 +40,11 @@ class GalleryImageVersion(Resource):
      'Migrating'
     :vartype provisioning_state: str or
      ~azure.mgmt.compute.v2018_06_01.models.enum
-    :param storage_profile:
-    :type storage_profile:
+    :ivar storage_profile:
+    :vartype storage_profile:
      ~azure.mgmt.compute.v2018_06_01.models.GalleryImageVersionStorageProfile
-    :param replication_status:
-    :type replication_status:
+    :ivar replication_status:
+    :vartype replication_status:
      ~azure.mgmt.compute.v2018_06_01.models.ReplicationStatus
     """
 
@@ -54,6 +54,8 @@ class GalleryImageVersion(Resource):
         'type': {'readonly': True},
         'location': {'required': True},
         'provisioning_state': {'readonly': True},
+        'storage_profile': {'readonly': True},
+        'replication_status': {'readonly': True},
     }
 
     _attribute_map = {
@@ -72,5 +74,5 @@ def __init__(self, **kwargs):
         super(GalleryImageVersion, self).__init__(**kwargs)
         self.publishing_profile = kwargs.get('publishing_profile', None)
         self.provisioning_state = None
-        self.storage_profile = kwargs.get('storage_profile', None)
-        self.replication_status = kwargs.get('replication_status', None)
+        self.storage_profile = None
+        self.replication_status = None
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 4ca5bae74c72..e475a6192ec7 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
@@ -22,15 +22,18 @@ class GalleryImageVersionPublishingProfile(GalleryArtifactPublishingProfileBase)
     :type regions: list[str]
     :param source:
     :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 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
     :ivar published_date: The time when the gallery image version is
      published.
-    :vartype published_date: date
+    :vartype published_date: datetime
     :param end_of_life_date: The end of life date of the gallery image
      version.
-    :type end_of_life_date: date
+    :type end_of_life_date: datetime
     """
 
     _validation = {
@@ -40,13 +43,15 @@ class GalleryImageVersionPublishingProfile(GalleryArtifactPublishingProfileBase)
     _attribute_map = {
         'regions': {'key': 'regions', 'type': '[str]'},
         'source': {'key': 'source', 'type': 'GalleryArtifactSource'},
+        'scale_tier': {'key': 'scaleTier', 'type': 'str'},
         'exclude_from_latest': {'key': 'excludeFromLatest', 'type': 'bool'},
-        'published_date': {'key': 'publishedDate', 'type': 'date'},
-        'end_of_life_date': {'key': 'endOfLifeDate', 'type': 'date'},
+        'published_date': {'key': 'publishedDate', 'type': 'iso-8601'},
+        'end_of_life_date': {'key': 'endOfLifeDate', 'type': 'iso-8601'},
     }
 
     def __init__(self, **kwargs):
         super(GalleryImageVersionPublishingProfile, self).__init__(**kwargs)
+        self.scale_tier = kwargs.get('scale_tier', 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 478b8d780317..13b13fdd244f 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
@@ -22,15 +22,18 @@ class GalleryImageVersionPublishingProfile(GalleryArtifactPublishingProfileBase)
     :type regions: list[str]
     :param source:
     :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 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
     :ivar published_date: The time when the gallery image version is
      published.
-    :vartype published_date: date
+    :vartype published_date: datetime
     :param end_of_life_date: The end of life date of the gallery image
      version.
-    :type end_of_life_date: date
+    :type end_of_life_date: datetime
     """
 
     _validation = {
@@ -40,13 +43,15 @@ class GalleryImageVersionPublishingProfile(GalleryArtifactPublishingProfileBase)
     _attribute_map = {
         'regions': {'key': 'regions', 'type': '[str]'},
         'source': {'key': 'source', 'type': 'GalleryArtifactSource'},
+        'scale_tier': {'key': 'scaleTier', 'type': 'str'},
         'exclude_from_latest': {'key': 'excludeFromLatest', 'type': 'bool'},
-        'published_date': {'key': 'publishedDate', 'type': 'date'},
-        'end_of_life_date': {'key': 'endOfLifeDate', 'type': 'date'},
+        'published_date': {'key': 'publishedDate', 'type': 'iso-8601'},
+        'end_of_life_date': {'key': 'endOfLifeDate', 'type': 'iso-8601'},
     }
 
-    def __init__(self, *, regions=None, source=None, exclude_from_latest: bool=None, end_of_life_date=None, **kwargs) -> None:
+    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
         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 dd86bc5f911f..b01071bd2279 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
@@ -40,11 +40,11 @@ class GalleryImageVersion(Resource):
      'Migrating'
     :vartype provisioning_state: str or
      ~azure.mgmt.compute.v2018_06_01.models.enum
-    :param storage_profile:
-    :type storage_profile:
+    :ivar storage_profile:
+    :vartype storage_profile:
      ~azure.mgmt.compute.v2018_06_01.models.GalleryImageVersionStorageProfile
-    :param replication_status:
-    :type replication_status:
+    :ivar replication_status:
+    :vartype replication_status:
      ~azure.mgmt.compute.v2018_06_01.models.ReplicationStatus
     """
 
@@ -54,6 +54,8 @@ class GalleryImageVersion(Resource):
         'type': {'readonly': True},
         'location': {'required': True},
         'provisioning_state': {'readonly': True},
+        'storage_profile': {'readonly': True},
+        'replication_status': {'readonly': True},
     }
 
     _attribute_map = {
@@ -68,9 +70,9 @@ class GalleryImageVersion(Resource):
         'replication_status': {'key': 'properties.replicationStatus', 'type': 'ReplicationStatus'},
     }
 
-    def __init__(self, *, location: str, tags=None, publishing_profile=None, storage_profile=None, replication_status=None, **kwargs) -> None:
+    def __init__(self, *, location: str, tags=None, publishing_profile=None, **kwargs) -> None:
         super(GalleryImageVersion, self).__init__(location=location, tags=tags, **kwargs)
         self.publishing_profile = publishing_profile
         self.provisioning_state = None
-        self.storage_profile = storage_profile
-        self.replication_status = replication_status
+        self.storage_profile = None
+        self.replication_status = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile.py
index 20d969c702e8..0a213a2f051d 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile.py
@@ -15,14 +15,22 @@
 class GalleryImageVersionStorageProfile(Model):
     """This is the storage profile of a gallery image version.
 
-    :param os_disk_image:
-    :type os_disk_image:
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar os_disk_image:
+    :vartype os_disk_image:
      ~azure.mgmt.compute.v2018_06_01.models.GalleryOSDiskImage
-    :param data_disk_images: A list of data disk images.
-    :type data_disk_images:
+    :ivar data_disk_images: A list of data disk images.
+    :vartype data_disk_images:
      list[~azure.mgmt.compute.v2018_06_01.models.GalleryDataDiskImage]
     """
 
+    _validation = {
+        'os_disk_image': {'readonly': True},
+        'data_disk_images': {'readonly': True},
+    }
+
     _attribute_map = {
         'os_disk_image': {'key': 'osDiskImage', 'type': 'GalleryOSDiskImage'},
         'data_disk_images': {'key': 'dataDiskImages', 'type': '[GalleryDataDiskImage]'},
@@ -30,5 +38,5 @@ class GalleryImageVersionStorageProfile(Model):
 
     def __init__(self, **kwargs):
         super(GalleryImageVersionStorageProfile, self).__init__(**kwargs)
-        self.os_disk_image = kwargs.get('os_disk_image', None)
-        self.data_disk_images = kwargs.get('data_disk_images', None)
+        self.os_disk_image = None
+        self.data_disk_images = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile_py3.py
index 8d0814e207ed..ea45b454b07c 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_version_storage_profile_py3.py
@@ -15,20 +15,28 @@
 class GalleryImageVersionStorageProfile(Model):
     """This is the storage profile of a gallery image version.
 
-    :param os_disk_image:
-    :type os_disk_image:
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar os_disk_image:
+    :vartype os_disk_image:
      ~azure.mgmt.compute.v2018_06_01.models.GalleryOSDiskImage
-    :param data_disk_images: A list of data disk images.
-    :type data_disk_images:
+    :ivar data_disk_images: A list of data disk images.
+    :vartype data_disk_images:
      list[~azure.mgmt.compute.v2018_06_01.models.GalleryDataDiskImage]
     """
 
+    _validation = {
+        'os_disk_image': {'readonly': True},
+        'data_disk_images': {'readonly': True},
+    }
+
     _attribute_map = {
         'os_disk_image': {'key': 'osDiskImage', 'type': 'GalleryOSDiskImage'},
         'data_disk_images': {'key': 'dataDiskImages', 'type': '[GalleryDataDiskImage]'},
     }
 
-    def __init__(self, *, os_disk_image=None, data_disk_images=None, **kwargs) -> None:
+    def __init__(self, **kwargs) -> None:
         super(GalleryImageVersionStorageProfile, self).__init__(**kwargs)
-        self.os_disk_image = os_disk_image
-        self.data_disk_images = data_disk_images
+        self.os_disk_image = None
+        self.data_disk_images = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image.py
index ee00cee1f1b9..75b6dde7e996 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image.py
@@ -15,17 +15,25 @@
 class GalleryOSDiskImage(GalleryDiskImage):
     """This is the OS disk image.
 
-    :param sized_in_gb: It indicates the size of the VHD to create.
-    :type sized_in_gb: int
-    :param host_caching: The host caching of the disk. Valid values are
-     'None', 'ReadOnly', and 'ReadWrite'. Possible values include: 'None',
-     'ReadOnly', 'ReadWrite'
-    :type host_caching: str or
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar size_in_gb: It indicates the size of the VHD to create.
+    :vartype size_in_gb: int
+    :ivar host_caching: The host caching of the disk. Valid values are 'None',
+     'ReadOnly', and 'ReadWrite'. Possible values include: 'None', 'ReadOnly',
+     'ReadWrite'
+    :vartype host_caching: str or
      ~azure.mgmt.compute.v2018_06_01.models.HostCaching
     """
 
+    _validation = {
+        'size_in_gb': {'readonly': True},
+        'host_caching': {'readonly': True},
+    }
+
     _attribute_map = {
-        'sized_in_gb': {'key': 'sizedInGB', 'type': 'int'},
+        'size_in_gb': {'key': 'sizeInGB', 'type': 'int'},
         'host_caching': {'key': 'hostCaching', 'type': 'HostCaching'},
     }
 
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image_py3.py
index e0907ddbf47e..8981e015c475 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_os_disk_image_py3.py
@@ -15,19 +15,27 @@
 class GalleryOSDiskImage(GalleryDiskImage):
     """This is the OS disk image.
 
-    :param sized_in_gb: It indicates the size of the VHD to create.
-    :type sized_in_gb: int
-    :param host_caching: The host caching of the disk. Valid values are
-     'None', 'ReadOnly', and 'ReadWrite'. Possible values include: 'None',
-     'ReadOnly', 'ReadWrite'
-    :type host_caching: str or
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar size_in_gb: It indicates the size of the VHD to create.
+    :vartype size_in_gb: int
+    :ivar host_caching: The host caching of the disk. Valid values are 'None',
+     'ReadOnly', and 'ReadWrite'. Possible values include: 'None', 'ReadOnly',
+     'ReadWrite'
+    :vartype host_caching: str or
      ~azure.mgmt.compute.v2018_06_01.models.HostCaching
     """
 
+    _validation = {
+        'size_in_gb': {'readonly': True},
+        'host_caching': {'readonly': True},
+    }
+
     _attribute_map = {
-        'sized_in_gb': {'key': 'sizedInGB', 'type': 'int'},
+        'size_in_gb': {'key': 'sizeInGB', 'type': 'int'},
         'host_caching': {'key': 'hostCaching', 'type': 'HostCaching'},
     }
 
-    def __init__(self, *, sized_in_gb: int=None, host_caching=None, **kwargs) -> None:
-        super(GalleryOSDiskImage, self).__init__(sized_in_gb=sized_in_gb, host_caching=host_caching, **kwargs)
+    def __init__(self, **kwargs) -> None:
+        super(GalleryOSDiskImage, self).__init__(**kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response.py
deleted file mode 100644
index 18065b7ec12f..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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 OperationStatusResponse(Model):
-    """Operation status response.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar name: Operation ID
-    :vartype name: str
-    :ivar status: Operation status
-    :vartype status: str
-    :ivar start_time: Start time of the operation
-    :vartype start_time: datetime
-    :ivar end_time: End time of the operation
-    :vartype end_time: datetime
-    :ivar error: Api error
-    :vartype error: ~azure.mgmt.compute.v2018_06_01.models.ApiError
-    """
-
-    _validation = {
-        'name': {'readonly': True},
-        'status': {'readonly': True},
-        'start_time': {'readonly': True},
-        'end_time': {'readonly': True},
-        'error': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'status': {'key': 'status', 'type': 'str'},
-        'start_time': {'key': 'startTime', 'type': 'iso-8601'},
-        'end_time': {'key': 'endTime', 'type': 'iso-8601'},
-        'error': {'key': 'error', 'type': 'ApiError'},
-    }
-
-    def __init__(self, **kwargs):
-        super(OperationStatusResponse, self).__init__(**kwargs)
-        self.name = None
-        self.status = None
-        self.start_time = None
-        self.end_time = None
-        self.error = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response_py3.py
deleted file mode 100644
index e36e5fb46916..000000000000
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/operation_status_response_py3.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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 OperationStatusResponse(Model):
-    """Operation status response.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :ivar name: Operation ID
-    :vartype name: str
-    :ivar status: Operation status
-    :vartype status: str
-    :ivar start_time: Start time of the operation
-    :vartype start_time: datetime
-    :ivar end_time: End time of the operation
-    :vartype end_time: datetime
-    :ivar error: Api error
-    :vartype error: ~azure.mgmt.compute.v2018_06_01.models.ApiError
-    """
-
-    _validation = {
-        'name': {'readonly': True},
-        'status': {'readonly': True},
-        'start_time': {'readonly': True},
-        'end_time': {'readonly': True},
-        'error': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'name': {'key': 'name', 'type': 'str'},
-        'status': {'key': 'status', 'type': 'str'},
-        'start_time': {'key': 'startTime', 'type': 'iso-8601'},
-        'end_time': {'key': 'endTime', 'type': 'iso-8601'},
-        'error': {'key': 'error', 'type': 'ApiError'},
-    }
-
-    def __init__(self, **kwargs) -> None:
-        super(OperationStatusResponse, self).__init__(**kwargs)
-        self.name = None
-        self.status = None
-        self.start_time = None
-        self.end_time = None
-        self.error = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status.py
index be74a7fdeb00..ac541c4f4080 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status.py
@@ -15,28 +15,38 @@
 class RegionalReplicationStatus(Model):
     """This is the regional replication status.
 
-    :param region: The region where the gallery image version is published to.
-    :type region: str
-    :param state: This is the regional replication state. Possible values
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar region: The region where the gallery image version is published to.
+    :vartype region: str
+    :ivar state: This is the regional replication state. Possible values
      include: 'Unknown', 'Replicating', 'Completed', 'Failed'
-    :type state: str or
+    :vartype state: str or
      ~azure.mgmt.compute.v2018_06_01.models.ReplicationState
-    :param details: The details of the replication status.
-    :type details: str
-    :param progress: It indicates progress of the replication job.
-    :type progress: int
+    :ivar details: The details of the replication status.
+    :vartype details: str
+    :ivar progress: It indicates progress of the replication job.
+    :vartype progress: int
     """
 
+    _validation = {
+        'region': {'readonly': True},
+        'state': {'readonly': True},
+        'details': {'readonly': True},
+        'progress': {'readonly': True},
+    }
+
     _attribute_map = {
         'region': {'key': 'region', 'type': 'str'},
-        'state': {'key': 'state', 'type': 'ReplicationState'},
+        'state': {'key': 'state', 'type': 'str'},
         'details': {'key': 'details', 'type': 'str'},
         'progress': {'key': 'progress', 'type': 'int'},
     }
 
     def __init__(self, **kwargs):
         super(RegionalReplicationStatus, self).__init__(**kwargs)
-        self.region = kwargs.get('region', None)
-        self.state = kwargs.get('state', None)
-        self.details = kwargs.get('details', None)
-        self.progress = kwargs.get('progress', None)
+        self.region = None
+        self.state = None
+        self.details = None
+        self.progress = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status_py3.py
index ad9e0e83c4d2..4838b5542b8c 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/regional_replication_status_py3.py
@@ -15,28 +15,38 @@
 class RegionalReplicationStatus(Model):
     """This is the regional replication status.
 
-    :param region: The region where the gallery image version is published to.
-    :type region: str
-    :param state: This is the regional replication state. Possible values
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar region: The region where the gallery image version is published to.
+    :vartype region: str
+    :ivar state: This is the regional replication state. Possible values
      include: 'Unknown', 'Replicating', 'Completed', 'Failed'
-    :type state: str or
+    :vartype state: str or
      ~azure.mgmt.compute.v2018_06_01.models.ReplicationState
-    :param details: The details of the replication status.
-    :type details: str
-    :param progress: It indicates progress of the replication job.
-    :type progress: int
+    :ivar details: The details of the replication status.
+    :vartype details: str
+    :ivar progress: It indicates progress of the replication job.
+    :vartype progress: int
     """
 
+    _validation = {
+        'region': {'readonly': True},
+        'state': {'readonly': True},
+        'details': {'readonly': True},
+        'progress': {'readonly': True},
+    }
+
     _attribute_map = {
         'region': {'key': 'region', 'type': 'str'},
-        'state': {'key': 'state', 'type': 'ReplicationState'},
+        'state': {'key': 'state', 'type': 'str'},
         'details': {'key': 'details', 'type': 'str'},
         'progress': {'key': 'progress', 'type': 'int'},
     }
 
-    def __init__(self, *, region: str=None, state=None, details: str=None, progress: int=None, **kwargs) -> None:
+    def __init__(self, **kwargs) -> None:
         super(RegionalReplicationStatus, self).__init__(**kwargs)
-        self.region = region
-        self.state = state
-        self.details = details
-        self.progress = progress
+        self.region = None
+        self.state = None
+        self.details = None
+        self.progress = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status.py
index dca3310506b8..5d20b80672e2 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status.py
@@ -15,22 +15,30 @@
 class ReplicationStatus(Model):
     """This is the replication status of the gallery image version.
 
-    :param aggregated_state: This is the aggregated replication status based
-     on the regional replication status. Possible values include: 'Unknown',
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar aggregated_state: This is the aggregated replication status based on
+     the regional replication status. Possible values include: 'Unknown',
      'InProgress', 'Completed', 'Failed'
-    :type aggregated_state: str or
+    :vartype aggregated_state: str or
      ~azure.mgmt.compute.v2018_06_01.models.AggregatedReplicationState
-    :param summary: This is a summary of replication status for each region.
-    :type summary:
+    :ivar summary: This is a summary of replication status for each region.
+    :vartype summary:
      list[~azure.mgmt.compute.v2018_06_01.models.RegionalReplicationStatus]
     """
 
+    _validation = {
+        'aggregated_state': {'readonly': True},
+        'summary': {'readonly': True},
+    }
+
     _attribute_map = {
-        'aggregated_state': {'key': 'aggregatedState', 'type': 'AggregatedReplicationState'},
+        'aggregated_state': {'key': 'aggregatedState', 'type': 'str'},
         'summary': {'key': 'summary', 'type': '[RegionalReplicationStatus]'},
     }
 
     def __init__(self, **kwargs):
         super(ReplicationStatus, self).__init__(**kwargs)
-        self.aggregated_state = kwargs.get('aggregated_state', None)
-        self.summary = kwargs.get('summary', None)
+        self.aggregated_state = None
+        self.summary = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status_py3.py
index 72bf40691d04..c492353698fd 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/replication_status_py3.py
@@ -15,22 +15,30 @@
 class ReplicationStatus(Model):
     """This is the replication status of the gallery image version.
 
-    :param aggregated_state: This is the aggregated replication status based
-     on the regional replication status. Possible values include: 'Unknown',
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar aggregated_state: This is the aggregated replication status based on
+     the regional replication status. Possible values include: 'Unknown',
      'InProgress', 'Completed', 'Failed'
-    :type aggregated_state: str or
+    :vartype aggregated_state: str or
      ~azure.mgmt.compute.v2018_06_01.models.AggregatedReplicationState
-    :param summary: This is a summary of replication status for each region.
-    :type summary:
+    :ivar summary: This is a summary of replication status for each region.
+    :vartype summary:
      list[~azure.mgmt.compute.v2018_06_01.models.RegionalReplicationStatus]
     """
 
+    _validation = {
+        'aggregated_state': {'readonly': True},
+        'summary': {'readonly': True},
+    }
+
     _attribute_map = {
-        'aggregated_state': {'key': 'aggregatedState', 'type': 'AggregatedReplicationState'},
+        'aggregated_state': {'key': 'aggregatedState', 'type': 'str'},
         'summary': {'key': 'summary', 'type': '[RegionalReplicationStatus]'},
     }
 
-    def __init__(self, *, aggregated_state=None, summary=None, **kwargs) -> None:
+    def __init__(self, **kwargs) -> None:
         super(ReplicationStatus, self).__init__(**kwargs)
-        self.aggregated_state = aggregated_state
-        self.summary = summary
+        self.aggregated_state = None
+        self.summary = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/galleries_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/galleries_operations.py
index 7d94dc409558..b05139317ddf 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/galleries_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/galleries_operations.py
@@ -73,7 +73,7 @@ def _create_or_update_initial(
         response = self._client.send(
             request, header_parameters, body_content, stream=False, **operation_config)
 
-        if response.status_code not in [200, 201]:
+        if response.status_code not in [200, 201, 202]:
             exp = CloudError(response)
             exp.request_id = response.headers.get('x-ms-request-id')
             raise exp
@@ -84,6 +84,8 @@ def _create_or_update_initial(
             deserialized = self._deserialize('Gallery', response)
         if response.status_code == 201:
             deserialized = self._deserialize('Gallery', response)
+        if response.status_code == 202:
+            deserialized = self._deserialize('Gallery', response)
 
         if raw:
             client_raw_response = ClientRawResponse(deserialized, response)
@@ -239,17 +241,10 @@ def _delete_initial(
             exp.request_id = response.headers.get('x-ms-request-id')
             raise exp
 
-        deserialized = None
-
-        if response.status_code == 200:
-            deserialized = self._deserialize('OperationStatusResponse', response)
-
         if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
+            client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
 
-        return deserialized
-
     def delete(
             self, resource_group_name, gallery_name, custom_headers=None, raw=False, polling=True, **operation_config):
         """Delete a gallery.
@@ -263,12 +258,10 @@ def delete(
          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 OperationStatusResponse
-         or ClientRawResponse<OperationStatusResponse> if raw==True
-        :rtype:
-         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.OperationStatusResponse]
-         or
-         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.OperationStatusResponse]]
+        :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(
@@ -280,14 +273,10 @@ def delete(
         )
 
         def get_long_running_output(response):
-            deserialized = self._deserialize('OperationStatusResponse', response)
-
             if raw:
-                client_raw_response = ClientRawResponse(deserialized, response)
+                client_raw_response = ClientRawResponse(None, response)
                 return client_raw_response
 
-            return deserialized
-
         lro_delay = operation_config.get(
             'long_running_operation_timeout',
             self.config.long_running_operation_timeout)
@@ -365,7 +354,7 @@ def internal_paging(next_link=None, raw=False):
         return deserialized
     list_by_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/galleries'}
 
-    def list_by_subscription(
+    def list(
             self, custom_headers=None, raw=False, **operation_config):
         """List galleries under a subscription.
 
@@ -383,7 +372,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = self.list_by_subscription.metadata['url']
+                url = self.list.metadata['url']
                 path_format_arguments = {
                     'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str')
                 }
@@ -428,4 +417,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
-    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/galleries'}
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/galleries'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_image_versions_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_image_versions_operations.py
index e0aa712f5c54..3acc16a4d1bc 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_image_versions_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_image_versions_operations.py
@@ -75,7 +75,7 @@ def _create_or_update_initial(
         response = self._client.send(
             request, header_parameters, body_content, stream=False, **operation_config)
 
-        if response.status_code not in [200, 201]:
+        if response.status_code not in [200, 201, 202]:
             exp = CloudError(response)
             exp.request_id = response.headers.get('x-ms-request-id')
             raise exp
@@ -86,6 +86,8 @@ def _create_or_update_initial(
             deserialized = self._deserialize('GalleryImageVersion', response)
         if response.status_code == 201:
             deserialized = self._deserialize('GalleryImageVersion', response)
+        if response.status_code == 202:
+            deserialized = self._deserialize('GalleryImageVersion', response)
 
         if raw:
             client_raw_response = ClientRawResponse(deserialized, response)
@@ -104,7 +106,9 @@ def create_or_update(
         :param gallery_image_name: The name of the gallery image.
         :type gallery_image_name: str
         :param gallery_image_version_name: The name of the gallery image
-         version.
+         version. Needs to follow semantic version name pattern: The allowed
+         characters are digit and period. Digits must be within the range of a
+         32-bit integer. Format: <MajorVersion>.<MinorVersion>.<Patch>
         :type gallery_image_version_name: str
         :param gallery_image_version: Parameters supplied to the create or
          update gallery image version operation.
@@ -193,7 +197,7 @@ def get(
         # Construct parameters
         query_parameters = {}
         if expand is not None:
-            query_parameters['$expand'] = self._serialize.query("expand", expand, 'ReplicationStatusTypes')
+            query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
         query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
 
         # Construct headers
@@ -264,17 +268,10 @@ def _delete_initial(
             exp.request_id = response.headers.get('x-ms-request-id')
             raise exp
 
-        deserialized = None
-
-        if response.status_code == 200:
-            deserialized = self._deserialize('OperationStatusResponse', response)
-
         if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
+            client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
 
-        return deserialized
-
     def delete(
             self, resource_group_name, gallery_name, gallery_image_name, gallery_image_version_name, custom_headers=None, raw=False, polling=True, **operation_config):
         """Delete a gallery image version.
@@ -293,12 +290,10 @@ def delete(
          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 OperationStatusResponse
-         or ClientRawResponse<OperationStatusResponse> if raw==True
-        :rtype:
-         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.OperationStatusResponse]
-         or
-         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.OperationStatusResponse]]
+        :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(
@@ -312,14 +307,10 @@ def delete(
         )
 
         def get_long_running_output(response):
-            deserialized = self._deserialize('OperationStatusResponse', response)
-
             if raw:
-                client_raw_response = ClientRawResponse(deserialized, response)
+                client_raw_response = ClientRawResponse(None, response)
                 return client_raw_response
 
-            return deserialized
-
         lro_delay = operation_config.get(
             'long_running_operation_timeout',
             self.config.long_running_operation_timeout)
@@ -329,7 +320,7 @@ def get_long_running_output(response):
         return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
     delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/galleries/{galleryName}/images/{galleryImageName}/versions/{galleryImageVersionName}'}
 
-    def list_gallery_image_versions_by_gallery_image(
+    def list_by_gallery_image(
             self, resource_group_name, gallery_name, gallery_image_name, custom_headers=None, raw=False, **operation_config):
         """List gallery image versions under a gallery image.
 
@@ -353,7 +344,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = self.list_gallery_image_versions_by_gallery_image.metadata['url']
+                url = self.list_by_gallery_image.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'),
@@ -401,4 +392,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
-    list_gallery_image_versions_by_gallery_image.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/galleries/{galleryName}/images/{galleryImageName}/versions'}
+    list_by_gallery_image.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/galleries/{galleryName}/images/{galleryImageName}/versions'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_images_operations.py
index e28d24dc1d58..fc8b6ff9f1ac 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_images_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_images_operations.py
@@ -74,7 +74,7 @@ def _create_or_update_initial(
         response = self._client.send(
             request, header_parameters, body_content, stream=False, **operation_config)
 
-        if response.status_code not in [200, 201]:
+        if response.status_code not in [200, 201, 202]:
             exp = CloudError(response)
             exp.request_id = response.headers.get('x-ms-request-id')
             raise exp
@@ -85,6 +85,8 @@ def _create_or_update_initial(
             deserialized = self._deserialize('GalleryImage', response)
         if response.status_code == 201:
             deserialized = self._deserialize('GalleryImage', response)
+        if response.status_code == 202:
+            deserialized = self._deserialize('GalleryImage', response)
 
         if raw:
             client_raw_response = ClientRawResponse(deserialized, response)
@@ -248,17 +250,10 @@ def _delete_initial(
             exp.request_id = response.headers.get('x-ms-request-id')
             raise exp
 
-        deserialized = None
-
-        if response.status_code == 200:
-            deserialized = self._deserialize('OperationStatusResponse', response)
-
         if raw:
-            client_raw_response = ClientRawResponse(deserialized, response)
+            client_raw_response = ClientRawResponse(None, response)
             return client_raw_response
 
-        return deserialized
-
     def delete(
             self, resource_group_name, gallery_name, gallery_image_name, custom_headers=None, raw=False, polling=True, **operation_config):
         """Delete a gallery image.
@@ -274,12 +269,10 @@ def delete(
          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 OperationStatusResponse
-         or ClientRawResponse<OperationStatusResponse> if raw==True
-        :rtype:
-         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.OperationStatusResponse]
-         or
-         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.OperationStatusResponse]]
+        :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(
@@ -292,14 +285,10 @@ def delete(
         )
 
         def get_long_running_output(response):
-            deserialized = self._deserialize('OperationStatusResponse', response)
-
             if raw:
-                client_raw_response = ClientRawResponse(deserialized, response)
+                client_raw_response = ClientRawResponse(None, response)
                 return client_raw_response
 
-            return deserialized
-
         lro_delay = operation_config.get(
             'long_running_operation_timeout',
             self.config.long_running_operation_timeout)
@@ -309,7 +298,7 @@ def get_long_running_output(response):
         return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
     delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/galleries/{galleryName}/images/{galleryImageName}'}
 
-    def list_gallery_images_by_gallery(
+    def list_by_gallery(
             self, resource_group_name, gallery_name, custom_headers=None, raw=False, **operation_config):
         """List gallery images under a gallery.
 
@@ -331,7 +320,7 @@ def internal_paging(next_link=None, raw=False):
 
             if not next_link:
                 # Construct URL
-                url = self.list_gallery_images_by_gallery.metadata['url']
+                url = self.list_by_gallery.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'),
@@ -378,4 +367,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
-    list_gallery_images_by_gallery.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/galleries/{galleryName}/images'}
+    list_by_gallery.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/galleries/{galleryName}/images'}

From 15479ef738fe602471a564eb36be268045a85f52 Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Fri, 6 Jul 2018 14:04:53 -0700
Subject: [PATCH 14/29] Generated from d4e9a10c23b602709da6ec04f970c7802ca60af3
 (#2886)

Got the latest code from official repo master branch and resolved the conflicts.
---
 .../availability_sets_operations.py           | 65 -------------------
 .../availability_sets_operations.py           | 65 -------------------
 .../availability_sets_operations.py           | 65 -------------------
 .../availability_sets_operations.py           | 65 -------------------
 .../models/compute_management_client_enums.py |  1 -
 .../compute/v2018_04_01/models/disk_sku.py    |  4 +-
 .../v2018_04_01/models/disk_sku_py3.py        |  4 +-
 .../v2018_04_01/models/image_data_disk.py     |  5 +-
 .../v2018_04_01/models/image_data_disk_py3.py |  5 +-
 .../v2018_04_01/models/image_os_disk.py       |  5 +-
 .../v2018_04_01/models/image_os_disk_py3.py   |  5 +-
 .../models/managed_disk_parameters.py         |  5 +-
 .../models/managed_disk_parameters_py3.py     |  5 +-
 ...chine_scale_set_managed_disk_parameters.py |  5 +-
 ...e_scale_set_managed_disk_parameters_py3.py |  5 +-
 .../availability_sets_operations.py           | 65 -------------------
 16 files changed, 20 insertions(+), 354 deletions(-)

diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/availability_sets_operations.py
index dd549283c784..48582fd18dc4 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/availability_sets_operations.py
@@ -231,71 +231,6 @@ def get(
         return deserialized
     get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
 
-    def list_by_subscription(
-            self, custom_headers=None, raw=False, **operation_config):
-        """Lists all availability sets in 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 AvailabilitySet
-        :rtype:
-         ~azure.mgmt.compute.v2016_03_30.models.AvailabilitySetPaged[~azure.mgmt.compute.v2016_03_30.models.AvailabilitySet]
-        :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_subscription.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['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 and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
-            return client_raw_response
-
-        return deserialized
-    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
-
     def list(
             self, resource_group_name, custom_headers=None, raw=False, **operation_config):
         """Lists all availability sets in a resource group.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/availability_sets_operations.py
index 8eb5f352915b..dda88859b1f5 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/availability_sets_operations.py
@@ -232,71 +232,6 @@ def get(
         return deserialized
     get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
 
-    def list_by_subscription(
-            self, custom_headers=None, raw=False, **operation_config):
-        """Lists all availability sets in 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 AvailabilitySet
-        :rtype:
-         ~azure.mgmt.compute.v2016_04_30_preview.models.AvailabilitySetPaged[~azure.mgmt.compute.v2016_04_30_preview.models.AvailabilitySet]
-        :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_subscription.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['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 and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
-            return client_raw_response
-
-        return deserialized
-    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
-
     def list(
             self, resource_group_name, custom_headers=None, raw=False, **operation_config):
         """Lists all availability sets in a resource group.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/availability_sets_operations.py
index 4e7b3494c55a..ce2e741626f2 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/availability_sets_operations.py
@@ -231,71 +231,6 @@ def get(
         return deserialized
     get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
 
-    def list_by_subscription(
-            self, custom_headers=None, raw=False, **operation_config):
-        """Lists all availability sets in 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 AvailabilitySet
-        :rtype:
-         ~azure.mgmt.compute.v2017_03_30.models.AvailabilitySetPaged[~azure.mgmt.compute.v2017_03_30.models.AvailabilitySet]
-        :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_subscription.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['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 and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
-            return client_raw_response
-
-        return deserialized
-    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
-
     def list(
             self, resource_group_name, custom_headers=None, raw=False, **operation_config):
         """Lists all availability sets in a resource group.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/availability_sets_operations.py
index 5f03fa563156..5e2cc0d7f116 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/availability_sets_operations.py
@@ -301,71 +301,6 @@ def get(
         return deserialized
     get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
 
-    def list_by_subscription(
-            self, custom_headers=None, raw=False, **operation_config):
-        """Lists all availability sets in 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 AvailabilitySet
-        :rtype:
-         ~azure.mgmt.compute.v2017_12_01.models.AvailabilitySetPaged[~azure.mgmt.compute.v2017_12_01.models.AvailabilitySet]
-        :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_subscription.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['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 and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
-            return client_raw_response
-
-        return deserialized
-    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
-
     def list(
             self, resource_group_name, custom_headers=None, raw=False, **operation_config):
         """Lists all availability sets in a resource group.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py
index d72727b5e98e..b66be29c4cf4 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py
@@ -213,7 +213,6 @@ class StorageAccountTypes(str, Enum):
 
     standard_lrs = "Standard_LRS"
     premium_lrs = "Premium_LRS"
-    standard_ssd_lrs = "StandardSSD_LRS"
 
 
 class PassNames(str, Enum):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku.py
index 1123feabd42c..f0bbc41f21e1 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku.py
@@ -13,13 +13,13 @@
 
 
 class DiskSku(Model):
-    """The disks sku name. Can be Standard_LRS, Premium_LRS, or StandardSSD_LRS.
+    """The disks sku name. Can be Standard_LRS or Premium_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'
+     'Premium_LRS'
     :type name: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     :ivar tier: The sku tier. Default value: "Standard" .
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku_py3.py
index df30d24c240a..99a2821b0aeb 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku_py3.py
@@ -13,13 +13,13 @@
 
 
 class DiskSku(Model):
-    """The disks sku name. Can be Standard_LRS, Premium_LRS, or StandardSSD_LRS.
+    """The disks sku name. Can be Standard_LRS or Premium_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'
+     'Premium_LRS'
     :type name: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     :ivar tier: The sku tier. Default value: "Standard" .
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py
index 3d96a893bb63..ae905adba8c4 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py
@@ -37,9 +37,8 @@ class ImageDataDisk(Model):
      machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :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. Possible values are: Standard_LRS or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py
index d7262b81ba6b..7112f92f78c0 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py
@@ -37,9 +37,8 @@ class ImageDataDisk(Model):
      machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :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. Possible values are: Standard_LRS or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py
index 7515a838e5cf..3ef3a0cd4414 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py
@@ -43,9 +43,8 @@ class ImageOSDisk(Model):
      machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :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. Possible values are: Standard_LRS or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py
index 06cc994712fa..59c61abd3f0f 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py
@@ -43,9 +43,8 @@ class ImageOSDisk(Model):
      machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :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. Possible values are: Standard_LRS or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py
index e3f0b5324e39..a16aed3bbcbf 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py
@@ -18,9 +18,8 @@ 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. Possible values are: Standard_LRS or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py
index 02d27c61f9d3..50b8a76181d6 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py
@@ -18,9 +18,8 @@ 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. Possible values are: Standard_LRS or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py
index 89b93a0524f2..495309b9b2cf 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py
@@ -16,9 +16,8 @@ class VirtualMachineScaleSetManagedDiskParameters(Model):
     """Describes the parameters of a ScaleSet managed disk.
 
     :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. Possible values are: Standard_LRS or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py
index a35e25fcba75..68f66be2e34e 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py
@@ -16,9 +16,8 @@ class VirtualMachineScaleSetManagedDiskParameters(Model):
     """Describes the parameters of a ScaleSet managed disk.
 
     :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. Possible values are: Standard_LRS or Premium_LRS. Possible
+     values include: 'Standard_LRS', 'Premium_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py
index 2c6a7d2a0f18..ba8e21445a27 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py
@@ -293,71 +293,6 @@ def get(
         return deserialized
     get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
 
-    def list_by_subscription(
-            self, custom_headers=None, raw=False, **operation_config):
-        """Lists all availability sets in 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 AvailabilitySet
-        :rtype:
-         ~azure.mgmt.compute.v2018_04_01.models.AvailabilitySetPaged[~azure.mgmt.compute.v2018_04_01.models.AvailabilitySet]
-        :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_subscription.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['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 and send request
-            request = self._client.get(url, query_parameters)
-            response = self._client.send(
-                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
-
-        if raw:
-            header_dict = {}
-            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
-            return client_raw_response
-
-        return deserialized
-    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
-
     def list(
             self, resource_group_name, custom_headers=None, raw=False, **operation_config):
         """Lists all availability sets in a resource group.

From 82c4f0b71f831143bf36ebd5d7f8f71fd5c6c849 Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Fri, 6 Jul 2018 21:09:37 +0000
Subject: [PATCH 15/29] Rebuild by
 https://github.com/Azure/azure-sdk-for-python/pull/2487

---
 .../availability_sets_operations.py           | 65 +++++++++++++++++++
 .../availability_sets_operations.py           | 65 +++++++++++++++++++
 .../availability_sets_operations.py           | 65 +++++++++++++++++++
 .../availability_sets_operations.py           | 65 +++++++++++++++++++
 .../models/compute_management_client_enums.py |  1 +
 .../compute/v2018_04_01/models/disk_sku.py    |  4 +-
 .../v2018_04_01/models/disk_sku_py3.py        |  4 +-
 .../v2018_04_01/models/image_data_disk.py     |  5 +-
 .../v2018_04_01/models/image_data_disk_py3.py |  5 +-
 .../v2018_04_01/models/image_os_disk.py       |  5 +-
 .../v2018_04_01/models/image_os_disk_py3.py   |  5 +-
 .../models/managed_disk_parameters.py         |  5 +-
 .../models/managed_disk_parameters_py3.py     |  5 +-
 ...chine_scale_set_managed_disk_parameters.py |  5 +-
 ...e_scale_set_managed_disk_parameters_py3.py |  5 +-
 .../availability_sets_operations.py           | 65 +++++++++++++++++++
 16 files changed, 354 insertions(+), 20 deletions(-)

diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/availability_sets_operations.py
index 48582fd18dc4..dd549283c784 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/availability_sets_operations.py
@@ -231,6 +231,71 @@ def get(
         return deserialized
     get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
 
+    def list_by_subscription(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Lists all availability sets in 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 AvailabilitySet
+        :rtype:
+         ~azure.mgmt.compute.v2016_03_30.models.AvailabilitySetPaged[~azure.mgmt.compute.v2016_03_30.models.AvailabilitySet]
+        :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_subscription.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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
+
     def list(
             self, resource_group_name, custom_headers=None, raw=False, **operation_config):
         """Lists all availability sets in a resource group.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/availability_sets_operations.py
index dda88859b1f5..8eb5f352915b 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/availability_sets_operations.py
@@ -232,6 +232,71 @@ def get(
         return deserialized
     get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
 
+    def list_by_subscription(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Lists all availability sets in 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 AvailabilitySet
+        :rtype:
+         ~azure.mgmt.compute.v2016_04_30_preview.models.AvailabilitySetPaged[~azure.mgmt.compute.v2016_04_30_preview.models.AvailabilitySet]
+        :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_subscription.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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
+
     def list(
             self, resource_group_name, custom_headers=None, raw=False, **operation_config):
         """Lists all availability sets in a resource group.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/availability_sets_operations.py
index ce2e741626f2..4e7b3494c55a 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/availability_sets_operations.py
@@ -231,6 +231,71 @@ def get(
         return deserialized
     get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
 
+    def list_by_subscription(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Lists all availability sets in 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 AvailabilitySet
+        :rtype:
+         ~azure.mgmt.compute.v2017_03_30.models.AvailabilitySetPaged[~azure.mgmt.compute.v2017_03_30.models.AvailabilitySet]
+        :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_subscription.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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
+
     def list(
             self, resource_group_name, custom_headers=None, raw=False, **operation_config):
         """Lists all availability sets in a resource group.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/availability_sets_operations.py
index 5e2cc0d7f116..5f03fa563156 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/availability_sets_operations.py
@@ -301,6 +301,71 @@ def get(
         return deserialized
     get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
 
+    def list_by_subscription(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Lists all availability sets in 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 AvailabilitySet
+        :rtype:
+         ~azure.mgmt.compute.v2017_12_01.models.AvailabilitySetPaged[~azure.mgmt.compute.v2017_12_01.models.AvailabilitySet]
+        :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_subscription.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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
+
     def list(
             self, resource_group_name, custom_headers=None, raw=False, **operation_config):
         """Lists all availability sets in a resource group.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py
index b66be29c4cf4..d72727b5e98e 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/compute_management_client_enums.py
@@ -213,6 +213,7 @@ class StorageAccountTypes(str, Enum):
 
     standard_lrs = "Standard_LRS"
     premium_lrs = "Premium_LRS"
+    standard_ssd_lrs = "StandardSSD_LRS"
 
 
 class PassNames(str, Enum):
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku.py
index f0bbc41f21e1..1123feabd42c 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku.py
@@ -13,13 +13,13 @@
 
 
 class DiskSku(Model):
-    """The disks sku name. Can be Standard_LRS or Premium_LRS.
+    """The disks sku name. Can be Standard_LRS, Premium_LRS, or StandardSSD_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'
+     'Premium_LRS', 'StandardSSD_LRS'
     :type name: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     :ivar tier: The sku tier. Default value: "Standard" .
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku_py3.py
index 99a2821b0aeb..df30d24c240a 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_sku_py3.py
@@ -13,13 +13,13 @@
 
 
 class DiskSku(Model):
-    """The disks sku name. Can be Standard_LRS or Premium_LRS.
+    """The disks sku name. Can be Standard_LRS, Premium_LRS, or StandardSSD_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'
+     'Premium_LRS', 'StandardSSD_LRS'
     :type name: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     :ivar tier: The sku tier. Default value: "Standard" .
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py
index ae905adba8c4..3d96a893bb63 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk.py
@@ -37,8 +37,9 @@ class ImageDataDisk(Model):
      machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param storage_account_type: Specifies the storage account type for the
-     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
+     managed disk. Possible values are: Standard_LRS, Premium_LRS, and
+     StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
+     'StandardSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py
index 7112f92f78c0..d7262b81ba6b 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_data_disk_py3.py
@@ -37,8 +37,9 @@ class ImageDataDisk(Model):
      machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param storage_account_type: Specifies the storage account type for the
-     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
+     managed disk. Possible values are: Standard_LRS, Premium_LRS, and
+     StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
+     'StandardSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py
index 3ef3a0cd4414..7515a838e5cf 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk.py
@@ -43,8 +43,9 @@ class ImageOSDisk(Model):
      machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param storage_account_type: Specifies the storage account type for the
-     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
+     managed disk. Possible values are: Standard_LRS, Premium_LRS, and
+     StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
+     'StandardSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py
index 59c61abd3f0f..06cc994712fa 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/image_os_disk_py3.py
@@ -43,8 +43,9 @@ class ImageOSDisk(Model):
      machine image. <br><br> This value cannot be larger than 1023 GB
     :type disk_size_gb: int
     :param storage_account_type: Specifies the storage account type for the
-     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
+     managed disk. Possible values are: Standard_LRS, Premium_LRS, and
+     StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
+     'StandardSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py
index a16aed3bbcbf..e3f0b5324e39 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters.py
@@ -18,8 +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 or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
+     managed disk. Possible values are: Standard_LRS, Premium_LRS, and
+     StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
+     'StandardSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py
index 50b8a76181d6..02d27c61f9d3 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/managed_disk_parameters_py3.py
@@ -18,8 +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 or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
+     managed disk. Possible values are: Standard_LRS, Premium_LRS, and
+     StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
+     'StandardSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py
index 495309b9b2cf..89b93a0524f2 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters.py
@@ -16,8 +16,9 @@ class VirtualMachineScaleSetManagedDiskParameters(Model):
     """Describes the parameters of a ScaleSet managed disk.
 
     :param storage_account_type: Specifies the storage account type for the
-     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
+     managed disk. Possible values are: Standard_LRS, Premium_LRS, and
+     StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
+     'StandardSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py
index 68f66be2e34e..a35e25fcba75 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py
@@ -16,8 +16,9 @@ class VirtualMachineScaleSetManagedDiskParameters(Model):
     """Describes the parameters of a ScaleSet managed disk.
 
     :param storage_account_type: Specifies the storage account type for the
-     managed disk. Possible values are: Standard_LRS or Premium_LRS. Possible
-     values include: 'Standard_LRS', 'Premium_LRS'
+     managed disk. Possible values are: Standard_LRS, Premium_LRS, and
+     StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
+     'StandardSSD_LRS'
     :type storage_account_type: str or
      ~azure.mgmt.compute.v2018_04_01.models.StorageAccountTypes
     """
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py
index ba8e21445a27..2c6a7d2a0f18 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py
@@ -293,6 +293,71 @@ def get(
         return deserialized
     get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
 
+    def list_by_subscription(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Lists all availability sets in 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 AvailabilitySet
+        :rtype:
+         ~azure.mgmt.compute.v2018_04_01.models.AvailabilitySetPaged[~azure.mgmt.compute.v2018_04_01.models.AvailabilitySet]
+        :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_subscription.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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
+
     def list(
             self, resource_group_name, custom_headers=None, raw=False, **operation_config):
         """Lists all availability sets in a resource group.

From c2f5dceef2981bf429d2d5e739eece47ce76112a Mon Sep 17 00:00:00 2001
From: Laurent Mazuel <laurent.mazuel@gmail.com>
Date: Fri, 6 Jul 2018 15:38:37 -0700
Subject: [PATCH 16/29] Update version.py

---
 azure-mgmt-compute/azure/mgmt/compute/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-mgmt-compute/azure/mgmt/compute/version.py b/azure-mgmt-compute/azure/mgmt/compute/version.py
index cacb8dacb979..6b28d101df44 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.0rc2"
+VERSION = "4.0.0rc3"

From d75f3b06e9938e22098c8b355f89deedab30f67b Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Mon, 9 Jul 2018 10:01:16 -0700
Subject: [PATCH 17/29] Generated from 0e3b2e2f19773ecc8bb676f2d40cff4119b2a357
 (#2890)

Python conf for Compute 2018-06
---
 .../mgmt/compute/compute_management_client.py |   42 +
 .../v2018_06_01/compute_management_client.py  |   70 +
 .../compute/v2018_06_01/models/__init__.py    |  444 ++++-
 .../models/additional_unattend_content.py     |   52 +
 .../models/additional_unattend_content_py3.py |   52 +
 .../models/api_entity_reference.py            |   29 +
 .../models/api_entity_reference_py3.py        |   29 +
 .../models/auto_os_upgrade_policy.py          |   29 +
 .../models/auto_os_upgrade_policy_py3.py      |   29 +
 .../v2018_06_01/models/availability_set.py    |   85 +
 .../models/availability_set_paged.py          |   27 +
 .../models/availability_set_py3.py            |   85 +
 .../models/availability_set_update.py         |   58 +
 .../models/availability_set_update_py3.py     |   58 +
 .../v2018_06_01/models/boot_diagnostics.py    |   38 +
 .../models/boot_diagnostics_instance_view.py  |   32 +
 .../boot_diagnostics_instance_view_py3.py     |   32 +
 .../models/boot_diagnostics_py3.py            |   38 +
 .../models/compute_management_client_enums.py |  309 +++
 .../models/compute_operation_value.py         |   60 +
 .../models/compute_operation_value_paged.py   |   27 +
 .../models/compute_operation_value_py3.py     |   60 +
 .../compute/v2018_06_01/models/data_disk.py   |   87 +
 .../v2018_06_01/models/data_disk_image.py     |   37 +
 .../v2018_06_01/models/data_disk_image_py3.py |   37 +
 .../v2018_06_01/models/data_disk_py3.py       |   87 +
 .../v2018_06_01/models/diagnostics_profile.py |   34 +
 .../models/diagnostics_profile_py3.py         |   34 +
 .../models/disk_encryption_settings.py        |   41 +
 .../models/disk_encryption_settings_py3.py    |   41 +
 .../v2018_06_01/models/disk_instance_view.py  |   39 +
 .../models/disk_instance_view_py3.py          |   39 +
 .../v2018_06_01/models/hardware_profile.py    |   85 +
 .../models/hardware_profile_py3.py            |   85 +
 .../mgmt/compute/v2018_06_01/models/image.py  |   70 +
 .../v2018_06_01/models/image_data_disk.py     |   69 +
 .../v2018_06_01/models/image_data_disk_py3.py |   69 +
 .../v2018_06_01/models/image_os_disk.py       |   78 +
 .../v2018_06_01/models/image_os_disk_py3.py   |   78 +
 .../compute/v2018_06_01/models/image_paged.py |   27 +
 .../compute/v2018_06_01/models/image_py3.py   |   70 +
 .../v2018_06_01/models/image_reference.py     |   54 +
 .../v2018_06_01/models/image_reference_py3.py |   54 +
 .../models/image_storage_profile.py           |   45 +
 .../models/image_storage_profile_py3.py       |   45 +
 .../v2018_06_01/models/image_update.py        |   50 +
 .../v2018_06_01/models/image_update_py3.py    |   50 +
 .../models/instance_view_status.py            |   47 +
 .../models/instance_view_status_py3.py        |   47 +
 .../models/key_vault_key_reference.py         |   41 +
 .../models/key_vault_key_reference_py3.py     |   41 +
 .../models/key_vault_secret_reference.py      |   40 +
 .../models/key_vault_secret_reference_py3.py  |   40 +
 .../v2018_06_01/models/linux_configuration.py |   47 +
 .../models/linux_configuration_py3.py         |   47 +
 .../models/log_analytics_input_base.py        |   58 +
 .../models/log_analytics_input_base_py3.py    |   58 +
 .../models/log_analytics_operation_result.py  |   36 +
 .../log_analytics_operation_result_py3.py     |   36 +
 .../models/log_analytics_output.py            |   35 +
 .../models/log_analytics_output_py3.py        |   35 +
 .../models/maintenance_redeploy_status.py     |   60 +
 .../models/maintenance_redeploy_status_py3.py |   60 +
 .../models/managed_disk_parameters.py         |   35 +
 .../models/managed_disk_parameters_py3.py     |   35 +
 .../models/network_interface_reference.py     |   32 +
 .../models/network_interface_reference_py3.py |   32 +
 .../v2018_06_01/models/network_profile.py     |   30 +
 .../v2018_06_01/models/network_profile_py3.py |   30 +
 .../compute/v2018_06_01/models/os_disk.py     |   97 +
 .../v2018_06_01/models/os_disk_image.py       |   36 +
 .../v2018_06_01/models/os_disk_image_py3.py   |   36 +
 .../compute/v2018_06_01/models/os_disk_py3.py |   97 +
 .../compute/v2018_06_01/models/os_profile.py  |  105 +
 .../v2018_06_01/models/os_profile_py3.py      |  105 +
 .../mgmt/compute/v2018_06_01/models/plan.py   |   46 +
 .../compute/v2018_06_01/models/plan_py3.py    |   46 +
 .../v2018_06_01/models/purchase_plan.py       |   47 +
 .../v2018_06_01/models/purchase_plan_py3.py   |   47 +
 .../models/recovery_walk_response.py          |   41 +
 .../models/recovery_walk_response_py3.py      |   41 +
 .../models/request_rate_by_interval_input.py  |   60 +
 .../request_rate_by_interval_input_py3.py     |   60 +
 .../models/rollback_status_info.py            |   48 +
 .../models/rollback_status_info_py3.py        |   48 +
 .../models/rolling_upgrade_policy.py          |   63 +
 .../models/rolling_upgrade_policy_py3.py      |   63 +
 .../models/rolling_upgrade_progress_info.py   |   55 +
 .../rolling_upgrade_progress_info_py3.py      |   55 +
 .../models/rolling_upgrade_running_status.py  |   54 +
 .../rolling_upgrade_running_status_py3.py     |   54 +
 .../models/rolling_upgrade_status_info.py     |   76 +
 .../models/rolling_upgrade_status_info_py3.py |   76 +
 .../mgmt/compute/v2018_06_01/models/sku.py    |   38 +
 .../compute/v2018_06_01/models/sku_py3.py     |   38 +
 .../v2018_06_01/models/ssh_configuration.py   |   30 +
 .../models/ssh_configuration_py3.py           |   30 +
 .../v2018_06_01/models/ssh_public_key.py      |   39 +
 .../v2018_06_01/models/ssh_public_key_py3.py  |   39 +
 .../v2018_06_01/models/storage_profile.py     |   47 +
 .../v2018_06_01/models/storage_profile_py3.py |   47 +
 .../v2018_06_01/models/sub_resource.py        |   28 +
 .../v2018_06_01/models/sub_resource_py3.py    |   28 +
 .../models/sub_resource_read_only.py          |   35 +
 .../models/sub_resource_read_only_py3.py      |   35 +
 .../models/throttled_requests_input.py        |   52 +
 .../models/throttled_requests_input_py3.py    |   52 +
 .../v2018_06_01/models/update_resource.py     |   28 +
 .../v2018_06_01/models/update_resource_py3.py |   28 +
 ...pgrade_operation_historical_status_info.py |   47 +
 ..._operation_historical_status_info_paged.py |   27 +
 ...ation_historical_status_info_properties.py |   67 +
 ...n_historical_status_info_properties_py3.py |   67 +
 ...de_operation_historical_status_info_py3.py |   47 +
 .../upgrade_operation_history_status.py       |   46 +
 .../upgrade_operation_history_status_py3.py   |   46 +
 .../v2018_06_01/models/upgrade_policy.py      |   51 +
 .../v2018_06_01/models/upgrade_policy_py3.py  |   51 +
 .../mgmt/compute/v2018_06_01/models/usage.py  |   54 +
 .../compute/v2018_06_01/models/usage_name.py  |   32 +
 .../v2018_06_01/models/usage_name_py3.py      |   32 +
 .../compute/v2018_06_01/models/usage_paged.py |   27 +
 .../compute/v2018_06_01/models/usage_py3.py   |   54 +
 .../v2018_06_01/models/vault_certificate.py   |   46 +
 .../models/vault_certificate_py3.py           |   46 +
 .../v2018_06_01/models/vault_secret_group.py  |   35 +
 .../models/vault_secret_group_py3.py          |   35 +
 .../v2018_06_01/models/virtual_hard_disk.py   |   28 +
 .../models/virtual_hard_disk_py3.py           |   28 +
 .../v2018_06_01/models/virtual_machine.py     |  150 ++
 .../virtual_machine_agent_instance_view.py    |   39 +
 ...virtual_machine_agent_instance_view_py3.py |   39 +
 .../virtual_machine_capture_parameters.py     |   46 +
 .../virtual_machine_capture_parameters_py3.py |   46 +
 .../models/virtual_machine_capture_result.py  |   53 +
 .../virtual_machine_capture_result_py3.py     |   53 +
 .../models/virtual_machine_extension.py       |   97 +
 ...machine_extension_handler_instance_view.py |   37 +
 ...ine_extension_handler_instance_view_py3.py |   37 +
 .../models/virtual_machine_extension_image.py |   81 +
 .../virtual_machine_extension_image_py3.py    |   81 +
 ...virtual_machine_extension_instance_view.py |   47 +
 ...ual_machine_extension_instance_view_py3.py |   47 +
 .../models/virtual_machine_extension_py3.py   |   97 +
 .../virtual_machine_extension_update.py       |   62 +
 .../virtual_machine_extension_update_py3.py   |   62 +
 .../virtual_machine_extensions_list_result.py |   29 +
 ...tual_machine_extensions_list_result_py3.py |   29 +
 .../models/virtual_machine_health_status.py   |   35 +
 .../virtual_machine_health_status_py3.py      |   35 +
 .../models/virtual_machine_identity.py        |   59 +
 .../models/virtual_machine_identity_py3.py    |   59 +
 ...identity_user_assigned_identities_value.py |   40 +
 ...tity_user_assigned_identities_value_py3.py |   40 +
 .../models/virtual_machine_image.py           |   59 +
 .../models/virtual_machine_image_py3.py       |   59 +
 .../models/virtual_machine_image_resource.py  |   49 +
 .../virtual_machine_image_resource_py3.py     |   49 +
 .../models/virtual_machine_instance_view.py   |   85 +
 .../virtual_machine_instance_view_py3.py      |   85 +
 .../models/virtual_machine_paged.py           |   27 +
 .../v2018_06_01/models/virtual_machine_py3.py |  150 ++
 .../models/virtual_machine_scale_set.py       |  116 ++
 .../virtual_machine_scale_set_data_disk.py    |   70 +
 ...virtual_machine_scale_set_data_disk_py3.py |   70 +
 .../virtual_machine_scale_set_extension.py    |   80 +
 ...rtual_machine_scale_set_extension_paged.py |   27 +
 ...ual_machine_scale_set_extension_profile.py |   30 +
 ...machine_scale_set_extension_profile_py3.py |   30 +
 ...virtual_machine_scale_set_extension_py3.py |   80 +
 .../virtual_machine_scale_set_identity.py     |   61 +
 .../virtual_machine_scale_set_identity_py3.py |   61 +
 ...identity_user_assigned_identities_value.py |   40 +
 ...tity_user_assigned_identities_value_py3.py |   40 +
 ...virtual_machine_scale_set_instance_view.py |   48 +
 ...ual_machine_scale_set_instance_view_py3.py |   48 +
 ...cale_set_instance_view_statuses_summary.py |   37 +
 ..._set_instance_view_statuses_summary_py3.py |   37 +
 ...tual_machine_scale_set_ip_configuration.py |   83 +
 ..._machine_scale_set_ip_configuration_py3.py |   83 +
 .../virtual_machine_scale_set_ip_tag.py       |   33 +
 .../virtual_machine_scale_set_ip_tag_py3.py   |   33 +
 ...chine_scale_set_managed_disk_parameters.py |   32 +
 ...e_scale_set_managed_disk_parameters_py3.py |   32 +
 ...machine_scale_set_network_configuration.py |   70 +
 ..._set_network_configuration_dns_settings.py |   29 +
 ..._network_configuration_dns_settings_py3.py |   29 +
 ...ine_scale_set_network_configuration_py3.py |   70 +
 ...rtual_machine_scale_set_network_profile.py |   38 +
 ...l_machine_scale_set_network_profile_py3.py |   38 +
 .../virtual_machine_scale_set_os_disk.py      |   80 +
 .../virtual_machine_scale_set_os_disk_py3.py  |   80 +
 .../virtual_machine_scale_set_os_profile.py   |   97 +
 ...irtual_machine_scale_set_os_profile_py3.py |   97 +
 .../models/virtual_machine_scale_set_paged.py |   27 +
 ...ale_set_public_ip_address_configuration.py |   50 +
 ...c_ip_address_configuration_dns_settings.py |   37 +
 ..._address_configuration_dns_settings_py3.py |   37 +
 ...set_public_ip_address_configuration_py3.py |   50 +
 .../models/virtual_machine_scale_set_py3.py   |  116 ++
 .../models/virtual_machine_scale_set_sku.py   |   46 +
 .../virtual_machine_scale_set_sku_capacity.py |   52 +
 ...tual_machine_scale_set_sku_capacity_py3.py |   52 +
 .../virtual_machine_scale_set_sku_paged.py    |   27 +
 .../virtual_machine_scale_set_sku_py3.py      |   46 +
 ...rtual_machine_scale_set_storage_profile.py |   49 +
 ...l_machine_scale_set_storage_profile_py3.py |   49 +
 .../virtual_machine_scale_set_update.py       |   61 +
 ...chine_scale_set_update_ip_configuration.py |   71 +
 ...e_scale_set_update_ip_configuration_py3.py |   71 +
 ..._scale_set_update_network_configuration.py |   61 +
 ...le_set_update_network_configuration_py3.py |   61 +
 ...achine_scale_set_update_network_profile.py |   30 +
 ...ne_scale_set_update_network_profile_py3.py |   30 +
 ...irtual_machine_scale_set_update_os_disk.py |   50 +
 ...al_machine_scale_set_update_os_disk_py3.py |   50 +
 ...ual_machine_scale_set_update_os_profile.py |   43 +
 ...machine_scale_set_update_os_profile_py3.py |   43 +
 ..._update_public_ip_address_configuration.py |   39 +
 ...ate_public_ip_address_configuration_py3.py |   39 +
 .../virtual_machine_scale_set_update_py3.py   |   61 +
 ...achine_scale_set_update_storage_profile.py |   39 +
 ...ne_scale_set_update_storage_profile_py3.py |   39 +
 ...ual_machine_scale_set_update_vm_profile.py |   55 +
 ...machine_scale_set_update_vm_profile_py3.py |   55 +
 .../models/virtual_machine_scale_set_vm.py    |  155 ++
 ...machine_scale_set_vm_extensions_summary.py |   41 +
 ...ine_scale_set_vm_extensions_summary_py3.py |   41 +
 ...rtual_machine_scale_set_vm_instance_ids.py |   30 +
 ...l_machine_scale_set_vm_instance_ids_py3.py |   30 +
 ...hine_scale_set_vm_instance_required_ids.py |   34 +
 ..._scale_set_vm_instance_required_ids_py3.py |   34 +
 ...tual_machine_scale_set_vm_instance_view.py |   87 +
 ..._machine_scale_set_vm_instance_view_py3.py |   87 +
 .../virtual_machine_scale_set_vm_paged.py     |   27 +
 .../virtual_machine_scale_set_vm_profile.py   |   80 +
 ...irtual_machine_scale_set_vm_profile_py3.py |   80 +
 .../virtual_machine_scale_set_vm_py3.py       |  155 ++
 .../models/virtual_machine_size.py            |   53 +
 .../models/virtual_machine_size_paged.py      |   27 +
 .../models/virtual_machine_size_py3.py        |   53 +
 .../virtual_machine_status_code_count.py      |   41 +
 .../virtual_machine_status_code_count_py3.py  |   41 +
 .../models/virtual_machine_update.py          |  126 ++
 .../models/virtual_machine_update_py3.py      |  126 ++
 .../models/win_rm_configuration.py            |   29 +
 .../models/win_rm_configuration_py3.py        |   29 +
 .../v2018_06_01/models/win_rm_listener.py     |   42 +
 .../v2018_06_01/models/win_rm_listener_py3.py |   42 +
 .../models/windows_configuration.py           |   54 +
 .../models/windows_configuration_py3.py       |   54 +
 .../v2018_06_01/operations/__init__.py        |   28 +
 .../availability_sets_operations.py           |  499 +++++
 .../operations/images_operations.py           |  525 +++++
 .../operations/log_analytics_operations.py    |  242 +++
 .../v2018_06_01/operations/operations.py      |   99 +
 .../operations/usage_operations.py            |  108 +
 ...ual_machine_extension_images_operations.py |  248 +++
 .../virtual_machine_extensions_operations.py  |  480 +++++
 .../virtual_machine_images_operations.py      |  383 ++++
 ...machine_scale_set_extensions_operations.py |  379 ++++
 ...e_scale_set_rolling_upgrades_operations.py |  267 +++
 ...irtual_machine_scale_set_vms_operations.py | 1131 +++++++++++
 .../virtual_machine_scale_sets_operations.py  | 1762 +++++++++++++++++
 .../virtual_machine_sizes_operations.py       |  108 +
 .../operations/virtual_machines_operations.py | 1393 +++++++++++++
 266 files changed, 21464 insertions(+), 12 deletions(-)
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/additional_unattend_content.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/additional_unattend_content_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/api_entity_reference.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/api_entity_reference_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/auto_os_upgrade_policy.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/auto_os_upgrade_policy_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/availability_set.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/availability_set_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/availability_set_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/availability_set_update.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/availability_set_update_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/boot_diagnostics.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/boot_diagnostics_instance_view.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/boot_diagnostics_instance_view_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/boot_diagnostics_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/compute_operation_value.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/compute_operation_value_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/compute_operation_value_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/data_disk.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/data_disk_image.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/data_disk_image_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/data_disk_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/diagnostics_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/diagnostics_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_encryption_settings.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_encryption_settings_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_instance_view.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_instance_view_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/hardware_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/hardware_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_data_disk.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_data_disk_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_os_disk.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_os_disk_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_reference.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_reference_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_storage_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_storage_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_update.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_update_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/instance_view_status.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/instance_view_status_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/key_vault_key_reference.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/key_vault_key_reference_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/key_vault_secret_reference.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/key_vault_secret_reference_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/linux_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/linux_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/log_analytics_input_base.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/log_analytics_input_base_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/log_analytics_operation_result.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/log_analytics_operation_result_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/log_analytics_output.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/log_analytics_output_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/maintenance_redeploy_status.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/maintenance_redeploy_status_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/managed_disk_parameters.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/managed_disk_parameters_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/network_interface_reference.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/network_interface_reference_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/network_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/network_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/os_disk.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/os_disk_image.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/os_disk_image_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/os_disk_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/os_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/os_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/plan.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/plan_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/purchase_plan.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/purchase_plan_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/recovery_walk_response.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/recovery_walk_response_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/request_rate_by_interval_input.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/request_rate_by_interval_input_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rollback_status_info.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rollback_status_info_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_policy.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_policy_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_progress_info.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_progress_info_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_running_status.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_running_status_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_status_info.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_status_info_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sku.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sku_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/ssh_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/ssh_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/ssh_public_key.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/ssh_public_key_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/storage_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/storage_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sub_resource.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sub_resource_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sub_resource_read_only.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sub_resource_read_only_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/throttled_requests_input.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/throttled_requests_input_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/update_resource.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/update_resource_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_operation_historical_status_info.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_operation_historical_status_info_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_operation_historical_status_info_properties.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_operation_historical_status_info_properties_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_operation_historical_status_info_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_operation_history_status.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_operation_history_status_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_policy.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_policy_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/usage.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/usage_name.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/usage_name_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/usage_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/usage_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/vault_certificate.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/vault_certificate_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/vault_secret_group.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/vault_secret_group_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_hard_disk.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_hard_disk_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_agent_instance_view.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_agent_instance_view_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_capture_parameters.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_capture_parameters_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_capture_result.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_capture_result_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_handler_instance_view.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_handler_instance_view_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_image.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_image_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_instance_view.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_instance_view_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_update.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_update_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extensions_list_result.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extensions_list_result_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_health_status.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_health_status_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_identity.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_identity_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_identity_user_assigned_identities_value.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_identity_user_assigned_identities_value_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_image.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_image_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_image_resource.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_image_resource_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_instance_view.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_instance_view_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_data_disk.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_data_disk_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_extension.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_extension_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_extension_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_extension_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_extension_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_identity.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_identity_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_identity_user_assigned_identities_value.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_identity_user_assigned_identities_value_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_instance_view.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_instance_view_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_instance_view_statuses_summary.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_instance_view_statuses_summary_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_ip_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_ip_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_ip_tag.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_ip_tag_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_managed_disk_parameters.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_network_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_network_configuration_dns_settings.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_network_configuration_dns_settings_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_network_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_network_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_network_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_os_disk.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_os_disk_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_os_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_os_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_public_ip_address_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_public_ip_address_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_sku.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_sku_capacity.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_sku_capacity_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_sku_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_sku_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_storage_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_storage_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_ip_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_ip_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_network_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_network_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_network_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_network_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_os_disk.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_os_disk_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_os_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_os_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_public_ip_address_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_public_ip_address_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_storage_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_storage_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_vm_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_vm_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_extensions_summary.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_extensions_summary_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_instance_ids.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_instance_ids_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_instance_required_ids.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_instance_required_ids_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_instance_view.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_instance_view_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_profile.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_profile_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_size.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_size_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_size_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_status_code_count.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_status_code_count_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_update.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_update_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/win_rm_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/win_rm_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/win_rm_listener.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/win_rm_listener_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/windows_configuration.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/windows_configuration_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/availability_sets_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/images_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/log_analytics_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/usage_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_extension_images_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_extensions_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_images_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_set_extensions_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_set_rolling_upgrades_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_set_vms_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_sets_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_sizes_operations.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machines_operations.py

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 f12ba0766a1e..d81ad13372e9 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py
@@ -159,6 +159,7 @@ def availability_sets(self):
            * 2017-03-30: :class:`AvailabilitySetsOperations<azure.mgmt.compute.v2017_03_30.operations.AvailabilitySetsOperations>`
            * 2017-12-01: :class:`AvailabilitySetsOperations<azure.mgmt.compute.v2017_12_01.operations.AvailabilitySetsOperations>`
            * 2018-04-01: :class:`AvailabilitySetsOperations<azure.mgmt.compute.v2018_04_01.operations.AvailabilitySetsOperations>`
+           * 2018-06-01: :class:`AvailabilitySetsOperations<azure.mgmt.compute.v2018_06_01.operations.AvailabilitySetsOperations>`
         """
         api_version = self._get_api_version('availability_sets')
         if api_version == '2015-06-15':
@@ -173,6 +174,8 @@ def availability_sets(self):
             from .v2017_12_01.operations import AvailabilitySetsOperations as OperationClass
         elif api_version == '2018-04-01':
             from .v2018_04_01.operations import AvailabilitySetsOperations as OperationClass
+        elif api_version == '2018-06-01':
+            from .v2018_06_01.operations import AvailabilitySetsOperations 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)))
@@ -243,6 +246,7 @@ def images(self):
            * 2017-03-30: :class:`ImagesOperations<azure.mgmt.compute.v2017_03_30.operations.ImagesOperations>`
            * 2017-12-01: :class:`ImagesOperations<azure.mgmt.compute.v2017_12_01.operations.ImagesOperations>`
            * 2018-04-01: :class:`ImagesOperations<azure.mgmt.compute.v2018_04_01.operations.ImagesOperations>`
+           * 2018-06-01: :class:`ImagesOperations<azure.mgmt.compute.v2018_06_01.operations.ImagesOperations>`
         """
         api_version = self._get_api_version('images')
         if api_version == '2016-04-30-preview':
@@ -253,6 +257,8 @@ def images(self):
             from .v2017_12_01.operations import ImagesOperations as OperationClass
         elif api_version == '2018-04-01':
             from .v2018_04_01.operations import ImagesOperations as OperationClass
+        elif api_version == '2018-06-01':
+            from .v2018_06_01.operations import ImagesOperations 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)))
@@ -263,12 +269,15 @@ def log_analytics(self):
 
            * 2017-12-01: :class:`LogAnalyticsOperations<azure.mgmt.compute.v2017_12_01.operations.LogAnalyticsOperations>`
            * 2018-04-01: :class:`LogAnalyticsOperations<azure.mgmt.compute.v2018_04_01.operations.LogAnalyticsOperations>`
+           * 2018-06-01: :class:`LogAnalyticsOperations<azure.mgmt.compute.v2018_06_01.operations.LogAnalyticsOperations>`
         """
         api_version = self._get_api_version('log_analytics')
         if api_version == '2017-12-01':
             from .v2017_12_01.operations import LogAnalyticsOperations as OperationClass
         elif api_version == '2018-04-01':
             from .v2018_04_01.operations import LogAnalyticsOperations as OperationClass
+        elif api_version == '2018-06-01':
+            from .v2018_06_01.operations import LogAnalyticsOperations 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)))
@@ -279,12 +288,15 @@ def operations(self):
 
            * 2017-12-01: :class:`Operations<azure.mgmt.compute.v2017_12_01.operations.Operations>`
            * 2018-04-01: :class:`Operations<azure.mgmt.compute.v2018_04_01.operations.Operations>`
+           * 2018-06-01: :class:`Operations<azure.mgmt.compute.v2018_06_01.operations.Operations>`
         """
         api_version = self._get_api_version('operations')
         if api_version == '2017-12-01':
             from .v2017_12_01.operations import Operations as OperationClass
         elif api_version == '2018-04-01':
             from .v2018_04_01.operations import Operations as OperationClass
+        elif api_version == '2018-06-01':
+            from .v2018_06_01.operations import Operations 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)))
@@ -334,6 +346,7 @@ def usage(self):
            * 2017-03-30: :class:`UsageOperations<azure.mgmt.compute.v2017_03_30.operations.UsageOperations>`
            * 2017-12-01: :class:`UsageOperations<azure.mgmt.compute.v2017_12_01.operations.UsageOperations>`
            * 2018-04-01: :class:`UsageOperations<azure.mgmt.compute.v2018_04_01.operations.UsageOperations>`
+           * 2018-06-01: :class:`UsageOperations<azure.mgmt.compute.v2018_06_01.operations.UsageOperations>`
         """
         api_version = self._get_api_version('usage')
         if api_version == '2015-06-15':
@@ -348,6 +361,8 @@ def usage(self):
             from .v2017_12_01.operations import UsageOperations as OperationClass
         elif api_version == '2018-04-01':
             from .v2018_04_01.operations import UsageOperations as OperationClass
+        elif api_version == '2018-06-01':
+            from .v2018_06_01.operations import UsageOperations 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)))
@@ -362,6 +377,7 @@ def virtual_machine_extension_images(self):
            * 2017-03-30: :class:`VirtualMachineExtensionImagesOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineExtensionImagesOperations>`
            * 2017-12-01: :class:`VirtualMachineExtensionImagesOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineExtensionImagesOperations>`
            * 2018-04-01: :class:`VirtualMachineExtensionImagesOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineExtensionImagesOperations>`
+           * 2018-06-01: :class:`VirtualMachineExtensionImagesOperations<azure.mgmt.compute.v2018_06_01.operations.VirtualMachineExtensionImagesOperations>`
         """
         api_version = self._get_api_version('virtual_machine_extension_images')
         if api_version == '2015-06-15':
@@ -376,6 +392,8 @@ def virtual_machine_extension_images(self):
             from .v2017_12_01.operations import VirtualMachineExtensionImagesOperations as OperationClass
         elif api_version == '2018-04-01':
             from .v2018_04_01.operations import VirtualMachineExtensionImagesOperations as OperationClass
+        elif api_version == '2018-06-01':
+            from .v2018_06_01.operations import VirtualMachineExtensionImagesOperations 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)))
@@ -390,6 +408,7 @@ def virtual_machine_extensions(self):
            * 2017-03-30: :class:`VirtualMachineExtensionsOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineExtensionsOperations>`
            * 2017-12-01: :class:`VirtualMachineExtensionsOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineExtensionsOperations>`
            * 2018-04-01: :class:`VirtualMachineExtensionsOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineExtensionsOperations>`
+           * 2018-06-01: :class:`VirtualMachineExtensionsOperations<azure.mgmt.compute.v2018_06_01.operations.VirtualMachineExtensionsOperations>`
         """
         api_version = self._get_api_version('virtual_machine_extensions')
         if api_version == '2015-06-15':
@@ -404,6 +423,8 @@ def virtual_machine_extensions(self):
             from .v2017_12_01.operations import VirtualMachineExtensionsOperations as OperationClass
         elif api_version == '2018-04-01':
             from .v2018_04_01.operations import VirtualMachineExtensionsOperations as OperationClass
+        elif api_version == '2018-06-01':
+            from .v2018_06_01.operations import VirtualMachineExtensionsOperations 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)))
@@ -418,6 +439,7 @@ def virtual_machine_images(self):
            * 2017-03-30: :class:`VirtualMachineImagesOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineImagesOperations>`
            * 2017-12-01: :class:`VirtualMachineImagesOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineImagesOperations>`
            * 2018-04-01: :class:`VirtualMachineImagesOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineImagesOperations>`
+           * 2018-06-01: :class:`VirtualMachineImagesOperations<azure.mgmt.compute.v2018_06_01.operations.VirtualMachineImagesOperations>`
         """
         api_version = self._get_api_version('virtual_machine_images')
         if api_version == '2015-06-15':
@@ -432,6 +454,8 @@ def virtual_machine_images(self):
             from .v2017_12_01.operations import VirtualMachineImagesOperations as OperationClass
         elif api_version == '2018-04-01':
             from .v2018_04_01.operations import VirtualMachineImagesOperations as OperationClass
+        elif api_version == '2018-06-01':
+            from .v2018_06_01.operations import VirtualMachineImagesOperations 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)))
@@ -462,6 +486,7 @@ def virtual_machine_scale_set_extensions(self):
            * 2017-03-30: :class:`VirtualMachineScaleSetExtensionsOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineScaleSetExtensionsOperations>`
            * 2017-12-01: :class:`VirtualMachineScaleSetExtensionsOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineScaleSetExtensionsOperations>`
            * 2018-04-01: :class:`VirtualMachineScaleSetExtensionsOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineScaleSetExtensionsOperations>`
+           * 2018-06-01: :class:`VirtualMachineScaleSetExtensionsOperations<azure.mgmt.compute.v2018_06_01.operations.VirtualMachineScaleSetExtensionsOperations>`
         """
         api_version = self._get_api_version('virtual_machine_scale_set_extensions')
         if api_version == '2017-03-30':
@@ -470,6 +495,8 @@ def virtual_machine_scale_set_extensions(self):
             from .v2017_12_01.operations import VirtualMachineScaleSetExtensionsOperations as OperationClass
         elif api_version == '2018-04-01':
             from .v2018_04_01.operations import VirtualMachineScaleSetExtensionsOperations as OperationClass
+        elif api_version == '2018-06-01':
+            from .v2018_06_01.operations import VirtualMachineScaleSetExtensionsOperations 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)))
@@ -481,6 +508,7 @@ def virtual_machine_scale_set_rolling_upgrades(self):
            * 2017-03-30: :class:`VirtualMachineScaleSetRollingUpgradesOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineScaleSetRollingUpgradesOperations>`
            * 2017-12-01: :class:`VirtualMachineScaleSetRollingUpgradesOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineScaleSetRollingUpgradesOperations>`
            * 2018-04-01: :class:`VirtualMachineScaleSetRollingUpgradesOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineScaleSetRollingUpgradesOperations>`
+           * 2018-06-01: :class:`VirtualMachineScaleSetRollingUpgradesOperations<azure.mgmt.compute.v2018_06_01.operations.VirtualMachineScaleSetRollingUpgradesOperations>`
         """
         api_version = self._get_api_version('virtual_machine_scale_set_rolling_upgrades')
         if api_version == '2017-03-30':
@@ -489,6 +517,8 @@ def virtual_machine_scale_set_rolling_upgrades(self):
             from .v2017_12_01.operations import VirtualMachineScaleSetRollingUpgradesOperations as OperationClass
         elif api_version == '2018-04-01':
             from .v2018_04_01.operations import VirtualMachineScaleSetRollingUpgradesOperations as OperationClass
+        elif api_version == '2018-06-01':
+            from .v2018_06_01.operations import VirtualMachineScaleSetRollingUpgradesOperations 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)))
@@ -503,6 +533,7 @@ def virtual_machine_scale_set_vms(self):
            * 2017-03-30: :class:`VirtualMachineScaleSetVMsOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineScaleSetVMsOperations>`
            * 2017-12-01: :class:`VirtualMachineScaleSetVMsOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineScaleSetVMsOperations>`
            * 2018-04-01: :class:`VirtualMachineScaleSetVMsOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineScaleSetVMsOperations>`
+           * 2018-06-01: :class:`VirtualMachineScaleSetVMsOperations<azure.mgmt.compute.v2018_06_01.operations.VirtualMachineScaleSetVMsOperations>`
         """
         api_version = self._get_api_version('virtual_machine_scale_set_vms')
         if api_version == '2015-06-15':
@@ -517,6 +548,8 @@ def virtual_machine_scale_set_vms(self):
             from .v2017_12_01.operations import VirtualMachineScaleSetVMsOperations as OperationClass
         elif api_version == '2018-04-01':
             from .v2018_04_01.operations import VirtualMachineScaleSetVMsOperations as OperationClass
+        elif api_version == '2018-06-01':
+            from .v2018_06_01.operations import VirtualMachineScaleSetVMsOperations 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)))
@@ -531,6 +564,7 @@ def virtual_machine_scale_sets(self):
            * 2017-03-30: :class:`VirtualMachineScaleSetsOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineScaleSetsOperations>`
            * 2017-12-01: :class:`VirtualMachineScaleSetsOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineScaleSetsOperations>`
            * 2018-04-01: :class:`VirtualMachineScaleSetsOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineScaleSetsOperations>`
+           * 2018-06-01: :class:`VirtualMachineScaleSetsOperations<azure.mgmt.compute.v2018_06_01.operations.VirtualMachineScaleSetsOperations>`
         """
         api_version = self._get_api_version('virtual_machine_scale_sets')
         if api_version == '2015-06-15':
@@ -545,6 +579,8 @@ def virtual_machine_scale_sets(self):
             from .v2017_12_01.operations import VirtualMachineScaleSetsOperations as OperationClass
         elif api_version == '2018-04-01':
             from .v2018_04_01.operations import VirtualMachineScaleSetsOperations as OperationClass
+        elif api_version == '2018-06-01':
+            from .v2018_06_01.operations import VirtualMachineScaleSetsOperations 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)))
@@ -559,6 +595,7 @@ def virtual_machine_sizes(self):
            * 2017-03-30: :class:`VirtualMachineSizesOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineSizesOperations>`
            * 2017-12-01: :class:`VirtualMachineSizesOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineSizesOperations>`
            * 2018-04-01: :class:`VirtualMachineSizesOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineSizesOperations>`
+           * 2018-06-01: :class:`VirtualMachineSizesOperations<azure.mgmt.compute.v2018_06_01.operations.VirtualMachineSizesOperations>`
         """
         api_version = self._get_api_version('virtual_machine_sizes')
         if api_version == '2015-06-15':
@@ -573,6 +610,8 @@ def virtual_machine_sizes(self):
             from .v2017_12_01.operations import VirtualMachineSizesOperations as OperationClass
         elif api_version == '2018-04-01':
             from .v2018_04_01.operations import VirtualMachineSizesOperations as OperationClass
+        elif api_version == '2018-06-01':
+            from .v2018_06_01.operations import VirtualMachineSizesOperations 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)))
@@ -587,6 +626,7 @@ def virtual_machines(self):
            * 2017-03-30: :class:`VirtualMachinesOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachinesOperations>`
            * 2017-12-01: :class:`VirtualMachinesOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachinesOperations>`
            * 2018-04-01: :class:`VirtualMachinesOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachinesOperations>`
+           * 2018-06-01: :class:`VirtualMachinesOperations<azure.mgmt.compute.v2018_06_01.operations.VirtualMachinesOperations>`
         """
         api_version = self._get_api_version('virtual_machines')
         if api_version == '2015-06-15':
@@ -601,6 +641,8 @@ def virtual_machines(self):
             from .v2017_12_01.operations import VirtualMachinesOperations as OperationClass
         elif api_version == '2018-04-01':
             from .v2018_04_01.operations import VirtualMachinesOperations as OperationClass
+        elif api_version == '2018-06-01':
+            from .v2018_06_01.operations import VirtualMachinesOperations 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/v2018_06_01/compute_management_client.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/compute_management_client.py
index a0928105b324..ea3dc47fbf80 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
@@ -13,6 +13,20 @@
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
+from .operations.operations import Operations
+from .operations.availability_sets_operations import AvailabilitySetsOperations
+from .operations.virtual_machine_extension_images_operations import VirtualMachineExtensionImagesOperations
+from .operations.virtual_machine_extensions_operations import VirtualMachineExtensionsOperations
+from .operations.virtual_machine_images_operations import VirtualMachineImagesOperations
+from .operations.usage_operations import UsageOperations
+from .operations.virtual_machine_sizes_operations import VirtualMachineSizesOperations
+from .operations.images_operations import ImagesOperations
+from .operations.virtual_machines_operations import VirtualMachinesOperations
+from .operations.virtual_machine_scale_sets_operations import VirtualMachineScaleSetsOperations
+from .operations.virtual_machine_scale_set_extensions_operations import VirtualMachineScaleSetExtensionsOperations
+from .operations.virtual_machine_scale_set_rolling_upgrades_operations import VirtualMachineScaleSetRollingUpgradesOperations
+from .operations.virtual_machine_scale_set_vms_operations import VirtualMachineScaleSetVMsOperations
+from .operations.log_analytics_operations import LogAnalyticsOperations
 from .operations.galleries_operations import GalleriesOperations
 from .operations.gallery_images_operations import GalleryImagesOperations
 from .operations.gallery_image_versions_operations import GalleryImageVersionsOperations
@@ -59,6 +73,34 @@ class ComputeManagementClient(SDKClient):
     :ivar config: Configuration for client.
     :vartype config: ComputeManagementClientConfiguration
 
+    :ivar operations: Operations operations
+    :vartype operations: azure.mgmt.compute.v2018_06_01.operations.Operations
+    :ivar availability_sets: AvailabilitySets operations
+    :vartype availability_sets: azure.mgmt.compute.v2018_06_01.operations.AvailabilitySetsOperations
+    :ivar virtual_machine_extension_images: VirtualMachineExtensionImages operations
+    :vartype virtual_machine_extension_images: azure.mgmt.compute.v2018_06_01.operations.VirtualMachineExtensionImagesOperations
+    :ivar virtual_machine_extensions: VirtualMachineExtensions operations
+    :vartype virtual_machine_extensions: azure.mgmt.compute.v2018_06_01.operations.VirtualMachineExtensionsOperations
+    :ivar virtual_machine_images: VirtualMachineImages operations
+    :vartype virtual_machine_images: azure.mgmt.compute.v2018_06_01.operations.VirtualMachineImagesOperations
+    :ivar usage: Usage operations
+    :vartype usage: azure.mgmt.compute.v2018_06_01.operations.UsageOperations
+    :ivar virtual_machine_sizes: VirtualMachineSizes operations
+    :vartype virtual_machine_sizes: azure.mgmt.compute.v2018_06_01.operations.VirtualMachineSizesOperations
+    :ivar images: Images operations
+    :vartype images: azure.mgmt.compute.v2018_06_01.operations.ImagesOperations
+    :ivar virtual_machines: VirtualMachines operations
+    :vartype virtual_machines: azure.mgmt.compute.v2018_06_01.operations.VirtualMachinesOperations
+    :ivar virtual_machine_scale_sets: VirtualMachineScaleSets operations
+    :vartype virtual_machine_scale_sets: azure.mgmt.compute.v2018_06_01.operations.VirtualMachineScaleSetsOperations
+    :ivar virtual_machine_scale_set_extensions: VirtualMachineScaleSetExtensions operations
+    :vartype virtual_machine_scale_set_extensions: azure.mgmt.compute.v2018_06_01.operations.VirtualMachineScaleSetExtensionsOperations
+    :ivar virtual_machine_scale_set_rolling_upgrades: VirtualMachineScaleSetRollingUpgrades operations
+    :vartype virtual_machine_scale_set_rolling_upgrades: azure.mgmt.compute.v2018_06_01.operations.VirtualMachineScaleSetRollingUpgradesOperations
+    :ivar virtual_machine_scale_set_vms: VirtualMachineScaleSetVMs operations
+    :vartype virtual_machine_scale_set_vms: azure.mgmt.compute.v2018_06_01.operations.VirtualMachineScaleSetVMsOperations
+    :ivar log_analytics: LogAnalytics operations
+    :vartype log_analytics: azure.mgmt.compute.v2018_06_01.operations.LogAnalyticsOperations
     :ivar galleries: Galleries operations
     :vartype galleries: azure.mgmt.compute.v2018_06_01.operations.GalleriesOperations
     :ivar gallery_images: GalleryImages operations
@@ -87,6 +129,34 @@ def __init__(
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
+        self.operations = Operations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.availability_sets = AvailabilitySetsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machine_extension_images = VirtualMachineExtensionImagesOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machine_extensions = VirtualMachineExtensionsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machine_images = VirtualMachineImagesOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.usage = UsageOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machine_sizes = VirtualMachineSizesOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.images = ImagesOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machines = VirtualMachinesOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machine_scale_sets = VirtualMachineScaleSetsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machine_scale_set_extensions = VirtualMachineScaleSetExtensionsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machine_scale_set_rolling_upgrades = VirtualMachineScaleSetRollingUpgradesOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machine_scale_set_vms = VirtualMachineScaleSetVMsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
+        self.log_analytics = LogAnalyticsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
         self.galleries = GalleriesOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.gallery_images = GalleryImagesOperations(
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 39442e272bac..019a19c87ece 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
@@ -10,6 +10,128 @@
 # --------------------------------------------------------------------------
 
 try:
+    from .compute_operation_value_py3 import ComputeOperationValue
+    from .instance_view_status_py3 import InstanceViewStatus
+    from .sub_resource_py3 import SubResource
+    from .sku_py3 import Sku
+    from .availability_set_py3 import AvailabilitySet
+    from .availability_set_update_py3 import AvailabilitySetUpdate
+    from .virtual_machine_size_py3 import VirtualMachineSize
+    from .virtual_machine_extension_image_py3 import VirtualMachineExtensionImage
+    from .virtual_machine_image_resource_py3 import VirtualMachineImageResource
+    from .virtual_machine_extension_instance_view_py3 import VirtualMachineExtensionInstanceView
+    from .virtual_machine_extension_py3 import VirtualMachineExtension
+    from .virtual_machine_extension_update_py3 import VirtualMachineExtensionUpdate
+    from .virtual_machine_extensions_list_result_py3 import VirtualMachineExtensionsListResult
+    from .purchase_plan_py3 import PurchasePlan
+    from .os_disk_image_py3 import OSDiskImage
+    from .data_disk_image_py3 import DataDiskImage
+    from .virtual_machine_image_py3 import VirtualMachineImage
+    from .usage_name_py3 import UsageName
+    from .usage_py3 import Usage
+    from .virtual_machine_capture_parameters_py3 import VirtualMachineCaptureParameters
+    from .virtual_machine_capture_result_py3 import VirtualMachineCaptureResult
+    from .plan_py3 import Plan
+    from .hardware_profile_py3 import HardwareProfile
+    from .image_reference_py3 import ImageReference
+    from .key_vault_secret_reference_py3 import KeyVaultSecretReference
+    from .key_vault_key_reference_py3 import KeyVaultKeyReference
+    from .disk_encryption_settings_py3 import DiskEncryptionSettings
+    from .virtual_hard_disk_py3 import VirtualHardDisk
+    from .managed_disk_parameters_py3 import ManagedDiskParameters
+    from .os_disk_py3 import OSDisk
+    from .data_disk_py3 import DataDisk
+    from .storage_profile_py3 import StorageProfile
+    from .additional_unattend_content_py3 import AdditionalUnattendContent
+    from .win_rm_listener_py3 import WinRMListener
+    from .win_rm_configuration_py3 import WinRMConfiguration
+    from .windows_configuration_py3 import WindowsConfiguration
+    from .ssh_public_key_py3 import SshPublicKey
+    from .ssh_configuration_py3 import SshConfiguration
+    from .linux_configuration_py3 import LinuxConfiguration
+    from .vault_certificate_py3 import VaultCertificate
+    from .vault_secret_group_py3 import VaultSecretGroup
+    from .os_profile_py3 import OSProfile
+    from .network_interface_reference_py3 import NetworkInterfaceReference
+    from .network_profile_py3 import NetworkProfile
+    from .boot_diagnostics_py3 import BootDiagnostics
+    from .diagnostics_profile_py3 import DiagnosticsProfile
+    from .virtual_machine_extension_handler_instance_view_py3 import VirtualMachineExtensionHandlerInstanceView
+    from .virtual_machine_agent_instance_view_py3 import VirtualMachineAgentInstanceView
+    from .disk_instance_view_py3 import DiskInstanceView
+    from .boot_diagnostics_instance_view_py3 import BootDiagnosticsInstanceView
+    from .virtual_machine_identity_user_assigned_identities_value_py3 import VirtualMachineIdentityUserAssignedIdentitiesValue
+    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_py3 import VirtualMachine
+    from .virtual_machine_update_py3 import VirtualMachineUpdate
+    from .auto_os_upgrade_policy_py3 import AutoOSUpgradePolicy
+    from .rolling_upgrade_policy_py3 import RollingUpgradePolicy
+    from .upgrade_policy_py3 import UpgradePolicy
+    from .image_os_disk_py3 import ImageOSDisk
+    from .image_data_disk_py3 import ImageDataDisk
+    from .image_storage_profile_py3 import ImageStorageProfile
+    from .image_py3 import Image
+    from .image_update_py3 import ImageUpdate
+    from .virtual_machine_scale_set_identity_user_assigned_identities_value_py3 import VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue
+    from .virtual_machine_scale_set_identity_py3 import VirtualMachineScaleSetIdentity
+    from .virtual_machine_scale_set_os_profile_py3 import VirtualMachineScaleSetOSProfile
+    from .virtual_machine_scale_set_update_os_profile_py3 import VirtualMachineScaleSetUpdateOSProfile
+    from .virtual_machine_scale_set_managed_disk_parameters_py3 import VirtualMachineScaleSetManagedDiskParameters
+    from .virtual_machine_scale_set_os_disk_py3 import VirtualMachineScaleSetOSDisk
+    from .virtual_machine_scale_set_update_os_disk_py3 import VirtualMachineScaleSetUpdateOSDisk
+    from .virtual_machine_scale_set_data_disk_py3 import VirtualMachineScaleSetDataDisk
+    from .virtual_machine_scale_set_storage_profile_py3 import VirtualMachineScaleSetStorageProfile
+    from .virtual_machine_scale_set_update_storage_profile_py3 import VirtualMachineScaleSetUpdateStorageProfile
+    from .api_entity_reference_py3 import ApiEntityReference
+    from .virtual_machine_scale_set_public_ip_address_configuration_dns_settings_py3 import VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings
+    from .virtual_machine_scale_set_ip_tag_py3 import VirtualMachineScaleSetIpTag
+    from .virtual_machine_scale_set_public_ip_address_configuration_py3 import VirtualMachineScaleSetPublicIPAddressConfiguration
+    from .virtual_machine_scale_set_update_public_ip_address_configuration_py3 import VirtualMachineScaleSetUpdatePublicIPAddressConfiguration
+    from .virtual_machine_scale_set_ip_configuration_py3 import VirtualMachineScaleSetIPConfiguration
+    from .virtual_machine_scale_set_update_ip_configuration_py3 import VirtualMachineScaleSetUpdateIPConfiguration
+    from .virtual_machine_scale_set_network_configuration_dns_settings_py3 import VirtualMachineScaleSetNetworkConfigurationDnsSettings
+    from .virtual_machine_scale_set_network_configuration_py3 import VirtualMachineScaleSetNetworkConfiguration
+    from .virtual_machine_scale_set_update_network_configuration_py3 import VirtualMachineScaleSetUpdateNetworkConfiguration
+    from .virtual_machine_scale_set_network_profile_py3 import VirtualMachineScaleSetNetworkProfile
+    from .virtual_machine_scale_set_update_network_profile_py3 import VirtualMachineScaleSetUpdateNetworkProfile
+    from .virtual_machine_scale_set_extension_py3 import VirtualMachineScaleSetExtension
+    from .virtual_machine_scale_set_extension_profile_py3 import VirtualMachineScaleSetExtensionProfile
+    from .virtual_machine_scale_set_vm_profile_py3 import VirtualMachineScaleSetVMProfile
+    from .virtual_machine_scale_set_update_vm_profile_py3 import VirtualMachineScaleSetUpdateVMProfile
+    from .virtual_machine_scale_set_py3 import VirtualMachineScaleSet
+    from .virtual_machine_scale_set_update_py3 import VirtualMachineScaleSetUpdate
+    from .virtual_machine_scale_set_vm_instance_ids_py3 import VirtualMachineScaleSetVMInstanceIDs
+    from .virtual_machine_scale_set_vm_instance_required_ids_py3 import VirtualMachineScaleSetVMInstanceRequiredIDs
+    from .virtual_machine_status_code_count_py3 import VirtualMachineStatusCodeCount
+    from .virtual_machine_scale_set_instance_view_statuses_summary_py3 import VirtualMachineScaleSetInstanceViewStatusesSummary
+    from .virtual_machine_scale_set_vm_extensions_summary_py3 import VirtualMachineScaleSetVMExtensionsSummary
+    from .virtual_machine_scale_set_instance_view_py3 import VirtualMachineScaleSetInstanceView
+    from .virtual_machine_scale_set_sku_capacity_py3 import VirtualMachineScaleSetSkuCapacity
+    from .virtual_machine_scale_set_sku_py3 import VirtualMachineScaleSetSku
+    from .api_error_base_py3 import ApiErrorBase
+    from .inner_error_py3 import InnerError
+    from .api_error_py3 import ApiError
+    from .rollback_status_info_py3 import RollbackStatusInfo
+    from .upgrade_operation_history_status_py3 import UpgradeOperationHistoryStatus
+    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_scale_set_vm_py3 import VirtualMachineScaleSetVM
+    from .virtual_machine_health_status_py3 import VirtualMachineHealthStatus
+    from .virtual_machine_scale_set_vm_instance_view_py3 import VirtualMachineScaleSetVMInstanceView
+    from .rolling_upgrade_running_status_py3 import RollingUpgradeRunningStatus
+    from .rolling_upgrade_status_info_py3 import RollingUpgradeStatusInfo
+    from .resource_py3 import Resource
+    from .update_resource_py3 import UpdateResource
+    from .sub_resource_read_only_py3 import SubResourceReadOnly
+    from .recovery_walk_response_py3 import RecoveryWalkResponse
+    from .request_rate_by_interval_input_py3 import RequestRateByIntervalInput
+    from .throttled_requests_input_py3 import ThrottledRequestsInput
+    from .log_analytics_input_base_py3 import LogAnalyticsInputBase
+    from .log_analytics_output_py3 import LogAnalyticsOutput
+    from .log_analytics_operation_result_py3 import LogAnalyticsOperationResult
     from .gallery_identifier_py3 import GalleryIdentifier
     from .gallery_py3 import Gallery
     from .gallery_image_identifier_py3 import GalleryImageIdentifier
@@ -29,11 +151,129 @@
     from .gallery_artifact_source_py3 import GalleryArtifactSource
     from .gallery_artifact_publishing_profile_base_py3 import GalleryArtifactPublishingProfileBase
     from .gallery_disk_image_py3 import GalleryDiskImage
-    from .api_error_base_py3 import ApiErrorBase
-    from .inner_error_py3 import InnerError
-    from .api_error_py3 import ApiError
-    from .resource_py3 import Resource
 except (SyntaxError, ImportError):
+    from .compute_operation_value import ComputeOperationValue
+    from .instance_view_status import InstanceViewStatus
+    from .sub_resource import SubResource
+    from .sku import Sku
+    from .availability_set import AvailabilitySet
+    from .availability_set_update import AvailabilitySetUpdate
+    from .virtual_machine_size import VirtualMachineSize
+    from .virtual_machine_extension_image import VirtualMachineExtensionImage
+    from .virtual_machine_image_resource import VirtualMachineImageResource
+    from .virtual_machine_extension_instance_view import VirtualMachineExtensionInstanceView
+    from .virtual_machine_extension import VirtualMachineExtension
+    from .virtual_machine_extension_update import VirtualMachineExtensionUpdate
+    from .virtual_machine_extensions_list_result import VirtualMachineExtensionsListResult
+    from .purchase_plan import PurchasePlan
+    from .os_disk_image import OSDiskImage
+    from .data_disk_image import DataDiskImage
+    from .virtual_machine_image import VirtualMachineImage
+    from .usage_name import UsageName
+    from .usage import Usage
+    from .virtual_machine_capture_parameters import VirtualMachineCaptureParameters
+    from .virtual_machine_capture_result import VirtualMachineCaptureResult
+    from .plan import Plan
+    from .hardware_profile import HardwareProfile
+    from .image_reference import ImageReference
+    from .key_vault_secret_reference import KeyVaultSecretReference
+    from .key_vault_key_reference import KeyVaultKeyReference
+    from .disk_encryption_settings import DiskEncryptionSettings
+    from .virtual_hard_disk import VirtualHardDisk
+    from .managed_disk_parameters import ManagedDiskParameters
+    from .os_disk import OSDisk
+    from .data_disk import DataDisk
+    from .storage_profile import StorageProfile
+    from .additional_unattend_content import AdditionalUnattendContent
+    from .win_rm_listener import WinRMListener
+    from .win_rm_configuration import WinRMConfiguration
+    from .windows_configuration import WindowsConfiguration
+    from .ssh_public_key import SshPublicKey
+    from .ssh_configuration import SshConfiguration
+    from .linux_configuration import LinuxConfiguration
+    from .vault_certificate import VaultCertificate
+    from .vault_secret_group import VaultSecretGroup
+    from .os_profile import OSProfile
+    from .network_interface_reference import NetworkInterfaceReference
+    from .network_profile import NetworkProfile
+    from .boot_diagnostics import BootDiagnostics
+    from .diagnostics_profile import DiagnosticsProfile
+    from .virtual_machine_extension_handler_instance_view import VirtualMachineExtensionHandlerInstanceView
+    from .virtual_machine_agent_instance_view import VirtualMachineAgentInstanceView
+    from .disk_instance_view import DiskInstanceView
+    from .boot_diagnostics_instance_view import BootDiagnosticsInstanceView
+    from .virtual_machine_identity_user_assigned_identities_value import VirtualMachineIdentityUserAssignedIdentitiesValue
+    from .virtual_machine_identity import VirtualMachineIdentity
+    from .maintenance_redeploy_status import MaintenanceRedeployStatus
+    from .virtual_machine_instance_view import VirtualMachineInstanceView
+    from .virtual_machine import VirtualMachine
+    from .virtual_machine_update import VirtualMachineUpdate
+    from .auto_os_upgrade_policy import AutoOSUpgradePolicy
+    from .rolling_upgrade_policy import RollingUpgradePolicy
+    from .upgrade_policy import UpgradePolicy
+    from .image_os_disk import ImageOSDisk
+    from .image_data_disk import ImageDataDisk
+    from .image_storage_profile import ImageStorageProfile
+    from .image import Image
+    from .image_update import ImageUpdate
+    from .virtual_machine_scale_set_identity_user_assigned_identities_value import VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue
+    from .virtual_machine_scale_set_identity import VirtualMachineScaleSetIdentity
+    from .virtual_machine_scale_set_os_profile import VirtualMachineScaleSetOSProfile
+    from .virtual_machine_scale_set_update_os_profile import VirtualMachineScaleSetUpdateOSProfile
+    from .virtual_machine_scale_set_managed_disk_parameters import VirtualMachineScaleSetManagedDiskParameters
+    from .virtual_machine_scale_set_os_disk import VirtualMachineScaleSetOSDisk
+    from .virtual_machine_scale_set_update_os_disk import VirtualMachineScaleSetUpdateOSDisk
+    from .virtual_machine_scale_set_data_disk import VirtualMachineScaleSetDataDisk
+    from .virtual_machine_scale_set_storage_profile import VirtualMachineScaleSetStorageProfile
+    from .virtual_machine_scale_set_update_storage_profile import VirtualMachineScaleSetUpdateStorageProfile
+    from .api_entity_reference import ApiEntityReference
+    from .virtual_machine_scale_set_public_ip_address_configuration_dns_settings import VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings
+    from .virtual_machine_scale_set_ip_tag import VirtualMachineScaleSetIpTag
+    from .virtual_machine_scale_set_public_ip_address_configuration import VirtualMachineScaleSetPublicIPAddressConfiguration
+    from .virtual_machine_scale_set_update_public_ip_address_configuration import VirtualMachineScaleSetUpdatePublicIPAddressConfiguration
+    from .virtual_machine_scale_set_ip_configuration import VirtualMachineScaleSetIPConfiguration
+    from .virtual_machine_scale_set_update_ip_configuration import VirtualMachineScaleSetUpdateIPConfiguration
+    from .virtual_machine_scale_set_network_configuration_dns_settings import VirtualMachineScaleSetNetworkConfigurationDnsSettings
+    from .virtual_machine_scale_set_network_configuration import VirtualMachineScaleSetNetworkConfiguration
+    from .virtual_machine_scale_set_update_network_configuration import VirtualMachineScaleSetUpdateNetworkConfiguration
+    from .virtual_machine_scale_set_network_profile import VirtualMachineScaleSetNetworkProfile
+    from .virtual_machine_scale_set_update_network_profile import VirtualMachineScaleSetUpdateNetworkProfile
+    from .virtual_machine_scale_set_extension import VirtualMachineScaleSetExtension
+    from .virtual_machine_scale_set_extension_profile import VirtualMachineScaleSetExtensionProfile
+    from .virtual_machine_scale_set_vm_profile import VirtualMachineScaleSetVMProfile
+    from .virtual_machine_scale_set_update_vm_profile import VirtualMachineScaleSetUpdateVMProfile
+    from .virtual_machine_scale_set import VirtualMachineScaleSet
+    from .virtual_machine_scale_set_update import VirtualMachineScaleSetUpdate
+    from .virtual_machine_scale_set_vm_instance_ids import VirtualMachineScaleSetVMInstanceIDs
+    from .virtual_machine_scale_set_vm_instance_required_ids import VirtualMachineScaleSetVMInstanceRequiredIDs
+    from .virtual_machine_status_code_count import VirtualMachineStatusCodeCount
+    from .virtual_machine_scale_set_instance_view_statuses_summary import VirtualMachineScaleSetInstanceViewStatusesSummary
+    from .virtual_machine_scale_set_vm_extensions_summary import VirtualMachineScaleSetVMExtensionsSummary
+    from .virtual_machine_scale_set_instance_view import VirtualMachineScaleSetInstanceView
+    from .virtual_machine_scale_set_sku_capacity import VirtualMachineScaleSetSkuCapacity
+    from .virtual_machine_scale_set_sku import VirtualMachineScaleSetSku
+    from .api_error_base import ApiErrorBase
+    from .inner_error import InnerError
+    from .api_error import ApiError
+    from .rollback_status_info import RollbackStatusInfo
+    from .upgrade_operation_history_status import UpgradeOperationHistoryStatus
+    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_scale_set_vm import VirtualMachineScaleSetVM
+    from .virtual_machine_health_status import VirtualMachineHealthStatus
+    from .virtual_machine_scale_set_vm_instance_view import VirtualMachineScaleSetVMInstanceView
+    from .rolling_upgrade_running_status import RollingUpgradeRunningStatus
+    from .rolling_upgrade_status_info import RollingUpgradeStatusInfo
+    from .resource import Resource
+    from .update_resource import UpdateResource
+    from .sub_resource_read_only import SubResourceReadOnly
+    from .recovery_walk_response import RecoveryWalkResponse
+    from .request_rate_by_interval_input import RequestRateByIntervalInput
+    from .throttled_requests_input import ThrottledRequestsInput
+    from .log_analytics_input_base import LogAnalyticsInputBase
+    from .log_analytics_output import LogAnalyticsOutput
+    from .log_analytics_operation_result import LogAnalyticsOperationResult
     from .gallery_identifier import GalleryIdentifier
     from .gallery import Gallery
     from .gallery_image_identifier import GalleryImageIdentifier
@@ -53,24 +293,175 @@
     from .gallery_artifact_source import GalleryArtifactSource
     from .gallery_artifact_publishing_profile_base import GalleryArtifactPublishingProfileBase
     from .gallery_disk_image import GalleryDiskImage
-    from .api_error_base import ApiErrorBase
-    from .inner_error import InnerError
-    from .api_error import ApiError
-    from .resource import Resource
+from .compute_operation_value_paged import ComputeOperationValuePaged
+from .availability_set_paged import AvailabilitySetPaged
+from .virtual_machine_size_paged import VirtualMachineSizePaged
+from .usage_paged import UsagePaged
+from .image_paged import ImagePaged
+from .virtual_machine_paged import VirtualMachinePaged
+from .virtual_machine_scale_set_paged import VirtualMachineScaleSetPaged
+from .virtual_machine_scale_set_sku_paged import VirtualMachineScaleSetSkuPaged
+from .upgrade_operation_historical_status_info_paged import UpgradeOperationHistoricalStatusInfoPaged
+from .virtual_machine_scale_set_extension_paged import VirtualMachineScaleSetExtensionPaged
+from .virtual_machine_scale_set_vm_paged import VirtualMachineScaleSetVMPaged
 from .gallery_paged import GalleryPaged
 from .gallery_image_paged import GalleryImagePaged
 from .gallery_image_version_paged import GalleryImageVersionPaged
 from .compute_management_client_enums import (
+    StatusLevelTypes,
     OperatingSystemTypes,
+    VirtualMachineSizeTypes,
+    CachingTypes,
+    DiskCreateOptionTypes,
+    StorageAccountTypes,
+    PassNames,
+    ComponentNames,
+    SettingNames,
+    ProtocolTypes,
+    ResourceIdentityType,
+    MaintenanceOperationResultCodeTypes,
+    UpgradeMode,
     OperatingSystemStateTypes,
+    IPVersion,
+    VirtualMachinePriorityTypes,
+    VirtualMachineEvictionPolicyTypes,
+    VirtualMachineScaleSetSkuScaleType,
+    UpgradeState,
+    UpgradeOperationInvoker,
+    RollingUpgradeStatusCode,
+    RollingUpgradeActionType,
+    IntervalInMins,
     ScaleTier,
     AggregatedReplicationState,
     ReplicationState,
     HostCaching,
+    InstanceViewTypes,
     ReplicationStatusTypes,
 )
 
 __all__ = [
+    'ComputeOperationValue',
+    'InstanceViewStatus',
+    'SubResource',
+    'Sku',
+    'AvailabilitySet',
+    'AvailabilitySetUpdate',
+    'VirtualMachineSize',
+    'VirtualMachineExtensionImage',
+    'VirtualMachineImageResource',
+    'VirtualMachineExtensionInstanceView',
+    'VirtualMachineExtension',
+    'VirtualMachineExtensionUpdate',
+    'VirtualMachineExtensionsListResult',
+    'PurchasePlan',
+    'OSDiskImage',
+    'DataDiskImage',
+    'VirtualMachineImage',
+    'UsageName',
+    'Usage',
+    'VirtualMachineCaptureParameters',
+    'VirtualMachineCaptureResult',
+    'Plan',
+    'HardwareProfile',
+    'ImageReference',
+    'KeyVaultSecretReference',
+    'KeyVaultKeyReference',
+    'DiskEncryptionSettings',
+    'VirtualHardDisk',
+    'ManagedDiskParameters',
+    'OSDisk',
+    'DataDisk',
+    'StorageProfile',
+    'AdditionalUnattendContent',
+    'WinRMListener',
+    'WinRMConfiguration',
+    'WindowsConfiguration',
+    'SshPublicKey',
+    'SshConfiguration',
+    'LinuxConfiguration',
+    'VaultCertificate',
+    'VaultSecretGroup',
+    'OSProfile',
+    'NetworkInterfaceReference',
+    'NetworkProfile',
+    'BootDiagnostics',
+    'DiagnosticsProfile',
+    'VirtualMachineExtensionHandlerInstanceView',
+    'VirtualMachineAgentInstanceView',
+    'DiskInstanceView',
+    'BootDiagnosticsInstanceView',
+    'VirtualMachineIdentityUserAssignedIdentitiesValue',
+    'VirtualMachineIdentity',
+    'MaintenanceRedeployStatus',
+    'VirtualMachineInstanceView',
+    'VirtualMachine',
+    'VirtualMachineUpdate',
+    'AutoOSUpgradePolicy',
+    'RollingUpgradePolicy',
+    'UpgradePolicy',
+    'ImageOSDisk',
+    'ImageDataDisk',
+    'ImageStorageProfile',
+    'Image',
+    'ImageUpdate',
+    'VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue',
+    'VirtualMachineScaleSetIdentity',
+    'VirtualMachineScaleSetOSProfile',
+    'VirtualMachineScaleSetUpdateOSProfile',
+    'VirtualMachineScaleSetManagedDiskParameters',
+    'VirtualMachineScaleSetOSDisk',
+    'VirtualMachineScaleSetUpdateOSDisk',
+    'VirtualMachineScaleSetDataDisk',
+    'VirtualMachineScaleSetStorageProfile',
+    'VirtualMachineScaleSetUpdateStorageProfile',
+    'ApiEntityReference',
+    'VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings',
+    'VirtualMachineScaleSetIpTag',
+    'VirtualMachineScaleSetPublicIPAddressConfiguration',
+    'VirtualMachineScaleSetUpdatePublicIPAddressConfiguration',
+    'VirtualMachineScaleSetIPConfiguration',
+    'VirtualMachineScaleSetUpdateIPConfiguration',
+    'VirtualMachineScaleSetNetworkConfigurationDnsSettings',
+    'VirtualMachineScaleSetNetworkConfiguration',
+    'VirtualMachineScaleSetUpdateNetworkConfiguration',
+    'VirtualMachineScaleSetNetworkProfile',
+    'VirtualMachineScaleSetUpdateNetworkProfile',
+    'VirtualMachineScaleSetExtension',
+    'VirtualMachineScaleSetExtensionProfile',
+    'VirtualMachineScaleSetVMProfile',
+    'VirtualMachineScaleSetUpdateVMProfile',
+    'VirtualMachineScaleSet',
+    'VirtualMachineScaleSetUpdate',
+    'VirtualMachineScaleSetVMInstanceIDs',
+    'VirtualMachineScaleSetVMInstanceRequiredIDs',
+    'VirtualMachineStatusCodeCount',
+    'VirtualMachineScaleSetInstanceViewStatusesSummary',
+    'VirtualMachineScaleSetVMExtensionsSummary',
+    'VirtualMachineScaleSetInstanceView',
+    'VirtualMachineScaleSetSkuCapacity',
+    'VirtualMachineScaleSetSku',
+    'ApiErrorBase',
+    'InnerError',
+    'ApiError',
+    'RollbackStatusInfo',
+    'UpgradeOperationHistoryStatus',
+    'RollingUpgradeProgressInfo',
+    'UpgradeOperationHistoricalStatusInfoProperties',
+    'UpgradeOperationHistoricalStatusInfo',
+    'VirtualMachineScaleSetVM',
+    'VirtualMachineHealthStatus',
+    'VirtualMachineScaleSetVMInstanceView',
+    'RollingUpgradeRunningStatus',
+    'RollingUpgradeStatusInfo',
+    'Resource',
+    'UpdateResource',
+    'SubResourceReadOnly',
+    'RecoveryWalkResponse',
+    'RequestRateByIntervalInput',
+    'ThrottledRequestsInput',
+    'LogAnalyticsInputBase',
+    'LogAnalyticsOutput',
+    'LogAnalyticsOperationResult',
     'GalleryIdentifier',
     'Gallery',
     'GalleryImageIdentifier',
@@ -90,18 +481,47 @@
     'GalleryArtifactSource',
     'GalleryArtifactPublishingProfileBase',
     'GalleryDiskImage',
-    'ApiErrorBase',
-    'InnerError',
-    'ApiError',
-    'Resource',
+    'ComputeOperationValuePaged',
+    'AvailabilitySetPaged',
+    'VirtualMachineSizePaged',
+    'UsagePaged',
+    'ImagePaged',
+    'VirtualMachinePaged',
+    'VirtualMachineScaleSetPaged',
+    'VirtualMachineScaleSetSkuPaged',
+    'UpgradeOperationHistoricalStatusInfoPaged',
+    'VirtualMachineScaleSetExtensionPaged',
+    'VirtualMachineScaleSetVMPaged',
     'GalleryPaged',
     'GalleryImagePaged',
     'GalleryImageVersionPaged',
+    'StatusLevelTypes',
     'OperatingSystemTypes',
+    'VirtualMachineSizeTypes',
+    'CachingTypes',
+    'DiskCreateOptionTypes',
+    'StorageAccountTypes',
+    'PassNames',
+    'ComponentNames',
+    'SettingNames',
+    'ProtocolTypes',
+    'ResourceIdentityType',
+    'MaintenanceOperationResultCodeTypes',
+    'UpgradeMode',
     'OperatingSystemStateTypes',
+    'IPVersion',
+    'VirtualMachinePriorityTypes',
+    'VirtualMachineEvictionPolicyTypes',
+    'VirtualMachineScaleSetSkuScaleType',
+    'UpgradeState',
+    'UpgradeOperationInvoker',
+    'RollingUpgradeStatusCode',
+    'RollingUpgradeActionType',
+    'IntervalInMins',
     'ScaleTier',
     'AggregatedReplicationState',
     'ReplicationState',
     'HostCaching',
+    'InstanceViewTypes',
     'ReplicationStatusTypes',
 ]
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/additional_unattend_content.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/additional_unattend_content.py
new file mode 100644
index 000000000000..7a2b04fa830e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/additional_unattend_content.py
@@ -0,0 +1,52 @@
+# 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 AdditionalUnattendContent(Model):
+    """Specifies additional XML formatted information that can be included in the
+    Unattend.xml file, which is used by Windows Setup. Contents are defined by
+    setting name, component name, and the pass in which the content is applied.
+
+    :param pass_name: The pass name. Currently, the only allowable value is
+     OobeSystem. Possible values include: 'OobeSystem'
+    :type pass_name: str or ~azure.mgmt.compute.v2018_06_01.models.PassNames
+    :param component_name: The component name. Currently, the only allowable
+     value is Microsoft-Windows-Shell-Setup. Possible values include:
+     'Microsoft-Windows-Shell-Setup'
+    :type component_name: str or
+     ~azure.mgmt.compute.v2018_06_01.models.ComponentNames
+    :param setting_name: Specifies the name of the setting to which the
+     content applies. Possible values are: FirstLogonCommands and AutoLogon.
+     Possible values include: 'AutoLogon', 'FirstLogonCommands'
+    :type setting_name: str or
+     ~azure.mgmt.compute.v2018_06_01.models.SettingNames
+    :param content: Specifies the XML formatted content that is added to the
+     unattend.xml file for the specified path and component. The XML must be
+     less than 4KB and must include the root element for the setting or feature
+     that is being inserted.
+    :type content: str
+    """
+
+    _attribute_map = {
+        'pass_name': {'key': 'passName', 'type': 'PassNames'},
+        'component_name': {'key': 'componentName', 'type': 'ComponentNames'},
+        'setting_name': {'key': 'settingName', 'type': 'SettingNames'},
+        'content': {'key': 'content', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(AdditionalUnattendContent, self).__init__(**kwargs)
+        self.pass_name = kwargs.get('pass_name', None)
+        self.component_name = kwargs.get('component_name', None)
+        self.setting_name = kwargs.get('setting_name', None)
+        self.content = kwargs.get('content', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/additional_unattend_content_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/additional_unattend_content_py3.py
new file mode 100644
index 000000000000..4ca484f69dac
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/additional_unattend_content_py3.py
@@ -0,0 +1,52 @@
+# 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 AdditionalUnattendContent(Model):
+    """Specifies additional XML formatted information that can be included in the
+    Unattend.xml file, which is used by Windows Setup. Contents are defined by
+    setting name, component name, and the pass in which the content is applied.
+
+    :param pass_name: The pass name. Currently, the only allowable value is
+     OobeSystem. Possible values include: 'OobeSystem'
+    :type pass_name: str or ~azure.mgmt.compute.v2018_06_01.models.PassNames
+    :param component_name: The component name. Currently, the only allowable
+     value is Microsoft-Windows-Shell-Setup. Possible values include:
+     'Microsoft-Windows-Shell-Setup'
+    :type component_name: str or
+     ~azure.mgmt.compute.v2018_06_01.models.ComponentNames
+    :param setting_name: Specifies the name of the setting to which the
+     content applies. Possible values are: FirstLogonCommands and AutoLogon.
+     Possible values include: 'AutoLogon', 'FirstLogonCommands'
+    :type setting_name: str or
+     ~azure.mgmt.compute.v2018_06_01.models.SettingNames
+    :param content: Specifies the XML formatted content that is added to the
+     unattend.xml file for the specified path and component. The XML must be
+     less than 4KB and must include the root element for the setting or feature
+     that is being inserted.
+    :type content: str
+    """
+
+    _attribute_map = {
+        'pass_name': {'key': 'passName', 'type': 'PassNames'},
+        'component_name': {'key': 'componentName', 'type': 'ComponentNames'},
+        'setting_name': {'key': 'settingName', 'type': 'SettingNames'},
+        'content': {'key': 'content', 'type': 'str'},
+    }
+
+    def __init__(self, *, pass_name=None, component_name=None, setting_name=None, content: str=None, **kwargs) -> None:
+        super(AdditionalUnattendContent, self).__init__(**kwargs)
+        self.pass_name = pass_name
+        self.component_name = component_name
+        self.setting_name = setting_name
+        self.content = content
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/api_entity_reference.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/api_entity_reference.py
new file mode 100644
index 000000000000..d1bf572e916d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/api_entity_reference.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 ApiEntityReference(Model):
+    """The API entity reference.
+
+    :param id: The ARM resource id in the form of
+     /subscriptions/{SubcriptionId}/resourceGroups/{ResourceGroupName}/...
+    :type id: str
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ApiEntityReference, self).__init__(**kwargs)
+        self.id = kwargs.get('id', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/api_entity_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/api_entity_reference_py3.py
new file mode 100644
index 000000000000..da3e07082381
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/api_entity_reference_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 ApiEntityReference(Model):
+    """The API entity reference.
+
+    :param id: The ARM resource id in the form of
+     /subscriptions/{SubcriptionId}/resourceGroups/{ResourceGroupName}/...
+    :type id: str
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+    }
+
+    def __init__(self, *, id: str=None, **kwargs) -> None:
+        super(ApiEntityReference, self).__init__(**kwargs)
+        self.id = id
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/auto_os_upgrade_policy.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/auto_os_upgrade_policy.py
new file mode 100644
index 000000000000..2c74af408892
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/auto_os_upgrade_policy.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 AutoOSUpgradePolicy(Model):
+    """The configuration parameters used for performing automatic OS upgrade.
+
+    :param disable_auto_rollback: Whether OS image rollback feature should be
+     disabled. Default value is false.
+    :type disable_auto_rollback: bool
+    """
+
+    _attribute_map = {
+        'disable_auto_rollback': {'key': 'disableAutoRollback', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(AutoOSUpgradePolicy, self).__init__(**kwargs)
+        self.disable_auto_rollback = kwargs.get('disable_auto_rollback', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/auto_os_upgrade_policy_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/auto_os_upgrade_policy_py3.py
new file mode 100644
index 000000000000..3e3e751838a8
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/auto_os_upgrade_policy_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 AutoOSUpgradePolicy(Model):
+    """The configuration parameters used for performing automatic OS upgrade.
+
+    :param disable_auto_rollback: Whether OS image rollback feature should be
+     disabled. Default value is false.
+    :type disable_auto_rollback: bool
+    """
+
+    _attribute_map = {
+        'disable_auto_rollback': {'key': 'disableAutoRollback', 'type': 'bool'},
+    }
+
+    def __init__(self, *, disable_auto_rollback: bool=None, **kwargs) -> None:
+        super(AutoOSUpgradePolicy, self).__init__(**kwargs)
+        self.disable_auto_rollback = disable_auto_rollback
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/availability_set.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/availability_set.py
new file mode 100644
index 000000000000..cc99cdb180b4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/availability_set.py
@@ -0,0 +1,85 @@
+# 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 AvailabilitySet(Resource):
+    """Specifies information about the availability set that the virtual machine
+    should be assigned to. Virtual machines specified in the same availability
+    set are allocated to different nodes to maximize availability. For more
+    information about availability sets, see [Manage the availability of
+    virtual
+    machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    <br><br> For more information on Azure planned maintainance, see [Planned
+    maintenance for virtual machines in
+    Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+    <br><br> Currently, a VM can only be added to availability set at creation
+    time. An existing VM cannot be added to an availability set.
+
+    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]
+    :param platform_update_domain_count: Update Domain count.
+    :type platform_update_domain_count: int
+    :param platform_fault_domain_count: Fault Domain count.
+    :type platform_fault_domain_count: int
+    :param virtual_machines: A list of references to all virtual machines in
+     the availability set.
+    :type virtual_machines:
+     list[~azure.mgmt.compute.v2018_06_01.models.SubResource]
+    :ivar statuses: The resource status information.
+    :vartype statuses:
+     list[~azure.mgmt.compute.v2018_06_01.models.InstanceViewStatus]
+    :param sku: Sku of the availability set
+    :type sku: ~azure.mgmt.compute.v2018_06_01.models.Sku
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'statuses': {'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}'},
+        'platform_update_domain_count': {'key': 'properties.platformUpdateDomainCount', 'type': 'int'},
+        'platform_fault_domain_count': {'key': 'properties.platformFaultDomainCount', 'type': 'int'},
+        'virtual_machines': {'key': 'properties.virtualMachines', 'type': '[SubResource]'},
+        'statuses': {'key': 'properties.statuses', 'type': '[InstanceViewStatus]'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+    }
+
+    def __init__(self, **kwargs):
+        super(AvailabilitySet, self).__init__(**kwargs)
+        self.platform_update_domain_count = kwargs.get('platform_update_domain_count', None)
+        self.platform_fault_domain_count = kwargs.get('platform_fault_domain_count', None)
+        self.virtual_machines = kwargs.get('virtual_machines', None)
+        self.statuses = None
+        self.sku = kwargs.get('sku', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/availability_set_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/availability_set_paged.py
new file mode 100644
index 000000000000..e321ccaf5b29
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/availability_set_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 AvailabilitySetPaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`AvailabilitySet <azure.mgmt.compute.v2018_06_01.models.AvailabilitySet>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[AvailabilitySet]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(AvailabilitySetPaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/availability_set_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/availability_set_py3.py
new file mode 100644
index 000000000000..64ea887cb556
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/availability_set_py3.py
@@ -0,0 +1,85 @@
+# 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 AvailabilitySet(Resource):
+    """Specifies information about the availability set that the virtual machine
+    should be assigned to. Virtual machines specified in the same availability
+    set are allocated to different nodes to maximize availability. For more
+    information about availability sets, see [Manage the availability of
+    virtual
+    machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    <br><br> For more information on Azure planned maintainance, see [Planned
+    maintenance for virtual machines in
+    Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+    <br><br> Currently, a VM can only be added to availability set at creation
+    time. An existing VM cannot be added to an availability set.
+
+    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]
+    :param platform_update_domain_count: Update Domain count.
+    :type platform_update_domain_count: int
+    :param platform_fault_domain_count: Fault Domain count.
+    :type platform_fault_domain_count: int
+    :param virtual_machines: A list of references to all virtual machines in
+     the availability set.
+    :type virtual_machines:
+     list[~azure.mgmt.compute.v2018_06_01.models.SubResource]
+    :ivar statuses: The resource status information.
+    :vartype statuses:
+     list[~azure.mgmt.compute.v2018_06_01.models.InstanceViewStatus]
+    :param sku: Sku of the availability set
+    :type sku: ~azure.mgmt.compute.v2018_06_01.models.Sku
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'statuses': {'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}'},
+        'platform_update_domain_count': {'key': 'properties.platformUpdateDomainCount', 'type': 'int'},
+        'platform_fault_domain_count': {'key': 'properties.platformFaultDomainCount', 'type': 'int'},
+        'virtual_machines': {'key': 'properties.virtualMachines', 'type': '[SubResource]'},
+        'statuses': {'key': 'properties.statuses', 'type': '[InstanceViewStatus]'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+    }
+
+    def __init__(self, *, location: str, tags=None, platform_update_domain_count: int=None, platform_fault_domain_count: int=None, virtual_machines=None, sku=None, **kwargs) -> None:
+        super(AvailabilitySet, self).__init__(location=location, tags=tags, **kwargs)
+        self.platform_update_domain_count = platform_update_domain_count
+        self.platform_fault_domain_count = platform_fault_domain_count
+        self.virtual_machines = virtual_machines
+        self.statuses = None
+        self.sku = sku
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/availability_set_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/availability_set_update.py
new file mode 100644
index 000000000000..2ea56a7f07f3
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/availability_set_update.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 .update_resource import UpdateResource
+
+
+class AvailabilitySetUpdate(UpdateResource):
+    """Specifies information about the availability set that the virtual machine
+    should be assigned to. Only tags may be updated.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param platform_update_domain_count: Update Domain count.
+    :type platform_update_domain_count: int
+    :param platform_fault_domain_count: Fault Domain count.
+    :type platform_fault_domain_count: int
+    :param virtual_machines: A list of references to all virtual machines in
+     the availability set.
+    :type virtual_machines:
+     list[~azure.mgmt.compute.v2018_06_01.models.SubResource]
+    :ivar statuses: The resource status information.
+    :vartype statuses:
+     list[~azure.mgmt.compute.v2018_06_01.models.InstanceViewStatus]
+    :param sku: Sku of the availability set
+    :type sku: ~azure.mgmt.compute.v2018_06_01.models.Sku
+    """
+
+    _validation = {
+        'statuses': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'platform_update_domain_count': {'key': 'properties.platformUpdateDomainCount', 'type': 'int'},
+        'platform_fault_domain_count': {'key': 'properties.platformFaultDomainCount', 'type': 'int'},
+        'virtual_machines': {'key': 'properties.virtualMachines', 'type': '[SubResource]'},
+        'statuses': {'key': 'properties.statuses', 'type': '[InstanceViewStatus]'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+    }
+
+    def __init__(self, **kwargs):
+        super(AvailabilitySetUpdate, self).__init__(**kwargs)
+        self.platform_update_domain_count = kwargs.get('platform_update_domain_count', None)
+        self.platform_fault_domain_count = kwargs.get('platform_fault_domain_count', None)
+        self.virtual_machines = kwargs.get('virtual_machines', None)
+        self.statuses = None
+        self.sku = kwargs.get('sku', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/availability_set_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/availability_set_update_py3.py
new file mode 100644
index 000000000000..e4d109456c4d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/availability_set_update_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 .update_resource_py3 import UpdateResource
+
+
+class AvailabilitySetUpdate(UpdateResource):
+    """Specifies information about the availability set that the virtual machine
+    should be assigned to. Only tags may be updated.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param platform_update_domain_count: Update Domain count.
+    :type platform_update_domain_count: int
+    :param platform_fault_domain_count: Fault Domain count.
+    :type platform_fault_domain_count: int
+    :param virtual_machines: A list of references to all virtual machines in
+     the availability set.
+    :type virtual_machines:
+     list[~azure.mgmt.compute.v2018_06_01.models.SubResource]
+    :ivar statuses: The resource status information.
+    :vartype statuses:
+     list[~azure.mgmt.compute.v2018_06_01.models.InstanceViewStatus]
+    :param sku: Sku of the availability set
+    :type sku: ~azure.mgmt.compute.v2018_06_01.models.Sku
+    """
+
+    _validation = {
+        'statuses': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'platform_update_domain_count': {'key': 'properties.platformUpdateDomainCount', 'type': 'int'},
+        'platform_fault_domain_count': {'key': 'properties.platformFaultDomainCount', 'type': 'int'},
+        'virtual_machines': {'key': 'properties.virtualMachines', 'type': '[SubResource]'},
+        'statuses': {'key': 'properties.statuses', 'type': '[InstanceViewStatus]'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+    }
+
+    def __init__(self, *, tags=None, platform_update_domain_count: int=None, platform_fault_domain_count: int=None, virtual_machines=None, sku=None, **kwargs) -> None:
+        super(AvailabilitySetUpdate, self).__init__(tags=tags, **kwargs)
+        self.platform_update_domain_count = platform_update_domain_count
+        self.platform_fault_domain_count = platform_fault_domain_count
+        self.virtual_machines = virtual_machines
+        self.statuses = None
+        self.sku = sku
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/boot_diagnostics.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/boot_diagnostics.py
new file mode 100644
index 000000000000..ca3dbdd4f23c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/boot_diagnostics.py
@@ -0,0 +1,38 @@
+# 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 BootDiagnostics(Model):
+    """Boot Diagnostics is a debugging feature which allows you to view Console
+    Output and Screenshot to diagnose VM status. <br><br> For Linux Virtual
+    Machines, you can easily view the output of your console log. <br><br> For
+    both Windows and Linux virtual machines, Azure also enables you to see a
+    screenshot of the VM from the hypervisor.
+
+    :param enabled: Whether boot diagnostics should be enabled on the Virtual
+     Machine.
+    :type enabled: bool
+    :param storage_uri: Uri of the storage account to use for placing the
+     console output and screenshot.
+    :type storage_uri: str
+    """
+
+    _attribute_map = {
+        'enabled': {'key': 'enabled', 'type': 'bool'},
+        'storage_uri': {'key': 'storageUri', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(BootDiagnostics, self).__init__(**kwargs)
+        self.enabled = kwargs.get('enabled', None)
+        self.storage_uri = kwargs.get('storage_uri', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/boot_diagnostics_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/boot_diagnostics_instance_view.py
new file mode 100644
index 000000000000..6fe1f84a3910
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/boot_diagnostics_instance_view.py
@@ -0,0 +1,32 @@
+# 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 BootDiagnosticsInstanceView(Model):
+    """The instance view of a virtual machine boot diagnostics.
+
+    :param console_screenshot_blob_uri: The console screenshot blob URI.
+    :type console_screenshot_blob_uri: str
+    :param serial_console_log_blob_uri: The Linux serial console log blob Uri.
+    :type serial_console_log_blob_uri: str
+    """
+
+    _attribute_map = {
+        'console_screenshot_blob_uri': {'key': 'consoleScreenshotBlobUri', 'type': 'str'},
+        'serial_console_log_blob_uri': {'key': 'serialConsoleLogBlobUri', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(BootDiagnosticsInstanceView, self).__init__(**kwargs)
+        self.console_screenshot_blob_uri = kwargs.get('console_screenshot_blob_uri', None)
+        self.serial_console_log_blob_uri = kwargs.get('serial_console_log_blob_uri', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/boot_diagnostics_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/boot_diagnostics_instance_view_py3.py
new file mode 100644
index 000000000000..d85b51981ab9
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/boot_diagnostics_instance_view_py3.py
@@ -0,0 +1,32 @@
+# 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 BootDiagnosticsInstanceView(Model):
+    """The instance view of a virtual machine boot diagnostics.
+
+    :param console_screenshot_blob_uri: The console screenshot blob URI.
+    :type console_screenshot_blob_uri: str
+    :param serial_console_log_blob_uri: The Linux serial console log blob Uri.
+    :type serial_console_log_blob_uri: str
+    """
+
+    _attribute_map = {
+        'console_screenshot_blob_uri': {'key': 'consoleScreenshotBlobUri', 'type': 'str'},
+        'serial_console_log_blob_uri': {'key': 'serialConsoleLogBlobUri', 'type': 'str'},
+    }
+
+    def __init__(self, *, console_screenshot_blob_uri: str=None, serial_console_log_blob_uri: str=None, **kwargs) -> None:
+        super(BootDiagnosticsInstanceView, self).__init__(**kwargs)
+        self.console_screenshot_blob_uri = console_screenshot_blob_uri
+        self.serial_console_log_blob_uri = serial_console_log_blob_uri
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/boot_diagnostics_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/boot_diagnostics_py3.py
new file mode 100644
index 000000000000..b0a756ea4fa0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/boot_diagnostics_py3.py
@@ -0,0 +1,38 @@
+# 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 BootDiagnostics(Model):
+    """Boot Diagnostics is a debugging feature which allows you to view Console
+    Output and Screenshot to diagnose VM status. <br><br> For Linux Virtual
+    Machines, you can easily view the output of your console log. <br><br> For
+    both Windows and Linux virtual machines, Azure also enables you to see a
+    screenshot of the VM from the hypervisor.
+
+    :param enabled: Whether boot diagnostics should be enabled on the Virtual
+     Machine.
+    :type enabled: bool
+    :param storage_uri: Uri of the storage account to use for placing the
+     console output and screenshot.
+    :type storage_uri: str
+    """
+
+    _attribute_map = {
+        'enabled': {'key': 'enabled', 'type': 'bool'},
+        'storage_uri': {'key': 'storageUri', 'type': 'str'},
+    }
+
+    def __init__(self, *, enabled: bool=None, storage_uri: str=None, **kwargs) -> None:
+        super(BootDiagnostics, self).__init__(**kwargs)
+        self.enabled = enabled
+        self.storage_uri = storage_uri
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 c575a854046e..7992a6cd0806 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
@@ -12,18 +12,322 @@
 from enum import Enum
 
 
+class StatusLevelTypes(str, Enum):
+
+    info = "Info"
+    warning = "Warning"
+    error = "Error"
+
+
 class OperatingSystemTypes(str, Enum):
 
     windows = "Windows"
     linux = "Linux"
 
 
+class VirtualMachineSizeTypes(str, Enum):
+
+    basic_a0 = "Basic_A0"
+    basic_a1 = "Basic_A1"
+    basic_a2 = "Basic_A2"
+    basic_a3 = "Basic_A3"
+    basic_a4 = "Basic_A4"
+    standard_a0 = "Standard_A0"
+    standard_a1 = "Standard_A1"
+    standard_a2 = "Standard_A2"
+    standard_a3 = "Standard_A3"
+    standard_a4 = "Standard_A4"
+    standard_a5 = "Standard_A5"
+    standard_a6 = "Standard_A6"
+    standard_a7 = "Standard_A7"
+    standard_a8 = "Standard_A8"
+    standard_a9 = "Standard_A9"
+    standard_a10 = "Standard_A10"
+    standard_a11 = "Standard_A11"
+    standard_a1_v2 = "Standard_A1_v2"
+    standard_a2_v2 = "Standard_A2_v2"
+    standard_a4_v2 = "Standard_A4_v2"
+    standard_a8_v2 = "Standard_A8_v2"
+    standard_a2m_v2 = "Standard_A2m_v2"
+    standard_a4m_v2 = "Standard_A4m_v2"
+    standard_a8m_v2 = "Standard_A8m_v2"
+    standard_b1s = "Standard_B1s"
+    standard_b1ms = "Standard_B1ms"
+    standard_b2s = "Standard_B2s"
+    standard_b2ms = "Standard_B2ms"
+    standard_b4ms = "Standard_B4ms"
+    standard_b8ms = "Standard_B8ms"
+    standard_d1 = "Standard_D1"
+    standard_d2 = "Standard_D2"
+    standard_d3 = "Standard_D3"
+    standard_d4 = "Standard_D4"
+    standard_d11 = "Standard_D11"
+    standard_d12 = "Standard_D12"
+    standard_d13 = "Standard_D13"
+    standard_d14 = "Standard_D14"
+    standard_d1_v2 = "Standard_D1_v2"
+    standard_d2_v2 = "Standard_D2_v2"
+    standard_d3_v2 = "Standard_D3_v2"
+    standard_d4_v2 = "Standard_D4_v2"
+    standard_d5_v2 = "Standard_D5_v2"
+    standard_d2_v3 = "Standard_D2_v3"
+    standard_d4_v3 = "Standard_D4_v3"
+    standard_d8_v3 = "Standard_D8_v3"
+    standard_d16_v3 = "Standard_D16_v3"
+    standard_d32_v3 = "Standard_D32_v3"
+    standard_d64_v3 = "Standard_D64_v3"
+    standard_d2s_v3 = "Standard_D2s_v3"
+    standard_d4s_v3 = "Standard_D4s_v3"
+    standard_d8s_v3 = "Standard_D8s_v3"
+    standard_d16s_v3 = "Standard_D16s_v3"
+    standard_d32s_v3 = "Standard_D32s_v3"
+    standard_d64s_v3 = "Standard_D64s_v3"
+    standard_d11_v2 = "Standard_D11_v2"
+    standard_d12_v2 = "Standard_D12_v2"
+    standard_d13_v2 = "Standard_D13_v2"
+    standard_d14_v2 = "Standard_D14_v2"
+    standard_d15_v2 = "Standard_D15_v2"
+    standard_ds1 = "Standard_DS1"
+    standard_ds2 = "Standard_DS2"
+    standard_ds3 = "Standard_DS3"
+    standard_ds4 = "Standard_DS4"
+    standard_ds11 = "Standard_DS11"
+    standard_ds12 = "Standard_DS12"
+    standard_ds13 = "Standard_DS13"
+    standard_ds14 = "Standard_DS14"
+    standard_ds1_v2 = "Standard_DS1_v2"
+    standard_ds2_v2 = "Standard_DS2_v2"
+    standard_ds3_v2 = "Standard_DS3_v2"
+    standard_ds4_v2 = "Standard_DS4_v2"
+    standard_ds5_v2 = "Standard_DS5_v2"
+    standard_ds11_v2 = "Standard_DS11_v2"
+    standard_ds12_v2 = "Standard_DS12_v2"
+    standard_ds13_v2 = "Standard_DS13_v2"
+    standard_ds14_v2 = "Standard_DS14_v2"
+    standard_ds15_v2 = "Standard_DS15_v2"
+    standard_ds13_4_v2 = "Standard_DS13-4_v2"
+    standard_ds13_2_v2 = "Standard_DS13-2_v2"
+    standard_ds14_8_v2 = "Standard_DS14-8_v2"
+    standard_ds14_4_v2 = "Standard_DS14-4_v2"
+    standard_e2_v3 = "Standard_E2_v3"
+    standard_e4_v3 = "Standard_E4_v3"
+    standard_e8_v3 = "Standard_E8_v3"
+    standard_e16_v3 = "Standard_E16_v3"
+    standard_e32_v3 = "Standard_E32_v3"
+    standard_e64_v3 = "Standard_E64_v3"
+    standard_e2s_v3 = "Standard_E2s_v3"
+    standard_e4s_v3 = "Standard_E4s_v3"
+    standard_e8s_v3 = "Standard_E8s_v3"
+    standard_e16s_v3 = "Standard_E16s_v3"
+    standard_e32s_v3 = "Standard_E32s_v3"
+    standard_e64s_v3 = "Standard_E64s_v3"
+    standard_e32_16_v3 = "Standard_E32-16_v3"
+    standard_e32_8s_v3 = "Standard_E32-8s_v3"
+    standard_e64_32s_v3 = "Standard_E64-32s_v3"
+    standard_e64_16s_v3 = "Standard_E64-16s_v3"
+    standard_f1 = "Standard_F1"
+    standard_f2 = "Standard_F2"
+    standard_f4 = "Standard_F4"
+    standard_f8 = "Standard_F8"
+    standard_f16 = "Standard_F16"
+    standard_f1s = "Standard_F1s"
+    standard_f2s = "Standard_F2s"
+    standard_f4s = "Standard_F4s"
+    standard_f8s = "Standard_F8s"
+    standard_f16s = "Standard_F16s"
+    standard_f2s_v2 = "Standard_F2s_v2"
+    standard_f4s_v2 = "Standard_F4s_v2"
+    standard_f8s_v2 = "Standard_F8s_v2"
+    standard_f16s_v2 = "Standard_F16s_v2"
+    standard_f32s_v2 = "Standard_F32s_v2"
+    standard_f64s_v2 = "Standard_F64s_v2"
+    standard_f72s_v2 = "Standard_F72s_v2"
+    standard_g1 = "Standard_G1"
+    standard_g2 = "Standard_G2"
+    standard_g3 = "Standard_G3"
+    standard_g4 = "Standard_G4"
+    standard_g5 = "Standard_G5"
+    standard_gs1 = "Standard_GS1"
+    standard_gs2 = "Standard_GS2"
+    standard_gs3 = "Standard_GS3"
+    standard_gs4 = "Standard_GS4"
+    standard_gs5 = "Standard_GS5"
+    standard_gs4_8 = "Standard_GS4-8"
+    standard_gs4_4 = "Standard_GS4-4"
+    standard_gs5_16 = "Standard_GS5-16"
+    standard_gs5_8 = "Standard_GS5-8"
+    standard_h8 = "Standard_H8"
+    standard_h16 = "Standard_H16"
+    standard_h8m = "Standard_H8m"
+    standard_h16m = "Standard_H16m"
+    standard_h16r = "Standard_H16r"
+    standard_h16mr = "Standard_H16mr"
+    standard_l4s = "Standard_L4s"
+    standard_l8s = "Standard_L8s"
+    standard_l16s = "Standard_L16s"
+    standard_l32s = "Standard_L32s"
+    standard_m64s = "Standard_M64s"
+    standard_m64ms = "Standard_M64ms"
+    standard_m128s = "Standard_M128s"
+    standard_m128ms = "Standard_M128ms"
+    standard_m64_32ms = "Standard_M64-32ms"
+    standard_m64_16ms = "Standard_M64-16ms"
+    standard_m128_64ms = "Standard_M128-64ms"
+    standard_m128_32ms = "Standard_M128-32ms"
+    standard_nc6 = "Standard_NC6"
+    standard_nc12 = "Standard_NC12"
+    standard_nc24 = "Standard_NC24"
+    standard_nc24r = "Standard_NC24r"
+    standard_nc6s_v2 = "Standard_NC6s_v2"
+    standard_nc12s_v2 = "Standard_NC12s_v2"
+    standard_nc24s_v2 = "Standard_NC24s_v2"
+    standard_nc24rs_v2 = "Standard_NC24rs_v2"
+    standard_nc6s_v3 = "Standard_NC6s_v3"
+    standard_nc12s_v3 = "Standard_NC12s_v3"
+    standard_nc24s_v3 = "Standard_NC24s_v3"
+    standard_nc24rs_v3 = "Standard_NC24rs_v3"
+    standard_nd6s = "Standard_ND6s"
+    standard_nd12s = "Standard_ND12s"
+    standard_nd24s = "Standard_ND24s"
+    standard_nd24rs = "Standard_ND24rs"
+    standard_nv6 = "Standard_NV6"
+    standard_nv12 = "Standard_NV12"
+    standard_nv24 = "Standard_NV24"
+
+
+class CachingTypes(str, Enum):
+
+    none = "None"
+    read_only = "ReadOnly"
+    read_write = "ReadWrite"
+
+
+class DiskCreateOptionTypes(str, Enum):
+
+    from_image = "FromImage"
+    empty = "Empty"
+    attach = "Attach"
+
+
+class StorageAccountTypes(str, Enum):
+
+    standard_lrs = "Standard_LRS"
+    premium_lrs = "Premium_LRS"
+    standard_ssd_lrs = "StandardSSD_LRS"
+
+
+class PassNames(str, Enum):
+
+    oobe_system = "OobeSystem"
+
+
+class ComponentNames(str, Enum):
+
+    microsoft_windows_shell_setup = "Microsoft-Windows-Shell-Setup"
+
+
+class SettingNames(str, Enum):
+
+    auto_logon = "AutoLogon"
+    first_logon_commands = "FirstLogonCommands"
+
+
+class ProtocolTypes(str, Enum):
+
+    http = "Http"
+    https = "Https"
+
+
+class ResourceIdentityType(str, Enum):
+
+    system_assigned = "SystemAssigned"
+    user_assigned = "UserAssigned"
+    system_assigned_user_assigned = "SystemAssigned, UserAssigned"
+    none = "None"
+
+
+class MaintenanceOperationResultCodeTypes(str, Enum):
+
+    none = "None"
+    retry_later = "RetryLater"
+    maintenance_aborted = "MaintenanceAborted"
+    maintenance_completed = "MaintenanceCompleted"
+
+
+class UpgradeMode(str, Enum):
+
+    automatic = "Automatic"
+    manual = "Manual"
+    rolling = "Rolling"
+
+
 class OperatingSystemStateTypes(str, Enum):
 
     generalized = "Generalized"
     specialized = "Specialized"
 
 
+class IPVersion(str, Enum):
+
+    ipv4 = "IPv4"
+    ipv6 = "IPv6"
+
+
+class VirtualMachinePriorityTypes(str, Enum):
+
+    regular = "Regular"
+    low = "Low"
+
+
+class VirtualMachineEvictionPolicyTypes(str, Enum):
+
+    deallocate = "Deallocate"
+    delete = "Delete"
+
+
+class VirtualMachineScaleSetSkuScaleType(str, Enum):
+
+    automatic = "Automatic"
+    none = "None"
+
+
+class UpgradeState(str, Enum):
+
+    rolling_forward = "RollingForward"
+    cancelled = "Cancelled"
+    completed = "Completed"
+    faulted = "Faulted"
+
+
+class UpgradeOperationInvoker(str, Enum):
+
+    unknown = "Unknown"
+    user = "User"
+    platform = "Platform"
+
+
+class RollingUpgradeStatusCode(str, Enum):
+
+    rolling_forward = "RollingForward"
+    cancelled = "Cancelled"
+    completed = "Completed"
+    faulted = "Faulted"
+
+
+class RollingUpgradeActionType(str, Enum):
+
+    start = "Start"
+    cancel = "Cancel"
+
+
+class IntervalInMins(str, Enum):
+
+    three_mins = "ThreeMins"
+    five_mins = "FiveMins"
+    thirty_mins = "ThirtyMins"
+    sixty_mins = "SixtyMins"
+
+
 class ScaleTier(str, Enum):
 
     s30 = "S30"
@@ -53,6 +357,11 @@ class HostCaching(str, Enum):
     read_write = "ReadWrite"
 
 
+class InstanceViewTypes(str, Enum):
+
+    instance_view = "instanceView"
+
+
 class ReplicationStatusTypes(str, Enum):
 
     replication_status = "ReplicationStatus"
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/compute_operation_value.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/compute_operation_value.py
new file mode 100644
index 000000000000..525ef3bbb69a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/compute_operation_value.py
@@ -0,0 +1,60 @@
+# 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 ComputeOperationValue(Model):
+    """Describes the properties of a Compute Operation value.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar origin: The origin of the compute operation.
+    :vartype origin: str
+    :ivar name: The name of the compute operation.
+    :vartype name: str
+    :ivar operation: The display name of the compute operation.
+    :vartype operation: str
+    :ivar resource: The display name of the resource the operation applies to.
+    :vartype resource: str
+    :ivar description: The description of the operation.
+    :vartype description: str
+    :ivar provider: The resource provider for the operation.
+    :vartype provider: str
+    """
+
+    _validation = {
+        'origin': {'readonly': True},
+        'name': {'readonly': True},
+        'operation': {'readonly': True},
+        'resource': {'readonly': True},
+        'description': {'readonly': True},
+        'provider': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'origin': {'key': 'origin', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'operation': {'key': 'display.operation', 'type': 'str'},
+        'resource': {'key': 'display.resource', 'type': 'str'},
+        'description': {'key': 'display.description', 'type': 'str'},
+        'provider': {'key': 'display.provider', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ComputeOperationValue, self).__init__(**kwargs)
+        self.origin = None
+        self.name = None
+        self.operation = None
+        self.resource = None
+        self.description = None
+        self.provider = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/compute_operation_value_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/compute_operation_value_paged.py
new file mode 100644
index 000000000000..5a0a2d6ed17e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/compute_operation_value_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 ComputeOperationValuePaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`ComputeOperationValue <azure.mgmt.compute.v2018_06_01.models.ComputeOperationValue>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[ComputeOperationValue]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(ComputeOperationValuePaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/compute_operation_value_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/compute_operation_value_py3.py
new file mode 100644
index 000000000000..3c4388f312b9
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/compute_operation_value_py3.py
@@ -0,0 +1,60 @@
+# 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 ComputeOperationValue(Model):
+    """Describes the properties of a Compute Operation value.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar origin: The origin of the compute operation.
+    :vartype origin: str
+    :ivar name: The name of the compute operation.
+    :vartype name: str
+    :ivar operation: The display name of the compute operation.
+    :vartype operation: str
+    :ivar resource: The display name of the resource the operation applies to.
+    :vartype resource: str
+    :ivar description: The description of the operation.
+    :vartype description: str
+    :ivar provider: The resource provider for the operation.
+    :vartype provider: str
+    """
+
+    _validation = {
+        'origin': {'readonly': True},
+        'name': {'readonly': True},
+        'operation': {'readonly': True},
+        'resource': {'readonly': True},
+        'description': {'readonly': True},
+        'provider': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'origin': {'key': 'origin', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'operation': {'key': 'display.operation', 'type': 'str'},
+        'resource': {'key': 'display.resource', 'type': 'str'},
+        'description': {'key': 'display.description', 'type': 'str'},
+        'provider': {'key': 'display.provider', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(ComputeOperationValue, self).__init__(**kwargs)
+        self.origin = None
+        self.name = None
+        self.operation = None
+        self.resource = None
+        self.description = None
+        self.provider = None
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
new file mode 100644
index 000000000000..13e4cbe4499e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/data_disk.py
@@ -0,0 +1,87 @@
+# 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 DataDisk(Model):
+    """Describes a data disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param lun: Required. Specifies the logical unit number of the data disk.
+     This value is used to identify data disks within the VM and therefore must
+     be unique for each data disk attached to a VM.
+    :type lun: int
+    :param name: The disk name.
+    :type name: str
+    :param vhd: The virtual hard disk.
+    :type vhd: ~azure.mgmt.compute.v2018_06_01.models.VirtualHardDisk
+    :param image: The source user image virtual hard disk. The virtual hard
+     disk will be copied before being attached to the virtual machine. If
+     SourceImage is provided, the destination virtual hard drive must not
+     exist.
+    :type image: ~azure.mgmt.compute.v2018_06_01.models.VirtualHardDisk
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_06_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :param create_option: Required. Specifies how the virtual machine should
+     be created.<br><br> Possible values are:<br><br> **Attach** \\u2013 This
+     value is used when you are using a specialized disk to create the virtual
+     machine.<br><br> **FromImage** \\u2013 This value is used when you are
+     using an image to create the virtual machine. If you are using a platform
+     image, you also use the imageReference element described above. If you are
+     using a marketplace image, you  also use the plan element previously
+     described. 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 an empty data disk in
+     gigabytes. This element can be used to overwrite the name 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.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_06_01.models.ManagedDiskParameters
+    """
+
+    _validation = {
+        'lun': {'required': True},
+        'create_option': {'required': True},
+    }
+
+    _attribute_map = {
+        'lun': {'key': 'lun', 'type': 'int'},
+        'name': {'key': 'name', 'type': 'str'},
+        'vhd': {'key': 'vhd', 'type': 'VirtualHardDisk'},
+        'image': {'key': 'image', 'type': 'VirtualHardDisk'},
+        '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'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'ManagedDiskParameters'},
+    }
+
+    def __init__(self, **kwargs):
+        super(DataDisk, self).__init__(**kwargs)
+        self.lun = kwargs.get('lun', None)
+        self.name = kwargs.get('name', None)
+        self.vhd = kwargs.get('vhd', None)
+        self.image = kwargs.get('image', None)
+        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.managed_disk = kwargs.get('managed_disk', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/data_disk_image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/data_disk_image.py
new file mode 100644
index 000000000000..b5dbfcefb472
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/data_disk_image.py
@@ -0,0 +1,37 @@
+# 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 DataDiskImage(Model):
+    """Contains the data disk images information.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar lun: Specifies the logical unit number of the data disk. This value
+     is used to identify data disks within the VM and therefore must be unique
+     for each data disk attached to a VM.
+    :vartype lun: int
+    """
+
+    _validation = {
+        'lun': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'lun': {'key': 'lun', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs):
+        super(DataDiskImage, self).__init__(**kwargs)
+        self.lun = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/data_disk_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/data_disk_image_py3.py
new file mode 100644
index 000000000000..8431a3988502
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/data_disk_image_py3.py
@@ -0,0 +1,37 @@
+# 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 DataDiskImage(Model):
+    """Contains the data disk images information.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar lun: Specifies the logical unit number of the data disk. This value
+     is used to identify data disks within the VM and therefore must be unique
+     for each data disk attached to a VM.
+    :vartype lun: int
+    """
+
+    _validation = {
+        'lun': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'lun': {'key': 'lun', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(DataDiskImage, self).__init__(**kwargs)
+        self.lun = None
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
new file mode 100644
index 000000000000..84ca02e05d3d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/data_disk_py3.py
@@ -0,0 +1,87 @@
+# 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 DataDisk(Model):
+    """Describes a data disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param lun: Required. Specifies the logical unit number of the data disk.
+     This value is used to identify data disks within the VM and therefore must
+     be unique for each data disk attached to a VM.
+    :type lun: int
+    :param name: The disk name.
+    :type name: str
+    :param vhd: The virtual hard disk.
+    :type vhd: ~azure.mgmt.compute.v2018_06_01.models.VirtualHardDisk
+    :param image: The source user image virtual hard disk. The virtual hard
+     disk will be copied before being attached to the virtual machine. If
+     SourceImage is provided, the destination virtual hard drive must not
+     exist.
+    :type image: ~azure.mgmt.compute.v2018_06_01.models.VirtualHardDisk
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_06_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :param create_option: Required. Specifies how the virtual machine should
+     be created.<br><br> Possible values are:<br><br> **Attach** \\u2013 This
+     value is used when you are using a specialized disk to create the virtual
+     machine.<br><br> **FromImage** \\u2013 This value is used when you are
+     using an image to create the virtual machine. If you are using a platform
+     image, you also use the imageReference element described above. If you are
+     using a marketplace image, you  also use the plan element previously
+     described. 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 an empty data disk in
+     gigabytes. This element can be used to overwrite the name 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.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_06_01.models.ManagedDiskParameters
+    """
+
+    _validation = {
+        'lun': {'required': True},
+        'create_option': {'required': True},
+    }
+
+    _attribute_map = {
+        'lun': {'key': 'lun', 'type': 'int'},
+        'name': {'key': 'name', 'type': 'str'},
+        'vhd': {'key': 'vhd', 'type': 'VirtualHardDisk'},
+        'image': {'key': 'image', 'type': 'VirtualHardDisk'},
+        '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'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'ManagedDiskParameters'},
+    }
+
+    def __init__(self, *, lun: int, create_option, name: str=None, vhd=None, image=None, caching=None, write_accelerator_enabled: bool=None, disk_size_gb: int=None, managed_disk=None, **kwargs) -> None:
+        super(DataDisk, self).__init__(**kwargs)
+        self.lun = lun
+        self.name = name
+        self.vhd = vhd
+        self.image = image
+        self.caching = caching
+        self.write_accelerator_enabled = write_accelerator_enabled
+        self.create_option = create_option
+        self.disk_size_gb = disk_size_gb
+        self.managed_disk = managed_disk
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/diagnostics_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/diagnostics_profile.py
new file mode 100644
index 000000000000..79cfd1e65745
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/diagnostics_profile.py
@@ -0,0 +1,34 @@
+# 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 DiagnosticsProfile(Model):
+    """Specifies the boot diagnostic settings state. <br><br>Minimum api-version:
+    2015-06-15.
+
+    :param boot_diagnostics: Boot Diagnostics is a debugging feature which
+     allows you to view Console Output and Screenshot to diagnose VM status.
+     <br><br> For Linux Virtual Machines, you can easily view the output of
+     your console log. <br><br> For both Windows and Linux virtual machines,
+     Azure also enables you to see a screenshot of the VM from the hypervisor.
+    :type boot_diagnostics:
+     ~azure.mgmt.compute.v2018_06_01.models.BootDiagnostics
+    """
+
+    _attribute_map = {
+        'boot_diagnostics': {'key': 'bootDiagnostics', 'type': 'BootDiagnostics'},
+    }
+
+    def __init__(self, **kwargs):
+        super(DiagnosticsProfile, self).__init__(**kwargs)
+        self.boot_diagnostics = kwargs.get('boot_diagnostics', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/diagnostics_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/diagnostics_profile_py3.py
new file mode 100644
index 000000000000..472d61da6fba
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/diagnostics_profile_py3.py
@@ -0,0 +1,34 @@
+# 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 DiagnosticsProfile(Model):
+    """Specifies the boot diagnostic settings state. <br><br>Minimum api-version:
+    2015-06-15.
+
+    :param boot_diagnostics: Boot Diagnostics is a debugging feature which
+     allows you to view Console Output and Screenshot to diagnose VM status.
+     <br><br> For Linux Virtual Machines, you can easily view the output of
+     your console log. <br><br> For both Windows and Linux virtual machines,
+     Azure also enables you to see a screenshot of the VM from the hypervisor.
+    :type boot_diagnostics:
+     ~azure.mgmt.compute.v2018_06_01.models.BootDiagnostics
+    """
+
+    _attribute_map = {
+        'boot_diagnostics': {'key': 'bootDiagnostics', 'type': 'BootDiagnostics'},
+    }
+
+    def __init__(self, *, boot_diagnostics=None, **kwargs) -> None:
+        super(DiagnosticsProfile, self).__init__(**kwargs)
+        self.boot_diagnostics = boot_diagnostics
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_encryption_settings.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_encryption_settings.py
new file mode 100644
index 000000000000..4963bf2831e5
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_encryption_settings.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 DiskEncryptionSettings(Model):
+    """Describes a Encryption Settings for a Disk.
+
+    :param disk_encryption_key: Specifies the location of the disk encryption
+     key, which is a Key Vault Secret.
+    :type disk_encryption_key:
+     ~azure.mgmt.compute.v2018_06_01.models.KeyVaultSecretReference
+    :param key_encryption_key: Specifies the location of the key encryption
+     key in Key Vault.
+    :type key_encryption_key:
+     ~azure.mgmt.compute.v2018_06_01.models.KeyVaultKeyReference
+    :param enabled: Specifies whether disk encryption should be enabled on the
+     virtual machine.
+    :type enabled: bool
+    """
+
+    _attribute_map = {
+        'disk_encryption_key': {'key': 'diskEncryptionKey', 'type': 'KeyVaultSecretReference'},
+        'key_encryption_key': {'key': 'keyEncryptionKey', 'type': 'KeyVaultKeyReference'},
+        'enabled': {'key': 'enabled', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(DiskEncryptionSettings, self).__init__(**kwargs)
+        self.disk_encryption_key = kwargs.get('disk_encryption_key', None)
+        self.key_encryption_key = kwargs.get('key_encryption_key', None)
+        self.enabled = kwargs.get('enabled', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_encryption_settings_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_encryption_settings_py3.py
new file mode 100644
index 000000000000..05ea2823bcf4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_encryption_settings_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 DiskEncryptionSettings(Model):
+    """Describes a Encryption Settings for a Disk.
+
+    :param disk_encryption_key: Specifies the location of the disk encryption
+     key, which is a Key Vault Secret.
+    :type disk_encryption_key:
+     ~azure.mgmt.compute.v2018_06_01.models.KeyVaultSecretReference
+    :param key_encryption_key: Specifies the location of the key encryption
+     key in Key Vault.
+    :type key_encryption_key:
+     ~azure.mgmt.compute.v2018_06_01.models.KeyVaultKeyReference
+    :param enabled: Specifies whether disk encryption should be enabled on the
+     virtual machine.
+    :type enabled: bool
+    """
+
+    _attribute_map = {
+        'disk_encryption_key': {'key': 'diskEncryptionKey', 'type': 'KeyVaultSecretReference'},
+        'key_encryption_key': {'key': 'keyEncryptionKey', 'type': 'KeyVaultKeyReference'},
+        'enabled': {'key': 'enabled', 'type': 'bool'},
+    }
+
+    def __init__(self, *, disk_encryption_key=None, key_encryption_key=None, enabled: bool=None, **kwargs) -> None:
+        super(DiskEncryptionSettings, self).__init__(**kwargs)
+        self.disk_encryption_key = disk_encryption_key
+        self.key_encryption_key = key_encryption_key
+        self.enabled = enabled
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_instance_view.py
new file mode 100644
index 000000000000..5547326ab911
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_instance_view.py
@@ -0,0 +1,39 @@
+# 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 DiskInstanceView(Model):
+    """The instance view of the disk.
+
+    :param name: The disk name.
+    :type name: str
+    :param encryption_settings: Specifies the encryption settings for the OS
+     Disk. <br><br> Minimum api-version: 2015-06-15
+    :type encryption_settings:
+     list[~azure.mgmt.compute.v2018_06_01.models.DiskEncryptionSettings]
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_06_01.models.InstanceViewStatus]
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'encryption_settings': {'key': 'encryptionSettings', 'type': '[DiskEncryptionSettings]'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(DiskInstanceView, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.encryption_settings = kwargs.get('encryption_settings', None)
+        self.statuses = kwargs.get('statuses', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_instance_view_py3.py
new file mode 100644
index 000000000000..f25091adab47
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/disk_instance_view_py3.py
@@ -0,0 +1,39 @@
+# 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 DiskInstanceView(Model):
+    """The instance view of the disk.
+
+    :param name: The disk name.
+    :type name: str
+    :param encryption_settings: Specifies the encryption settings for the OS
+     Disk. <br><br> Minimum api-version: 2015-06-15
+    :type encryption_settings:
+     list[~azure.mgmt.compute.v2018_06_01.models.DiskEncryptionSettings]
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_06_01.models.InstanceViewStatus]
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'encryption_settings': {'key': 'encryptionSettings', 'type': '[DiskEncryptionSettings]'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, *, name: str=None, encryption_settings=None, statuses=None, **kwargs) -> None:
+        super(DiskInstanceView, self).__init__(**kwargs)
+        self.name = name
+        self.encryption_settings = encryption_settings
+        self.statuses = statuses
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/hardware_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/hardware_profile.py
new file mode 100644
index 000000000000..4d0bee440154
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/hardware_profile.py
@@ -0,0 +1,85 @@
+# 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 HardwareProfile(Model):
+    """Specifies the hardware settings for the virtual machine.
+
+    :param vm_size: Specifies the size of the virtual machine. For more
+     information about virtual machine sizes, see [Sizes for virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-sizes?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+     <br><br> The available VM sizes depend on region and availability set. For
+     a list of available sizes use these APIs:  <br><br> [List all available
+     virtual machine sizes in an availability
+     set](https://docs.microsoft.com/rest/api/compute/availabilitysets/listavailablesizes)
+     <br><br> [List all available virtual machine sizes in a
+     region](https://docs.microsoft.com/rest/api/compute/virtualmachinesizes/list)
+     <br><br> [List all available virtual machine sizes for
+     resizing](https://docs.microsoft.com/rest/api/compute/virtualmachines/listavailablesizes).
+     Possible values include: 'Basic_A0', 'Basic_A1', 'Basic_A2', 'Basic_A3',
+     'Basic_A4', 'Standard_A0', 'Standard_A1', 'Standard_A2', 'Standard_A3',
+     'Standard_A4', 'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8',
+     'Standard_A9', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2',
+     'Standard_A2_v2', 'Standard_A4_v2', 'Standard_A8_v2', 'Standard_A2m_v2',
+     'Standard_A4m_v2', 'Standard_A8m_v2', 'Standard_B1s', 'Standard_B1ms',
+     'Standard_B2s', 'Standard_B2ms', 'Standard_B4ms', 'Standard_B8ms',
+     'Standard_D1', 'Standard_D2', 'Standard_D3', 'Standard_D4',
+     'Standard_D11', 'Standard_D12', 'Standard_D13', 'Standard_D14',
+     'Standard_D1_v2', 'Standard_D2_v2', 'Standard_D3_v2', 'Standard_D4_v2',
+     'Standard_D5_v2', 'Standard_D2_v3', 'Standard_D4_v3', 'Standard_D8_v3',
+     'Standard_D16_v3', 'Standard_D32_v3', 'Standard_D64_v3',
+     'Standard_D2s_v3', 'Standard_D4s_v3', 'Standard_D8s_v3',
+     'Standard_D16s_v3', 'Standard_D32s_v3', 'Standard_D64s_v3',
+     'Standard_D11_v2', 'Standard_D12_v2', 'Standard_D13_v2',
+     'Standard_D14_v2', 'Standard_D15_v2', 'Standard_DS1', 'Standard_DS2',
+     'Standard_DS3', 'Standard_DS4', 'Standard_DS11', 'Standard_DS12',
+     'Standard_DS13', 'Standard_DS14', 'Standard_DS1_v2', 'Standard_DS2_v2',
+     'Standard_DS3_v2', 'Standard_DS4_v2', 'Standard_DS5_v2',
+     'Standard_DS11_v2', 'Standard_DS12_v2', 'Standard_DS13_v2',
+     'Standard_DS14_v2', 'Standard_DS15_v2', 'Standard_DS13-4_v2',
+     'Standard_DS13-2_v2', 'Standard_DS14-8_v2', 'Standard_DS14-4_v2',
+     'Standard_E2_v3', 'Standard_E4_v3', 'Standard_E8_v3', 'Standard_E16_v3',
+     'Standard_E32_v3', 'Standard_E64_v3', 'Standard_E2s_v3',
+     'Standard_E4s_v3', 'Standard_E8s_v3', 'Standard_E16s_v3',
+     'Standard_E32s_v3', 'Standard_E64s_v3', 'Standard_E32-16_v3',
+     'Standard_E32-8s_v3', 'Standard_E64-32s_v3', 'Standard_E64-16s_v3',
+     'Standard_F1', 'Standard_F2', 'Standard_F4', 'Standard_F8',
+     'Standard_F16', 'Standard_F1s', 'Standard_F2s', 'Standard_F4s',
+     'Standard_F8s', 'Standard_F16s', 'Standard_F2s_v2', 'Standard_F4s_v2',
+     'Standard_F8s_v2', 'Standard_F16s_v2', 'Standard_F32s_v2',
+     'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_G1', 'Standard_G2',
+     'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1',
+     'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS5',
+     'Standard_GS4-8', 'Standard_GS4-4', 'Standard_GS5-16', 'Standard_GS5-8',
+     'Standard_H8', 'Standard_H16', 'Standard_H8m', 'Standard_H16m',
+     'Standard_H16r', 'Standard_H16mr', 'Standard_L4s', 'Standard_L8s',
+     'Standard_L16s', 'Standard_L32s', 'Standard_M64s', 'Standard_M64ms',
+     'Standard_M128s', 'Standard_M128ms', 'Standard_M64-32ms',
+     'Standard_M64-16ms', 'Standard_M128-64ms', 'Standard_M128-32ms',
+     'Standard_NC6', 'Standard_NC12', 'Standard_NC24', 'Standard_NC24r',
+     'Standard_NC6s_v2', 'Standard_NC12s_v2', 'Standard_NC24s_v2',
+     'Standard_NC24rs_v2', 'Standard_NC6s_v3', 'Standard_NC12s_v3',
+     'Standard_NC24s_v3', 'Standard_NC24rs_v3', 'Standard_ND6s',
+     'Standard_ND12s', 'Standard_ND24s', 'Standard_ND24rs', 'Standard_NV6',
+     'Standard_NV12', 'Standard_NV24'
+    :type vm_size: str or
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineSizeTypes
+    """
+
+    _attribute_map = {
+        'vm_size': {'key': 'vmSize', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(HardwareProfile, self).__init__(**kwargs)
+        self.vm_size = kwargs.get('vm_size', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/hardware_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/hardware_profile_py3.py
new file mode 100644
index 000000000000..39de37732177
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/hardware_profile_py3.py
@@ -0,0 +1,85 @@
+# 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 HardwareProfile(Model):
+    """Specifies the hardware settings for the virtual machine.
+
+    :param vm_size: Specifies the size of the virtual machine. For more
+     information about virtual machine sizes, see [Sizes for virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-sizes?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+     <br><br> The available VM sizes depend on region and availability set. For
+     a list of available sizes use these APIs:  <br><br> [List all available
+     virtual machine sizes in an availability
+     set](https://docs.microsoft.com/rest/api/compute/availabilitysets/listavailablesizes)
+     <br><br> [List all available virtual machine sizes in a
+     region](https://docs.microsoft.com/rest/api/compute/virtualmachinesizes/list)
+     <br><br> [List all available virtual machine sizes for
+     resizing](https://docs.microsoft.com/rest/api/compute/virtualmachines/listavailablesizes).
+     Possible values include: 'Basic_A0', 'Basic_A1', 'Basic_A2', 'Basic_A3',
+     'Basic_A4', 'Standard_A0', 'Standard_A1', 'Standard_A2', 'Standard_A3',
+     'Standard_A4', 'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8',
+     'Standard_A9', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2',
+     'Standard_A2_v2', 'Standard_A4_v2', 'Standard_A8_v2', 'Standard_A2m_v2',
+     'Standard_A4m_v2', 'Standard_A8m_v2', 'Standard_B1s', 'Standard_B1ms',
+     'Standard_B2s', 'Standard_B2ms', 'Standard_B4ms', 'Standard_B8ms',
+     'Standard_D1', 'Standard_D2', 'Standard_D3', 'Standard_D4',
+     'Standard_D11', 'Standard_D12', 'Standard_D13', 'Standard_D14',
+     'Standard_D1_v2', 'Standard_D2_v2', 'Standard_D3_v2', 'Standard_D4_v2',
+     'Standard_D5_v2', 'Standard_D2_v3', 'Standard_D4_v3', 'Standard_D8_v3',
+     'Standard_D16_v3', 'Standard_D32_v3', 'Standard_D64_v3',
+     'Standard_D2s_v3', 'Standard_D4s_v3', 'Standard_D8s_v3',
+     'Standard_D16s_v3', 'Standard_D32s_v3', 'Standard_D64s_v3',
+     'Standard_D11_v2', 'Standard_D12_v2', 'Standard_D13_v2',
+     'Standard_D14_v2', 'Standard_D15_v2', 'Standard_DS1', 'Standard_DS2',
+     'Standard_DS3', 'Standard_DS4', 'Standard_DS11', 'Standard_DS12',
+     'Standard_DS13', 'Standard_DS14', 'Standard_DS1_v2', 'Standard_DS2_v2',
+     'Standard_DS3_v2', 'Standard_DS4_v2', 'Standard_DS5_v2',
+     'Standard_DS11_v2', 'Standard_DS12_v2', 'Standard_DS13_v2',
+     'Standard_DS14_v2', 'Standard_DS15_v2', 'Standard_DS13-4_v2',
+     'Standard_DS13-2_v2', 'Standard_DS14-8_v2', 'Standard_DS14-4_v2',
+     'Standard_E2_v3', 'Standard_E4_v3', 'Standard_E8_v3', 'Standard_E16_v3',
+     'Standard_E32_v3', 'Standard_E64_v3', 'Standard_E2s_v3',
+     'Standard_E4s_v3', 'Standard_E8s_v3', 'Standard_E16s_v3',
+     'Standard_E32s_v3', 'Standard_E64s_v3', 'Standard_E32-16_v3',
+     'Standard_E32-8s_v3', 'Standard_E64-32s_v3', 'Standard_E64-16s_v3',
+     'Standard_F1', 'Standard_F2', 'Standard_F4', 'Standard_F8',
+     'Standard_F16', 'Standard_F1s', 'Standard_F2s', 'Standard_F4s',
+     'Standard_F8s', 'Standard_F16s', 'Standard_F2s_v2', 'Standard_F4s_v2',
+     'Standard_F8s_v2', 'Standard_F16s_v2', 'Standard_F32s_v2',
+     'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_G1', 'Standard_G2',
+     'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1',
+     'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS5',
+     'Standard_GS4-8', 'Standard_GS4-4', 'Standard_GS5-16', 'Standard_GS5-8',
+     'Standard_H8', 'Standard_H16', 'Standard_H8m', 'Standard_H16m',
+     'Standard_H16r', 'Standard_H16mr', 'Standard_L4s', 'Standard_L8s',
+     'Standard_L16s', 'Standard_L32s', 'Standard_M64s', 'Standard_M64ms',
+     'Standard_M128s', 'Standard_M128ms', 'Standard_M64-32ms',
+     'Standard_M64-16ms', 'Standard_M128-64ms', 'Standard_M128-32ms',
+     'Standard_NC6', 'Standard_NC12', 'Standard_NC24', 'Standard_NC24r',
+     'Standard_NC6s_v2', 'Standard_NC12s_v2', 'Standard_NC24s_v2',
+     'Standard_NC24rs_v2', 'Standard_NC6s_v3', 'Standard_NC12s_v3',
+     'Standard_NC24s_v3', 'Standard_NC24rs_v3', 'Standard_ND6s',
+     'Standard_ND12s', 'Standard_ND24s', 'Standard_ND24rs', 'Standard_NV6',
+     'Standard_NV12', 'Standard_NV24'
+    :type vm_size: str or
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineSizeTypes
+    """
+
+    _attribute_map = {
+        'vm_size': {'key': 'vmSize', 'type': 'str'},
+    }
+
+    def __init__(self, *, vm_size=None, **kwargs) -> None:
+        super(HardwareProfile, self).__init__(**kwargs)
+        self.vm_size = vm_size
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image.py
new file mode 100644
index 000000000000..b059cea001e2
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image.py
@@ -0,0 +1,70 @@
+# 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 Image(Resource):
+    """The source user image virtual hard disk. The virtual hard disk will be
+    copied before being attached to the virtual machine. If SourceImage is
+    provided, the destination virtual hard drive must not exist.
+
+    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]
+    :param source_virtual_machine: The source virtual machine from which Image
+     is created.
+    :type source_virtual_machine:
+     ~azure.mgmt.compute.v2018_06_01.models.SubResource
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.ImageStorageProfile
+    :ivar provisioning_state: The provisioning state.
+    :vartype provisioning_state: str
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'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}'},
+        'source_virtual_machine': {'key': 'properties.sourceVirtualMachine', 'type': 'SubResource'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'ImageStorageProfile'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(Image, self).__init__(**kwargs)
+        self.source_virtual_machine = kwargs.get('source_virtual_machine', None)
+        self.storage_profile = kwargs.get('storage_profile', None)
+        self.provisioning_state = None
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
new file mode 100644
index 000000000000..ef006422c907
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_data_disk.py
@@ -0,0 +1,69 @@
+# 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 ImageDataDisk(Model):
+    """Describes a data disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param lun: Required. Specifies the logical unit number of the data disk.
+     This value is used to identify data disks within the VM and therefore must
+     be unique for each data disk attached to a VM.
+    :type lun: int
+    :param snapshot: The snapshot.
+    :type snapshot: ~azure.mgmt.compute.v2018_06_01.models.SubResource
+    :param managed_disk: The managedDisk.
+    :type managed_disk: ~azure.mgmt.compute.v2018_06_01.models.SubResource
+    :param blob_uri: The Virtual Hard Disk.
+    :type blob_uri: str
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_06_01.models.CachingTypes
+    :param disk_size_gb: Specifies the size of empty data disks in gigabytes.
+     This element can be used to overwrite the name of the disk in a virtual
+     machine image. <br><br> This value cannot be larger than 1023 GB
+    :type disk_size_gb: int
+    :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'
+    :type storage_account_type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.StorageAccountTypes
+    """
+
+    _validation = {
+        'lun': {'required': True},
+    }
+
+    _attribute_map = {
+        'lun': {'key': 'lun', 'type': 'int'},
+        'snapshot': {'key': 'snapshot', 'type': 'SubResource'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'SubResource'},
+        'blob_uri': {'key': 'blobUri', 'type': 'str'},
+        'caching': {'key': 'caching', 'type': 'CachingTypes'},
+        'disk_size_gb': {'key': 'diskSizeGB', 'type': 'int'},
+        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ImageDataDisk, self).__init__(**kwargs)
+        self.lun = kwargs.get('lun', None)
+        self.snapshot = kwargs.get('snapshot', None)
+        self.managed_disk = kwargs.get('managed_disk', None)
+        self.blob_uri = kwargs.get('blob_uri', None)
+        self.caching = kwargs.get('caching', None)
+        self.disk_size_gb = kwargs.get('disk_size_gb', None)
+        self.storage_account_type = kwargs.get('storage_account_type', None)
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
new file mode 100644
index 000000000000..ca60113b45bf
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_data_disk_py3.py
@@ -0,0 +1,69 @@
+# 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 ImageDataDisk(Model):
+    """Describes a data disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param lun: Required. Specifies the logical unit number of the data disk.
+     This value is used to identify data disks within the VM and therefore must
+     be unique for each data disk attached to a VM.
+    :type lun: int
+    :param snapshot: The snapshot.
+    :type snapshot: ~azure.mgmt.compute.v2018_06_01.models.SubResource
+    :param managed_disk: The managedDisk.
+    :type managed_disk: ~azure.mgmt.compute.v2018_06_01.models.SubResource
+    :param blob_uri: The Virtual Hard Disk.
+    :type blob_uri: str
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_06_01.models.CachingTypes
+    :param disk_size_gb: Specifies the size of empty data disks in gigabytes.
+     This element can be used to overwrite the name of the disk in a virtual
+     machine image. <br><br> This value cannot be larger than 1023 GB
+    :type disk_size_gb: int
+    :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'
+    :type storage_account_type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.StorageAccountTypes
+    """
+
+    _validation = {
+        'lun': {'required': True},
+    }
+
+    _attribute_map = {
+        'lun': {'key': 'lun', 'type': 'int'},
+        'snapshot': {'key': 'snapshot', 'type': 'SubResource'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'SubResource'},
+        'blob_uri': {'key': 'blobUri', 'type': 'str'},
+        'caching': {'key': 'caching', 'type': 'CachingTypes'},
+        'disk_size_gb': {'key': 'diskSizeGB', 'type': 'int'},
+        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
+    }
+
+    def __init__(self, *, lun: int, snapshot=None, managed_disk=None, blob_uri: str=None, caching=None, disk_size_gb: int=None, storage_account_type=None, **kwargs) -> None:
+        super(ImageDataDisk, self).__init__(**kwargs)
+        self.lun = lun
+        self.snapshot = snapshot
+        self.managed_disk = managed_disk
+        self.blob_uri = blob_uri
+        self.caching = caching
+        self.disk_size_gb = disk_size_gb
+        self.storage_account_type = storage_account_type
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
new file mode 100644
index 000000000000..6cf7454c0e37
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_os_disk.py
@@ -0,0 +1,78 @@
+# 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 ImageOSDisk(Model):
+    """Describes an Operating System disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :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 a custom image.
+     <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: Required. The OS State. Possible values include:
+     'Generalized', 'Specialized'
+    :type os_state: str or
+     ~azure.mgmt.compute.v2018_06_01.models.OperatingSystemStateTypes
+    :param snapshot: The snapshot.
+    :type snapshot: ~azure.mgmt.compute.v2018_06_01.models.SubResource
+    :param managed_disk: The managedDisk.
+    :type managed_disk: ~azure.mgmt.compute.v2018_06_01.models.SubResource
+    :param blob_uri: The Virtual Hard Disk.
+    :type blob_uri: str
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_06_01.models.CachingTypes
+    :param disk_size_gb: Specifies the size of empty data disks in gigabytes.
+     This element can be used to overwrite the name of the disk in a virtual
+     machine image. <br><br> This value cannot be larger than 1023 GB
+    :type disk_size_gb: int
+    :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'
+    :type storage_account_type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.StorageAccountTypes
+    """
+
+    _validation = {
+        'os_type': {'required': True},
+        'os_state': {'required': True},
+    }
+
+    _attribute_map = {
+        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
+        'os_state': {'key': 'osState', 'type': 'OperatingSystemStateTypes'},
+        'snapshot': {'key': 'snapshot', 'type': 'SubResource'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'SubResource'},
+        'blob_uri': {'key': 'blobUri', 'type': 'str'},
+        'caching': {'key': 'caching', 'type': 'CachingTypes'},
+        'disk_size_gb': {'key': 'diskSizeGB', 'type': 'int'},
+        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ImageOSDisk, self).__init__(**kwargs)
+        self.os_type = kwargs.get('os_type', None)
+        self.os_state = kwargs.get('os_state', None)
+        self.snapshot = kwargs.get('snapshot', None)
+        self.managed_disk = kwargs.get('managed_disk', None)
+        self.blob_uri = kwargs.get('blob_uri', None)
+        self.caching = kwargs.get('caching', None)
+        self.disk_size_gb = kwargs.get('disk_size_gb', None)
+        self.storage_account_type = kwargs.get('storage_account_type', None)
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
new file mode 100644
index 000000000000..3f402e67cf9e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_os_disk_py3.py
@@ -0,0 +1,78 @@
+# 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 ImageOSDisk(Model):
+    """Describes an Operating System disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :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 a custom image.
+     <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: Required. The OS State. Possible values include:
+     'Generalized', 'Specialized'
+    :type os_state: str or
+     ~azure.mgmt.compute.v2018_06_01.models.OperatingSystemStateTypes
+    :param snapshot: The snapshot.
+    :type snapshot: ~azure.mgmt.compute.v2018_06_01.models.SubResource
+    :param managed_disk: The managedDisk.
+    :type managed_disk: ~azure.mgmt.compute.v2018_06_01.models.SubResource
+    :param blob_uri: The Virtual Hard Disk.
+    :type blob_uri: str
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_06_01.models.CachingTypes
+    :param disk_size_gb: Specifies the size of empty data disks in gigabytes.
+     This element can be used to overwrite the name of the disk in a virtual
+     machine image. <br><br> This value cannot be larger than 1023 GB
+    :type disk_size_gb: int
+    :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'
+    :type storage_account_type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.StorageAccountTypes
+    """
+
+    _validation = {
+        'os_type': {'required': True},
+        'os_state': {'required': True},
+    }
+
+    _attribute_map = {
+        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
+        'os_state': {'key': 'osState', 'type': 'OperatingSystemStateTypes'},
+        'snapshot': {'key': 'snapshot', 'type': 'SubResource'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'SubResource'},
+        'blob_uri': {'key': 'blobUri', 'type': 'str'},
+        'caching': {'key': 'caching', 'type': 'CachingTypes'},
+        'disk_size_gb': {'key': 'diskSizeGB', 'type': 'int'},
+        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
+    }
+
+    def __init__(self, *, os_type, os_state, snapshot=None, managed_disk=None, blob_uri: str=None, caching=None, disk_size_gb: int=None, storage_account_type=None, **kwargs) -> None:
+        super(ImageOSDisk, self).__init__(**kwargs)
+        self.os_type = os_type
+        self.os_state = os_state
+        self.snapshot = snapshot
+        self.managed_disk = managed_disk
+        self.blob_uri = blob_uri
+        self.caching = caching
+        self.disk_size_gb = disk_size_gb
+        self.storage_account_type = storage_account_type
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_paged.py
new file mode 100644
index 000000000000..bd91758bd2d3
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_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 ImagePaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`Image <azure.mgmt.compute.v2018_06_01.models.Image>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[Image]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(ImagePaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_py3.py
new file mode 100644
index 000000000000..edab16a19ec3
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_py3.py
@@ -0,0 +1,70 @@
+# 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 Image(Resource):
+    """The source user image virtual hard disk. The virtual hard disk will be
+    copied before being attached to the virtual machine. If SourceImage is
+    provided, the destination virtual hard drive must not exist.
+
+    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]
+    :param source_virtual_machine: The source virtual machine from which Image
+     is created.
+    :type source_virtual_machine:
+     ~azure.mgmt.compute.v2018_06_01.models.SubResource
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.ImageStorageProfile
+    :ivar provisioning_state: The provisioning state.
+    :vartype provisioning_state: str
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'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}'},
+        'source_virtual_machine': {'key': 'properties.sourceVirtualMachine', 'type': 'SubResource'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'ImageStorageProfile'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+    }
+
+    def __init__(self, *, location: str, tags=None, source_virtual_machine=None, storage_profile=None, **kwargs) -> None:
+        super(Image, self).__init__(location=location, tags=tags, **kwargs)
+        self.source_virtual_machine = source_virtual_machine
+        self.storage_profile = storage_profile
+        self.provisioning_state = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_reference.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_reference.py
new file mode 100644
index 000000000000..b8f929f4ad70
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_reference.py
@@ -0,0 +1,54 @@
+# 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 .sub_resource import SubResource
+
+
+class ImageReference(SubResource):
+    """Specifies information about the image to use. You can specify information
+    about platform images, marketplace images, or virtual machine images. This
+    element is required when you want to use a platform image, marketplace
+    image, or virtual machine image, but is not used in other creation
+    operations.
+
+    :param id: Resource Id
+    :type id: str
+    :param publisher: The image publisher.
+    :type publisher: str
+    :param offer: Specifies the offer of the platform image or marketplace
+     image used to create the virtual machine.
+    :type offer: str
+    :param sku: The image SKU.
+    :type sku: str
+    :param version: Specifies the version of the platform image or marketplace
+     image used to create the virtual machine. The allowed formats are
+     Major.Minor.Build or 'latest'. Major, Minor, and Build are decimal
+     numbers. Specify 'latest' to use the latest version of an image available
+     at deploy time. Even if you use 'latest', the VM image will not
+     automatically update after deploy time even if a new version becomes
+     available.
+    :type version: str
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'publisher': {'key': 'publisher', 'type': 'str'},
+        'offer': {'key': 'offer', 'type': 'str'},
+        'sku': {'key': 'sku', 'type': 'str'},
+        'version': {'key': 'version', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ImageReference, self).__init__(**kwargs)
+        self.publisher = kwargs.get('publisher', None)
+        self.offer = kwargs.get('offer', None)
+        self.sku = kwargs.get('sku', None)
+        self.version = kwargs.get('version', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_reference_py3.py
new file mode 100644
index 000000000000..1d7eefe5ac65
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_reference_py3.py
@@ -0,0 +1,54 @@
+# 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 .sub_resource_py3 import SubResource
+
+
+class ImageReference(SubResource):
+    """Specifies information about the image to use. You can specify information
+    about platform images, marketplace images, or virtual machine images. This
+    element is required when you want to use a platform image, marketplace
+    image, or virtual machine image, but is not used in other creation
+    operations.
+
+    :param id: Resource Id
+    :type id: str
+    :param publisher: The image publisher.
+    :type publisher: str
+    :param offer: Specifies the offer of the platform image or marketplace
+     image used to create the virtual machine.
+    :type offer: str
+    :param sku: The image SKU.
+    :type sku: str
+    :param version: Specifies the version of the platform image or marketplace
+     image used to create the virtual machine. The allowed formats are
+     Major.Minor.Build or 'latest'. Major, Minor, and Build are decimal
+     numbers. Specify 'latest' to use the latest version of an image available
+     at deploy time. Even if you use 'latest', the VM image will not
+     automatically update after deploy time even if a new version becomes
+     available.
+    :type version: str
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'publisher': {'key': 'publisher', 'type': 'str'},
+        'offer': {'key': 'offer', 'type': 'str'},
+        'sku': {'key': 'sku', 'type': 'str'},
+        'version': {'key': 'version', 'type': 'str'},
+    }
+
+    def __init__(self, *, id: str=None, publisher: str=None, offer: str=None, sku: str=None, version: str=None, **kwargs) -> None:
+        super(ImageReference, self).__init__(id=id, **kwargs)
+        self.publisher = publisher
+        self.offer = offer
+        self.sku = sku
+        self.version = version
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_storage_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_storage_profile.py
new file mode 100644
index 000000000000..035adb2c538c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_storage_profile.py
@@ -0,0 +1,45 @@
+# 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 ImageStorageProfile(Model):
+    """Describes a storage profile.
+
+    :param os_disk: Specifies information about the operating system disk used
+     by the virtual machine. <br><br> For more information about disks, see
+     [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type os_disk: ~azure.mgmt.compute.v2018_06_01.models.ImageOSDisk
+    :param data_disks: Specifies the parameters that are used to add a data
+     disk to a virtual machine. <br><br> For more information about disks, see
+     [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type data_disks:
+     list[~azure.mgmt.compute.v2018_06_01.models.ImageDataDisk]
+    :param zone_resilient: Specifies whether an image is zone resilient or
+     not. Default is false. Zone resilient images can be created only in
+     regions that provide Zone Redundant Storage (ZRS).
+    :type zone_resilient: bool
+    """
+
+    _attribute_map = {
+        'os_disk': {'key': 'osDisk', 'type': 'ImageOSDisk'},
+        'data_disks': {'key': 'dataDisks', 'type': '[ImageDataDisk]'},
+        'zone_resilient': {'key': 'zoneResilient', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ImageStorageProfile, self).__init__(**kwargs)
+        self.os_disk = kwargs.get('os_disk', None)
+        self.data_disks = kwargs.get('data_disks', None)
+        self.zone_resilient = kwargs.get('zone_resilient', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_storage_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_storage_profile_py3.py
new file mode 100644
index 000000000000..f359b74fe49f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_storage_profile_py3.py
@@ -0,0 +1,45 @@
+# 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 ImageStorageProfile(Model):
+    """Describes a storage profile.
+
+    :param os_disk: Specifies information about the operating system disk used
+     by the virtual machine. <br><br> For more information about disks, see
+     [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type os_disk: ~azure.mgmt.compute.v2018_06_01.models.ImageOSDisk
+    :param data_disks: Specifies the parameters that are used to add a data
+     disk to a virtual machine. <br><br> For more information about disks, see
+     [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type data_disks:
+     list[~azure.mgmt.compute.v2018_06_01.models.ImageDataDisk]
+    :param zone_resilient: Specifies whether an image is zone resilient or
+     not. Default is false. Zone resilient images can be created only in
+     regions that provide Zone Redundant Storage (ZRS).
+    :type zone_resilient: bool
+    """
+
+    _attribute_map = {
+        'os_disk': {'key': 'osDisk', 'type': 'ImageOSDisk'},
+        'data_disks': {'key': 'dataDisks', 'type': '[ImageDataDisk]'},
+        'zone_resilient': {'key': 'zoneResilient', 'type': 'bool'},
+    }
+
+    def __init__(self, *, os_disk=None, data_disks=None, zone_resilient: bool=None, **kwargs) -> None:
+        super(ImageStorageProfile, self).__init__(**kwargs)
+        self.os_disk = os_disk
+        self.data_disks = data_disks
+        self.zone_resilient = zone_resilient
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_update.py
new file mode 100644
index 000000000000..f294f5592de3
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_update.py
@@ -0,0 +1,50 @@
+# 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 .update_resource import UpdateResource
+
+
+class ImageUpdate(UpdateResource):
+    """The source user image virtual hard disk. Only tags may be updated.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param source_virtual_machine: The source virtual machine from which Image
+     is created.
+    :type source_virtual_machine:
+     ~azure.mgmt.compute.v2018_06_01.models.SubResource
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.ImageStorageProfile
+    :ivar provisioning_state: The provisioning state.
+    :vartype provisioning_state: str
+    """
+
+    _validation = {
+        'provisioning_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'source_virtual_machine': {'key': 'properties.sourceVirtualMachine', 'type': 'SubResource'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'ImageStorageProfile'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ImageUpdate, self).__init__(**kwargs)
+        self.source_virtual_machine = kwargs.get('source_virtual_machine', None)
+        self.storage_profile = kwargs.get('storage_profile', None)
+        self.provisioning_state = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_update_py3.py
new file mode 100644
index 000000000000..effbc357fd43
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/image_update_py3.py
@@ -0,0 +1,50 @@
+# 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 .update_resource_py3 import UpdateResource
+
+
+class ImageUpdate(UpdateResource):
+    """The source user image virtual hard disk. Only tags may be updated.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param source_virtual_machine: The source virtual machine from which Image
+     is created.
+    :type source_virtual_machine:
+     ~azure.mgmt.compute.v2018_06_01.models.SubResource
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.ImageStorageProfile
+    :ivar provisioning_state: The provisioning state.
+    :vartype provisioning_state: str
+    """
+
+    _validation = {
+        'provisioning_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'source_virtual_machine': {'key': 'properties.sourceVirtualMachine', 'type': 'SubResource'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'ImageStorageProfile'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+    }
+
+    def __init__(self, *, tags=None, source_virtual_machine=None, storage_profile=None, **kwargs) -> None:
+        super(ImageUpdate, self).__init__(tags=tags, **kwargs)
+        self.source_virtual_machine = source_virtual_machine
+        self.storage_profile = storage_profile
+        self.provisioning_state = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/instance_view_status.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/instance_view_status.py
new file mode 100644
index 000000000000..3de16cb0d1d2
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/instance_view_status.py
@@ -0,0 +1,47 @@
+# 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 InstanceViewStatus(Model):
+    """Instance view status.
+
+    :param code: The status code.
+    :type code: str
+    :param level: The level code. Possible values include: 'Info', 'Warning',
+     'Error'
+    :type level: str or
+     ~azure.mgmt.compute.v2018_06_01.models.StatusLevelTypes
+    :param display_status: The short localizable label for the status.
+    :type display_status: str
+    :param message: The detailed status message, including for alerts and
+     error messages.
+    :type message: str
+    :param time: The time of the status.
+    :type time: datetime
+    """
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'str'},
+        'level': {'key': 'level', 'type': 'StatusLevelTypes'},
+        'display_status': {'key': 'displayStatus', 'type': 'str'},
+        'message': {'key': 'message', 'type': 'str'},
+        'time': {'key': 'time', 'type': 'iso-8601'},
+    }
+
+    def __init__(self, **kwargs):
+        super(InstanceViewStatus, self).__init__(**kwargs)
+        self.code = kwargs.get('code', None)
+        self.level = kwargs.get('level', None)
+        self.display_status = kwargs.get('display_status', None)
+        self.message = kwargs.get('message', None)
+        self.time = kwargs.get('time', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/instance_view_status_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/instance_view_status_py3.py
new file mode 100644
index 000000000000..2098b03be405
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/instance_view_status_py3.py
@@ -0,0 +1,47 @@
+# 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 InstanceViewStatus(Model):
+    """Instance view status.
+
+    :param code: The status code.
+    :type code: str
+    :param level: The level code. Possible values include: 'Info', 'Warning',
+     'Error'
+    :type level: str or
+     ~azure.mgmt.compute.v2018_06_01.models.StatusLevelTypes
+    :param display_status: The short localizable label for the status.
+    :type display_status: str
+    :param message: The detailed status message, including for alerts and
+     error messages.
+    :type message: str
+    :param time: The time of the status.
+    :type time: datetime
+    """
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'str'},
+        'level': {'key': 'level', 'type': 'StatusLevelTypes'},
+        'display_status': {'key': 'displayStatus', 'type': 'str'},
+        'message': {'key': 'message', 'type': 'str'},
+        'time': {'key': 'time', 'type': 'iso-8601'},
+    }
+
+    def __init__(self, *, code: str=None, level=None, display_status: str=None, message: str=None, time=None, **kwargs) -> None:
+        super(InstanceViewStatus, self).__init__(**kwargs)
+        self.code = code
+        self.level = level
+        self.display_status = display_status
+        self.message = message
+        self.time = time
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/key_vault_key_reference.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/key_vault_key_reference.py
new file mode 100644
index 000000000000..982bcf7f2275
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/key_vault_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 KeyVaultKeyReference(Model):
+    """Describes a reference to Key Vault Key.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param key_url: Required. The URL referencing a key encryption key in Key
+     Vault.
+    :type key_url: str
+    :param source_vault: Required. The relative URL of the Key Vault
+     containing the key.
+    :type source_vault: ~azure.mgmt.compute.v2018_06_01.models.SubResource
+    """
+
+    _validation = {
+        'key_url': {'required': True},
+        'source_vault': {'required': True},
+    }
+
+    _attribute_map = {
+        'key_url': {'key': 'keyUrl', 'type': 'str'},
+        'source_vault': {'key': 'sourceVault', 'type': 'SubResource'},
+    }
+
+    def __init__(self, **kwargs):
+        super(KeyVaultKeyReference, self).__init__(**kwargs)
+        self.key_url = kwargs.get('key_url', None)
+        self.source_vault = kwargs.get('source_vault', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/key_vault_key_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/key_vault_key_reference_py3.py
new file mode 100644
index 000000000000..8949ec597000
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/key_vault_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 KeyVaultKeyReference(Model):
+    """Describes a reference to Key Vault Key.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param key_url: Required. The URL referencing a key encryption key in Key
+     Vault.
+    :type key_url: str
+    :param source_vault: Required. The relative URL of the Key Vault
+     containing the key.
+    :type source_vault: ~azure.mgmt.compute.v2018_06_01.models.SubResource
+    """
+
+    _validation = {
+        'key_url': {'required': True},
+        'source_vault': {'required': True},
+    }
+
+    _attribute_map = {
+        'key_url': {'key': 'keyUrl', 'type': 'str'},
+        'source_vault': {'key': 'sourceVault', 'type': 'SubResource'},
+    }
+
+    def __init__(self, *, key_url: str, source_vault, **kwargs) -> None:
+        super(KeyVaultKeyReference, self).__init__(**kwargs)
+        self.key_url = key_url
+        self.source_vault = source_vault
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/key_vault_secret_reference.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/key_vault_secret_reference.py
new file mode 100644
index 000000000000..3fe0ba1f016d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/key_vault_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 KeyVaultSecretReference(Model):
+    """Describes a reference to Key Vault Secret.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param secret_url: Required. The URL referencing a secret in a Key Vault.
+    :type secret_url: str
+    :param source_vault: Required. The relative URL of the Key Vault
+     containing the secret.
+    :type source_vault: ~azure.mgmt.compute.v2018_06_01.models.SubResource
+    """
+
+    _validation = {
+        'secret_url': {'required': True},
+        'source_vault': {'required': True},
+    }
+
+    _attribute_map = {
+        'secret_url': {'key': 'secretUrl', 'type': 'str'},
+        'source_vault': {'key': 'sourceVault', 'type': 'SubResource'},
+    }
+
+    def __init__(self, **kwargs):
+        super(KeyVaultSecretReference, self).__init__(**kwargs)
+        self.secret_url = kwargs.get('secret_url', None)
+        self.source_vault = kwargs.get('source_vault', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/key_vault_secret_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/key_vault_secret_reference_py3.py
new file mode 100644
index 000000000000..a705b0ff48f2
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/key_vault_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 KeyVaultSecretReference(Model):
+    """Describes a reference to Key Vault Secret.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param secret_url: Required. The URL referencing a secret in a Key Vault.
+    :type secret_url: str
+    :param source_vault: Required. The relative URL of the Key Vault
+     containing the secret.
+    :type source_vault: ~azure.mgmt.compute.v2018_06_01.models.SubResource
+    """
+
+    _validation = {
+        'secret_url': {'required': True},
+        'source_vault': {'required': True},
+    }
+
+    _attribute_map = {
+        'secret_url': {'key': 'secretUrl', 'type': 'str'},
+        'source_vault': {'key': 'sourceVault', 'type': 'SubResource'},
+    }
+
+    def __init__(self, *, secret_url: str, source_vault, **kwargs) -> None:
+        super(KeyVaultSecretReference, self).__init__(**kwargs)
+        self.secret_url = secret_url
+        self.source_vault = source_vault
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/linux_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/linux_configuration.py
new file mode 100644
index 000000000000..2cbcb6d5232d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/linux_configuration.py
@@ -0,0 +1,47 @@
+# 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 LinuxConfiguration(Model):
+    """Specifies the Linux operating system settings on the virtual machine.
+    <br><br>For a list of supported Linux distributions, see [Linux on
+    Azure-Endorsed
+    Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    <br><br> For running non-endorsed distributions, see [Information for
+    Non-Endorsed
+    Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
+
+    :param disable_password_authentication: Specifies whether password
+     authentication should be disabled.
+    :type disable_password_authentication: bool
+    :param ssh: Specifies the ssh key configuration for a Linux OS.
+    :type ssh: ~azure.mgmt.compute.v2018_06_01.models.SshConfiguration
+    :param provision_vm_agent: Indicates whether virtual machine agent should
+     be provisioned on the virtual machine. <br><br> When this property is not
+     specified in the request body, default behavior is to set it to true.
+     This will ensure that VM Agent is installed on the VM so that extensions
+     can be added to the VM later.
+    :type provision_vm_agent: bool
+    """
+
+    _attribute_map = {
+        'disable_password_authentication': {'key': 'disablePasswordAuthentication', 'type': 'bool'},
+        'ssh': {'key': 'ssh', 'type': 'SshConfiguration'},
+        'provision_vm_agent': {'key': 'provisionVMAgent', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(LinuxConfiguration, self).__init__(**kwargs)
+        self.disable_password_authentication = kwargs.get('disable_password_authentication', None)
+        self.ssh = kwargs.get('ssh', None)
+        self.provision_vm_agent = kwargs.get('provision_vm_agent', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/linux_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/linux_configuration_py3.py
new file mode 100644
index 000000000000..362feb8a1b99
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/linux_configuration_py3.py
@@ -0,0 +1,47 @@
+# 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 LinuxConfiguration(Model):
+    """Specifies the Linux operating system settings on the virtual machine.
+    <br><br>For a list of supported Linux distributions, see [Linux on
+    Azure-Endorsed
+    Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    <br><br> For running non-endorsed distributions, see [Information for
+    Non-Endorsed
+    Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
+
+    :param disable_password_authentication: Specifies whether password
+     authentication should be disabled.
+    :type disable_password_authentication: bool
+    :param ssh: Specifies the ssh key configuration for a Linux OS.
+    :type ssh: ~azure.mgmt.compute.v2018_06_01.models.SshConfiguration
+    :param provision_vm_agent: Indicates whether virtual machine agent should
+     be provisioned on the virtual machine. <br><br> When this property is not
+     specified in the request body, default behavior is to set it to true.
+     This will ensure that VM Agent is installed on the VM so that extensions
+     can be added to the VM later.
+    :type provision_vm_agent: bool
+    """
+
+    _attribute_map = {
+        'disable_password_authentication': {'key': 'disablePasswordAuthentication', 'type': 'bool'},
+        'ssh': {'key': 'ssh', 'type': 'SshConfiguration'},
+        'provision_vm_agent': {'key': 'provisionVMAgent', 'type': 'bool'},
+    }
+
+    def __init__(self, *, disable_password_authentication: bool=None, ssh=None, provision_vm_agent: bool=None, **kwargs) -> None:
+        super(LinuxConfiguration, self).__init__(**kwargs)
+        self.disable_password_authentication = disable_password_authentication
+        self.ssh = ssh
+        self.provision_vm_agent = provision_vm_agent
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/log_analytics_input_base.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/log_analytics_input_base.py
new file mode 100644
index 000000000000..843b739a0328
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/log_analytics_input_base.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 LogAnalyticsInputBase(Model):
+    """Api input base class for LogAnalytics Api.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param blob_container_sas_uri: Required. SAS Uri of the logging blob
+     container to which LogAnalytics Api writes output logs to.
+    :type blob_container_sas_uri: str
+    :param from_time: Required. From time of the query
+    :type from_time: datetime
+    :param to_time: Required. To time of the query
+    :type to_time: datetime
+    :param group_by_throttle_policy: Group query result by Throttle Policy
+     applied.
+    :type group_by_throttle_policy: bool
+    :param group_by_operation_name: Group query result by  by Operation Name.
+    :type group_by_operation_name: bool
+    :param group_by_resource_name: Group query result by Resource Name.
+    :type group_by_resource_name: bool
+    """
+
+    _validation = {
+        'blob_container_sas_uri': {'required': True},
+        'from_time': {'required': True},
+        'to_time': {'required': True},
+    }
+
+    _attribute_map = {
+        'blob_container_sas_uri': {'key': 'blobContainerSasUri', 'type': 'str'},
+        'from_time': {'key': 'fromTime', 'type': 'iso-8601'},
+        'to_time': {'key': 'toTime', 'type': 'iso-8601'},
+        'group_by_throttle_policy': {'key': 'groupByThrottlePolicy', 'type': 'bool'},
+        'group_by_operation_name': {'key': 'groupByOperationName', 'type': 'bool'},
+        'group_by_resource_name': {'key': 'groupByResourceName', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(LogAnalyticsInputBase, self).__init__(**kwargs)
+        self.blob_container_sas_uri = kwargs.get('blob_container_sas_uri', None)
+        self.from_time = kwargs.get('from_time', None)
+        self.to_time = kwargs.get('to_time', None)
+        self.group_by_throttle_policy = kwargs.get('group_by_throttle_policy', None)
+        self.group_by_operation_name = kwargs.get('group_by_operation_name', None)
+        self.group_by_resource_name = kwargs.get('group_by_resource_name', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/log_analytics_input_base_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/log_analytics_input_base_py3.py
new file mode 100644
index 000000000000..b9420117a8ca
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/log_analytics_input_base_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 LogAnalyticsInputBase(Model):
+    """Api input base class for LogAnalytics Api.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param blob_container_sas_uri: Required. SAS Uri of the logging blob
+     container to which LogAnalytics Api writes output logs to.
+    :type blob_container_sas_uri: str
+    :param from_time: Required. From time of the query
+    :type from_time: datetime
+    :param to_time: Required. To time of the query
+    :type to_time: datetime
+    :param group_by_throttle_policy: Group query result by Throttle Policy
+     applied.
+    :type group_by_throttle_policy: bool
+    :param group_by_operation_name: Group query result by  by Operation Name.
+    :type group_by_operation_name: bool
+    :param group_by_resource_name: Group query result by Resource Name.
+    :type group_by_resource_name: bool
+    """
+
+    _validation = {
+        'blob_container_sas_uri': {'required': True},
+        'from_time': {'required': True},
+        'to_time': {'required': True},
+    }
+
+    _attribute_map = {
+        'blob_container_sas_uri': {'key': 'blobContainerSasUri', 'type': 'str'},
+        'from_time': {'key': 'fromTime', 'type': 'iso-8601'},
+        'to_time': {'key': 'toTime', 'type': 'iso-8601'},
+        'group_by_throttle_policy': {'key': 'groupByThrottlePolicy', 'type': 'bool'},
+        'group_by_operation_name': {'key': 'groupByOperationName', 'type': 'bool'},
+        'group_by_resource_name': {'key': 'groupByResourceName', 'type': 'bool'},
+    }
+
+    def __init__(self, *, blob_container_sas_uri: str, from_time, to_time, group_by_throttle_policy: bool=None, group_by_operation_name: bool=None, group_by_resource_name: bool=None, **kwargs) -> None:
+        super(LogAnalyticsInputBase, self).__init__(**kwargs)
+        self.blob_container_sas_uri = blob_container_sas_uri
+        self.from_time = from_time
+        self.to_time = to_time
+        self.group_by_throttle_policy = group_by_throttle_policy
+        self.group_by_operation_name = group_by_operation_name
+        self.group_by_resource_name = group_by_resource_name
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/log_analytics_operation_result.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/log_analytics_operation_result.py
new file mode 100644
index 000000000000..eeb149cce9cd
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/log_analytics_operation_result.py
@@ -0,0 +1,36 @@
+# 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 LogAnalyticsOperationResult(Model):
+    """LogAnalytics operation status response.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar properties: LogAnalyticsOutput
+    :vartype properties:
+     ~azure.mgmt.compute.v2018_06_01.models.LogAnalyticsOutput
+    """
+
+    _validation = {
+        'properties': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'properties': {'key': 'properties', 'type': 'LogAnalyticsOutput'},
+    }
+
+    def __init__(self, **kwargs):
+        super(LogAnalyticsOperationResult, self).__init__(**kwargs)
+        self.properties = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/log_analytics_operation_result_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/log_analytics_operation_result_py3.py
new file mode 100644
index 000000000000..bb34ad66506a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/log_analytics_operation_result_py3.py
@@ -0,0 +1,36 @@
+# 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 LogAnalyticsOperationResult(Model):
+    """LogAnalytics operation status response.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar properties: LogAnalyticsOutput
+    :vartype properties:
+     ~azure.mgmt.compute.v2018_06_01.models.LogAnalyticsOutput
+    """
+
+    _validation = {
+        'properties': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'properties': {'key': 'properties', 'type': 'LogAnalyticsOutput'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(LogAnalyticsOperationResult, self).__init__(**kwargs)
+        self.properties = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/log_analytics_output.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/log_analytics_output.py
new file mode 100644
index 000000000000..5ea1615011c3
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/log_analytics_output.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 LogAnalyticsOutput(Model):
+    """LogAnalytics output properties.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar output: Output file Uri path to blob container.
+    :vartype output: str
+    """
+
+    _validation = {
+        'output': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'output': {'key': 'output', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(LogAnalyticsOutput, self).__init__(**kwargs)
+        self.output = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/log_analytics_output_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/log_analytics_output_py3.py
new file mode 100644
index 000000000000..71a428a8e49a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/log_analytics_output_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 LogAnalyticsOutput(Model):
+    """LogAnalytics output properties.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar output: Output file Uri path to blob container.
+    :vartype output: str
+    """
+
+    _validation = {
+        'output': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'output': {'key': 'output', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(LogAnalyticsOutput, self).__init__(**kwargs)
+        self.output = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/maintenance_redeploy_status.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/maintenance_redeploy_status.py
new file mode 100644
index 000000000000..ee6ab2934a63
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/maintenance_redeploy_status.py
@@ -0,0 +1,60 @@
+# 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 MaintenanceRedeployStatus(Model):
+    """Maintenance Operation Status.
+
+    :param is_customer_initiated_maintenance_allowed: True, if customer is
+     allowed to perform Maintenance.
+    :type is_customer_initiated_maintenance_allowed: bool
+    :param pre_maintenance_window_start_time: Start Time for the Pre
+     Maintenance Window.
+    :type pre_maintenance_window_start_time: datetime
+    :param pre_maintenance_window_end_time: End Time for the Pre Maintenance
+     Window.
+    :type pre_maintenance_window_end_time: datetime
+    :param maintenance_window_start_time: Start Time for the Maintenance
+     Window.
+    :type maintenance_window_start_time: datetime
+    :param maintenance_window_end_time: End Time for the Maintenance Window.
+    :type maintenance_window_end_time: datetime
+    :param last_operation_result_code: The Last Maintenance Operation Result
+     Code. Possible values include: 'None', 'RetryLater', 'MaintenanceAborted',
+     'MaintenanceCompleted'
+    :type last_operation_result_code: str or
+     ~azure.mgmt.compute.v2018_06_01.models.MaintenanceOperationResultCodeTypes
+    :param last_operation_message: Message returned for the last Maintenance
+     Operation.
+    :type last_operation_message: str
+    """
+
+    _attribute_map = {
+        'is_customer_initiated_maintenance_allowed': {'key': 'isCustomerInitiatedMaintenanceAllowed', 'type': 'bool'},
+        'pre_maintenance_window_start_time': {'key': 'preMaintenanceWindowStartTime', 'type': 'iso-8601'},
+        'pre_maintenance_window_end_time': {'key': 'preMaintenanceWindowEndTime', 'type': 'iso-8601'},
+        'maintenance_window_start_time': {'key': 'maintenanceWindowStartTime', 'type': 'iso-8601'},
+        'maintenance_window_end_time': {'key': 'maintenanceWindowEndTime', 'type': 'iso-8601'},
+        'last_operation_result_code': {'key': 'lastOperationResultCode', 'type': 'MaintenanceOperationResultCodeTypes'},
+        'last_operation_message': {'key': 'lastOperationMessage', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MaintenanceRedeployStatus, self).__init__(**kwargs)
+        self.is_customer_initiated_maintenance_allowed = kwargs.get('is_customer_initiated_maintenance_allowed', None)
+        self.pre_maintenance_window_start_time = kwargs.get('pre_maintenance_window_start_time', None)
+        self.pre_maintenance_window_end_time = kwargs.get('pre_maintenance_window_end_time', None)
+        self.maintenance_window_start_time = kwargs.get('maintenance_window_start_time', None)
+        self.maintenance_window_end_time = kwargs.get('maintenance_window_end_time', None)
+        self.last_operation_result_code = kwargs.get('last_operation_result_code', None)
+        self.last_operation_message = kwargs.get('last_operation_message', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/maintenance_redeploy_status_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/maintenance_redeploy_status_py3.py
new file mode 100644
index 000000000000..435bb41bdabf
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/maintenance_redeploy_status_py3.py
@@ -0,0 +1,60 @@
+# 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 MaintenanceRedeployStatus(Model):
+    """Maintenance Operation Status.
+
+    :param is_customer_initiated_maintenance_allowed: True, if customer is
+     allowed to perform Maintenance.
+    :type is_customer_initiated_maintenance_allowed: bool
+    :param pre_maintenance_window_start_time: Start Time for the Pre
+     Maintenance Window.
+    :type pre_maintenance_window_start_time: datetime
+    :param pre_maintenance_window_end_time: End Time for the Pre Maintenance
+     Window.
+    :type pre_maintenance_window_end_time: datetime
+    :param maintenance_window_start_time: Start Time for the Maintenance
+     Window.
+    :type maintenance_window_start_time: datetime
+    :param maintenance_window_end_time: End Time for the Maintenance Window.
+    :type maintenance_window_end_time: datetime
+    :param last_operation_result_code: The Last Maintenance Operation Result
+     Code. Possible values include: 'None', 'RetryLater', 'MaintenanceAborted',
+     'MaintenanceCompleted'
+    :type last_operation_result_code: str or
+     ~azure.mgmt.compute.v2018_06_01.models.MaintenanceOperationResultCodeTypes
+    :param last_operation_message: Message returned for the last Maintenance
+     Operation.
+    :type last_operation_message: str
+    """
+
+    _attribute_map = {
+        'is_customer_initiated_maintenance_allowed': {'key': 'isCustomerInitiatedMaintenanceAllowed', 'type': 'bool'},
+        'pre_maintenance_window_start_time': {'key': 'preMaintenanceWindowStartTime', 'type': 'iso-8601'},
+        'pre_maintenance_window_end_time': {'key': 'preMaintenanceWindowEndTime', 'type': 'iso-8601'},
+        'maintenance_window_start_time': {'key': 'maintenanceWindowStartTime', 'type': 'iso-8601'},
+        'maintenance_window_end_time': {'key': 'maintenanceWindowEndTime', 'type': 'iso-8601'},
+        'last_operation_result_code': {'key': 'lastOperationResultCode', 'type': 'MaintenanceOperationResultCodeTypes'},
+        'last_operation_message': {'key': 'lastOperationMessage', 'type': 'str'},
+    }
+
+    def __init__(self, *, is_customer_initiated_maintenance_allowed: bool=None, pre_maintenance_window_start_time=None, pre_maintenance_window_end_time=None, maintenance_window_start_time=None, maintenance_window_end_time=None, last_operation_result_code=None, last_operation_message: str=None, **kwargs) -> None:
+        super(MaintenanceRedeployStatus, self).__init__(**kwargs)
+        self.is_customer_initiated_maintenance_allowed = is_customer_initiated_maintenance_allowed
+        self.pre_maintenance_window_start_time = pre_maintenance_window_start_time
+        self.pre_maintenance_window_end_time = pre_maintenance_window_end_time
+        self.maintenance_window_start_time = maintenance_window_start_time
+        self.maintenance_window_end_time = maintenance_window_end_time
+        self.last_operation_result_code = last_operation_result_code
+        self.last_operation_message = last_operation_message
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
new file mode 100644
index 000000000000..0880da4ab1b8
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/managed_disk_parameters.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 .sub_resource import SubResource
+
+
+class ManagedDiskParameters(SubResource):
+    """The parameters of a managed disk.
+
+    :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'
+    :type storage_account_type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.StorageAccountTypes
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ManagedDiskParameters, self).__init__(**kwargs)
+        self.storage_account_type = kwargs.get('storage_account_type', None)
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
new file mode 100644
index 000000000000..f2c1408ccaab
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/managed_disk_parameters_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 .sub_resource_py3 import SubResource
+
+
+class ManagedDiskParameters(SubResource):
+    """The parameters of a managed disk.
+
+    :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'
+    :type storage_account_type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.StorageAccountTypes
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
+    }
+
+    def __init__(self, *, id: str=None, storage_account_type=None, **kwargs) -> None:
+        super(ManagedDiskParameters, self).__init__(id=id, **kwargs)
+        self.storage_account_type = storage_account_type
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/network_interface_reference.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/network_interface_reference.py
new file mode 100644
index 000000000000..b86e305e3f74
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/network_interface_reference.py
@@ -0,0 +1,32 @@
+# 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 .sub_resource import SubResource
+
+
+class NetworkInterfaceReference(SubResource):
+    """Describes a network interface reference.
+
+    :param id: Resource Id
+    :type id: str
+    :param primary: Specifies the primary network interface in case the
+     virtual machine has more than 1 network interface.
+    :type primary: bool
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(NetworkInterfaceReference, self).__init__(**kwargs)
+        self.primary = kwargs.get('primary', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/network_interface_reference_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/network_interface_reference_py3.py
new file mode 100644
index 000000000000..47da29278832
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/network_interface_reference_py3.py
@@ -0,0 +1,32 @@
+# 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 .sub_resource_py3 import SubResource
+
+
+class NetworkInterfaceReference(SubResource):
+    """Describes a network interface reference.
+
+    :param id: Resource Id
+    :type id: str
+    :param primary: Specifies the primary network interface in case the
+     virtual machine has more than 1 network interface.
+    :type primary: bool
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+    }
+
+    def __init__(self, *, id: str=None, primary: bool=None, **kwargs) -> None:
+        super(NetworkInterfaceReference, self).__init__(id=id, **kwargs)
+        self.primary = primary
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/network_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/network_profile.py
new file mode 100644
index 000000000000..ac3e28ae5095
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/network_profile.py
@@ -0,0 +1,30 @@
+# 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 NetworkProfile(Model):
+    """Specifies the network interfaces of the virtual machine.
+
+    :param network_interfaces: Specifies the list of resource Ids for the
+     network interfaces associated with the virtual machine.
+    :type network_interfaces:
+     list[~azure.mgmt.compute.v2018_06_01.models.NetworkInterfaceReference]
+    """
+
+    _attribute_map = {
+        'network_interfaces': {'key': 'networkInterfaces', 'type': '[NetworkInterfaceReference]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(NetworkProfile, self).__init__(**kwargs)
+        self.network_interfaces = kwargs.get('network_interfaces', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/network_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/network_profile_py3.py
new file mode 100644
index 000000000000..1aa6b1780358
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/network_profile_py3.py
@@ -0,0 +1,30 @@
+# 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 NetworkProfile(Model):
+    """Specifies the network interfaces of the virtual machine.
+
+    :param network_interfaces: Specifies the list of resource Ids for the
+     network interfaces associated with the virtual machine.
+    :type network_interfaces:
+     list[~azure.mgmt.compute.v2018_06_01.models.NetworkInterfaceReference]
+    """
+
+    _attribute_map = {
+        'network_interfaces': {'key': 'networkInterfaces', 'type': '[NetworkInterfaceReference]'},
+    }
+
+    def __init__(self, *, network_interfaces=None, **kwargs) -> None:
+        super(NetworkProfile, self).__init__(**kwargs)
+        self.network_interfaces = network_interfaces
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
new file mode 100644
index 000000000000..8b399ec2aa04
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/os_disk.py
@@ -0,0 +1,97 @@
+# 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 OSDisk(Model):
+    """Specifies information about the operating system disk used by the virtual
+    machine. <br><br> For more information about disks, see [About disks and
+    VHDs for Azure virtual
+    machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+
+    All required parameters must be populated in order to send to Azure.
+
+    :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**
+     <br><br> **Linux**. Possible values include: 'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.OperatingSystemTypes
+    :param encryption_settings: Specifies the encryption settings for the OS
+     Disk. <br><br> Minimum api-version: 2015-06-15
+    :type encryption_settings:
+     ~azure.mgmt.compute.v2018_06_01.models.DiskEncryptionSettings
+    :param name: The disk name.
+    :type name: str
+    :param vhd: The virtual hard disk.
+    :type vhd: ~azure.mgmt.compute.v2018_06_01.models.VirtualHardDisk
+    :param image: The source user image virtual hard disk. The virtual hard
+     disk will be copied before being attached to the virtual machine. If
+     SourceImage is provided, the destination virtual hard drive must not
+     exist.
+    :type image: ~azure.mgmt.compute.v2018_06_01.models.VirtualHardDisk
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_06_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :param create_option: Required. Specifies how the virtual machine should
+     be created.<br><br> Possible values are:<br><br> **Attach** \\u2013 This
+     value is used when you are using a specialized disk to create the virtual
+     machine.<br><br> **FromImage** \\u2013 This value is used when you are
+     using an image to create the virtual machine. If you are using a platform
+     image, you also use the imageReference element described above. If you are
+     using a marketplace image, you  also use the plan element previously
+     described. 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 an empty data disk in
+     gigabytes. This element can be used to overwrite the name 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.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_06_01.models.ManagedDiskParameters
+    """
+
+    _validation = {
+        'create_option': {'required': True},
+    }
+
+    _attribute_map = {
+        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
+        'encryption_settings': {'key': 'encryptionSettings', 'type': 'DiskEncryptionSettings'},
+        'name': {'key': 'name', 'type': 'str'},
+        'vhd': {'key': 'vhd', 'type': 'VirtualHardDisk'},
+        'image': {'key': 'image', 'type': 'VirtualHardDisk'},
+        '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'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'ManagedDiskParameters'},
+    }
+
+    def __init__(self, **kwargs):
+        super(OSDisk, self).__init__(**kwargs)
+        self.os_type = kwargs.get('os_type', None)
+        self.encryption_settings = kwargs.get('encryption_settings', None)
+        self.name = kwargs.get('name', None)
+        self.vhd = kwargs.get('vhd', None)
+        self.image = kwargs.get('image', None)
+        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.managed_disk = kwargs.get('managed_disk', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/os_disk_image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/os_disk_image.py
new file mode 100644
index 000000000000..a05bb7d0ef68
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/os_disk_image.py
@@ -0,0 +1,36 @@
+# 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 OSDiskImage(Model):
+    """Contains the os disk image information.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param operating_system: Required. The operating system of the
+     osDiskImage. Possible values include: 'Windows', 'Linux'
+    :type operating_system: str or
+     ~azure.mgmt.compute.v2018_06_01.models.OperatingSystemTypes
+    """
+
+    _validation = {
+        'operating_system': {'required': True},
+    }
+
+    _attribute_map = {
+        'operating_system': {'key': 'operatingSystem', 'type': 'OperatingSystemTypes'},
+    }
+
+    def __init__(self, **kwargs):
+        super(OSDiskImage, self).__init__(**kwargs)
+        self.operating_system = kwargs.get('operating_system', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/os_disk_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/os_disk_image_py3.py
new file mode 100644
index 000000000000..a96627150e39
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/os_disk_image_py3.py
@@ -0,0 +1,36 @@
+# 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 OSDiskImage(Model):
+    """Contains the os disk image information.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param operating_system: Required. The operating system of the
+     osDiskImage. Possible values include: 'Windows', 'Linux'
+    :type operating_system: str or
+     ~azure.mgmt.compute.v2018_06_01.models.OperatingSystemTypes
+    """
+
+    _validation = {
+        'operating_system': {'required': True},
+    }
+
+    _attribute_map = {
+        'operating_system': {'key': 'operatingSystem', 'type': 'OperatingSystemTypes'},
+    }
+
+    def __init__(self, *, operating_system, **kwargs) -> None:
+        super(OSDiskImage, self).__init__(**kwargs)
+        self.operating_system = operating_system
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
new file mode 100644
index 000000000000..0c71fd4cab9b
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/os_disk_py3.py
@@ -0,0 +1,97 @@
+# 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 OSDisk(Model):
+    """Specifies information about the operating system disk used by the virtual
+    machine. <br><br> For more information about disks, see [About disks and
+    VHDs for Azure virtual
+    machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+
+    All required parameters must be populated in order to send to Azure.
+
+    :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**
+     <br><br> **Linux**. Possible values include: 'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.OperatingSystemTypes
+    :param encryption_settings: Specifies the encryption settings for the OS
+     Disk. <br><br> Minimum api-version: 2015-06-15
+    :type encryption_settings:
+     ~azure.mgmt.compute.v2018_06_01.models.DiskEncryptionSettings
+    :param name: The disk name.
+    :type name: str
+    :param vhd: The virtual hard disk.
+    :type vhd: ~azure.mgmt.compute.v2018_06_01.models.VirtualHardDisk
+    :param image: The source user image virtual hard disk. The virtual hard
+     disk will be copied before being attached to the virtual machine. If
+     SourceImage is provided, the destination virtual hard drive must not
+     exist.
+    :type image: ~azure.mgmt.compute.v2018_06_01.models.VirtualHardDisk
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_06_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :param create_option: Required. Specifies how the virtual machine should
+     be created.<br><br> Possible values are:<br><br> **Attach** \\u2013 This
+     value is used when you are using a specialized disk to create the virtual
+     machine.<br><br> **FromImage** \\u2013 This value is used when you are
+     using an image to create the virtual machine. If you are using a platform
+     image, you also use the imageReference element described above. If you are
+     using a marketplace image, you  also use the plan element previously
+     described. 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 an empty data disk in
+     gigabytes. This element can be used to overwrite the name 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.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_06_01.models.ManagedDiskParameters
+    """
+
+    _validation = {
+        'create_option': {'required': True},
+    }
+
+    _attribute_map = {
+        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
+        'encryption_settings': {'key': 'encryptionSettings', 'type': 'DiskEncryptionSettings'},
+        'name': {'key': 'name', 'type': 'str'},
+        'vhd': {'key': 'vhd', 'type': 'VirtualHardDisk'},
+        'image': {'key': 'image', 'type': 'VirtualHardDisk'},
+        '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'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'ManagedDiskParameters'},
+    }
+
+    def __init__(self, *, create_option, os_type=None, encryption_settings=None, name: str=None, vhd=None, image=None, caching=None, write_accelerator_enabled: bool=None, disk_size_gb: int=None, managed_disk=None, **kwargs) -> None:
+        super(OSDisk, self).__init__(**kwargs)
+        self.os_type = os_type
+        self.encryption_settings = encryption_settings
+        self.name = name
+        self.vhd = vhd
+        self.image = image
+        self.caching = caching
+        self.write_accelerator_enabled = write_accelerator_enabled
+        self.create_option = create_option
+        self.disk_size_gb = disk_size_gb
+        self.managed_disk = managed_disk
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/os_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/os_profile.py
new file mode 100644
index 000000000000..82e97ea28eeb
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/os_profile.py
@@ -0,0 +1,105 @@
+# 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 OSProfile(Model):
+    """Specifies the operating system settings for the virtual machine.
+
+    :param computer_name: Specifies the host OS name of the virtual machine.
+     <br><br> **Max-length (Windows):** 15 characters <br><br> **Max-length
+     (Linux):** 64 characters. <br><br> For naming conventions and restrictions
+     see [Azure infrastructure services implementation
+     guidelines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-infrastructure-subscription-accounts-guidelines?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#1-naming-conventions).
+    :type computer_name: str
+    :param admin_username: Specifies the name of the administrator account.
+     <br><br> **Windows-only restriction:** Cannot end in "." <br><br>
+     **Disallowed values:** "administrator", "admin", "user", "user1", "test",
+     "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm",
+     "admin2", "aspnet", "backup", "console", "david", "guest", "john",
+     "owner", "root", "server", "sql", "support", "support_388945a0", "sys",
+     "test2", "test3", "user4", "user5". <br><br> **Minimum-length (Linux):** 1
+     character <br><br> **Max-length (Linux):** 64 characters <br><br>
+     **Max-length (Windows):** 20 characters  <br><br><li> For root access to
+     the Linux VM, see [Using root privileges on Linux virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-use-root-privileges?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)<br><li>
+     For a list of built-in system users on Linux that should not be used in
+     this field, see [Selecting User Names for Linux on
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-usernames?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    :type admin_username: str
+    :param admin_password: Specifies the password of the administrator
+     account. <br><br> **Minimum-length (Windows):** 8 characters <br><br>
+     **Minimum-length (Linux):** 6 characters <br><br> **Max-length
+     (Windows):** 123 characters <br><br> **Max-length (Linux):** 72 characters
+     <br><br> **Complexity requirements:** 3 out of 4 conditions below need to
+     be fulfilled <br> Has lower characters <br>Has upper characters <br> Has a
+     digit <br> Has a special character (Regex match [\\W_]) <br><br>
+     **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123",
+     "Pa$$word", "pass@word1", "Password!", "Password1", "Password22",
+     "iloveyou!" <br><br> For resetting the password, see [How to reset the
+     Remote Desktop service or its login password in a Windows
+     VM](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-reset-rdp?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> For resetting root password, see [Manage users, SSH, and check or
+     repair disks on Azure Linux VMs using the VMAccess
+     Extension](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-vmaccess-extension?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#reset-root-password)
+    :type admin_password: str
+    :param custom_data: Specifies a base-64 encoded string of custom data. The
+     base-64 encoded string is decoded to a binary array that is saved as a
+     file on the Virtual Machine. The maximum length of the binary array is
+     65535 bytes. <br><br> For using cloud-init for your VM, see [Using
+     cloud-init to customize a Linux VM during
+     creation](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-cloud-init?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    :type custom_data: str
+    :param windows_configuration: Specifies Windows operating system settings
+     on the virtual machine.
+    :type windows_configuration:
+     ~azure.mgmt.compute.v2018_06_01.models.WindowsConfiguration
+    :param linux_configuration: Specifies the Linux operating system settings
+     on the virtual machine. <br><br>For a list of supported Linux
+     distributions, see [Linux on Azure-Endorsed
+     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+     <br><br> For running non-endorsed distributions, see [Information for
+     Non-Endorsed
+     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
+    :type linux_configuration:
+     ~azure.mgmt.compute.v2018_06_01.models.LinuxConfiguration
+    :param secrets: Specifies set of certificates that should be installed
+     onto the virtual machine.
+    :type secrets:
+     list[~azure.mgmt.compute.v2018_06_01.models.VaultSecretGroup]
+    :param allow_extension_operations: Specifies whether extension operations
+     should be allowed on the virtual machine. <br><br>This may only be set to
+     False when no extensions are present on the virtual machine.
+    :type allow_extension_operations: bool
+    """
+
+    _attribute_map = {
+        'computer_name': {'key': 'computerName', 'type': 'str'},
+        'admin_username': {'key': 'adminUsername', 'type': 'str'},
+        'admin_password': {'key': 'adminPassword', 'type': 'str'},
+        'custom_data': {'key': 'customData', 'type': 'str'},
+        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'WindowsConfiguration'},
+        'linux_configuration': {'key': 'linuxConfiguration', 'type': 'LinuxConfiguration'},
+        'secrets': {'key': 'secrets', 'type': '[VaultSecretGroup]'},
+        'allow_extension_operations': {'key': 'allowExtensionOperations', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(OSProfile, self).__init__(**kwargs)
+        self.computer_name = kwargs.get('computer_name', None)
+        self.admin_username = kwargs.get('admin_username', None)
+        self.admin_password = kwargs.get('admin_password', None)
+        self.custom_data = kwargs.get('custom_data', None)
+        self.windows_configuration = kwargs.get('windows_configuration', None)
+        self.linux_configuration = kwargs.get('linux_configuration', None)
+        self.secrets = kwargs.get('secrets', None)
+        self.allow_extension_operations = kwargs.get('allow_extension_operations', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/os_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/os_profile_py3.py
new file mode 100644
index 000000000000..42d767d06a80
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/os_profile_py3.py
@@ -0,0 +1,105 @@
+# 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 OSProfile(Model):
+    """Specifies the operating system settings for the virtual machine.
+
+    :param computer_name: Specifies the host OS name of the virtual machine.
+     <br><br> **Max-length (Windows):** 15 characters <br><br> **Max-length
+     (Linux):** 64 characters. <br><br> For naming conventions and restrictions
+     see [Azure infrastructure services implementation
+     guidelines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-infrastructure-subscription-accounts-guidelines?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#1-naming-conventions).
+    :type computer_name: str
+    :param admin_username: Specifies the name of the administrator account.
+     <br><br> **Windows-only restriction:** Cannot end in "." <br><br>
+     **Disallowed values:** "administrator", "admin", "user", "user1", "test",
+     "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm",
+     "admin2", "aspnet", "backup", "console", "david", "guest", "john",
+     "owner", "root", "server", "sql", "support", "support_388945a0", "sys",
+     "test2", "test3", "user4", "user5". <br><br> **Minimum-length (Linux):** 1
+     character <br><br> **Max-length (Linux):** 64 characters <br><br>
+     **Max-length (Windows):** 20 characters  <br><br><li> For root access to
+     the Linux VM, see [Using root privileges on Linux virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-use-root-privileges?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)<br><li>
+     For a list of built-in system users on Linux that should not be used in
+     this field, see [Selecting User Names for Linux on
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-usernames?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    :type admin_username: str
+    :param admin_password: Specifies the password of the administrator
+     account. <br><br> **Minimum-length (Windows):** 8 characters <br><br>
+     **Minimum-length (Linux):** 6 characters <br><br> **Max-length
+     (Windows):** 123 characters <br><br> **Max-length (Linux):** 72 characters
+     <br><br> **Complexity requirements:** 3 out of 4 conditions below need to
+     be fulfilled <br> Has lower characters <br>Has upper characters <br> Has a
+     digit <br> Has a special character (Regex match [\\W_]) <br><br>
+     **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123",
+     "Pa$$word", "pass@word1", "Password!", "Password1", "Password22",
+     "iloveyou!" <br><br> For resetting the password, see [How to reset the
+     Remote Desktop service or its login password in a Windows
+     VM](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-reset-rdp?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> For resetting root password, see [Manage users, SSH, and check or
+     repair disks on Azure Linux VMs using the VMAccess
+     Extension](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-vmaccess-extension?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#reset-root-password)
+    :type admin_password: str
+    :param custom_data: Specifies a base-64 encoded string of custom data. The
+     base-64 encoded string is decoded to a binary array that is saved as a
+     file on the Virtual Machine. The maximum length of the binary array is
+     65535 bytes. <br><br> For using cloud-init for your VM, see [Using
+     cloud-init to customize a Linux VM during
+     creation](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-cloud-init?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    :type custom_data: str
+    :param windows_configuration: Specifies Windows operating system settings
+     on the virtual machine.
+    :type windows_configuration:
+     ~azure.mgmt.compute.v2018_06_01.models.WindowsConfiguration
+    :param linux_configuration: Specifies the Linux operating system settings
+     on the virtual machine. <br><br>For a list of supported Linux
+     distributions, see [Linux on Azure-Endorsed
+     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+     <br><br> For running non-endorsed distributions, see [Information for
+     Non-Endorsed
+     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
+    :type linux_configuration:
+     ~azure.mgmt.compute.v2018_06_01.models.LinuxConfiguration
+    :param secrets: Specifies set of certificates that should be installed
+     onto the virtual machine.
+    :type secrets:
+     list[~azure.mgmt.compute.v2018_06_01.models.VaultSecretGroup]
+    :param allow_extension_operations: Specifies whether extension operations
+     should be allowed on the virtual machine. <br><br>This may only be set to
+     False when no extensions are present on the virtual machine.
+    :type allow_extension_operations: bool
+    """
+
+    _attribute_map = {
+        'computer_name': {'key': 'computerName', 'type': 'str'},
+        'admin_username': {'key': 'adminUsername', 'type': 'str'},
+        'admin_password': {'key': 'adminPassword', 'type': 'str'},
+        'custom_data': {'key': 'customData', 'type': 'str'},
+        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'WindowsConfiguration'},
+        'linux_configuration': {'key': 'linuxConfiguration', 'type': 'LinuxConfiguration'},
+        'secrets': {'key': 'secrets', 'type': '[VaultSecretGroup]'},
+        'allow_extension_operations': {'key': 'allowExtensionOperations', 'type': 'bool'},
+    }
+
+    def __init__(self, *, computer_name: str=None, admin_username: str=None, admin_password: str=None, custom_data: str=None, windows_configuration=None, linux_configuration=None, secrets=None, allow_extension_operations: bool=None, **kwargs) -> None:
+        super(OSProfile, self).__init__(**kwargs)
+        self.computer_name = computer_name
+        self.admin_username = admin_username
+        self.admin_password = admin_password
+        self.custom_data = custom_data
+        self.windows_configuration = windows_configuration
+        self.linux_configuration = linux_configuration
+        self.secrets = secrets
+        self.allow_extension_operations = allow_extension_operations
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/plan.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/plan.py
new file mode 100644
index 000000000000..d42b6b32cfac
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/plan.py
@@ -0,0 +1,46 @@
+# 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 Plan(Model):
+    """Specifies information about the marketplace image used to create the
+    virtual machine. This element is only used for marketplace images. Before
+    you can use a marketplace image from an API, you must enable the image for
+    programmatic use.  In the Azure portal, find the marketplace image that you
+    want to use and then click **Want to deploy programmatically, Get Started
+    ->**. Enter any required information and then click **Save**.
+
+    :param name: The plan ID.
+    :type name: str
+    :param publisher: The publisher ID.
+    :type publisher: str
+    :param product: Specifies the product of the image from the marketplace.
+     This is the same value as Offer under the imageReference element.
+    :type product: str
+    :param promotion_code: The promotion code.
+    :type promotion_code: str
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'publisher': {'key': 'publisher', 'type': 'str'},
+        'product': {'key': 'product', 'type': 'str'},
+        'promotion_code': {'key': 'promotionCode', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(Plan, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.publisher = kwargs.get('publisher', None)
+        self.product = kwargs.get('product', None)
+        self.promotion_code = kwargs.get('promotion_code', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/plan_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/plan_py3.py
new file mode 100644
index 000000000000..9cca2c78a123
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/plan_py3.py
@@ -0,0 +1,46 @@
+# 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 Plan(Model):
+    """Specifies information about the marketplace image used to create the
+    virtual machine. This element is only used for marketplace images. Before
+    you can use a marketplace image from an API, you must enable the image for
+    programmatic use.  In the Azure portal, find the marketplace image that you
+    want to use and then click **Want to deploy programmatically, Get Started
+    ->**. Enter any required information and then click **Save**.
+
+    :param name: The plan ID.
+    :type name: str
+    :param publisher: The publisher ID.
+    :type publisher: str
+    :param product: Specifies the product of the image from the marketplace.
+     This is the same value as Offer under the imageReference element.
+    :type product: str
+    :param promotion_code: The promotion code.
+    :type promotion_code: str
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'publisher': {'key': 'publisher', 'type': 'str'},
+        'product': {'key': 'product', 'type': 'str'},
+        'promotion_code': {'key': 'promotionCode', 'type': 'str'},
+    }
+
+    def __init__(self, *, name: str=None, publisher: str=None, product: str=None, promotion_code: str=None, **kwargs) -> None:
+        super(Plan, self).__init__(**kwargs)
+        self.name = name
+        self.publisher = publisher
+        self.product = product
+        self.promotion_code = promotion_code
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/purchase_plan.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/purchase_plan.py
new file mode 100644
index 000000000000..2e1509addca6
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/purchase_plan.py
@@ -0,0 +1,47 @@
+# 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 PurchasePlan(Model):
+    """Used for establishing the purchase context of any 3rd Party artifact
+    through MarketPlace.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param publisher: Required. The publisher ID.
+    :type publisher: str
+    :param name: Required. The plan ID.
+    :type name: str
+    :param product: Required. Specifies the product of the image from the
+     marketplace. This is the same value as Offer under the imageReference
+     element.
+    :type product: str
+    """
+
+    _validation = {
+        'publisher': {'required': True},
+        'name': {'required': True},
+        'product': {'required': True},
+    }
+
+    _attribute_map = {
+        'publisher': {'key': 'publisher', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'product': {'key': 'product', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(PurchasePlan, self).__init__(**kwargs)
+        self.publisher = kwargs.get('publisher', None)
+        self.name = kwargs.get('name', None)
+        self.product = kwargs.get('product', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/purchase_plan_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/purchase_plan_py3.py
new file mode 100644
index 000000000000..26f7996f1633
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/purchase_plan_py3.py
@@ -0,0 +1,47 @@
+# 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 PurchasePlan(Model):
+    """Used for establishing the purchase context of any 3rd Party artifact
+    through MarketPlace.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param publisher: Required. The publisher ID.
+    :type publisher: str
+    :param name: Required. The plan ID.
+    :type name: str
+    :param product: Required. Specifies the product of the image from the
+     marketplace. This is the same value as Offer under the imageReference
+     element.
+    :type product: str
+    """
+
+    _validation = {
+        'publisher': {'required': True},
+        'name': {'required': True},
+        'product': {'required': True},
+    }
+
+    _attribute_map = {
+        'publisher': {'key': 'publisher', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'product': {'key': 'product', 'type': 'str'},
+    }
+
+    def __init__(self, *, publisher: str, name: str, product: str, **kwargs) -> None:
+        super(PurchasePlan, self).__init__(**kwargs)
+        self.publisher = publisher
+        self.name = name
+        self.product = product
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/recovery_walk_response.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/recovery_walk_response.py
new file mode 100644
index 000000000000..8dcbca604c7e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/recovery_walk_response.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 RecoveryWalkResponse(Model):
+    """Response after calling a manual recovery walk.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar walk_performed: Whether the recovery walk was performed
+    :vartype walk_performed: bool
+    :ivar next_platform_update_domain: The next update domain that needs to be
+     walked. Null means walk spanning all update domains has been completed
+    :vartype next_platform_update_domain: int
+    """
+
+    _validation = {
+        'walk_performed': {'readonly': True},
+        'next_platform_update_domain': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'walk_performed': {'key': 'walkPerformed', 'type': 'bool'},
+        'next_platform_update_domain': {'key': 'nextPlatformUpdateDomain', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RecoveryWalkResponse, self).__init__(**kwargs)
+        self.walk_performed = None
+        self.next_platform_update_domain = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/recovery_walk_response_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/recovery_walk_response_py3.py
new file mode 100644
index 000000000000..5b24a0ed9b7a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/recovery_walk_response_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 RecoveryWalkResponse(Model):
+    """Response after calling a manual recovery walk.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar walk_performed: Whether the recovery walk was performed
+    :vartype walk_performed: bool
+    :ivar next_platform_update_domain: The next update domain that needs to be
+     walked. Null means walk spanning all update domains has been completed
+    :vartype next_platform_update_domain: int
+    """
+
+    _validation = {
+        'walk_performed': {'readonly': True},
+        'next_platform_update_domain': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'walk_performed': {'key': 'walkPerformed', 'type': 'bool'},
+        'next_platform_update_domain': {'key': 'nextPlatformUpdateDomain', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(RecoveryWalkResponse, self).__init__(**kwargs)
+        self.walk_performed = None
+        self.next_platform_update_domain = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/request_rate_by_interval_input.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/request_rate_by_interval_input.py
new file mode 100644
index 000000000000..2c05a02df9a3
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/request_rate_by_interval_input.py
@@ -0,0 +1,60 @@
+# 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 .log_analytics_input_base import LogAnalyticsInputBase
+
+
+class RequestRateByIntervalInput(LogAnalyticsInputBase):
+    """Api request input for LogAnalytics getRequestRateByInterval Api.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param blob_container_sas_uri: Required. SAS Uri of the logging blob
+     container to which LogAnalytics Api writes output logs to.
+    :type blob_container_sas_uri: str
+    :param from_time: Required. From time of the query
+    :type from_time: datetime
+    :param to_time: Required. To time of the query
+    :type to_time: datetime
+    :param group_by_throttle_policy: Group query result by Throttle Policy
+     applied.
+    :type group_by_throttle_policy: bool
+    :param group_by_operation_name: Group query result by  by Operation Name.
+    :type group_by_operation_name: bool
+    :param group_by_resource_name: Group query result by Resource Name.
+    :type group_by_resource_name: bool
+    :param interval_length: Required. Interval value in minutes used to create
+     LogAnalytics call rate logs. Possible values include: 'ThreeMins',
+     'FiveMins', 'ThirtyMins', 'SixtyMins'
+    :type interval_length: str or
+     ~azure.mgmt.compute.v2018_06_01.models.IntervalInMins
+    """
+
+    _validation = {
+        'blob_container_sas_uri': {'required': True},
+        'from_time': {'required': True},
+        'to_time': {'required': True},
+        'interval_length': {'required': True},
+    }
+
+    _attribute_map = {
+        'blob_container_sas_uri': {'key': 'blobContainerSasUri', 'type': 'str'},
+        'from_time': {'key': 'fromTime', 'type': 'iso-8601'},
+        'to_time': {'key': 'toTime', 'type': 'iso-8601'},
+        'group_by_throttle_policy': {'key': 'groupByThrottlePolicy', 'type': 'bool'},
+        'group_by_operation_name': {'key': 'groupByOperationName', 'type': 'bool'},
+        'group_by_resource_name': {'key': 'groupByResourceName', 'type': 'bool'},
+        'interval_length': {'key': 'intervalLength', 'type': 'IntervalInMins'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RequestRateByIntervalInput, self).__init__(**kwargs)
+        self.interval_length = kwargs.get('interval_length', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/request_rate_by_interval_input_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/request_rate_by_interval_input_py3.py
new file mode 100644
index 000000000000..5ff80a884bf7
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/request_rate_by_interval_input_py3.py
@@ -0,0 +1,60 @@
+# 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 .log_analytics_input_base_py3 import LogAnalyticsInputBase
+
+
+class RequestRateByIntervalInput(LogAnalyticsInputBase):
+    """Api request input for LogAnalytics getRequestRateByInterval Api.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param blob_container_sas_uri: Required. SAS Uri of the logging blob
+     container to which LogAnalytics Api writes output logs to.
+    :type blob_container_sas_uri: str
+    :param from_time: Required. From time of the query
+    :type from_time: datetime
+    :param to_time: Required. To time of the query
+    :type to_time: datetime
+    :param group_by_throttle_policy: Group query result by Throttle Policy
+     applied.
+    :type group_by_throttle_policy: bool
+    :param group_by_operation_name: Group query result by  by Operation Name.
+    :type group_by_operation_name: bool
+    :param group_by_resource_name: Group query result by Resource Name.
+    :type group_by_resource_name: bool
+    :param interval_length: Required. Interval value in minutes used to create
+     LogAnalytics call rate logs. Possible values include: 'ThreeMins',
+     'FiveMins', 'ThirtyMins', 'SixtyMins'
+    :type interval_length: str or
+     ~azure.mgmt.compute.v2018_06_01.models.IntervalInMins
+    """
+
+    _validation = {
+        'blob_container_sas_uri': {'required': True},
+        'from_time': {'required': True},
+        'to_time': {'required': True},
+        'interval_length': {'required': True},
+    }
+
+    _attribute_map = {
+        'blob_container_sas_uri': {'key': 'blobContainerSasUri', 'type': 'str'},
+        'from_time': {'key': 'fromTime', 'type': 'iso-8601'},
+        'to_time': {'key': 'toTime', 'type': 'iso-8601'},
+        'group_by_throttle_policy': {'key': 'groupByThrottlePolicy', 'type': 'bool'},
+        'group_by_operation_name': {'key': 'groupByOperationName', 'type': 'bool'},
+        'group_by_resource_name': {'key': 'groupByResourceName', 'type': 'bool'},
+        'interval_length': {'key': 'intervalLength', 'type': 'IntervalInMins'},
+    }
+
+    def __init__(self, *, blob_container_sas_uri: str, from_time, to_time, interval_length, group_by_throttle_policy: bool=None, group_by_operation_name: bool=None, group_by_resource_name: bool=None, **kwargs) -> None:
+        super(RequestRateByIntervalInput, self).__init__(blob_container_sas_uri=blob_container_sas_uri, from_time=from_time, to_time=to_time, group_by_throttle_policy=group_by_throttle_policy, group_by_operation_name=group_by_operation_name, group_by_resource_name=group_by_resource_name, **kwargs)
+        self.interval_length = interval_length
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rollback_status_info.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rollback_status_info.py
new file mode 100644
index 000000000000..50fa9b3ab6f6
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rollback_status_info.py
@@ -0,0 +1,48 @@
+# 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 RollbackStatusInfo(Model):
+    """Information about rollback on failed VM instances after a OS Upgrade
+    operation.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar successfully_rolledback_instance_count: The number of instances
+     which have been successfully rolled back.
+    :vartype successfully_rolledback_instance_count: int
+    :ivar failed_rolledback_instance_count: The number of instances which
+     failed to rollback.
+    :vartype failed_rolledback_instance_count: int
+    :ivar rollback_error: Error details if OS rollback failed.
+    :vartype rollback_error: ~azure.mgmt.compute.v2018_06_01.models.ApiError
+    """
+
+    _validation = {
+        'successfully_rolledback_instance_count': {'readonly': True},
+        'failed_rolledback_instance_count': {'readonly': True},
+        'rollback_error': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'successfully_rolledback_instance_count': {'key': 'successfullyRolledbackInstanceCount', 'type': 'int'},
+        'failed_rolledback_instance_count': {'key': 'failedRolledbackInstanceCount', 'type': 'int'},
+        'rollback_error': {'key': 'rollbackError', 'type': 'ApiError'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RollbackStatusInfo, self).__init__(**kwargs)
+        self.successfully_rolledback_instance_count = None
+        self.failed_rolledback_instance_count = None
+        self.rollback_error = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rollback_status_info_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rollback_status_info_py3.py
new file mode 100644
index 000000000000..9a0442704ff3
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rollback_status_info_py3.py
@@ -0,0 +1,48 @@
+# 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 RollbackStatusInfo(Model):
+    """Information about rollback on failed VM instances after a OS Upgrade
+    operation.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar successfully_rolledback_instance_count: The number of instances
+     which have been successfully rolled back.
+    :vartype successfully_rolledback_instance_count: int
+    :ivar failed_rolledback_instance_count: The number of instances which
+     failed to rollback.
+    :vartype failed_rolledback_instance_count: int
+    :ivar rollback_error: Error details if OS rollback failed.
+    :vartype rollback_error: ~azure.mgmt.compute.v2018_06_01.models.ApiError
+    """
+
+    _validation = {
+        'successfully_rolledback_instance_count': {'readonly': True},
+        'failed_rolledback_instance_count': {'readonly': True},
+        'rollback_error': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'successfully_rolledback_instance_count': {'key': 'successfullyRolledbackInstanceCount', 'type': 'int'},
+        'failed_rolledback_instance_count': {'key': 'failedRolledbackInstanceCount', 'type': 'int'},
+        'rollback_error': {'key': 'rollbackError', 'type': 'ApiError'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(RollbackStatusInfo, self).__init__(**kwargs)
+        self.successfully_rolledback_instance_count = None
+        self.failed_rolledback_instance_count = None
+        self.rollback_error = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_policy.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_policy.py
new file mode 100644
index 000000000000..1eecaa5e2e65
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_policy.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 RollingUpgradePolicy(Model):
+    """The configuration parameters used while performing a rolling upgrade.
+
+    :param max_batch_instance_percent: The maximum percent of total virtual
+     machine instances that will be upgraded simultaneously by the rolling
+     upgrade in one batch. As this is a maximum, unhealthy instances in
+     previous or future batches can cause the percentage of instances in a
+     batch to decrease to ensure higher reliability. The default value for this
+     parameter is 20%.
+    :type max_batch_instance_percent: int
+    :param max_unhealthy_instance_percent: The maximum percentage of the total
+     virtual machine instances in the scale set that can be simultaneously
+     unhealthy, either as a result of being upgraded, or by being found in an
+     unhealthy state by the virtual machine health checks before the rolling
+     upgrade aborts. This constraint will be checked prior to starting any
+     batch. The default value for this parameter is 20%.
+    :type max_unhealthy_instance_percent: int
+    :param max_unhealthy_upgraded_instance_percent: The maximum percentage of
+     upgraded virtual machine instances that can be found to be in an unhealthy
+     state. This check will happen after each batch is upgraded. If this
+     percentage is ever exceeded, the rolling update aborts. The default value
+     for this parameter is 20%.
+    :type max_unhealthy_upgraded_instance_percent: int
+    :param pause_time_between_batches: The wait time between completing the
+     update for all virtual machines in one batch and starting the next batch.
+     The time duration should be specified in ISO 8601 format. The default
+     value is 0 seconds (PT0S).
+    :type pause_time_between_batches: str
+    """
+
+    _validation = {
+        'max_batch_instance_percent': {'maximum': 100, 'minimum': 5},
+        'max_unhealthy_instance_percent': {'maximum': 100, 'minimum': 5},
+        'max_unhealthy_upgraded_instance_percent': {'maximum': 100, 'minimum': 0},
+    }
+
+    _attribute_map = {
+        'max_batch_instance_percent': {'key': 'maxBatchInstancePercent', 'type': 'int'},
+        'max_unhealthy_instance_percent': {'key': 'maxUnhealthyInstancePercent', 'type': 'int'},
+        'max_unhealthy_upgraded_instance_percent': {'key': 'maxUnhealthyUpgradedInstancePercent', 'type': 'int'},
+        'pause_time_between_batches': {'key': 'pauseTimeBetweenBatches', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RollingUpgradePolicy, self).__init__(**kwargs)
+        self.max_batch_instance_percent = kwargs.get('max_batch_instance_percent', None)
+        self.max_unhealthy_instance_percent = kwargs.get('max_unhealthy_instance_percent', None)
+        self.max_unhealthy_upgraded_instance_percent = kwargs.get('max_unhealthy_upgraded_instance_percent', None)
+        self.pause_time_between_batches = kwargs.get('pause_time_between_batches', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_policy_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_policy_py3.py
new file mode 100644
index 000000000000..e698a382f112
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_policy_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 RollingUpgradePolicy(Model):
+    """The configuration parameters used while performing a rolling upgrade.
+
+    :param max_batch_instance_percent: The maximum percent of total virtual
+     machine instances that will be upgraded simultaneously by the rolling
+     upgrade in one batch. As this is a maximum, unhealthy instances in
+     previous or future batches can cause the percentage of instances in a
+     batch to decrease to ensure higher reliability. The default value for this
+     parameter is 20%.
+    :type max_batch_instance_percent: int
+    :param max_unhealthy_instance_percent: The maximum percentage of the total
+     virtual machine instances in the scale set that can be simultaneously
+     unhealthy, either as a result of being upgraded, or by being found in an
+     unhealthy state by the virtual machine health checks before the rolling
+     upgrade aborts. This constraint will be checked prior to starting any
+     batch. The default value for this parameter is 20%.
+    :type max_unhealthy_instance_percent: int
+    :param max_unhealthy_upgraded_instance_percent: The maximum percentage of
+     upgraded virtual machine instances that can be found to be in an unhealthy
+     state. This check will happen after each batch is upgraded. If this
+     percentage is ever exceeded, the rolling update aborts. The default value
+     for this parameter is 20%.
+    :type max_unhealthy_upgraded_instance_percent: int
+    :param pause_time_between_batches: The wait time between completing the
+     update for all virtual machines in one batch and starting the next batch.
+     The time duration should be specified in ISO 8601 format. The default
+     value is 0 seconds (PT0S).
+    :type pause_time_between_batches: str
+    """
+
+    _validation = {
+        'max_batch_instance_percent': {'maximum': 100, 'minimum': 5},
+        'max_unhealthy_instance_percent': {'maximum': 100, 'minimum': 5},
+        'max_unhealthy_upgraded_instance_percent': {'maximum': 100, 'minimum': 0},
+    }
+
+    _attribute_map = {
+        'max_batch_instance_percent': {'key': 'maxBatchInstancePercent', 'type': 'int'},
+        'max_unhealthy_instance_percent': {'key': 'maxUnhealthyInstancePercent', 'type': 'int'},
+        'max_unhealthy_upgraded_instance_percent': {'key': 'maxUnhealthyUpgradedInstancePercent', 'type': 'int'},
+        'pause_time_between_batches': {'key': 'pauseTimeBetweenBatches', 'type': 'str'},
+    }
+
+    def __init__(self, *, max_batch_instance_percent: int=None, max_unhealthy_instance_percent: int=None, max_unhealthy_upgraded_instance_percent: int=None, pause_time_between_batches: str=None, **kwargs) -> None:
+        super(RollingUpgradePolicy, self).__init__(**kwargs)
+        self.max_batch_instance_percent = max_batch_instance_percent
+        self.max_unhealthy_instance_percent = max_unhealthy_instance_percent
+        self.max_unhealthy_upgraded_instance_percent = max_unhealthy_upgraded_instance_percent
+        self.pause_time_between_batches = pause_time_between_batches
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_progress_info.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_progress_info.py
new file mode 100644
index 000000000000..87e40590e275
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_progress_info.py
@@ -0,0 +1,55 @@
+# 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 RollingUpgradeProgressInfo(Model):
+    """Information about the number of virtual machine instances in each upgrade
+    state.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar successful_instance_count: The number of instances that have been
+     successfully upgraded.
+    :vartype successful_instance_count: int
+    :ivar failed_instance_count: The number of instances that have failed to
+     be upgraded successfully.
+    :vartype failed_instance_count: int
+    :ivar in_progress_instance_count: The number of instances that are
+     currently being upgraded.
+    :vartype in_progress_instance_count: int
+    :ivar pending_instance_count: The number of instances that have not yet
+     begun to be upgraded.
+    :vartype pending_instance_count: int
+    """
+
+    _validation = {
+        'successful_instance_count': {'readonly': True},
+        'failed_instance_count': {'readonly': True},
+        'in_progress_instance_count': {'readonly': True},
+        'pending_instance_count': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'successful_instance_count': {'key': 'successfulInstanceCount', 'type': 'int'},
+        'failed_instance_count': {'key': 'failedInstanceCount', 'type': 'int'},
+        'in_progress_instance_count': {'key': 'inProgressInstanceCount', 'type': 'int'},
+        'pending_instance_count': {'key': 'pendingInstanceCount', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RollingUpgradeProgressInfo, self).__init__(**kwargs)
+        self.successful_instance_count = None
+        self.failed_instance_count = None
+        self.in_progress_instance_count = None
+        self.pending_instance_count = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_progress_info_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_progress_info_py3.py
new file mode 100644
index 000000000000..060abc3063b4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_progress_info_py3.py
@@ -0,0 +1,55 @@
+# 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 RollingUpgradeProgressInfo(Model):
+    """Information about the number of virtual machine instances in each upgrade
+    state.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar successful_instance_count: The number of instances that have been
+     successfully upgraded.
+    :vartype successful_instance_count: int
+    :ivar failed_instance_count: The number of instances that have failed to
+     be upgraded successfully.
+    :vartype failed_instance_count: int
+    :ivar in_progress_instance_count: The number of instances that are
+     currently being upgraded.
+    :vartype in_progress_instance_count: int
+    :ivar pending_instance_count: The number of instances that have not yet
+     begun to be upgraded.
+    :vartype pending_instance_count: int
+    """
+
+    _validation = {
+        'successful_instance_count': {'readonly': True},
+        'failed_instance_count': {'readonly': True},
+        'in_progress_instance_count': {'readonly': True},
+        'pending_instance_count': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'successful_instance_count': {'key': 'successfulInstanceCount', 'type': 'int'},
+        'failed_instance_count': {'key': 'failedInstanceCount', 'type': 'int'},
+        'in_progress_instance_count': {'key': 'inProgressInstanceCount', 'type': 'int'},
+        'pending_instance_count': {'key': 'pendingInstanceCount', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(RollingUpgradeProgressInfo, self).__init__(**kwargs)
+        self.successful_instance_count = None
+        self.failed_instance_count = None
+        self.in_progress_instance_count = None
+        self.pending_instance_count = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_running_status.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_running_status.py
new file mode 100644
index 000000000000..a493b63db4da
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_running_status.py
@@ -0,0 +1,54 @@
+# 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 RollingUpgradeRunningStatus(Model):
+    """Information about the current running state of the overall upgrade.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar code: Code indicating the current status of the upgrade. Possible
+     values include: 'RollingForward', 'Cancelled', 'Completed', 'Faulted'
+    :vartype code: str or
+     ~azure.mgmt.compute.v2018_06_01.models.RollingUpgradeStatusCode
+    :ivar start_time: Start time of the upgrade.
+    :vartype start_time: datetime
+    :ivar last_action: The last action performed on the rolling upgrade.
+     Possible values include: 'Start', 'Cancel'
+    :vartype last_action: str or
+     ~azure.mgmt.compute.v2018_06_01.models.RollingUpgradeActionType
+    :ivar last_action_time: Last action time of the upgrade.
+    :vartype last_action_time: datetime
+    """
+
+    _validation = {
+        'code': {'readonly': True},
+        'start_time': {'readonly': True},
+        'last_action': {'readonly': True},
+        'last_action_time': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'RollingUpgradeStatusCode'},
+        'start_time': {'key': 'startTime', 'type': 'iso-8601'},
+        'last_action': {'key': 'lastAction', 'type': 'RollingUpgradeActionType'},
+        'last_action_time': {'key': 'lastActionTime', 'type': 'iso-8601'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RollingUpgradeRunningStatus, self).__init__(**kwargs)
+        self.code = None
+        self.start_time = None
+        self.last_action = None
+        self.last_action_time = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_running_status_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_running_status_py3.py
new file mode 100644
index 000000000000..479e95ee27d1
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_running_status_py3.py
@@ -0,0 +1,54 @@
+# 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 RollingUpgradeRunningStatus(Model):
+    """Information about the current running state of the overall upgrade.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar code: Code indicating the current status of the upgrade. Possible
+     values include: 'RollingForward', 'Cancelled', 'Completed', 'Faulted'
+    :vartype code: str or
+     ~azure.mgmt.compute.v2018_06_01.models.RollingUpgradeStatusCode
+    :ivar start_time: Start time of the upgrade.
+    :vartype start_time: datetime
+    :ivar last_action: The last action performed on the rolling upgrade.
+     Possible values include: 'Start', 'Cancel'
+    :vartype last_action: str or
+     ~azure.mgmt.compute.v2018_06_01.models.RollingUpgradeActionType
+    :ivar last_action_time: Last action time of the upgrade.
+    :vartype last_action_time: datetime
+    """
+
+    _validation = {
+        'code': {'readonly': True},
+        'start_time': {'readonly': True},
+        'last_action': {'readonly': True},
+        'last_action_time': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'RollingUpgradeStatusCode'},
+        'start_time': {'key': 'startTime', 'type': 'iso-8601'},
+        'last_action': {'key': 'lastAction', 'type': 'RollingUpgradeActionType'},
+        'last_action_time': {'key': 'lastActionTime', 'type': 'iso-8601'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(RollingUpgradeRunningStatus, self).__init__(**kwargs)
+        self.code = None
+        self.start_time = None
+        self.last_action = None
+        self.last_action_time = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_status_info.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_status_info.py
new file mode 100644
index 000000000000..3a96c43852b7
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_status_info.py
@@ -0,0 +1,76 @@
+# 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 RollingUpgradeStatusInfo(Resource):
+    """The status of the latest virtual machine scale set rolling upgrade.
+
+    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 policy: The rolling upgrade policies applied for this upgrade.
+    :vartype policy:
+     ~azure.mgmt.compute.v2018_06_01.models.RollingUpgradePolicy
+    :ivar running_status: Information about the current running state of the
+     overall upgrade.
+    :vartype running_status:
+     ~azure.mgmt.compute.v2018_06_01.models.RollingUpgradeRunningStatus
+    :ivar progress: Information about the number of virtual machine instances
+     in each upgrade state.
+    :vartype progress:
+     ~azure.mgmt.compute.v2018_06_01.models.RollingUpgradeProgressInfo
+    :ivar error: Error details for this upgrade, if there are any.
+    :vartype error: ~azure.mgmt.compute.v2018_06_01.models.ApiError
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'policy': {'readonly': True},
+        'running_status': {'readonly': True},
+        'progress': {'readonly': True},
+        'error': {'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}'},
+        'policy': {'key': 'properties.policy', 'type': 'RollingUpgradePolicy'},
+        'running_status': {'key': 'properties.runningStatus', 'type': 'RollingUpgradeRunningStatus'},
+        'progress': {'key': 'properties.progress', 'type': 'RollingUpgradeProgressInfo'},
+        'error': {'key': 'properties.error', 'type': 'ApiError'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RollingUpgradeStatusInfo, self).__init__(**kwargs)
+        self.policy = None
+        self.running_status = None
+        self.progress = None
+        self.error = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_status_info_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_status_info_py3.py
new file mode 100644
index 000000000000..afb2112208a4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/rolling_upgrade_status_info_py3.py
@@ -0,0 +1,76 @@
+# 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 RollingUpgradeStatusInfo(Resource):
+    """The status of the latest virtual machine scale set rolling upgrade.
+
+    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 policy: The rolling upgrade policies applied for this upgrade.
+    :vartype policy:
+     ~azure.mgmt.compute.v2018_06_01.models.RollingUpgradePolicy
+    :ivar running_status: Information about the current running state of the
+     overall upgrade.
+    :vartype running_status:
+     ~azure.mgmt.compute.v2018_06_01.models.RollingUpgradeRunningStatus
+    :ivar progress: Information about the number of virtual machine instances
+     in each upgrade state.
+    :vartype progress:
+     ~azure.mgmt.compute.v2018_06_01.models.RollingUpgradeProgressInfo
+    :ivar error: Error details for this upgrade, if there are any.
+    :vartype error: ~azure.mgmt.compute.v2018_06_01.models.ApiError
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'policy': {'readonly': True},
+        'running_status': {'readonly': True},
+        'progress': {'readonly': True},
+        'error': {'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}'},
+        'policy': {'key': 'properties.policy', 'type': 'RollingUpgradePolicy'},
+        'running_status': {'key': 'properties.runningStatus', 'type': 'RollingUpgradeRunningStatus'},
+        'progress': {'key': 'properties.progress', 'type': 'RollingUpgradeProgressInfo'},
+        'error': {'key': 'properties.error', 'type': 'ApiError'},
+    }
+
+    def __init__(self, *, location: str, tags=None, **kwargs) -> None:
+        super(RollingUpgradeStatusInfo, self).__init__(location=location, tags=tags, **kwargs)
+        self.policy = None
+        self.running_status = None
+        self.progress = None
+        self.error = None
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
new file mode 100644
index 000000000000..5c07709435e0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sku.py
@@ -0,0 +1,38 @@
+# 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 Sku(Model):
+    """Describes a virtual machine scale set sku.
+
+    :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**
+    :type tier: str
+    :param capacity: Specifies the number of virtual machines in the scale
+     set.
+    :type capacity: long
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'tier': {'key': 'tier', 'type': 'str'},
+        'capacity': {'key': 'capacity', 'type': 'long'},
+    }
+
+    def __init__(self, **kwargs):
+        super(Sku, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.tier = kwargs.get('tier', None)
+        self.capacity = kwargs.get('capacity', None)
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
new file mode 100644
index 000000000000..f6bc74afaadc
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sku_py3.py
@@ -0,0 +1,38 @@
+# 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 Sku(Model):
+    """Describes a virtual machine scale set sku.
+
+    :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**
+    :type tier: str
+    :param capacity: Specifies the number of virtual machines in the scale
+     set.
+    :type capacity: long
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'tier': {'key': 'tier', 'type': 'str'},
+        'capacity': {'key': 'capacity', 'type': 'long'},
+    }
+
+    def __init__(self, *, name: str=None, tier: str=None, capacity: int=None, **kwargs) -> None:
+        super(Sku, self).__init__(**kwargs)
+        self.name = name
+        self.tier = tier
+        self.capacity = capacity
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/ssh_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/ssh_configuration.py
new file mode 100644
index 000000000000..75abd89078e7
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/ssh_configuration.py
@@ -0,0 +1,30 @@
+# 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 SshConfiguration(Model):
+    """SSH configuration for Linux based VMs running on Azure.
+
+    :param public_keys: The list of SSH public keys used to authenticate with
+     linux based VMs.
+    :type public_keys:
+     list[~azure.mgmt.compute.v2018_06_01.models.SshPublicKey]
+    """
+
+    _attribute_map = {
+        'public_keys': {'key': 'publicKeys', 'type': '[SshPublicKey]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(SshConfiguration, self).__init__(**kwargs)
+        self.public_keys = kwargs.get('public_keys', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/ssh_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/ssh_configuration_py3.py
new file mode 100644
index 000000000000..57599c8f1561
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/ssh_configuration_py3.py
@@ -0,0 +1,30 @@
+# 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 SshConfiguration(Model):
+    """SSH configuration for Linux based VMs running on Azure.
+
+    :param public_keys: The list of SSH public keys used to authenticate with
+     linux based VMs.
+    :type public_keys:
+     list[~azure.mgmt.compute.v2018_06_01.models.SshPublicKey]
+    """
+
+    _attribute_map = {
+        'public_keys': {'key': 'publicKeys', 'type': '[SshPublicKey]'},
+    }
+
+    def __init__(self, *, public_keys=None, **kwargs) -> None:
+        super(SshConfiguration, self).__init__(**kwargs)
+        self.public_keys = public_keys
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/ssh_public_key.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/ssh_public_key.py
new file mode 100644
index 000000000000..122e0d3b9fdd
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/ssh_public_key.py
@@ -0,0 +1,39 @@
+# 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 SshPublicKey(Model):
+    """Contains information about SSH certificate public key and the path on the
+    Linux VM where the public key is placed.
+
+    :param path: Specifies the full path on the created VM where ssh public
+     key is stored. If the file already exists, the specified key is appended
+     to the file. Example: /home/user/.ssh/authorized_keys
+    :type path: str
+    :param key_data: SSH public key certificate used to authenticate with the
+     VM through ssh. The key needs to be at least 2048-bit and in ssh-rsa
+     format. <br><br> For creating ssh keys, see [Create SSH keys on Linux and
+     Mac for Linux VMs in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-mac-create-ssh-keys?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
+    :type key_data: str
+    """
+
+    _attribute_map = {
+        'path': {'key': 'path', 'type': 'str'},
+        'key_data': {'key': 'keyData', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(SshPublicKey, self).__init__(**kwargs)
+        self.path = kwargs.get('path', None)
+        self.key_data = kwargs.get('key_data', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/ssh_public_key_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/ssh_public_key_py3.py
new file mode 100644
index 000000000000..b16ee085b36b
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/ssh_public_key_py3.py
@@ -0,0 +1,39 @@
+# 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 SshPublicKey(Model):
+    """Contains information about SSH certificate public key and the path on the
+    Linux VM where the public key is placed.
+
+    :param path: Specifies the full path on the created VM where ssh public
+     key is stored. If the file already exists, the specified key is appended
+     to the file. Example: /home/user/.ssh/authorized_keys
+    :type path: str
+    :param key_data: SSH public key certificate used to authenticate with the
+     VM through ssh. The key needs to be at least 2048-bit and in ssh-rsa
+     format. <br><br> For creating ssh keys, see [Create SSH keys on Linux and
+     Mac for Linux VMs in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-mac-create-ssh-keys?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
+    :type key_data: str
+    """
+
+    _attribute_map = {
+        'path': {'key': 'path', 'type': 'str'},
+        'key_data': {'key': 'keyData', 'type': 'str'},
+    }
+
+    def __init__(self, *, path: str=None, key_data: str=None, **kwargs) -> None:
+        super(SshPublicKey, self).__init__(**kwargs)
+        self.path = path
+        self.key_data = key_data
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/storage_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/storage_profile.py
new file mode 100644
index 000000000000..4d6540891452
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/storage_profile.py
@@ -0,0 +1,47 @@
+# 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 StorageProfile(Model):
+    """Specifies the storage settings for the virtual machine disks.
+
+    :param image_reference: Specifies information about the image to use. You
+     can specify information about platform images, marketplace images, or
+     virtual machine images. This element is required when you want to use a
+     platform image, marketplace image, or virtual machine image, but is not
+     used in other creation operations.
+    :type image_reference:
+     ~azure.mgmt.compute.v2018_06_01.models.ImageReference
+    :param os_disk: Specifies information about the operating system disk used
+     by the virtual machine. <br><br> For more information about disks, see
+     [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type os_disk: ~azure.mgmt.compute.v2018_06_01.models.OSDisk
+    :param data_disks: Specifies the parameters that are used to add a data
+     disk to a virtual machine. <br><br> For more information about disks, see
+     [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type data_disks: list[~azure.mgmt.compute.v2018_06_01.models.DataDisk]
+    """
+
+    _attribute_map = {
+        'image_reference': {'key': 'imageReference', 'type': 'ImageReference'},
+        'os_disk': {'key': 'osDisk', 'type': 'OSDisk'},
+        'data_disks': {'key': 'dataDisks', 'type': '[DataDisk]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(StorageProfile, self).__init__(**kwargs)
+        self.image_reference = kwargs.get('image_reference', None)
+        self.os_disk = kwargs.get('os_disk', None)
+        self.data_disks = kwargs.get('data_disks', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/storage_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/storage_profile_py3.py
new file mode 100644
index 000000000000..832fc2897f1d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/storage_profile_py3.py
@@ -0,0 +1,47 @@
+# 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 StorageProfile(Model):
+    """Specifies the storage settings for the virtual machine disks.
+
+    :param image_reference: Specifies information about the image to use. You
+     can specify information about platform images, marketplace images, or
+     virtual machine images. This element is required when you want to use a
+     platform image, marketplace image, or virtual machine image, but is not
+     used in other creation operations.
+    :type image_reference:
+     ~azure.mgmt.compute.v2018_06_01.models.ImageReference
+    :param os_disk: Specifies information about the operating system disk used
+     by the virtual machine. <br><br> For more information about disks, see
+     [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type os_disk: ~azure.mgmt.compute.v2018_06_01.models.OSDisk
+    :param data_disks: Specifies the parameters that are used to add a data
+     disk to a virtual machine. <br><br> For more information about disks, see
+     [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type data_disks: list[~azure.mgmt.compute.v2018_06_01.models.DataDisk]
+    """
+
+    _attribute_map = {
+        'image_reference': {'key': 'imageReference', 'type': 'ImageReference'},
+        'os_disk': {'key': 'osDisk', 'type': 'OSDisk'},
+        'data_disks': {'key': 'dataDisks', 'type': '[DataDisk]'},
+    }
+
+    def __init__(self, *, image_reference=None, os_disk=None, data_disks=None, **kwargs) -> None:
+        super(StorageProfile, self).__init__(**kwargs)
+        self.image_reference = image_reference
+        self.os_disk = os_disk
+        self.data_disks = data_disks
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sub_resource.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sub_resource.py
new file mode 100644
index 000000000000..11e092cc6ff5
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sub_resource.py
@@ -0,0 +1,28 @@
+# 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 SubResource(Model):
+    """SubResource.
+
+    :param id: Resource Id
+    :type id: str
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(SubResource, self).__init__(**kwargs)
+        self.id = kwargs.get('id', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sub_resource_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sub_resource_py3.py
new file mode 100644
index 000000000000..29e5afee38f9
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sub_resource_py3.py
@@ -0,0 +1,28 @@
+# 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 SubResource(Model):
+    """SubResource.
+
+    :param id: Resource Id
+    :type id: str
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+    }
+
+    def __init__(self, *, id: str=None, **kwargs) -> None:
+        super(SubResource, self).__init__(**kwargs)
+        self.id = id
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sub_resource_read_only.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sub_resource_read_only.py
new file mode 100644
index 000000000000..4a0ec466c0d4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sub_resource_read_only.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 SubResourceReadOnly(Model):
+    """SubResourceReadOnly.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(SubResourceReadOnly, self).__init__(**kwargs)
+        self.id = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sub_resource_read_only_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sub_resource_read_only_py3.py
new file mode 100644
index 000000000000..cb918e9a2ac6
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/sub_resource_read_only_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 SubResourceReadOnly(Model):
+    """SubResourceReadOnly.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(SubResourceReadOnly, self).__init__(**kwargs)
+        self.id = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/throttled_requests_input.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/throttled_requests_input.py
new file mode 100644
index 000000000000..5eac2a5540ac
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/throttled_requests_input.py
@@ -0,0 +1,52 @@
+# 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 .log_analytics_input_base import LogAnalyticsInputBase
+
+
+class ThrottledRequestsInput(LogAnalyticsInputBase):
+    """Api request input for LogAnalytics getThrottledRequests Api.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param blob_container_sas_uri: Required. SAS Uri of the logging blob
+     container to which LogAnalytics Api writes output logs to.
+    :type blob_container_sas_uri: str
+    :param from_time: Required. From time of the query
+    :type from_time: datetime
+    :param to_time: Required. To time of the query
+    :type to_time: datetime
+    :param group_by_throttle_policy: Group query result by Throttle Policy
+     applied.
+    :type group_by_throttle_policy: bool
+    :param group_by_operation_name: Group query result by  by Operation Name.
+    :type group_by_operation_name: bool
+    :param group_by_resource_name: Group query result by Resource Name.
+    :type group_by_resource_name: bool
+    """
+
+    _validation = {
+        'blob_container_sas_uri': {'required': True},
+        'from_time': {'required': True},
+        'to_time': {'required': True},
+    }
+
+    _attribute_map = {
+        'blob_container_sas_uri': {'key': 'blobContainerSasUri', 'type': 'str'},
+        'from_time': {'key': 'fromTime', 'type': 'iso-8601'},
+        'to_time': {'key': 'toTime', 'type': 'iso-8601'},
+        'group_by_throttle_policy': {'key': 'groupByThrottlePolicy', 'type': 'bool'},
+        'group_by_operation_name': {'key': 'groupByOperationName', 'type': 'bool'},
+        'group_by_resource_name': {'key': 'groupByResourceName', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ThrottledRequestsInput, self).__init__(**kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/throttled_requests_input_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/throttled_requests_input_py3.py
new file mode 100644
index 000000000000..025900705375
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/throttled_requests_input_py3.py
@@ -0,0 +1,52 @@
+# 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 .log_analytics_input_base_py3 import LogAnalyticsInputBase
+
+
+class ThrottledRequestsInput(LogAnalyticsInputBase):
+    """Api request input for LogAnalytics getThrottledRequests Api.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param blob_container_sas_uri: Required. SAS Uri of the logging blob
+     container to which LogAnalytics Api writes output logs to.
+    :type blob_container_sas_uri: str
+    :param from_time: Required. From time of the query
+    :type from_time: datetime
+    :param to_time: Required. To time of the query
+    :type to_time: datetime
+    :param group_by_throttle_policy: Group query result by Throttle Policy
+     applied.
+    :type group_by_throttle_policy: bool
+    :param group_by_operation_name: Group query result by  by Operation Name.
+    :type group_by_operation_name: bool
+    :param group_by_resource_name: Group query result by Resource Name.
+    :type group_by_resource_name: bool
+    """
+
+    _validation = {
+        'blob_container_sas_uri': {'required': True},
+        'from_time': {'required': True},
+        'to_time': {'required': True},
+    }
+
+    _attribute_map = {
+        'blob_container_sas_uri': {'key': 'blobContainerSasUri', 'type': 'str'},
+        'from_time': {'key': 'fromTime', 'type': 'iso-8601'},
+        'to_time': {'key': 'toTime', 'type': 'iso-8601'},
+        'group_by_throttle_policy': {'key': 'groupByThrottlePolicy', 'type': 'bool'},
+        'group_by_operation_name': {'key': 'groupByOperationName', 'type': 'bool'},
+        'group_by_resource_name': {'key': 'groupByResourceName', 'type': 'bool'},
+    }
+
+    def __init__(self, *, blob_container_sas_uri: str, from_time, to_time, group_by_throttle_policy: bool=None, group_by_operation_name: bool=None, group_by_resource_name: bool=None, **kwargs) -> None:
+        super(ThrottledRequestsInput, self).__init__(blob_container_sas_uri=blob_container_sas_uri, from_time=from_time, to_time=to_time, group_by_throttle_policy=group_by_throttle_policy, group_by_operation_name=group_by_operation_name, group_by_resource_name=group_by_resource_name, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/update_resource.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/update_resource.py
new file mode 100644
index 000000000000..b1d2898ff082
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/update_resource.py
@@ -0,0 +1,28 @@
+# 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 UpdateResource(Model):
+    """The Update Resource model definition.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    """
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+    }
+
+    def __init__(self, **kwargs):
+        super(UpdateResource, self).__init__(**kwargs)
+        self.tags = kwargs.get('tags', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/update_resource_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/update_resource_py3.py
new file mode 100644
index 000000000000..c06c17c124d9
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/update_resource_py3.py
@@ -0,0 +1,28 @@
+# 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 UpdateResource(Model):
+    """The Update Resource model definition.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    """
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+    }
+
+    def __init__(self, *, tags=None, **kwargs) -> None:
+        super(UpdateResource, self).__init__(**kwargs)
+        self.tags = tags
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_operation_historical_status_info.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_operation_historical_status_info.py
new file mode 100644
index 000000000000..66d4e5fba5de
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_operation_historical_status_info.py
@@ -0,0 +1,47 @@
+# 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 UpgradeOperationHistoricalStatusInfo(Model):
+    """Virtual Machine Scale Set OS Upgrade History operation response.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar properties: Information about the properties of the upgrade
+     operation.
+    :vartype properties:
+     ~azure.mgmt.compute.v2018_06_01.models.UpgradeOperationHistoricalStatusInfoProperties
+    :ivar type: Resource type
+    :vartype type: str
+    :ivar location: Resource location
+    :vartype location: str
+    """
+
+    _validation = {
+        'properties': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'properties': {'key': 'properties', 'type': 'UpgradeOperationHistoricalStatusInfoProperties'},
+        'type': {'key': 'type', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(UpgradeOperationHistoricalStatusInfo, self).__init__(**kwargs)
+        self.properties = None
+        self.type = None
+        self.location = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_operation_historical_status_info_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_operation_historical_status_info_paged.py
new file mode 100644
index 000000000000..559abad8dd7b
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_operation_historical_status_info_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 UpgradeOperationHistoricalStatusInfoPaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`UpgradeOperationHistoricalStatusInfo <azure.mgmt.compute.v2018_06_01.models.UpgradeOperationHistoricalStatusInfo>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[UpgradeOperationHistoricalStatusInfo]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(UpgradeOperationHistoricalStatusInfoPaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_operation_historical_status_info_properties.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_operation_historical_status_info_properties.py
new file mode 100644
index 000000000000..0bdf4240c949
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_operation_historical_status_info_properties.py
@@ -0,0 +1,67 @@
+# 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 UpgradeOperationHistoricalStatusInfoProperties(Model):
+    """Describes each OS upgrade on the Virtual Machine Scale Set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar running_status: Information about the overall status of the upgrade
+     operation.
+    :vartype running_status:
+     ~azure.mgmt.compute.v2018_06_01.models.UpgradeOperationHistoryStatus
+    :ivar progress: Counts of the VM's in each state.
+    :vartype progress:
+     ~azure.mgmt.compute.v2018_06_01.models.RollingUpgradeProgressInfo
+    :ivar error: Error Details for this upgrade if there are any.
+    :vartype error: ~azure.mgmt.compute.v2018_06_01.models.ApiError
+    :ivar started_by: Invoker of the Upgrade Operation. Possible values
+     include: 'Unknown', 'User', 'Platform'
+    :vartype started_by: str or
+     ~azure.mgmt.compute.v2018_06_01.models.UpgradeOperationInvoker
+    :ivar target_image_reference: Image Reference details
+    :vartype target_image_reference:
+     ~azure.mgmt.compute.v2018_06_01.models.ImageReference
+    :ivar rollback_info: Information about OS rollback if performed
+    :vartype rollback_info:
+     ~azure.mgmt.compute.v2018_06_01.models.RollbackStatusInfo
+    """
+
+    _validation = {
+        'running_status': {'readonly': True},
+        'progress': {'readonly': True},
+        'error': {'readonly': True},
+        'started_by': {'readonly': True},
+        'target_image_reference': {'readonly': True},
+        'rollback_info': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'running_status': {'key': 'runningStatus', 'type': 'UpgradeOperationHistoryStatus'},
+        'progress': {'key': 'progress', 'type': 'RollingUpgradeProgressInfo'},
+        'error': {'key': 'error', 'type': 'ApiError'},
+        'started_by': {'key': 'startedBy', 'type': 'UpgradeOperationInvoker'},
+        'target_image_reference': {'key': 'targetImageReference', 'type': 'ImageReference'},
+        'rollback_info': {'key': 'rollbackInfo', 'type': 'RollbackStatusInfo'},
+    }
+
+    def __init__(self, **kwargs):
+        super(UpgradeOperationHistoricalStatusInfoProperties, self).__init__(**kwargs)
+        self.running_status = None
+        self.progress = None
+        self.error = None
+        self.started_by = None
+        self.target_image_reference = None
+        self.rollback_info = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_operation_historical_status_info_properties_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_operation_historical_status_info_properties_py3.py
new file mode 100644
index 000000000000..5bf54db81dc0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_operation_historical_status_info_properties_py3.py
@@ -0,0 +1,67 @@
+# 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 UpgradeOperationHistoricalStatusInfoProperties(Model):
+    """Describes each OS upgrade on the Virtual Machine Scale Set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar running_status: Information about the overall status of the upgrade
+     operation.
+    :vartype running_status:
+     ~azure.mgmt.compute.v2018_06_01.models.UpgradeOperationHistoryStatus
+    :ivar progress: Counts of the VM's in each state.
+    :vartype progress:
+     ~azure.mgmt.compute.v2018_06_01.models.RollingUpgradeProgressInfo
+    :ivar error: Error Details for this upgrade if there are any.
+    :vartype error: ~azure.mgmt.compute.v2018_06_01.models.ApiError
+    :ivar started_by: Invoker of the Upgrade Operation. Possible values
+     include: 'Unknown', 'User', 'Platform'
+    :vartype started_by: str or
+     ~azure.mgmt.compute.v2018_06_01.models.UpgradeOperationInvoker
+    :ivar target_image_reference: Image Reference details
+    :vartype target_image_reference:
+     ~azure.mgmt.compute.v2018_06_01.models.ImageReference
+    :ivar rollback_info: Information about OS rollback if performed
+    :vartype rollback_info:
+     ~azure.mgmt.compute.v2018_06_01.models.RollbackStatusInfo
+    """
+
+    _validation = {
+        'running_status': {'readonly': True},
+        'progress': {'readonly': True},
+        'error': {'readonly': True},
+        'started_by': {'readonly': True},
+        'target_image_reference': {'readonly': True},
+        'rollback_info': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'running_status': {'key': 'runningStatus', 'type': 'UpgradeOperationHistoryStatus'},
+        'progress': {'key': 'progress', 'type': 'RollingUpgradeProgressInfo'},
+        'error': {'key': 'error', 'type': 'ApiError'},
+        'started_by': {'key': 'startedBy', 'type': 'UpgradeOperationInvoker'},
+        'target_image_reference': {'key': 'targetImageReference', 'type': 'ImageReference'},
+        'rollback_info': {'key': 'rollbackInfo', 'type': 'RollbackStatusInfo'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(UpgradeOperationHistoricalStatusInfoProperties, self).__init__(**kwargs)
+        self.running_status = None
+        self.progress = None
+        self.error = None
+        self.started_by = None
+        self.target_image_reference = None
+        self.rollback_info = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_operation_historical_status_info_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_operation_historical_status_info_py3.py
new file mode 100644
index 000000000000..700d150fa350
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_operation_historical_status_info_py3.py
@@ -0,0 +1,47 @@
+# 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 UpgradeOperationHistoricalStatusInfo(Model):
+    """Virtual Machine Scale Set OS Upgrade History operation response.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar properties: Information about the properties of the upgrade
+     operation.
+    :vartype properties:
+     ~azure.mgmt.compute.v2018_06_01.models.UpgradeOperationHistoricalStatusInfoProperties
+    :ivar type: Resource type
+    :vartype type: str
+    :ivar location: Resource location
+    :vartype location: str
+    """
+
+    _validation = {
+        'properties': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'properties': {'key': 'properties', 'type': 'UpgradeOperationHistoricalStatusInfoProperties'},
+        'type': {'key': 'type', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(UpgradeOperationHistoricalStatusInfo, self).__init__(**kwargs)
+        self.properties = None
+        self.type = None
+        self.location = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_operation_history_status.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_operation_history_status.py
new file mode 100644
index 000000000000..d6e1950e6d86
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_operation_history_status.py
@@ -0,0 +1,46 @@
+# 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 UpgradeOperationHistoryStatus(Model):
+    """Information about the current running state of the overall upgrade.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar code: Code indicating the current status of the upgrade. Possible
+     values include: 'RollingForward', 'Cancelled', 'Completed', 'Faulted'
+    :vartype code: str or ~azure.mgmt.compute.v2018_06_01.models.UpgradeState
+    :ivar start_time: Start time of the upgrade.
+    :vartype start_time: datetime
+    :ivar end_time: End time of the upgrade.
+    :vartype end_time: datetime
+    """
+
+    _validation = {
+        'code': {'readonly': True},
+        'start_time': {'readonly': True},
+        'end_time': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'UpgradeState'},
+        'start_time': {'key': 'startTime', 'type': 'iso-8601'},
+        'end_time': {'key': 'endTime', 'type': 'iso-8601'},
+    }
+
+    def __init__(self, **kwargs):
+        super(UpgradeOperationHistoryStatus, self).__init__(**kwargs)
+        self.code = None
+        self.start_time = None
+        self.end_time = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_operation_history_status_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_operation_history_status_py3.py
new file mode 100644
index 000000000000..858d03eeac93
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_operation_history_status_py3.py
@@ -0,0 +1,46 @@
+# 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 UpgradeOperationHistoryStatus(Model):
+    """Information about the current running state of the overall upgrade.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar code: Code indicating the current status of the upgrade. Possible
+     values include: 'RollingForward', 'Cancelled', 'Completed', 'Faulted'
+    :vartype code: str or ~azure.mgmt.compute.v2018_06_01.models.UpgradeState
+    :ivar start_time: Start time of the upgrade.
+    :vartype start_time: datetime
+    :ivar end_time: End time of the upgrade.
+    :vartype end_time: datetime
+    """
+
+    _validation = {
+        'code': {'readonly': True},
+        'start_time': {'readonly': True},
+        'end_time': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'UpgradeState'},
+        'start_time': {'key': 'startTime', 'type': 'iso-8601'},
+        'end_time': {'key': 'endTime', 'type': 'iso-8601'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(UpgradeOperationHistoryStatus, self).__init__(**kwargs)
+        self.code = None
+        self.start_time = None
+        self.end_time = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_policy.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_policy.py
new file mode 100644
index 000000000000..513ba0ec5588
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_policy.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 UpgradePolicy(Model):
+    """Describes an upgrade policy - automatic, manual, or rolling.
+
+    :param mode: Specifies the mode of an upgrade to virtual machines in the
+     scale set.<br /><br /> Possible values are:<br /><br /> **Manual** - You
+     control the application of updates to virtual machines in the scale set.
+     You do this by using the manualUpgrade action.<br /><br /> **Automatic** -
+     All virtual machines in the scale set are  automatically updated at the
+     same time. Possible values include: 'Automatic', 'Manual', 'Rolling'
+    :type mode: str or ~azure.mgmt.compute.v2018_06_01.models.UpgradeMode
+    :param rolling_upgrade_policy: The configuration parameters used while
+     performing a rolling upgrade.
+    :type rolling_upgrade_policy:
+     ~azure.mgmt.compute.v2018_06_01.models.RollingUpgradePolicy
+    :param automatic_os_upgrade: Whether OS upgrades should automatically be
+     applied to scale set instances in a rolling fashion when a newer version
+     of the image becomes available.
+    :type automatic_os_upgrade: bool
+    :param auto_os_upgrade_policy: Configuration parameters used for
+     performing automatic OS Upgrade.
+    :type auto_os_upgrade_policy:
+     ~azure.mgmt.compute.v2018_06_01.models.AutoOSUpgradePolicy
+    """
+
+    _attribute_map = {
+        'mode': {'key': 'mode', 'type': 'UpgradeMode'},
+        'rolling_upgrade_policy': {'key': 'rollingUpgradePolicy', 'type': 'RollingUpgradePolicy'},
+        'automatic_os_upgrade': {'key': 'automaticOSUpgrade', 'type': 'bool'},
+        'auto_os_upgrade_policy': {'key': 'autoOSUpgradePolicy', 'type': 'AutoOSUpgradePolicy'},
+    }
+
+    def __init__(self, **kwargs):
+        super(UpgradePolicy, self).__init__(**kwargs)
+        self.mode = kwargs.get('mode', None)
+        self.rolling_upgrade_policy = kwargs.get('rolling_upgrade_policy', None)
+        self.automatic_os_upgrade = kwargs.get('automatic_os_upgrade', None)
+        self.auto_os_upgrade_policy = kwargs.get('auto_os_upgrade_policy', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_policy_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_policy_py3.py
new file mode 100644
index 000000000000..99a24dae2f77
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/upgrade_policy_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 UpgradePolicy(Model):
+    """Describes an upgrade policy - automatic, manual, or rolling.
+
+    :param mode: Specifies the mode of an upgrade to virtual machines in the
+     scale set.<br /><br /> Possible values are:<br /><br /> **Manual** - You
+     control the application of updates to virtual machines in the scale set.
+     You do this by using the manualUpgrade action.<br /><br /> **Automatic** -
+     All virtual machines in the scale set are  automatically updated at the
+     same time. Possible values include: 'Automatic', 'Manual', 'Rolling'
+    :type mode: str or ~azure.mgmt.compute.v2018_06_01.models.UpgradeMode
+    :param rolling_upgrade_policy: The configuration parameters used while
+     performing a rolling upgrade.
+    :type rolling_upgrade_policy:
+     ~azure.mgmt.compute.v2018_06_01.models.RollingUpgradePolicy
+    :param automatic_os_upgrade: Whether OS upgrades should automatically be
+     applied to scale set instances in a rolling fashion when a newer version
+     of the image becomes available.
+    :type automatic_os_upgrade: bool
+    :param auto_os_upgrade_policy: Configuration parameters used for
+     performing automatic OS Upgrade.
+    :type auto_os_upgrade_policy:
+     ~azure.mgmt.compute.v2018_06_01.models.AutoOSUpgradePolicy
+    """
+
+    _attribute_map = {
+        'mode': {'key': 'mode', 'type': 'UpgradeMode'},
+        'rolling_upgrade_policy': {'key': 'rollingUpgradePolicy', 'type': 'RollingUpgradePolicy'},
+        'automatic_os_upgrade': {'key': 'automaticOSUpgrade', 'type': 'bool'},
+        'auto_os_upgrade_policy': {'key': 'autoOSUpgradePolicy', 'type': 'AutoOSUpgradePolicy'},
+    }
+
+    def __init__(self, *, mode=None, rolling_upgrade_policy=None, automatic_os_upgrade: bool=None, auto_os_upgrade_policy=None, **kwargs) -> None:
+        super(UpgradePolicy, self).__init__(**kwargs)
+        self.mode = mode
+        self.rolling_upgrade_policy = rolling_upgrade_policy
+        self.automatic_os_upgrade = automatic_os_upgrade
+        self.auto_os_upgrade_policy = auto_os_upgrade_policy
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/usage.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/usage.py
new file mode 100644
index 000000000000..9b3b77b2f49d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/usage.py
@@ -0,0 +1,54 @@
+# 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 Usage(Model):
+    """Describes Compute Resource Usage.
+
+    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 unit: Required. An enum describing the unit of usage measurement.
+     Default value: "Count" .
+    :vartype unit: str
+    :param current_value: Required. The current usage of the resource.
+    :type current_value: int
+    :param limit: Required. The maximum permitted usage of the resource.
+    :type limit: long
+    :param name: Required. The name of the type of usage.
+    :type name: ~azure.mgmt.compute.v2018_06_01.models.UsageName
+    """
+
+    _validation = {
+        'unit': {'required': True, 'constant': True},
+        'current_value': {'required': True},
+        'limit': {'required': True},
+        'name': {'required': True},
+    }
+
+    _attribute_map = {
+        'unit': {'key': 'unit', 'type': 'str'},
+        'current_value': {'key': 'currentValue', 'type': 'int'},
+        'limit': {'key': 'limit', 'type': 'long'},
+        'name': {'key': 'name', 'type': 'UsageName'},
+    }
+
+    unit = "Count"
+
+    def __init__(self, **kwargs):
+        super(Usage, self).__init__(**kwargs)
+        self.current_value = kwargs.get('current_value', None)
+        self.limit = kwargs.get('limit', None)
+        self.name = kwargs.get('name', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/usage_name.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/usage_name.py
new file mode 100644
index 000000000000..e2560936493e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/usage_name.py
@@ -0,0 +1,32 @@
+# 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 UsageName(Model):
+    """The Usage Names.
+
+    :param value: The name of the resource.
+    :type value: str
+    :param localized_value: The localized name of the resource.
+    :type localized_value: str
+    """
+
+    _attribute_map = {
+        'value': {'key': 'value', 'type': 'str'},
+        'localized_value': {'key': 'localizedValue', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(UsageName, self).__init__(**kwargs)
+        self.value = kwargs.get('value', None)
+        self.localized_value = kwargs.get('localized_value', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/usage_name_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/usage_name_py3.py
new file mode 100644
index 000000000000..ad0b77459f75
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/usage_name_py3.py
@@ -0,0 +1,32 @@
+# 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 UsageName(Model):
+    """The Usage Names.
+
+    :param value: The name of the resource.
+    :type value: str
+    :param localized_value: The localized name of the resource.
+    :type localized_value: str
+    """
+
+    _attribute_map = {
+        'value': {'key': 'value', 'type': 'str'},
+        'localized_value': {'key': 'localizedValue', 'type': 'str'},
+    }
+
+    def __init__(self, *, value: str=None, localized_value: str=None, **kwargs) -> None:
+        super(UsageName, self).__init__(**kwargs)
+        self.value = value
+        self.localized_value = localized_value
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/usage_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/usage_paged.py
new file mode 100644
index 000000000000..7bed22a45648
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/usage_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 UsagePaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`Usage <azure.mgmt.compute.v2018_06_01.models.Usage>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[Usage]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(UsagePaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/usage_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/usage_py3.py
new file mode 100644
index 000000000000..f3ffae30d56c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/usage_py3.py
@@ -0,0 +1,54 @@
+# 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 Usage(Model):
+    """Describes Compute Resource Usage.
+
+    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 unit: Required. An enum describing the unit of usage measurement.
+     Default value: "Count" .
+    :vartype unit: str
+    :param current_value: Required. The current usage of the resource.
+    :type current_value: int
+    :param limit: Required. The maximum permitted usage of the resource.
+    :type limit: long
+    :param name: Required. The name of the type of usage.
+    :type name: ~azure.mgmt.compute.v2018_06_01.models.UsageName
+    """
+
+    _validation = {
+        'unit': {'required': True, 'constant': True},
+        'current_value': {'required': True},
+        'limit': {'required': True},
+        'name': {'required': True},
+    }
+
+    _attribute_map = {
+        'unit': {'key': 'unit', 'type': 'str'},
+        'current_value': {'key': 'currentValue', 'type': 'int'},
+        'limit': {'key': 'limit', 'type': 'long'},
+        'name': {'key': 'name', 'type': 'UsageName'},
+    }
+
+    unit = "Count"
+
+    def __init__(self, *, current_value: int, limit: int, name, **kwargs) -> None:
+        super(Usage, self).__init__(**kwargs)
+        self.current_value = current_value
+        self.limit = limit
+        self.name = name
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/vault_certificate.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/vault_certificate.py
new file mode 100644
index 000000000000..b173def6f820
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/vault_certificate.py
@@ -0,0 +1,46 @@
+# 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 VaultCertificate(Model):
+    """Describes a single certificate reference in a Key Vault, and where the
+    certificate should reside on the VM.
+
+    :param certificate_url: This is the URL of a certificate that has been
+     uploaded to Key Vault as a secret. For adding a secret to the Key Vault,
+     see [Add a key or secret to the key
+     vault](https://docs.microsoft.com/azure/key-vault/key-vault-get-started/#add).
+     In this case, your certificate needs to be It is the Base64 encoding of
+     the following JSON Object which is encoded in UTF-8: <br><br> {<br>
+     "data":"<Base64-encoded-certificate>",<br>  "dataType":"pfx",<br>
+     "password":"<pfx-file-password>"<br>}
+    :type certificate_url: str
+    :param certificate_store: For Windows VMs, specifies the certificate store
+     on the Virtual Machine to which the certificate should be added. The
+     specified certificate store is implicitly in the LocalMachine account.
+     <br><br>For Linux VMs, the certificate file is placed under the
+     /var/lib/waagent directory, with the file name <UppercaseThumbprint>.crt
+     for the X509 certificate file and <UppercaseThumbpring>.prv for private
+     key. Both of these files are .pem formatted.
+    :type certificate_store: str
+    """
+
+    _attribute_map = {
+        'certificate_url': {'key': 'certificateUrl', 'type': 'str'},
+        'certificate_store': {'key': 'certificateStore', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VaultCertificate, self).__init__(**kwargs)
+        self.certificate_url = kwargs.get('certificate_url', None)
+        self.certificate_store = kwargs.get('certificate_store', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/vault_certificate_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/vault_certificate_py3.py
new file mode 100644
index 000000000000..eda5ba1c3f1d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/vault_certificate_py3.py
@@ -0,0 +1,46 @@
+# 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 VaultCertificate(Model):
+    """Describes a single certificate reference in a Key Vault, and where the
+    certificate should reside on the VM.
+
+    :param certificate_url: This is the URL of a certificate that has been
+     uploaded to Key Vault as a secret. For adding a secret to the Key Vault,
+     see [Add a key or secret to the key
+     vault](https://docs.microsoft.com/azure/key-vault/key-vault-get-started/#add).
+     In this case, your certificate needs to be It is the Base64 encoding of
+     the following JSON Object which is encoded in UTF-8: <br><br> {<br>
+     "data":"<Base64-encoded-certificate>",<br>  "dataType":"pfx",<br>
+     "password":"<pfx-file-password>"<br>}
+    :type certificate_url: str
+    :param certificate_store: For Windows VMs, specifies the certificate store
+     on the Virtual Machine to which the certificate should be added. The
+     specified certificate store is implicitly in the LocalMachine account.
+     <br><br>For Linux VMs, the certificate file is placed under the
+     /var/lib/waagent directory, with the file name <UppercaseThumbprint>.crt
+     for the X509 certificate file and <UppercaseThumbpring>.prv for private
+     key. Both of these files are .pem formatted.
+    :type certificate_store: str
+    """
+
+    _attribute_map = {
+        'certificate_url': {'key': 'certificateUrl', 'type': 'str'},
+        'certificate_store': {'key': 'certificateStore', 'type': 'str'},
+    }
+
+    def __init__(self, *, certificate_url: str=None, certificate_store: str=None, **kwargs) -> None:
+        super(VaultCertificate, self).__init__(**kwargs)
+        self.certificate_url = certificate_url
+        self.certificate_store = certificate_store
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/vault_secret_group.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/vault_secret_group.py
new file mode 100644
index 000000000000..d79a189ed937
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/vault_secret_group.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 VaultSecretGroup(Model):
+    """Describes a set of certificates which are all in the same Key Vault.
+
+    :param source_vault: The relative URL of the Key Vault containing all of
+     the certificates in VaultCertificates.
+    :type source_vault: ~azure.mgmt.compute.v2018_06_01.models.SubResource
+    :param vault_certificates: The list of key vault references in SourceVault
+     which contain certificates.
+    :type vault_certificates:
+     list[~azure.mgmt.compute.v2018_06_01.models.VaultCertificate]
+    """
+
+    _attribute_map = {
+        'source_vault': {'key': 'sourceVault', 'type': 'SubResource'},
+        'vault_certificates': {'key': 'vaultCertificates', 'type': '[VaultCertificate]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VaultSecretGroup, self).__init__(**kwargs)
+        self.source_vault = kwargs.get('source_vault', None)
+        self.vault_certificates = kwargs.get('vault_certificates', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/vault_secret_group_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/vault_secret_group_py3.py
new file mode 100644
index 000000000000..42a4b92ac763
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/vault_secret_group_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 VaultSecretGroup(Model):
+    """Describes a set of certificates which are all in the same Key Vault.
+
+    :param source_vault: The relative URL of the Key Vault containing all of
+     the certificates in VaultCertificates.
+    :type source_vault: ~azure.mgmt.compute.v2018_06_01.models.SubResource
+    :param vault_certificates: The list of key vault references in SourceVault
+     which contain certificates.
+    :type vault_certificates:
+     list[~azure.mgmt.compute.v2018_06_01.models.VaultCertificate]
+    """
+
+    _attribute_map = {
+        'source_vault': {'key': 'sourceVault', 'type': 'SubResource'},
+        'vault_certificates': {'key': 'vaultCertificates', 'type': '[VaultCertificate]'},
+    }
+
+    def __init__(self, *, source_vault=None, vault_certificates=None, **kwargs) -> None:
+        super(VaultSecretGroup, self).__init__(**kwargs)
+        self.source_vault = source_vault
+        self.vault_certificates = vault_certificates
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_hard_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_hard_disk.py
new file mode 100644
index 000000000000..5e3ad9dea7d4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_hard_disk.py
@@ -0,0 +1,28 @@
+# 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 VirtualHardDisk(Model):
+    """Describes the uri of a disk.
+
+    :param uri: Specifies the virtual hard disk's uri.
+    :type uri: str
+    """
+
+    _attribute_map = {
+        'uri': {'key': 'uri', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualHardDisk, self).__init__(**kwargs)
+        self.uri = kwargs.get('uri', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_hard_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_hard_disk_py3.py
new file mode 100644
index 000000000000..9c069b95f084
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_hard_disk_py3.py
@@ -0,0 +1,28 @@
+# 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 VirtualHardDisk(Model):
+    """Describes the uri of a disk.
+
+    :param uri: Specifies the virtual hard disk's uri.
+    :type uri: str
+    """
+
+    _attribute_map = {
+        'uri': {'key': 'uri', 'type': 'str'},
+    }
+
+    def __init__(self, *, uri: str=None, **kwargs) -> None:
+        super(VirtualHardDisk, self).__init__(**kwargs)
+        self.uri = uri
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
new file mode 100644
index 000000000000..5ba0756820ef
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine.py
@@ -0,0 +1,150 @@
+# 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 VirtualMachine(Resource):
+    """Describes a Virtual Machine.
+
+    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]
+    :param plan: Specifies information about the marketplace image used to
+     create the virtual machine. This element is only used for marketplace
+     images. Before you can use a marketplace image from an API, you must
+     enable the image for programmatic use.  In the Azure portal, find the
+     marketplace image that you want to use and then click **Want to deploy
+     programmatically, Get Started ->**. Enter any required information and
+     then click **Save**.
+    :type plan: ~azure.mgmt.compute.v2018_06_01.models.Plan
+    :param hardware_profile: Specifies the hardware settings for the virtual
+     machine.
+    :type hardware_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.HardwareProfile
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.StorageProfile
+    :param os_profile: Specifies the operating system settings for the virtual
+     machine.
+    :type os_profile: ~azure.mgmt.compute.v2018_06_01.models.OSProfile
+    :param network_profile: Specifies the network interfaces of the virtual
+     machine.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.NetworkProfile
+    :param diagnostics_profile: Specifies the boot diagnostic settings state.
+     <br><br>Minimum api-version: 2015-06-15.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.DiagnosticsProfile
+    :param availability_set: Specifies information about the availability set
+     that the virtual machine should be assigned to. Virtual machines specified
+     in the same availability set are allocated to different nodes to maximize
+     availability. For more information about availability sets, see [Manage
+     the availability of virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+     <br><br> For more information on Azure planned maintainance, see [Planned
+     maintenance for virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Currently, a VM can only be added to availability set at creation
+     time. An existing VM cannot be added to an availability set.
+    :type availability_set: ~azure.mgmt.compute.v2018_06_01.models.SubResource
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :ivar instance_view: The virtual machine instance view.
+    :vartype instance_view:
+     ~azure.mgmt.compute.v2018_06_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:
+     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
+     is included in a request for an update, the value must match the initial
+     value. This value cannot be updated. <br><br> For more information, see
+     [Azure Hybrid Use Benefit for Windows
+     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Minimum api-version: 2015-06-15
+    :type license_type: str
+    :ivar vm_id: Specifies the VM unique ID which is a 128-bits identifier
+     that is encoded and stored in all Azure IaaS VMs SMBIOS and can be read
+     using platform BIOS commands.
+    :vartype vm_id: str
+    :ivar resources: The virtual machine child extension resources.
+    :vartype resources:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineExtension]
+    :param identity: The identity of the virtual machine, if configured.
+    :type identity:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineIdentity
+    :param zones: The virtual machine zones.
+    :type zones: list[str]
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'provisioning_state': {'readonly': True},
+        'instance_view': {'readonly': True},
+        'vm_id': {'readonly': True},
+        'resources': {'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}'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
+        'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
+        'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
+        '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': 'VirtualMachineInstanceView'},
+        'license_type': {'key': 'properties.licenseType', 'type': 'str'},
+        'vm_id': {'key': 'properties.vmId', 'type': 'str'},
+        'resources': {'key': 'resources', 'type': '[VirtualMachineExtension]'},
+        'identity': {'key': 'identity', 'type': 'VirtualMachineIdentity'},
+        'zones': {'key': 'zones', 'type': '[str]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachine, self).__init__(**kwargs)
+        self.plan = kwargs.get('plan', None)
+        self.hardware_profile = kwargs.get('hardware_profile', None)
+        self.storage_profile = kwargs.get('storage_profile', 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)
+        self.availability_set = kwargs.get('availability_set', None)
+        self.provisioning_state = None
+        self.instance_view = None
+        self.license_type = kwargs.get('license_type', None)
+        self.vm_id = None
+        self.resources = None
+        self.identity = kwargs.get('identity', None)
+        self.zones = kwargs.get('zones', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_agent_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_agent_instance_view.py
new file mode 100644
index 000000000000..d154b74e33f6
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_agent_instance_view.py
@@ -0,0 +1,39 @@
+# 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 VirtualMachineAgentInstanceView(Model):
+    """The instance view of the VM Agent running on the virtual machine.
+
+    :param vm_agent_version: The VM Agent full version.
+    :type vm_agent_version: str
+    :param extension_handlers: The virtual machine extension handler instance
+     view.
+    :type extension_handlers:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineExtensionHandlerInstanceView]
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_06_01.models.InstanceViewStatus]
+    """
+
+    _attribute_map = {
+        'vm_agent_version': {'key': 'vmAgentVersion', 'type': 'str'},
+        'extension_handlers': {'key': 'extensionHandlers', 'type': '[VirtualMachineExtensionHandlerInstanceView]'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineAgentInstanceView, self).__init__(**kwargs)
+        self.vm_agent_version = kwargs.get('vm_agent_version', None)
+        self.extension_handlers = kwargs.get('extension_handlers', None)
+        self.statuses = kwargs.get('statuses', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_agent_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_agent_instance_view_py3.py
new file mode 100644
index 000000000000..d0cdb97ae53b
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_agent_instance_view_py3.py
@@ -0,0 +1,39 @@
+# 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 VirtualMachineAgentInstanceView(Model):
+    """The instance view of the VM Agent running on the virtual machine.
+
+    :param vm_agent_version: The VM Agent full version.
+    :type vm_agent_version: str
+    :param extension_handlers: The virtual machine extension handler instance
+     view.
+    :type extension_handlers:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineExtensionHandlerInstanceView]
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_06_01.models.InstanceViewStatus]
+    """
+
+    _attribute_map = {
+        'vm_agent_version': {'key': 'vmAgentVersion', 'type': 'str'},
+        'extension_handlers': {'key': 'extensionHandlers', 'type': '[VirtualMachineExtensionHandlerInstanceView]'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, *, vm_agent_version: str=None, extension_handlers=None, statuses=None, **kwargs) -> None:
+        super(VirtualMachineAgentInstanceView, self).__init__(**kwargs)
+        self.vm_agent_version = vm_agent_version
+        self.extension_handlers = extension_handlers
+        self.statuses = statuses
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_capture_parameters.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_capture_parameters.py
new file mode 100644
index 000000000000..4e6ffbea7a4f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_capture_parameters.py
@@ -0,0 +1,46 @@
+# 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 VirtualMachineCaptureParameters(Model):
+    """Capture Virtual Machine parameters.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param vhd_prefix: Required. The captured virtual hard disk's name prefix.
+    :type vhd_prefix: str
+    :param destination_container_name: Required. The destination container
+     name.
+    :type destination_container_name: str
+    :param overwrite_vhds: Required. Specifies whether to overwrite the
+     destination virtual hard disk, in case of conflict.
+    :type overwrite_vhds: bool
+    """
+
+    _validation = {
+        'vhd_prefix': {'required': True},
+        'destination_container_name': {'required': True},
+        'overwrite_vhds': {'required': True},
+    }
+
+    _attribute_map = {
+        'vhd_prefix': {'key': 'vhdPrefix', 'type': 'str'},
+        'destination_container_name': {'key': 'destinationContainerName', 'type': 'str'},
+        'overwrite_vhds': {'key': 'overwriteVhds', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineCaptureParameters, self).__init__(**kwargs)
+        self.vhd_prefix = kwargs.get('vhd_prefix', None)
+        self.destination_container_name = kwargs.get('destination_container_name', None)
+        self.overwrite_vhds = kwargs.get('overwrite_vhds', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_capture_parameters_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_capture_parameters_py3.py
new file mode 100644
index 000000000000..1866cdc23300
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_capture_parameters_py3.py
@@ -0,0 +1,46 @@
+# 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 VirtualMachineCaptureParameters(Model):
+    """Capture Virtual Machine parameters.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param vhd_prefix: Required. The captured virtual hard disk's name prefix.
+    :type vhd_prefix: str
+    :param destination_container_name: Required. The destination container
+     name.
+    :type destination_container_name: str
+    :param overwrite_vhds: Required. Specifies whether to overwrite the
+     destination virtual hard disk, in case of conflict.
+    :type overwrite_vhds: bool
+    """
+
+    _validation = {
+        'vhd_prefix': {'required': True},
+        'destination_container_name': {'required': True},
+        'overwrite_vhds': {'required': True},
+    }
+
+    _attribute_map = {
+        'vhd_prefix': {'key': 'vhdPrefix', 'type': 'str'},
+        'destination_container_name': {'key': 'destinationContainerName', 'type': 'str'},
+        'overwrite_vhds': {'key': 'overwriteVhds', 'type': 'bool'},
+    }
+
+    def __init__(self, *, vhd_prefix: str, destination_container_name: str, overwrite_vhds: bool, **kwargs) -> None:
+        super(VirtualMachineCaptureParameters, self).__init__(**kwargs)
+        self.vhd_prefix = vhd_prefix
+        self.destination_container_name = destination_container_name
+        self.overwrite_vhds = overwrite_vhds
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_capture_result.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_capture_result.py
new file mode 100644
index 000000000000..2972e1f2fcda
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_capture_result.py
@@ -0,0 +1,53 @@
+# 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 .sub_resource import SubResource
+
+
+class VirtualMachineCaptureResult(SubResource):
+    """Output of virtual machine capture operation.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param id: Resource Id
+    :type id: str
+    :ivar schema: the schema of the captured virtual machine
+    :vartype schema: str
+    :ivar content_version: the version of the content
+    :vartype content_version: str
+    :ivar parameters: parameters of the captured virtual machine
+    :vartype parameters: object
+    :ivar resources: a list of resource items of the captured virtual machine
+    :vartype resources: list[object]
+    """
+
+    _validation = {
+        'schema': {'readonly': True},
+        'content_version': {'readonly': True},
+        'parameters': {'readonly': True},
+        'resources': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'schema': {'key': '$schema', 'type': 'str'},
+        'content_version': {'key': 'contentVersion', 'type': 'str'},
+        'parameters': {'key': 'parameters', 'type': 'object'},
+        'resources': {'key': 'resources', 'type': '[object]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineCaptureResult, self).__init__(**kwargs)
+        self.schema = None
+        self.content_version = None
+        self.parameters = None
+        self.resources = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_capture_result_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_capture_result_py3.py
new file mode 100644
index 000000000000..09e8afde1591
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_capture_result_py3.py
@@ -0,0 +1,53 @@
+# 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 .sub_resource_py3 import SubResource
+
+
+class VirtualMachineCaptureResult(SubResource):
+    """Output of virtual machine capture operation.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param id: Resource Id
+    :type id: str
+    :ivar schema: the schema of the captured virtual machine
+    :vartype schema: str
+    :ivar content_version: the version of the content
+    :vartype content_version: str
+    :ivar parameters: parameters of the captured virtual machine
+    :vartype parameters: object
+    :ivar resources: a list of resource items of the captured virtual machine
+    :vartype resources: list[object]
+    """
+
+    _validation = {
+        'schema': {'readonly': True},
+        'content_version': {'readonly': True},
+        'parameters': {'readonly': True},
+        'resources': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'schema': {'key': '$schema', 'type': 'str'},
+        'content_version': {'key': 'contentVersion', 'type': 'str'},
+        'parameters': {'key': 'parameters', 'type': 'object'},
+        'resources': {'key': 'resources', 'type': '[object]'},
+    }
+
+    def __init__(self, *, id: str=None, **kwargs) -> None:
+        super(VirtualMachineCaptureResult, self).__init__(id=id, **kwargs)
+        self.schema = None
+        self.content_version = None
+        self.parameters = None
+        self.resources = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension.py
new file mode 100644
index 000000000000..8b81c7301315
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension.py
@@ -0,0 +1,97 @@
+# 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 VirtualMachineExtension(Resource):
+    """Describes a Virtual Machine Extension.
+
+    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]
+    :param force_update_tag: How the extension handler should be forced to
+     update even if the extension configuration has not changed.
+    :type force_update_tag: str
+    :param publisher: The name of the extension handler publisher.
+    :type publisher: str
+    :param virtual_machine_extension_type: Specifies the type of the
+     extension; an example is "CustomScriptExtension".
+    :type virtual_machine_extension_type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param auto_upgrade_minor_version: Indicates whether the extension should
+     use a newer minor version if one is available at deployment time. Once
+     deployed, however, the extension will not upgrade minor versions unless
+     redeployed, even with this property set to true.
+    :type auto_upgrade_minor_version: bool
+    :param settings: Json formatted public settings for the extension.
+    :type settings: object
+    :param protected_settings: The extension can contain either
+     protectedSettings or protectedSettingsFromKeyVault or no protected
+     settings at all.
+    :type protected_settings: object
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :param instance_view: The virtual machine extension instance view.
+    :type instance_view:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineExtensionInstanceView
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'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}'},
+        'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'},
+        'publisher': {'key': 'properties.publisher', 'type': 'str'},
+        'virtual_machine_extension_type': {'key': 'properties.type', 'type': 'str'},
+        'type_handler_version': {'key': 'properties.typeHandlerVersion', 'type': 'str'},
+        'auto_upgrade_minor_version': {'key': 'properties.autoUpgradeMinorVersion', 'type': 'bool'},
+        'settings': {'key': 'properties.settings', 'type': 'object'},
+        'protected_settings': {'key': 'properties.protectedSettings', 'type': 'object'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineExtensionInstanceView'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineExtension, self).__init__(**kwargs)
+        self.force_update_tag = kwargs.get('force_update_tag', None)
+        self.publisher = kwargs.get('publisher', None)
+        self.virtual_machine_extension_type = kwargs.get('virtual_machine_extension_type', None)
+        self.type_handler_version = kwargs.get('type_handler_version', None)
+        self.auto_upgrade_minor_version = kwargs.get('auto_upgrade_minor_version', None)
+        self.settings = kwargs.get('settings', None)
+        self.protected_settings = kwargs.get('protected_settings', None)
+        self.provisioning_state = None
+        self.instance_view = kwargs.get('instance_view', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_handler_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_handler_instance_view.py
new file mode 100644
index 000000000000..2756ace1f244
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_handler_instance_view.py
@@ -0,0 +1,37 @@
+# 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 VirtualMachineExtensionHandlerInstanceView(Model):
+    """The instance view of a virtual machine extension handler.
+
+    :param type: Specifies the type of the extension; an example is
+     "CustomScriptExtension".
+    :type type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param status: The extension handler status.
+    :type status: ~azure.mgmt.compute.v2018_06_01.models.InstanceViewStatus
+    """
+
+    _attribute_map = {
+        'type': {'key': 'type', 'type': 'str'},
+        'type_handler_version': {'key': 'typeHandlerVersion', 'type': 'str'},
+        'status': {'key': 'status', 'type': 'InstanceViewStatus'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineExtensionHandlerInstanceView, self).__init__(**kwargs)
+        self.type = kwargs.get('type', None)
+        self.type_handler_version = kwargs.get('type_handler_version', None)
+        self.status = kwargs.get('status', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_handler_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_handler_instance_view_py3.py
new file mode 100644
index 000000000000..105a38c36494
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_handler_instance_view_py3.py
@@ -0,0 +1,37 @@
+# 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 VirtualMachineExtensionHandlerInstanceView(Model):
+    """The instance view of a virtual machine extension handler.
+
+    :param type: Specifies the type of the extension; an example is
+     "CustomScriptExtension".
+    :type type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param status: The extension handler status.
+    :type status: ~azure.mgmt.compute.v2018_06_01.models.InstanceViewStatus
+    """
+
+    _attribute_map = {
+        'type': {'key': 'type', 'type': 'str'},
+        'type_handler_version': {'key': 'typeHandlerVersion', 'type': 'str'},
+        'status': {'key': 'status', 'type': 'InstanceViewStatus'},
+    }
+
+    def __init__(self, *, type: str=None, type_handler_version: str=None, status=None, **kwargs) -> None:
+        super(VirtualMachineExtensionHandlerInstanceView, self).__init__(**kwargs)
+        self.type = type
+        self.type_handler_version = type_handler_version
+        self.status = status
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_image.py
new file mode 100644
index 000000000000..7273e2b84754
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_image.py
@@ -0,0 +1,81 @@
+# 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 VirtualMachineExtensionImage(Resource):
+    """Describes a Virtual Machine Extension Image.
+
+    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]
+    :param operating_system: Required. The operating system this extension
+     supports.
+    :type operating_system: str
+    :param compute_role: Required. The type of role (IaaS or PaaS) this
+     extension supports.
+    :type compute_role: str
+    :param handler_schema: Required. The schema defined by publisher, where
+     extension consumers should provide settings in a matching schema.
+    :type handler_schema: str
+    :param vm_scale_set_enabled: Whether the extension can be used on xRP
+     VMScaleSets. By default existing extensions are usable on scalesets, but
+     there might be cases where a publisher wants to explicitly indicate the
+     extension is only enabled for CRP VMs but not VMSS.
+    :type vm_scale_set_enabled: bool
+    :param supports_multiple_extensions: Whether the handler can support
+     multiple extensions.
+    :type supports_multiple_extensions: bool
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'operating_system': {'required': True},
+        'compute_role': {'required': True},
+        'handler_schema': {'required': 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}'},
+        'operating_system': {'key': 'properties.operatingSystem', 'type': 'str'},
+        'compute_role': {'key': 'properties.computeRole', 'type': 'str'},
+        'handler_schema': {'key': 'properties.handlerSchema', 'type': 'str'},
+        'vm_scale_set_enabled': {'key': 'properties.vmScaleSetEnabled', 'type': 'bool'},
+        'supports_multiple_extensions': {'key': 'properties.supportsMultipleExtensions', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineExtensionImage, self).__init__(**kwargs)
+        self.operating_system = kwargs.get('operating_system', None)
+        self.compute_role = kwargs.get('compute_role', None)
+        self.handler_schema = kwargs.get('handler_schema', None)
+        self.vm_scale_set_enabled = kwargs.get('vm_scale_set_enabled', None)
+        self.supports_multiple_extensions = kwargs.get('supports_multiple_extensions', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_image_py3.py
new file mode 100644
index 000000000000..3d48c3a87fb0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_image_py3.py
@@ -0,0 +1,81 @@
+# 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 VirtualMachineExtensionImage(Resource):
+    """Describes a Virtual Machine Extension Image.
+
+    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]
+    :param operating_system: Required. The operating system this extension
+     supports.
+    :type operating_system: str
+    :param compute_role: Required. The type of role (IaaS or PaaS) this
+     extension supports.
+    :type compute_role: str
+    :param handler_schema: Required. The schema defined by publisher, where
+     extension consumers should provide settings in a matching schema.
+    :type handler_schema: str
+    :param vm_scale_set_enabled: Whether the extension can be used on xRP
+     VMScaleSets. By default existing extensions are usable on scalesets, but
+     there might be cases where a publisher wants to explicitly indicate the
+     extension is only enabled for CRP VMs but not VMSS.
+    :type vm_scale_set_enabled: bool
+    :param supports_multiple_extensions: Whether the handler can support
+     multiple extensions.
+    :type supports_multiple_extensions: bool
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'operating_system': {'required': True},
+        'compute_role': {'required': True},
+        'handler_schema': {'required': 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}'},
+        'operating_system': {'key': 'properties.operatingSystem', 'type': 'str'},
+        'compute_role': {'key': 'properties.computeRole', 'type': 'str'},
+        'handler_schema': {'key': 'properties.handlerSchema', 'type': 'str'},
+        'vm_scale_set_enabled': {'key': 'properties.vmScaleSetEnabled', 'type': 'bool'},
+        'supports_multiple_extensions': {'key': 'properties.supportsMultipleExtensions', 'type': 'bool'},
+    }
+
+    def __init__(self, *, location: str, operating_system: str, compute_role: str, handler_schema: str, tags=None, vm_scale_set_enabled: bool=None, supports_multiple_extensions: bool=None, **kwargs) -> None:
+        super(VirtualMachineExtensionImage, self).__init__(location=location, tags=tags, **kwargs)
+        self.operating_system = operating_system
+        self.compute_role = compute_role
+        self.handler_schema = handler_schema
+        self.vm_scale_set_enabled = vm_scale_set_enabled
+        self.supports_multiple_extensions = supports_multiple_extensions
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_instance_view.py
new file mode 100644
index 000000000000..883d78c6f1ad
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_instance_view.py
@@ -0,0 +1,47 @@
+# 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 VirtualMachineExtensionInstanceView(Model):
+    """The instance view of a virtual machine extension.
+
+    :param name: The virtual machine extension name.
+    :type name: str
+    :param type: Specifies the type of the extension; an example is
+     "CustomScriptExtension".
+    :type type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param substatuses: The resource status information.
+    :type substatuses:
+     list[~azure.mgmt.compute.v2018_06_01.models.InstanceViewStatus]
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_06_01.models.InstanceViewStatus]
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'type_handler_version': {'key': 'typeHandlerVersion', 'type': 'str'},
+        'substatuses': {'key': 'substatuses', 'type': '[InstanceViewStatus]'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineExtensionInstanceView, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.type = kwargs.get('type', None)
+        self.type_handler_version = kwargs.get('type_handler_version', None)
+        self.substatuses = kwargs.get('substatuses', None)
+        self.statuses = kwargs.get('statuses', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_instance_view_py3.py
new file mode 100644
index 000000000000..52f3e8ae2f4c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_instance_view_py3.py
@@ -0,0 +1,47 @@
+# 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 VirtualMachineExtensionInstanceView(Model):
+    """The instance view of a virtual machine extension.
+
+    :param name: The virtual machine extension name.
+    :type name: str
+    :param type: Specifies the type of the extension; an example is
+     "CustomScriptExtension".
+    :type type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param substatuses: The resource status information.
+    :type substatuses:
+     list[~azure.mgmt.compute.v2018_06_01.models.InstanceViewStatus]
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_06_01.models.InstanceViewStatus]
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'type_handler_version': {'key': 'typeHandlerVersion', 'type': 'str'},
+        'substatuses': {'key': 'substatuses', 'type': '[InstanceViewStatus]'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, *, name: str=None, type: str=None, type_handler_version: str=None, substatuses=None, statuses=None, **kwargs) -> None:
+        super(VirtualMachineExtensionInstanceView, self).__init__(**kwargs)
+        self.name = name
+        self.type = type
+        self.type_handler_version = type_handler_version
+        self.substatuses = substatuses
+        self.statuses = statuses
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_py3.py
new file mode 100644
index 000000000000..1661bdd25f73
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_py3.py
@@ -0,0 +1,97 @@
+# 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 VirtualMachineExtension(Resource):
+    """Describes a Virtual Machine Extension.
+
+    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]
+    :param force_update_tag: How the extension handler should be forced to
+     update even if the extension configuration has not changed.
+    :type force_update_tag: str
+    :param publisher: The name of the extension handler publisher.
+    :type publisher: str
+    :param virtual_machine_extension_type: Specifies the type of the
+     extension; an example is "CustomScriptExtension".
+    :type virtual_machine_extension_type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param auto_upgrade_minor_version: Indicates whether the extension should
+     use a newer minor version if one is available at deployment time. Once
+     deployed, however, the extension will not upgrade minor versions unless
+     redeployed, even with this property set to true.
+    :type auto_upgrade_minor_version: bool
+    :param settings: Json formatted public settings for the extension.
+    :type settings: object
+    :param protected_settings: The extension can contain either
+     protectedSettings or protectedSettingsFromKeyVault or no protected
+     settings at all.
+    :type protected_settings: object
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :param instance_view: The virtual machine extension instance view.
+    :type instance_view:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineExtensionInstanceView
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'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}'},
+        'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'},
+        'publisher': {'key': 'properties.publisher', 'type': 'str'},
+        'virtual_machine_extension_type': {'key': 'properties.type', 'type': 'str'},
+        'type_handler_version': {'key': 'properties.typeHandlerVersion', 'type': 'str'},
+        'auto_upgrade_minor_version': {'key': 'properties.autoUpgradeMinorVersion', 'type': 'bool'},
+        'settings': {'key': 'properties.settings', 'type': 'object'},
+        'protected_settings': {'key': 'properties.protectedSettings', 'type': 'object'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineExtensionInstanceView'},
+    }
+
+    def __init__(self, *, location: str, tags=None, force_update_tag: str=None, publisher: str=None, virtual_machine_extension_type: str=None, type_handler_version: str=None, auto_upgrade_minor_version: bool=None, settings=None, protected_settings=None, instance_view=None, **kwargs) -> None:
+        super(VirtualMachineExtension, self).__init__(location=location, tags=tags, **kwargs)
+        self.force_update_tag = force_update_tag
+        self.publisher = publisher
+        self.virtual_machine_extension_type = virtual_machine_extension_type
+        self.type_handler_version = type_handler_version
+        self.auto_upgrade_minor_version = auto_upgrade_minor_version
+        self.settings = settings
+        self.protected_settings = protected_settings
+        self.provisioning_state = None
+        self.instance_view = instance_view
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_update.py
new file mode 100644
index 000000000000..b920ff57ff96
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_update.py
@@ -0,0 +1,62 @@
+# 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 .update_resource import UpdateResource
+
+
+class VirtualMachineExtensionUpdate(UpdateResource):
+    """Describes a Virtual Machine Extension.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param force_update_tag: How the extension handler should be forced to
+     update even if the extension configuration has not changed.
+    :type force_update_tag: str
+    :param publisher: The name of the extension handler publisher.
+    :type publisher: str
+    :param type: Specifies the type of the extension; an example is
+     "CustomScriptExtension".
+    :type type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param auto_upgrade_minor_version: Indicates whether the extension should
+     use a newer minor version if one is available at deployment time. Once
+     deployed, however, the extension will not upgrade minor versions unless
+     redeployed, even with this property set to true.
+    :type auto_upgrade_minor_version: bool
+    :param settings: Json formatted public settings for the extension.
+    :type settings: object
+    :param protected_settings: The extension can contain either
+     protectedSettings or protectedSettingsFromKeyVault or no protected
+     settings at all.
+    :type protected_settings: object
+    """
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'},
+        'publisher': {'key': 'properties.publisher', 'type': 'str'},
+        'type': {'key': 'properties.type', 'type': 'str'},
+        'type_handler_version': {'key': 'properties.typeHandlerVersion', 'type': 'str'},
+        'auto_upgrade_minor_version': {'key': 'properties.autoUpgradeMinorVersion', 'type': 'bool'},
+        'settings': {'key': 'properties.settings', 'type': 'object'},
+        'protected_settings': {'key': 'properties.protectedSettings', 'type': 'object'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineExtensionUpdate, self).__init__(**kwargs)
+        self.force_update_tag = kwargs.get('force_update_tag', None)
+        self.publisher = kwargs.get('publisher', None)
+        self.type = kwargs.get('type', None)
+        self.type_handler_version = kwargs.get('type_handler_version', None)
+        self.auto_upgrade_minor_version = kwargs.get('auto_upgrade_minor_version', None)
+        self.settings = kwargs.get('settings', None)
+        self.protected_settings = kwargs.get('protected_settings', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_update_py3.py
new file mode 100644
index 000000000000..c32c18d32759
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extension_update_py3.py
@@ -0,0 +1,62 @@
+# 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 .update_resource_py3 import UpdateResource
+
+
+class VirtualMachineExtensionUpdate(UpdateResource):
+    """Describes a Virtual Machine Extension.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param force_update_tag: How the extension handler should be forced to
+     update even if the extension configuration has not changed.
+    :type force_update_tag: str
+    :param publisher: The name of the extension handler publisher.
+    :type publisher: str
+    :param type: Specifies the type of the extension; an example is
+     "CustomScriptExtension".
+    :type type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param auto_upgrade_minor_version: Indicates whether the extension should
+     use a newer minor version if one is available at deployment time. Once
+     deployed, however, the extension will not upgrade minor versions unless
+     redeployed, even with this property set to true.
+    :type auto_upgrade_minor_version: bool
+    :param settings: Json formatted public settings for the extension.
+    :type settings: object
+    :param protected_settings: The extension can contain either
+     protectedSettings or protectedSettingsFromKeyVault or no protected
+     settings at all.
+    :type protected_settings: object
+    """
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'},
+        'publisher': {'key': 'properties.publisher', 'type': 'str'},
+        'type': {'key': 'properties.type', 'type': 'str'},
+        'type_handler_version': {'key': 'properties.typeHandlerVersion', 'type': 'str'},
+        'auto_upgrade_minor_version': {'key': 'properties.autoUpgradeMinorVersion', 'type': 'bool'},
+        'settings': {'key': 'properties.settings', 'type': 'object'},
+        'protected_settings': {'key': 'properties.protectedSettings', 'type': 'object'},
+    }
+
+    def __init__(self, *, tags=None, force_update_tag: str=None, publisher: str=None, type: str=None, type_handler_version: str=None, auto_upgrade_minor_version: bool=None, settings=None, protected_settings=None, **kwargs) -> None:
+        super(VirtualMachineExtensionUpdate, self).__init__(tags=tags, **kwargs)
+        self.force_update_tag = force_update_tag
+        self.publisher = publisher
+        self.type = type
+        self.type_handler_version = type_handler_version
+        self.auto_upgrade_minor_version = auto_upgrade_minor_version
+        self.settings = settings
+        self.protected_settings = protected_settings
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extensions_list_result.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extensions_list_result.py
new file mode 100644
index 000000000000..6ca61d5c0afb
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extensions_list_result.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 VirtualMachineExtensionsListResult(Model):
+    """The List Extension operation response.
+
+    :param value: The list of extensions
+    :type value:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineExtension]
+    """
+
+    _attribute_map = {
+        'value': {'key': 'value', 'type': '[VirtualMachineExtension]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineExtensionsListResult, self).__init__(**kwargs)
+        self.value = kwargs.get('value', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extensions_list_result_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extensions_list_result_py3.py
new file mode 100644
index 000000000000..07cdead08256
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_extensions_list_result_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 VirtualMachineExtensionsListResult(Model):
+    """The List Extension operation response.
+
+    :param value: The list of extensions
+    :type value:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineExtension]
+    """
+
+    _attribute_map = {
+        'value': {'key': 'value', 'type': '[VirtualMachineExtension]'},
+    }
+
+    def __init__(self, *, value=None, **kwargs) -> None:
+        super(VirtualMachineExtensionsListResult, self).__init__(**kwargs)
+        self.value = value
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_health_status.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_health_status.py
new file mode 100644
index 000000000000..264fba4efaf1
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_health_status.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 VirtualMachineHealthStatus(Model):
+    """The health status of the VM.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar status: The health status information for the VM.
+    :vartype status: ~azure.mgmt.compute.v2018_06_01.models.InstanceViewStatus
+    """
+
+    _validation = {
+        'status': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'status': {'key': 'status', 'type': 'InstanceViewStatus'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineHealthStatus, self).__init__(**kwargs)
+        self.status = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_health_status_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_health_status_py3.py
new file mode 100644
index 000000000000..0ce5813c371e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_health_status_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 VirtualMachineHealthStatus(Model):
+    """The health status of the VM.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar status: The health status information for the VM.
+    :vartype status: ~azure.mgmt.compute.v2018_06_01.models.InstanceViewStatus
+    """
+
+    _validation = {
+        'status': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'status': {'key': 'status', 'type': 'InstanceViewStatus'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(VirtualMachineHealthStatus, self).__init__(**kwargs)
+        self.status = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_identity.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_identity.py
new file mode 100644
index 000000000000..4069c2eb7bee
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_identity.py
@@ -0,0 +1,59 @@
+# 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 VirtualMachineIdentity(Model):
+    """Identity for the virtual machine.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar principal_id: The principal id of virtual machine identity. This
+     property will only be provided for a system assigned identity.
+    :vartype principal_id: str
+    :ivar tenant_id: The tenant id associated with the virtual machine. This
+     property will only be provided for a system assigned identity.
+    :vartype tenant_id: str
+    :param type: The type of identity used for the virtual machine. The type
+     'SystemAssigned, UserAssigned' includes both an implicitly created
+     identity and a set of user assigned identities. The type 'None' will
+     remove any identities from the virtual machine. Possible values include:
+     'SystemAssigned', 'UserAssigned', 'SystemAssigned, UserAssigned', 'None'
+    :type type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.ResourceIdentityType
+    :param user_assigned_identities: The list of user identities associated
+     with the Virtual Machine. The user identity dictionary key references will
+     be ARM resource ids in the form:
+     '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.
+    :type user_assigned_identities: dict[str,
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineIdentityUserAssignedIdentitiesValue]
+    """
+
+    _validation = {
+        'principal_id': {'readonly': True},
+        'tenant_id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'principal_id': {'key': 'principalId', 'type': 'str'},
+        'tenant_id': {'key': 'tenantId', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'ResourceIdentityType'},
+        'user_assigned_identities': {'key': 'userAssignedIdentities', 'type': '{VirtualMachineIdentityUserAssignedIdentitiesValue}'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineIdentity, self).__init__(**kwargs)
+        self.principal_id = None
+        self.tenant_id = None
+        self.type = kwargs.get('type', None)
+        self.user_assigned_identities = kwargs.get('user_assigned_identities', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_identity_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_identity_py3.py
new file mode 100644
index 000000000000..f5da27db3490
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_identity_py3.py
@@ -0,0 +1,59 @@
+# 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 VirtualMachineIdentity(Model):
+    """Identity for the virtual machine.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar principal_id: The principal id of virtual machine identity. This
+     property will only be provided for a system assigned identity.
+    :vartype principal_id: str
+    :ivar tenant_id: The tenant id associated with the virtual machine. This
+     property will only be provided for a system assigned identity.
+    :vartype tenant_id: str
+    :param type: The type of identity used for the virtual machine. The type
+     'SystemAssigned, UserAssigned' includes both an implicitly created
+     identity and a set of user assigned identities. The type 'None' will
+     remove any identities from the virtual machine. Possible values include:
+     'SystemAssigned', 'UserAssigned', 'SystemAssigned, UserAssigned', 'None'
+    :type type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.ResourceIdentityType
+    :param user_assigned_identities: The list of user identities associated
+     with the Virtual Machine. The user identity dictionary key references will
+     be ARM resource ids in the form:
+     '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.
+    :type user_assigned_identities: dict[str,
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineIdentityUserAssignedIdentitiesValue]
+    """
+
+    _validation = {
+        'principal_id': {'readonly': True},
+        'tenant_id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'principal_id': {'key': 'principalId', 'type': 'str'},
+        'tenant_id': {'key': 'tenantId', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'ResourceIdentityType'},
+        'user_assigned_identities': {'key': 'userAssignedIdentities', 'type': '{VirtualMachineIdentityUserAssignedIdentitiesValue}'},
+    }
+
+    def __init__(self, *, type=None, user_assigned_identities=None, **kwargs) -> None:
+        super(VirtualMachineIdentity, self).__init__(**kwargs)
+        self.principal_id = None
+        self.tenant_id = None
+        self.type = type
+        self.user_assigned_identities = user_assigned_identities
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_identity_user_assigned_identities_value.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_identity_user_assigned_identities_value.py
new file mode 100644
index 000000000000..8df9f5c86f49
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_identity_user_assigned_identities_value.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 VirtualMachineIdentityUserAssignedIdentitiesValue(Model):
+    """VirtualMachineIdentityUserAssignedIdentitiesValue.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar principal_id: The principal id of user assigned identity.
+    :vartype principal_id: str
+    :ivar client_id: The client id of user assigned identity.
+    :vartype client_id: str
+    """
+
+    _validation = {
+        'principal_id': {'readonly': True},
+        'client_id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'principal_id': {'key': 'principalId', 'type': 'str'},
+        'client_id': {'key': 'clientId', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineIdentityUserAssignedIdentitiesValue, self).__init__(**kwargs)
+        self.principal_id = None
+        self.client_id = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_identity_user_assigned_identities_value_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_identity_user_assigned_identities_value_py3.py
new file mode 100644
index 000000000000..0921bb643ccf
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_identity_user_assigned_identities_value_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 VirtualMachineIdentityUserAssignedIdentitiesValue(Model):
+    """VirtualMachineIdentityUserAssignedIdentitiesValue.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar principal_id: The principal id of user assigned identity.
+    :vartype principal_id: str
+    :ivar client_id: The client id of user assigned identity.
+    :vartype client_id: str
+    """
+
+    _validation = {
+        'principal_id': {'readonly': True},
+        'client_id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'principal_id': {'key': 'principalId', 'type': 'str'},
+        'client_id': {'key': 'clientId', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(VirtualMachineIdentityUserAssignedIdentitiesValue, self).__init__(**kwargs)
+        self.principal_id = None
+        self.client_id = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_image.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_image.py
new file mode 100644
index 000000000000..0b5583e10a82
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_image.py
@@ -0,0 +1,59 @@
+# 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 .virtual_machine_image_resource import VirtualMachineImageResource
+
+
+class VirtualMachineImage(VirtualMachineImageResource):
+    """Describes a Virtual Machine Image.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: Required. The name of the resource.
+    :type name: str
+    :param location: Required. The supported Azure location of the resource.
+    :type location: str
+    :param tags: Specifies the tags that are assigned to the virtual machine.
+     For more information about using tags, see [Using tags to organize your
+     Azure
+     resources](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-using-tags.md).
+    :type tags: dict[str, str]
+    :param plan:
+    :type plan: ~azure.mgmt.compute.v2018_06_01.models.PurchasePlan
+    :param os_disk_image:
+    :type os_disk_image: ~azure.mgmt.compute.v2018_06_01.models.OSDiskImage
+    :param data_disk_images:
+    :type data_disk_images:
+     list[~azure.mgmt.compute.v2018_06_01.models.DataDiskImage]
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'location': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'plan': {'key': 'properties.plan', 'type': 'PurchasePlan'},
+        'os_disk_image': {'key': 'properties.osDiskImage', 'type': 'OSDiskImage'},
+        'data_disk_images': {'key': 'properties.dataDiskImages', 'type': '[DataDiskImage]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineImage, self).__init__(**kwargs)
+        self.plan = kwargs.get('plan', None)
+        self.os_disk_image = kwargs.get('os_disk_image', None)
+        self.data_disk_images = kwargs.get('data_disk_images', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_image_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_image_py3.py
new file mode 100644
index 000000000000..f9f16cbb7f77
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_image_py3.py
@@ -0,0 +1,59 @@
+# 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 .virtual_machine_image_resource_py3 import VirtualMachineImageResource
+
+
+class VirtualMachineImage(VirtualMachineImageResource):
+    """Describes a Virtual Machine Image.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: Required. The name of the resource.
+    :type name: str
+    :param location: Required. The supported Azure location of the resource.
+    :type location: str
+    :param tags: Specifies the tags that are assigned to the virtual machine.
+     For more information about using tags, see [Using tags to organize your
+     Azure
+     resources](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-using-tags.md).
+    :type tags: dict[str, str]
+    :param plan:
+    :type plan: ~azure.mgmt.compute.v2018_06_01.models.PurchasePlan
+    :param os_disk_image:
+    :type os_disk_image: ~azure.mgmt.compute.v2018_06_01.models.OSDiskImage
+    :param data_disk_images:
+    :type data_disk_images:
+     list[~azure.mgmt.compute.v2018_06_01.models.DataDiskImage]
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'location': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'plan': {'key': 'properties.plan', 'type': 'PurchasePlan'},
+        'os_disk_image': {'key': 'properties.osDiskImage', 'type': 'OSDiskImage'},
+        'data_disk_images': {'key': 'properties.dataDiskImages', 'type': '[DataDiskImage]'},
+    }
+
+    def __init__(self, *, name: str, location: str, id: str=None, tags=None, plan=None, os_disk_image=None, data_disk_images=None, **kwargs) -> None:
+        super(VirtualMachineImage, self).__init__(id=id, name=name, location=location, tags=tags, **kwargs)
+        self.plan = plan
+        self.os_disk_image = os_disk_image
+        self.data_disk_images = data_disk_images
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_image_resource.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_image_resource.py
new file mode 100644
index 000000000000..8807cc8f391b
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_image_resource.py
@@ -0,0 +1,49 @@
+# 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 .sub_resource import SubResource
+
+
+class VirtualMachineImageResource(SubResource):
+    """Virtual machine image resource information.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: Required. The name of the resource.
+    :type name: str
+    :param location: Required. The supported Azure location of the resource.
+    :type location: str
+    :param tags: Specifies the tags that are assigned to the virtual machine.
+     For more information about using tags, see [Using tags to organize your
+     Azure
+     resources](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-using-tags.md).
+    :type tags: dict[str, str]
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'location': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+        'tags': {'key': 'tags', 'type': '{str}'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineImageResource, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.location = kwargs.get('location', None)
+        self.tags = kwargs.get('tags', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_image_resource_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_image_resource_py3.py
new file mode 100644
index 000000000000..b9d63a8bc9e0
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_image_resource_py3.py
@@ -0,0 +1,49 @@
+# 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 .sub_resource_py3 import SubResource
+
+
+class VirtualMachineImageResource(SubResource):
+    """Virtual machine image resource information.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: Required. The name of the resource.
+    :type name: str
+    :param location: Required. The supported Azure location of the resource.
+    :type location: str
+    :param tags: Specifies the tags that are assigned to the virtual machine.
+     For more information about using tags, see [Using tags to organize your
+     Azure
+     resources](https://docs.microsoft.com/azure/azure-resource-manager/resource-group-using-tags.md).
+    :type tags: dict[str, str]
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'location': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'location': {'key': 'location', 'type': 'str'},
+        'tags': {'key': 'tags', 'type': '{str}'},
+    }
+
+    def __init__(self, *, name: str, location: str, id: str=None, tags=None, **kwargs) -> None:
+        super(VirtualMachineImageResource, self).__init__(id=id, **kwargs)
+        self.name = name
+        self.location = location
+        self.tags = tags
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_instance_view.py
new file mode 100644
index 000000000000..906912b63196
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_instance_view.py
@@ -0,0 +1,85 @@
+# 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 VirtualMachineInstanceView(Model):
+    """The instance view of a virtual machine.
+
+    :param platform_update_domain: Specifies the update domain of the virtual
+     machine.
+    :type platform_update_domain: int
+    :param platform_fault_domain: Specifies the fault domain of the virtual
+     machine.
+    :type platform_fault_domain: int
+    :param computer_name: The computer name assigned to the virtual machine.
+    :type computer_name: str
+    :param os_name: The Operating System running on the virtual machine.
+    :type os_name: str
+    :param os_version: The version of Operating System running on the virtual
+     machine.
+    :type os_version: str
+    :param rdp_thumb_print: The Remote desktop certificate thumbprint.
+    :type rdp_thumb_print: str
+    :param vm_agent: The VM Agent running on the virtual machine.
+    :type vm_agent:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineAgentInstanceView
+    :param maintenance_redeploy_status: The Maintenance Operation status on
+     the virtual machine.
+    :type maintenance_redeploy_status:
+     ~azure.mgmt.compute.v2018_06_01.models.MaintenanceRedeployStatus
+    :param disks: The virtual machine disk information.
+    :type disks: list[~azure.mgmt.compute.v2018_06_01.models.DiskInstanceView]
+    :param extensions: The extensions information.
+    :type extensions:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineExtensionInstanceView]
+    :param boot_diagnostics: Boot Diagnostics is a debugging feature which
+     allows you to view Console Output and Screenshot to diagnose VM status.
+     <br><br> For Linux Virtual Machines, you can easily view the output of
+     your console log. <br><br> For both Windows and Linux virtual machines,
+     Azure also enables you to see a screenshot of the VM from the hypervisor.
+    :type boot_diagnostics:
+     ~azure.mgmt.compute.v2018_06_01.models.BootDiagnosticsInstanceView
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_06_01.models.InstanceViewStatus]
+    """
+
+    _attribute_map = {
+        'platform_update_domain': {'key': 'platformUpdateDomain', 'type': 'int'},
+        'platform_fault_domain': {'key': 'platformFaultDomain', 'type': 'int'},
+        'computer_name': {'key': 'computerName', 'type': 'str'},
+        'os_name': {'key': 'osName', 'type': 'str'},
+        'os_version': {'key': 'osVersion', 'type': 'str'},
+        'rdp_thumb_print': {'key': 'rdpThumbPrint', 'type': 'str'},
+        'vm_agent': {'key': 'vmAgent', 'type': 'VirtualMachineAgentInstanceView'},
+        'maintenance_redeploy_status': {'key': 'maintenanceRedeployStatus', 'type': 'MaintenanceRedeployStatus'},
+        'disks': {'key': 'disks', 'type': '[DiskInstanceView]'},
+        'extensions': {'key': 'extensions', 'type': '[VirtualMachineExtensionInstanceView]'},
+        'boot_diagnostics': {'key': 'bootDiagnostics', 'type': 'BootDiagnosticsInstanceView'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineInstanceView, self).__init__(**kwargs)
+        self.platform_update_domain = kwargs.get('platform_update_domain', None)
+        self.platform_fault_domain = kwargs.get('platform_fault_domain', None)
+        self.computer_name = kwargs.get('computer_name', None)
+        self.os_name = kwargs.get('os_name', None)
+        self.os_version = kwargs.get('os_version', None)
+        self.rdp_thumb_print = kwargs.get('rdp_thumb_print', None)
+        self.vm_agent = kwargs.get('vm_agent', None)
+        self.maintenance_redeploy_status = kwargs.get('maintenance_redeploy_status', None)
+        self.disks = kwargs.get('disks', None)
+        self.extensions = kwargs.get('extensions', None)
+        self.boot_diagnostics = kwargs.get('boot_diagnostics', None)
+        self.statuses = kwargs.get('statuses', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_instance_view_py3.py
new file mode 100644
index 000000000000..61074b565129
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_instance_view_py3.py
@@ -0,0 +1,85 @@
+# 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 VirtualMachineInstanceView(Model):
+    """The instance view of a virtual machine.
+
+    :param platform_update_domain: Specifies the update domain of the virtual
+     machine.
+    :type platform_update_domain: int
+    :param platform_fault_domain: Specifies the fault domain of the virtual
+     machine.
+    :type platform_fault_domain: int
+    :param computer_name: The computer name assigned to the virtual machine.
+    :type computer_name: str
+    :param os_name: The Operating System running on the virtual machine.
+    :type os_name: str
+    :param os_version: The version of Operating System running on the virtual
+     machine.
+    :type os_version: str
+    :param rdp_thumb_print: The Remote desktop certificate thumbprint.
+    :type rdp_thumb_print: str
+    :param vm_agent: The VM Agent running on the virtual machine.
+    :type vm_agent:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineAgentInstanceView
+    :param maintenance_redeploy_status: The Maintenance Operation status on
+     the virtual machine.
+    :type maintenance_redeploy_status:
+     ~azure.mgmt.compute.v2018_06_01.models.MaintenanceRedeployStatus
+    :param disks: The virtual machine disk information.
+    :type disks: list[~azure.mgmt.compute.v2018_06_01.models.DiskInstanceView]
+    :param extensions: The extensions information.
+    :type extensions:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineExtensionInstanceView]
+    :param boot_diagnostics: Boot Diagnostics is a debugging feature which
+     allows you to view Console Output and Screenshot to diagnose VM status.
+     <br><br> For Linux Virtual Machines, you can easily view the output of
+     your console log. <br><br> For both Windows and Linux virtual machines,
+     Azure also enables you to see a screenshot of the VM from the hypervisor.
+    :type boot_diagnostics:
+     ~azure.mgmt.compute.v2018_06_01.models.BootDiagnosticsInstanceView
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_06_01.models.InstanceViewStatus]
+    """
+
+    _attribute_map = {
+        'platform_update_domain': {'key': 'platformUpdateDomain', 'type': 'int'},
+        'platform_fault_domain': {'key': 'platformFaultDomain', 'type': 'int'},
+        'computer_name': {'key': 'computerName', 'type': 'str'},
+        'os_name': {'key': 'osName', 'type': 'str'},
+        'os_version': {'key': 'osVersion', 'type': 'str'},
+        'rdp_thumb_print': {'key': 'rdpThumbPrint', 'type': 'str'},
+        'vm_agent': {'key': 'vmAgent', 'type': 'VirtualMachineAgentInstanceView'},
+        'maintenance_redeploy_status': {'key': 'maintenanceRedeployStatus', 'type': 'MaintenanceRedeployStatus'},
+        'disks': {'key': 'disks', 'type': '[DiskInstanceView]'},
+        'extensions': {'key': 'extensions', 'type': '[VirtualMachineExtensionInstanceView]'},
+        'boot_diagnostics': {'key': 'bootDiagnostics', 'type': 'BootDiagnosticsInstanceView'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, *, platform_update_domain: int=None, platform_fault_domain: int=None, computer_name: str=None, os_name: str=None, os_version: str=None, rdp_thumb_print: str=None, vm_agent=None, maintenance_redeploy_status=None, disks=None, extensions=None, boot_diagnostics=None, statuses=None, **kwargs) -> None:
+        super(VirtualMachineInstanceView, self).__init__(**kwargs)
+        self.platform_update_domain = platform_update_domain
+        self.platform_fault_domain = platform_fault_domain
+        self.computer_name = computer_name
+        self.os_name = os_name
+        self.os_version = os_version
+        self.rdp_thumb_print = rdp_thumb_print
+        self.vm_agent = vm_agent
+        self.maintenance_redeploy_status = maintenance_redeploy_status
+        self.disks = disks
+        self.extensions = extensions
+        self.boot_diagnostics = boot_diagnostics
+        self.statuses = statuses
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_paged.py
new file mode 100644
index 000000000000..ebf00ac1115a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_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 VirtualMachinePaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`VirtualMachine <azure.mgmt.compute.v2018_06_01.models.VirtualMachine>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[VirtualMachine]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(VirtualMachinePaged, self).__init__(*args, **kwargs)
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
new file mode 100644
index 000000000000..0ac76ecae240
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_py3.py
@@ -0,0 +1,150 @@
+# 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 VirtualMachine(Resource):
+    """Describes a Virtual Machine.
+
+    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]
+    :param plan: Specifies information about the marketplace image used to
+     create the virtual machine. This element is only used for marketplace
+     images. Before you can use a marketplace image from an API, you must
+     enable the image for programmatic use.  In the Azure portal, find the
+     marketplace image that you want to use and then click **Want to deploy
+     programmatically, Get Started ->**. Enter any required information and
+     then click **Save**.
+    :type plan: ~azure.mgmt.compute.v2018_06_01.models.Plan
+    :param hardware_profile: Specifies the hardware settings for the virtual
+     machine.
+    :type hardware_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.HardwareProfile
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.StorageProfile
+    :param os_profile: Specifies the operating system settings for the virtual
+     machine.
+    :type os_profile: ~azure.mgmt.compute.v2018_06_01.models.OSProfile
+    :param network_profile: Specifies the network interfaces of the virtual
+     machine.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.NetworkProfile
+    :param diagnostics_profile: Specifies the boot diagnostic settings state.
+     <br><br>Minimum api-version: 2015-06-15.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.DiagnosticsProfile
+    :param availability_set: Specifies information about the availability set
+     that the virtual machine should be assigned to. Virtual machines specified
+     in the same availability set are allocated to different nodes to maximize
+     availability. For more information about availability sets, see [Manage
+     the availability of virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+     <br><br> For more information on Azure planned maintainance, see [Planned
+     maintenance for virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Currently, a VM can only be added to availability set at creation
+     time. An existing VM cannot be added to an availability set.
+    :type availability_set: ~azure.mgmt.compute.v2018_06_01.models.SubResource
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :ivar instance_view: The virtual machine instance view.
+    :vartype instance_view:
+     ~azure.mgmt.compute.v2018_06_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:
+     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
+     is included in a request for an update, the value must match the initial
+     value. This value cannot be updated. <br><br> For more information, see
+     [Azure Hybrid Use Benefit for Windows
+     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Minimum api-version: 2015-06-15
+    :type license_type: str
+    :ivar vm_id: Specifies the VM unique ID which is a 128-bits identifier
+     that is encoded and stored in all Azure IaaS VMs SMBIOS and can be read
+     using platform BIOS commands.
+    :vartype vm_id: str
+    :ivar resources: The virtual machine child extension resources.
+    :vartype resources:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineExtension]
+    :param identity: The identity of the virtual machine, if configured.
+    :type identity:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineIdentity
+    :param zones: The virtual machine zones.
+    :type zones: list[str]
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'provisioning_state': {'readonly': True},
+        'instance_view': {'readonly': True},
+        'vm_id': {'readonly': True},
+        'resources': {'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}'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
+        'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
+        'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
+        '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': 'VirtualMachineInstanceView'},
+        'license_type': {'key': 'properties.licenseType', 'type': 'str'},
+        'vm_id': {'key': 'properties.vmId', 'type': 'str'},
+        'resources': {'key': 'resources', 'type': '[VirtualMachineExtension]'},
+        'identity': {'key': 'identity', 'type': 'VirtualMachineIdentity'},
+        '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:
+        super(VirtualMachine, self).__init__(location=location, tags=tags, **kwargs)
+        self.plan = plan
+        self.hardware_profile = hardware_profile
+        self.storage_profile = storage_profile
+        self.os_profile = os_profile
+        self.network_profile = network_profile
+        self.diagnostics_profile = diagnostics_profile
+        self.availability_set = availability_set
+        self.provisioning_state = None
+        self.instance_view = None
+        self.license_type = license_type
+        self.vm_id = None
+        self.resources = None
+        self.identity = identity
+        self.zones = zones
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set.py
new file mode 100644
index 000000000000..5d7120567115
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set.py
@@ -0,0 +1,116 @@
+# 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 VirtualMachineScaleSet(Resource):
+    """Describes a Virtual Machine Scale Set.
+
+    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]
+    :param sku: The virtual machine scale set sku.
+    :type sku: ~azure.mgmt.compute.v2018_06_01.models.Sku
+    :param plan: Specifies information about the marketplace image used to
+     create the virtual machine. This element is only used for marketplace
+     images. Before you can use a marketplace image from an API, you must
+     enable the image for programmatic use.  In the Azure portal, find the
+     marketplace image that you want to use and then click **Want to deploy
+     programmatically, Get Started ->**. Enter any required information and
+     then click **Save**.
+    :type plan: ~azure.mgmt.compute.v2018_06_01.models.Plan
+    :param upgrade_policy: The upgrade policy.
+    :type upgrade_policy: ~azure.mgmt.compute.v2018_06_01.models.UpgradePolicy
+    :param virtual_machine_profile: The virtual machine profile.
+    :type virtual_machine_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetVMProfile
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :param overprovision: Specifies whether the Virtual Machine Scale Set
+     should be overprovisioned.
+    :type overprovision: bool
+    :ivar unique_id: Specifies the ID which uniquely identifies a Virtual
+     Machine Scale Set.
+    :vartype unique_id: str
+    :param single_placement_group: When true this limits the scale set to a
+     single placement group, of max size 100 virtual machines.
+    :type single_placement_group: bool
+    :param zone_balance: Whether to force stictly even Virtual Machine
+     distribution cross x-zones in case there is zone outage.
+    :type zone_balance: bool
+    :param platform_fault_domain_count: Fault Domain count for each placement
+     group.
+    :type platform_fault_domain_count: int
+    :param identity: The identity of the virtual machine scale set, if
+     configured.
+    :type identity:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetIdentity
+    :param zones: The virtual machine scale set zones.
+    :type zones: list[str]
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'provisioning_state': {'readonly': True},
+        'unique_id': {'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}'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'upgrade_policy': {'key': 'properties.upgradePolicy', 'type': 'UpgradePolicy'},
+        'virtual_machine_profile': {'key': 'properties.virtualMachineProfile', 'type': 'VirtualMachineScaleSetVMProfile'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'overprovision': {'key': 'properties.overprovision', 'type': 'bool'},
+        'unique_id': {'key': 'properties.uniqueId', 'type': 'str'},
+        'single_placement_group': {'key': 'properties.singlePlacementGroup', 'type': 'bool'},
+        'zone_balance': {'key': 'properties.zoneBalance', 'type': 'bool'},
+        'platform_fault_domain_count': {'key': 'properties.platformFaultDomainCount', 'type': 'int'},
+        'identity': {'key': 'identity', 'type': 'VirtualMachineScaleSetIdentity'},
+        'zones': {'key': 'zones', 'type': '[str]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSet, self).__init__(**kwargs)
+        self.sku = kwargs.get('sku', None)
+        self.plan = kwargs.get('plan', None)
+        self.upgrade_policy = kwargs.get('upgrade_policy', None)
+        self.virtual_machine_profile = kwargs.get('virtual_machine_profile', None)
+        self.provisioning_state = None
+        self.overprovision = kwargs.get('overprovision', None)
+        self.unique_id = None
+        self.single_placement_group = kwargs.get('single_placement_group', None)
+        self.zone_balance = kwargs.get('zone_balance', None)
+        self.platform_fault_domain_count = kwargs.get('platform_fault_domain_count', None)
+        self.identity = kwargs.get('identity', None)
+        self.zones = kwargs.get('zones', None)
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
new file mode 100644
index 000000000000..a4280ab06217
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_data_disk.py
@@ -0,0 +1,70 @@
+# 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 VirtualMachineScaleSetDataDisk(Model):
+    """Describes a virtual machine scale set data disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: The disk name.
+    :type name: str
+    :param lun: Required. Specifies the logical unit number of the data disk.
+     This value is used to identify data disks within the VM and therefore must
+     be unique for each data disk attached to a VM.
+    :type lun: int
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_06_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :param create_option: Required. The create option. 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 an empty data disk in
+     gigabytes. This element can be used to overwrite the name 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.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetManagedDiskParameters
+    """
+
+    _validation = {
+        'lun': {'required': True},
+        'create_option': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'lun': {'key': 'lun', 'type': 'int'},
+        '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'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'VirtualMachineScaleSetManagedDiskParameters'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetDataDisk, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.lun = kwargs.get('lun', None)
+        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.managed_disk = kwargs.get('managed_disk', None)
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
new file mode 100644
index 000000000000..eb40c17afad2
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_data_disk_py3.py
@@ -0,0 +1,70 @@
+# 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 VirtualMachineScaleSetDataDisk(Model):
+    """Describes a virtual machine scale set data disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: The disk name.
+    :type name: str
+    :param lun: Required. Specifies the logical unit number of the data disk.
+     This value is used to identify data disks within the VM and therefore must
+     be unique for each data disk attached to a VM.
+    :type lun: int
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_06_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :param create_option: Required. The create option. 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 an empty data disk in
+     gigabytes. This element can be used to overwrite the name 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.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetManagedDiskParameters
+    """
+
+    _validation = {
+        'lun': {'required': True},
+        'create_option': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'lun': {'key': 'lun', 'type': 'int'},
+        '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'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'VirtualMachineScaleSetManagedDiskParameters'},
+    }
+
+    def __init__(self, *, lun: int, create_option, name: str=None, caching=None, write_accelerator_enabled: bool=None, disk_size_gb: int=None, managed_disk=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetDataDisk, self).__init__(**kwargs)
+        self.name = name
+        self.lun = lun
+        self.caching = caching
+        self.write_accelerator_enabled = write_accelerator_enabled
+        self.create_option = create_option
+        self.disk_size_gb = disk_size_gb
+        self.managed_disk = managed_disk
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_extension.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_extension.py
new file mode 100644
index 000000000000..24a487547a2a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_extension.py
@@ -0,0 +1,80 @@
+# 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 .sub_resource_read_only import SubResourceReadOnly
+
+
+class VirtualMachineScaleSetExtension(SubResourceReadOnly):
+    """Describes a Virtual Machine Scale Set Extension.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    :param name: The name of the extension.
+    :type name: str
+    :param force_update_tag: If a value is provided and is different from the
+     previous value, the extension handler will be forced to update even if the
+     extension configuration has not changed.
+    :type force_update_tag: str
+    :param publisher: The name of the extension handler publisher.
+    :type publisher: str
+    :param type: Specifies the type of the extension; an example is
+     "CustomScriptExtension".
+    :type type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param auto_upgrade_minor_version: Indicates whether the extension should
+     use a newer minor version if one is available at deployment time. Once
+     deployed, however, the extension will not upgrade minor versions unless
+     redeployed, even with this property set to true.
+    :type auto_upgrade_minor_version: bool
+    :param settings: Json formatted public settings for the extension.
+    :type settings: object
+    :param protected_settings: The extension can contain either
+     protectedSettings or protectedSettingsFromKeyVault or no protected
+     settings at all.
+    :type protected_settings: object
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'provisioning_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'},
+        'publisher': {'key': 'properties.publisher', 'type': 'str'},
+        'type': {'key': 'properties.type', 'type': 'str'},
+        'type_handler_version': {'key': 'properties.typeHandlerVersion', 'type': 'str'},
+        'auto_upgrade_minor_version': {'key': 'properties.autoUpgradeMinorVersion', 'type': 'bool'},
+        'settings': {'key': 'properties.settings', 'type': 'object'},
+        'protected_settings': {'key': 'properties.protectedSettings', 'type': 'object'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetExtension, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.force_update_tag = kwargs.get('force_update_tag', None)
+        self.publisher = kwargs.get('publisher', None)
+        self.type = kwargs.get('type', None)
+        self.type_handler_version = kwargs.get('type_handler_version', None)
+        self.auto_upgrade_minor_version = kwargs.get('auto_upgrade_minor_version', None)
+        self.settings = kwargs.get('settings', None)
+        self.protected_settings = kwargs.get('protected_settings', None)
+        self.provisioning_state = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_extension_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_extension_paged.py
new file mode 100644
index 000000000000..a002ee520ed9
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_extension_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 VirtualMachineScaleSetExtensionPaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`VirtualMachineScaleSetExtension <azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetExtension>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[VirtualMachineScaleSetExtension]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(VirtualMachineScaleSetExtensionPaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_extension_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_extension_profile.py
new file mode 100644
index 000000000000..9af4754c6d94
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_extension_profile.py
@@ -0,0 +1,30 @@
+# 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 VirtualMachineScaleSetExtensionProfile(Model):
+    """Describes a virtual machine scale set extension profile.
+
+    :param extensions: The virtual machine scale set child extension
+     resources.
+    :type extensions:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetExtension]
+    """
+
+    _attribute_map = {
+        'extensions': {'key': 'extensions', 'type': '[VirtualMachineScaleSetExtension]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetExtensionProfile, self).__init__(**kwargs)
+        self.extensions = kwargs.get('extensions', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_extension_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_extension_profile_py3.py
new file mode 100644
index 000000000000..67d7dea3d24a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_extension_profile_py3.py
@@ -0,0 +1,30 @@
+# 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 VirtualMachineScaleSetExtensionProfile(Model):
+    """Describes a virtual machine scale set extension profile.
+
+    :param extensions: The virtual machine scale set child extension
+     resources.
+    :type extensions:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetExtension]
+    """
+
+    _attribute_map = {
+        'extensions': {'key': 'extensions', 'type': '[VirtualMachineScaleSetExtension]'},
+    }
+
+    def __init__(self, *, extensions=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetExtensionProfile, self).__init__(**kwargs)
+        self.extensions = extensions
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_extension_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_extension_py3.py
new file mode 100644
index 000000000000..27392a2de9fd
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_extension_py3.py
@@ -0,0 +1,80 @@
+# 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 .sub_resource_read_only_py3 import SubResourceReadOnly
+
+
+class VirtualMachineScaleSetExtension(SubResourceReadOnly):
+    """Describes a Virtual Machine Scale Set Extension.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar id: Resource Id
+    :vartype id: str
+    :param name: The name of the extension.
+    :type name: str
+    :param force_update_tag: If a value is provided and is different from the
+     previous value, the extension handler will be forced to update even if the
+     extension configuration has not changed.
+    :type force_update_tag: str
+    :param publisher: The name of the extension handler publisher.
+    :type publisher: str
+    :param type: Specifies the type of the extension; an example is
+     "CustomScriptExtension".
+    :type type: str
+    :param type_handler_version: Specifies the version of the script handler.
+    :type type_handler_version: str
+    :param auto_upgrade_minor_version: Indicates whether the extension should
+     use a newer minor version if one is available at deployment time. Once
+     deployed, however, the extension will not upgrade minor versions unless
+     redeployed, even with this property set to true.
+    :type auto_upgrade_minor_version: bool
+    :param settings: Json formatted public settings for the extension.
+    :type settings: object
+    :param protected_settings: The extension can contain either
+     protectedSettings or protectedSettingsFromKeyVault or no protected
+     settings at all.
+    :type protected_settings: object
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'provisioning_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'},
+        'publisher': {'key': 'properties.publisher', 'type': 'str'},
+        'type': {'key': 'properties.type', 'type': 'str'},
+        'type_handler_version': {'key': 'properties.typeHandlerVersion', 'type': 'str'},
+        'auto_upgrade_minor_version': {'key': 'properties.autoUpgradeMinorVersion', 'type': 'bool'},
+        'settings': {'key': 'properties.settings', 'type': 'object'},
+        'protected_settings': {'key': 'properties.protectedSettings', 'type': 'object'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+    }
+
+    def __init__(self, *, name: str=None, force_update_tag: str=None, publisher: str=None, type: str=None, type_handler_version: str=None, auto_upgrade_minor_version: bool=None, settings=None, protected_settings=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetExtension, self).__init__(**kwargs)
+        self.name = name
+        self.force_update_tag = force_update_tag
+        self.publisher = publisher
+        self.type = type
+        self.type_handler_version = type_handler_version
+        self.auto_upgrade_minor_version = auto_upgrade_minor_version
+        self.settings = settings
+        self.protected_settings = protected_settings
+        self.provisioning_state = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_identity.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_identity.py
new file mode 100644
index 000000000000..70529891807f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_identity.py
@@ -0,0 +1,61 @@
+# 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 VirtualMachineScaleSetIdentity(Model):
+    """Identity for the virtual machine scale set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar principal_id: The principal id of virtual machine scale set
+     identity. This property will only be provided for a system assigned
+     identity.
+    :vartype principal_id: str
+    :ivar tenant_id: The tenant id associated with the virtual machine scale
+     set. This property will only be provided for a system assigned identity.
+    :vartype tenant_id: str
+    :param type: The type of identity used for the virtual machine scale set.
+     The type 'SystemAssigned, UserAssigned' includes both an implicitly
+     created identity and a set of user assigned identities. The type 'None'
+     will remove any identities from the virtual machine scale set. Possible
+     values include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned,
+     UserAssigned', 'None'
+    :type type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.ResourceIdentityType
+    :param user_assigned_identities: The list of user identities associated
+     with the virtual machine scale set. The user identity dictionary key
+     references will be ARM resource ids in the form:
+     '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.
+    :type user_assigned_identities: dict[str,
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue]
+    """
+
+    _validation = {
+        'principal_id': {'readonly': True},
+        'tenant_id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'principal_id': {'key': 'principalId', 'type': 'str'},
+        'tenant_id': {'key': 'tenantId', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'ResourceIdentityType'},
+        'user_assigned_identities': {'key': 'userAssignedIdentities', 'type': '{VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue}'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetIdentity, self).__init__(**kwargs)
+        self.principal_id = None
+        self.tenant_id = None
+        self.type = kwargs.get('type', None)
+        self.user_assigned_identities = kwargs.get('user_assigned_identities', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_identity_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_identity_py3.py
new file mode 100644
index 000000000000..9189070f95f2
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_identity_py3.py
@@ -0,0 +1,61 @@
+# 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 VirtualMachineScaleSetIdentity(Model):
+    """Identity for the virtual machine scale set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar principal_id: The principal id of virtual machine scale set
+     identity. This property will only be provided for a system assigned
+     identity.
+    :vartype principal_id: str
+    :ivar tenant_id: The tenant id associated with the virtual machine scale
+     set. This property will only be provided for a system assigned identity.
+    :vartype tenant_id: str
+    :param type: The type of identity used for the virtual machine scale set.
+     The type 'SystemAssigned, UserAssigned' includes both an implicitly
+     created identity and a set of user assigned identities. The type 'None'
+     will remove any identities from the virtual machine scale set. Possible
+     values include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned,
+     UserAssigned', 'None'
+    :type type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.ResourceIdentityType
+    :param user_assigned_identities: The list of user identities associated
+     with the virtual machine scale set. The user identity dictionary key
+     references will be ARM resource ids in the form:
+     '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.
+    :type user_assigned_identities: dict[str,
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue]
+    """
+
+    _validation = {
+        'principal_id': {'readonly': True},
+        'tenant_id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'principal_id': {'key': 'principalId', 'type': 'str'},
+        'tenant_id': {'key': 'tenantId', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'ResourceIdentityType'},
+        'user_assigned_identities': {'key': 'userAssignedIdentities', 'type': '{VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue}'},
+    }
+
+    def __init__(self, *, type=None, user_assigned_identities=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetIdentity, self).__init__(**kwargs)
+        self.principal_id = None
+        self.tenant_id = None
+        self.type = type
+        self.user_assigned_identities = user_assigned_identities
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_identity_user_assigned_identities_value.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_identity_user_assigned_identities_value.py
new file mode 100644
index 000000000000..e362323ac96e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_identity_user_assigned_identities_value.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 VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue(Model):
+    """VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar principal_id: The principal id of user assigned identity.
+    :vartype principal_id: str
+    :ivar client_id: The client id of user assigned identity.
+    :vartype client_id: str
+    """
+
+    _validation = {
+        'principal_id': {'readonly': True},
+        'client_id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'principal_id': {'key': 'principalId', 'type': 'str'},
+        'client_id': {'key': 'clientId', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue, self).__init__(**kwargs)
+        self.principal_id = None
+        self.client_id = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_identity_user_assigned_identities_value_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_identity_user_assigned_identities_value_py3.py
new file mode 100644
index 000000000000..2839c26040cc
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_identity_user_assigned_identities_value_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 VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue(Model):
+    """VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar principal_id: The principal id of user assigned identity.
+    :vartype principal_id: str
+    :ivar client_id: The client id of user assigned identity.
+    :vartype client_id: str
+    """
+
+    _validation = {
+        'principal_id': {'readonly': True},
+        'client_id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'principal_id': {'key': 'principalId', 'type': 'str'},
+        'client_id': {'key': 'clientId', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(VirtualMachineScaleSetIdentityUserAssignedIdentitiesValue, self).__init__(**kwargs)
+        self.principal_id = None
+        self.client_id = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_instance_view.py
new file mode 100644
index 000000000000..b409783abd55
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_instance_view.py
@@ -0,0 +1,48 @@
+# 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 VirtualMachineScaleSetInstanceView(Model):
+    """The instance view of a virtual machine scale set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar virtual_machine: The instance view status summary for the virtual
+     machine scale set.
+    :vartype virtual_machine:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetInstanceViewStatusesSummary
+    :ivar extensions: The extensions information.
+    :vartype extensions:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetVMExtensionsSummary]
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_06_01.models.InstanceViewStatus]
+    """
+
+    _validation = {
+        'virtual_machine': {'readonly': True},
+        'extensions': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'virtual_machine': {'key': 'virtualMachine', 'type': 'VirtualMachineScaleSetInstanceViewStatusesSummary'},
+        'extensions': {'key': 'extensions', 'type': '[VirtualMachineScaleSetVMExtensionsSummary]'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetInstanceView, self).__init__(**kwargs)
+        self.virtual_machine = None
+        self.extensions = None
+        self.statuses = kwargs.get('statuses', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_instance_view_py3.py
new file mode 100644
index 000000000000..18ba110ccc77
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_instance_view_py3.py
@@ -0,0 +1,48 @@
+# 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 VirtualMachineScaleSetInstanceView(Model):
+    """The instance view of a virtual machine scale set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar virtual_machine: The instance view status summary for the virtual
+     machine scale set.
+    :vartype virtual_machine:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetInstanceViewStatusesSummary
+    :ivar extensions: The extensions information.
+    :vartype extensions:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetVMExtensionsSummary]
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_06_01.models.InstanceViewStatus]
+    """
+
+    _validation = {
+        'virtual_machine': {'readonly': True},
+        'extensions': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'virtual_machine': {'key': 'virtualMachine', 'type': 'VirtualMachineScaleSetInstanceViewStatusesSummary'},
+        'extensions': {'key': 'extensions', 'type': '[VirtualMachineScaleSetVMExtensionsSummary]'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, *, statuses=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetInstanceView, self).__init__(**kwargs)
+        self.virtual_machine = None
+        self.extensions = None
+        self.statuses = statuses
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_instance_view_statuses_summary.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_instance_view_statuses_summary.py
new file mode 100644
index 000000000000..5b56f5e61356
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_instance_view_statuses_summary.py
@@ -0,0 +1,37 @@
+# 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 VirtualMachineScaleSetInstanceViewStatusesSummary(Model):
+    """Instance view statuses summary for virtual machines of a virtual machine
+    scale set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar statuses_summary: The extensions information.
+    :vartype statuses_summary:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineStatusCodeCount]
+    """
+
+    _validation = {
+        'statuses_summary': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'statuses_summary': {'key': 'statusesSummary', 'type': '[VirtualMachineStatusCodeCount]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetInstanceViewStatusesSummary, self).__init__(**kwargs)
+        self.statuses_summary = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_instance_view_statuses_summary_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_instance_view_statuses_summary_py3.py
new file mode 100644
index 000000000000..c2e487d7ffb9
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_instance_view_statuses_summary_py3.py
@@ -0,0 +1,37 @@
+# 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 VirtualMachineScaleSetInstanceViewStatusesSummary(Model):
+    """Instance view statuses summary for virtual machines of a virtual machine
+    scale set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar statuses_summary: The extensions information.
+    :vartype statuses_summary:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineStatusCodeCount]
+    """
+
+    _validation = {
+        'statuses_summary': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'statuses_summary': {'key': 'statusesSummary', 'type': '[VirtualMachineStatusCodeCount]'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(VirtualMachineScaleSetInstanceViewStatusesSummary, self).__init__(**kwargs)
+        self.statuses_summary = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_ip_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_ip_configuration.py
new file mode 100644
index 000000000000..74cf9550b79f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_ip_configuration.py
@@ -0,0 +1,83 @@
+# 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 .sub_resource import SubResource
+
+
+class VirtualMachineScaleSetIPConfiguration(SubResource):
+    """Describes a virtual machine scale set network profile's IP configuration.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: Required. The IP configuration name.
+    :type name: str
+    :param subnet: Specifies the identifier of the subnet.
+    :type subnet: ~azure.mgmt.compute.v2018_06_01.models.ApiEntityReference
+    :param primary: Specifies the primary network interface in case the
+     virtual machine has more than 1 network interface.
+    :type primary: bool
+    :param public_ip_address_configuration: The publicIPAddressConfiguration.
+    :type public_ip_address_configuration:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetPublicIPAddressConfiguration
+    :param private_ip_address_version: Available from Api-Version 2017-03-30
+     onwards, it represents whether the specific ipconfiguration is IPv4 or
+     IPv6. Default is taken as IPv4.  Possible values are: 'IPv4' and 'IPv6'.
+     Possible values include: 'IPv4', 'IPv6'
+    :type private_ip_address_version: str or
+     ~azure.mgmt.compute.v2018_06_01.models.IPVersion
+    :param application_gateway_backend_address_pools: Specifies an array of
+     references to backend address pools of application gateways. A scale set
+     can reference backend address pools of multiple application gateways.
+     Multiple scale sets cannot use the same application gateway.
+    :type application_gateway_backend_address_pools:
+     list[~azure.mgmt.compute.v2018_06_01.models.SubResource]
+    :param load_balancer_backend_address_pools: Specifies an array of
+     references to backend address pools of load balancers. A scale set can
+     reference backend address pools of one public and one internal load
+     balancer. Multiple scale sets cannot use the same load balancer.
+    :type load_balancer_backend_address_pools:
+     list[~azure.mgmt.compute.v2018_06_01.models.SubResource]
+    :param load_balancer_inbound_nat_pools: Specifies an array of references
+     to inbound Nat pools of the load balancers. A scale set can reference
+     inbound nat pools of one public and one internal load balancer. Multiple
+     scale sets cannot use the same load balancer
+    :type load_balancer_inbound_nat_pools:
+     list[~azure.mgmt.compute.v2018_06_01.models.SubResource]
+    """
+
+    _validation = {
+        'name': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'subnet': {'key': 'properties.subnet', 'type': 'ApiEntityReference'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+        'public_ip_address_configuration': {'key': 'properties.publicIPAddressConfiguration', 'type': 'VirtualMachineScaleSetPublicIPAddressConfiguration'},
+        'private_ip_address_version': {'key': 'properties.privateIPAddressVersion', 'type': 'str'},
+        'application_gateway_backend_address_pools': {'key': 'properties.applicationGatewayBackendAddressPools', 'type': '[SubResource]'},
+        'load_balancer_backend_address_pools': {'key': 'properties.loadBalancerBackendAddressPools', 'type': '[SubResource]'},
+        'load_balancer_inbound_nat_pools': {'key': 'properties.loadBalancerInboundNatPools', 'type': '[SubResource]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetIPConfiguration, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.subnet = kwargs.get('subnet', None)
+        self.primary = kwargs.get('primary', None)
+        self.public_ip_address_configuration = kwargs.get('public_ip_address_configuration', None)
+        self.private_ip_address_version = kwargs.get('private_ip_address_version', None)
+        self.application_gateway_backend_address_pools = kwargs.get('application_gateway_backend_address_pools', None)
+        self.load_balancer_backend_address_pools = kwargs.get('load_balancer_backend_address_pools', None)
+        self.load_balancer_inbound_nat_pools = kwargs.get('load_balancer_inbound_nat_pools', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_ip_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_ip_configuration_py3.py
new file mode 100644
index 000000000000..80a43520122c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_ip_configuration_py3.py
@@ -0,0 +1,83 @@
+# 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 .sub_resource_py3 import SubResource
+
+
+class VirtualMachineScaleSetIPConfiguration(SubResource):
+    """Describes a virtual machine scale set network profile's IP configuration.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: Required. The IP configuration name.
+    :type name: str
+    :param subnet: Specifies the identifier of the subnet.
+    :type subnet: ~azure.mgmt.compute.v2018_06_01.models.ApiEntityReference
+    :param primary: Specifies the primary network interface in case the
+     virtual machine has more than 1 network interface.
+    :type primary: bool
+    :param public_ip_address_configuration: The publicIPAddressConfiguration.
+    :type public_ip_address_configuration:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetPublicIPAddressConfiguration
+    :param private_ip_address_version: Available from Api-Version 2017-03-30
+     onwards, it represents whether the specific ipconfiguration is IPv4 or
+     IPv6. Default is taken as IPv4.  Possible values are: 'IPv4' and 'IPv6'.
+     Possible values include: 'IPv4', 'IPv6'
+    :type private_ip_address_version: str or
+     ~azure.mgmt.compute.v2018_06_01.models.IPVersion
+    :param application_gateway_backend_address_pools: Specifies an array of
+     references to backend address pools of application gateways. A scale set
+     can reference backend address pools of multiple application gateways.
+     Multiple scale sets cannot use the same application gateway.
+    :type application_gateway_backend_address_pools:
+     list[~azure.mgmt.compute.v2018_06_01.models.SubResource]
+    :param load_balancer_backend_address_pools: Specifies an array of
+     references to backend address pools of load balancers. A scale set can
+     reference backend address pools of one public and one internal load
+     balancer. Multiple scale sets cannot use the same load balancer.
+    :type load_balancer_backend_address_pools:
+     list[~azure.mgmt.compute.v2018_06_01.models.SubResource]
+    :param load_balancer_inbound_nat_pools: Specifies an array of references
+     to inbound Nat pools of the load balancers. A scale set can reference
+     inbound nat pools of one public and one internal load balancer. Multiple
+     scale sets cannot use the same load balancer
+    :type load_balancer_inbound_nat_pools:
+     list[~azure.mgmt.compute.v2018_06_01.models.SubResource]
+    """
+
+    _validation = {
+        'name': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'subnet': {'key': 'properties.subnet', 'type': 'ApiEntityReference'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+        'public_ip_address_configuration': {'key': 'properties.publicIPAddressConfiguration', 'type': 'VirtualMachineScaleSetPublicIPAddressConfiguration'},
+        'private_ip_address_version': {'key': 'properties.privateIPAddressVersion', 'type': 'str'},
+        'application_gateway_backend_address_pools': {'key': 'properties.applicationGatewayBackendAddressPools', 'type': '[SubResource]'},
+        'load_balancer_backend_address_pools': {'key': 'properties.loadBalancerBackendAddressPools', 'type': '[SubResource]'},
+        'load_balancer_inbound_nat_pools': {'key': 'properties.loadBalancerInboundNatPools', 'type': '[SubResource]'},
+    }
+
+    def __init__(self, *, name: str, id: str=None, subnet=None, primary: bool=None, public_ip_address_configuration=None, private_ip_address_version=None, application_gateway_backend_address_pools=None, load_balancer_backend_address_pools=None, load_balancer_inbound_nat_pools=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetIPConfiguration, self).__init__(id=id, **kwargs)
+        self.name = name
+        self.subnet = subnet
+        self.primary = primary
+        self.public_ip_address_configuration = public_ip_address_configuration
+        self.private_ip_address_version = private_ip_address_version
+        self.application_gateway_backend_address_pools = application_gateway_backend_address_pools
+        self.load_balancer_backend_address_pools = load_balancer_backend_address_pools
+        self.load_balancer_inbound_nat_pools = load_balancer_inbound_nat_pools
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_ip_tag.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_ip_tag.py
new file mode 100644
index 000000000000..36b70260d646
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_ip_tag.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 VirtualMachineScaleSetIpTag(Model):
+    """Contains the IP tag associated with the public IP address.
+
+    :param ip_tag_type: IP tag type. Example: FirstPartyUsage.
+    :type ip_tag_type: str
+    :param tag: IP tag associated with the public IP. Example: SQL, Storage
+     etc.
+    :type tag: str
+    """
+
+    _attribute_map = {
+        'ip_tag_type': {'key': 'ipTagType', 'type': 'str'},
+        'tag': {'key': 'tag', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetIpTag, self).__init__(**kwargs)
+        self.ip_tag_type = kwargs.get('ip_tag_type', None)
+        self.tag = kwargs.get('tag', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_ip_tag_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_ip_tag_py3.py
new file mode 100644
index 000000000000..aaf788c9d772
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_ip_tag_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 VirtualMachineScaleSetIpTag(Model):
+    """Contains the IP tag associated with the public IP address.
+
+    :param ip_tag_type: IP tag type. Example: FirstPartyUsage.
+    :type ip_tag_type: str
+    :param tag: IP tag associated with the public IP. Example: SQL, Storage
+     etc.
+    :type tag: str
+    """
+
+    _attribute_map = {
+        'ip_tag_type': {'key': 'ipTagType', 'type': 'str'},
+        'tag': {'key': 'tag', 'type': 'str'},
+    }
+
+    def __init__(self, *, ip_tag_type: str=None, tag: str=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetIpTag, self).__init__(**kwargs)
+        self.ip_tag_type = ip_tag_type
+        self.tag = tag
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
new file mode 100644
index 000000000000..d3194e273ccb
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_managed_disk_parameters.py
@@ -0,0 +1,32 @@
+# 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 VirtualMachineScaleSetManagedDiskParameters(Model):
+    """Describes the parameters of a ScaleSet managed disk.
+
+    :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'
+    :type storage_account_type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.StorageAccountTypes
+    """
+
+    _attribute_map = {
+        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetManagedDiskParameters, self).__init__(**kwargs)
+        self.storage_account_type = kwargs.get('storage_account_type', None)
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
new file mode 100644
index 000000000000..517afc8e40d4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_managed_disk_parameters_py3.py
@@ -0,0 +1,32 @@
+# 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 VirtualMachineScaleSetManagedDiskParameters(Model):
+    """Describes the parameters of a ScaleSet managed disk.
+
+    :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'
+    :type storage_account_type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.StorageAccountTypes
+    """
+
+    _attribute_map = {
+        'storage_account_type': {'key': 'storageAccountType', 'type': 'str'},
+    }
+
+    def __init__(self, *, storage_account_type=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetManagedDiskParameters, self).__init__(**kwargs)
+        self.storage_account_type = storage_account_type
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_network_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_network_configuration.py
new file mode 100644
index 000000000000..5a6f335df9d6
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_network_configuration.py
@@ -0,0 +1,70 @@
+# 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 .sub_resource import SubResource
+
+
+class VirtualMachineScaleSetNetworkConfiguration(SubResource):
+    """Describes a virtual machine scale set network profile's network
+    configurations.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: Required. The network configuration name.
+    :type name: str
+    :param primary: Specifies the primary network interface in case the
+     virtual machine has more than 1 network interface.
+    :type primary: bool
+    :param enable_accelerated_networking: Specifies whether the network
+     interface is accelerated networking-enabled.
+    :type enable_accelerated_networking: bool
+    :param network_security_group: The network security group.
+    :type network_security_group:
+     ~azure.mgmt.compute.v2018_06_01.models.SubResource
+    :param dns_settings: The dns settings to be applied on the network
+     interfaces.
+    :type dns_settings:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetNetworkConfigurationDnsSettings
+    :param ip_configurations: Required. Specifies the IP configurations of the
+     network interface.
+    :type ip_configurations:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetIPConfiguration]
+    :param enable_ip_forwarding: Whether IP forwarding enabled on this NIC.
+    :type enable_ip_forwarding: bool
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'ip_configurations': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+        'enable_accelerated_networking': {'key': 'properties.enableAcceleratedNetworking', 'type': 'bool'},
+        'network_security_group': {'key': 'properties.networkSecurityGroup', 'type': 'SubResource'},
+        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetNetworkConfigurationDnsSettings'},
+        'ip_configurations': {'key': 'properties.ipConfigurations', 'type': '[VirtualMachineScaleSetIPConfiguration]'},
+        'enable_ip_forwarding': {'key': 'properties.enableIPForwarding', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetNetworkConfiguration, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.primary = kwargs.get('primary', None)
+        self.enable_accelerated_networking = kwargs.get('enable_accelerated_networking', None)
+        self.network_security_group = kwargs.get('network_security_group', None)
+        self.dns_settings = kwargs.get('dns_settings', None)
+        self.ip_configurations = kwargs.get('ip_configurations', None)
+        self.enable_ip_forwarding = kwargs.get('enable_ip_forwarding', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_network_configuration_dns_settings.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_network_configuration_dns_settings.py
new file mode 100644
index 000000000000..04e1c619383f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_network_configuration_dns_settings.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 VirtualMachineScaleSetNetworkConfigurationDnsSettings(Model):
+    """Describes a virtual machines scale sets network configuration's DNS
+    settings.
+
+    :param dns_servers: List of DNS servers IP addresses
+    :type dns_servers: list[str]
+    """
+
+    _attribute_map = {
+        'dns_servers': {'key': 'dnsServers', 'type': '[str]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetNetworkConfigurationDnsSettings, self).__init__(**kwargs)
+        self.dns_servers = kwargs.get('dns_servers', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_network_configuration_dns_settings_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_network_configuration_dns_settings_py3.py
new file mode 100644
index 000000000000..5607f74d3c6a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_network_configuration_dns_settings_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 VirtualMachineScaleSetNetworkConfigurationDnsSettings(Model):
+    """Describes a virtual machines scale sets network configuration's DNS
+    settings.
+
+    :param dns_servers: List of DNS servers IP addresses
+    :type dns_servers: list[str]
+    """
+
+    _attribute_map = {
+        'dns_servers': {'key': 'dnsServers', 'type': '[str]'},
+    }
+
+    def __init__(self, *, dns_servers=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetNetworkConfigurationDnsSettings, self).__init__(**kwargs)
+        self.dns_servers = dns_servers
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_network_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_network_configuration_py3.py
new file mode 100644
index 000000000000..94b5018fe871
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_network_configuration_py3.py
@@ -0,0 +1,70 @@
+# 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 .sub_resource_py3 import SubResource
+
+
+class VirtualMachineScaleSetNetworkConfiguration(SubResource):
+    """Describes a virtual machine scale set network profile's network
+    configurations.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: Required. The network configuration name.
+    :type name: str
+    :param primary: Specifies the primary network interface in case the
+     virtual machine has more than 1 network interface.
+    :type primary: bool
+    :param enable_accelerated_networking: Specifies whether the network
+     interface is accelerated networking-enabled.
+    :type enable_accelerated_networking: bool
+    :param network_security_group: The network security group.
+    :type network_security_group:
+     ~azure.mgmt.compute.v2018_06_01.models.SubResource
+    :param dns_settings: The dns settings to be applied on the network
+     interfaces.
+    :type dns_settings:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetNetworkConfigurationDnsSettings
+    :param ip_configurations: Required. Specifies the IP configurations of the
+     network interface.
+    :type ip_configurations:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetIPConfiguration]
+    :param enable_ip_forwarding: Whether IP forwarding enabled on this NIC.
+    :type enable_ip_forwarding: bool
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'ip_configurations': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+        'enable_accelerated_networking': {'key': 'properties.enableAcceleratedNetworking', 'type': 'bool'},
+        'network_security_group': {'key': 'properties.networkSecurityGroup', 'type': 'SubResource'},
+        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetNetworkConfigurationDnsSettings'},
+        'ip_configurations': {'key': 'properties.ipConfigurations', 'type': '[VirtualMachineScaleSetIPConfiguration]'},
+        'enable_ip_forwarding': {'key': 'properties.enableIPForwarding', 'type': 'bool'},
+    }
+
+    def __init__(self, *, name: str, ip_configurations, id: str=None, primary: bool=None, enable_accelerated_networking: bool=None, network_security_group=None, dns_settings=None, enable_ip_forwarding: bool=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetNetworkConfiguration, self).__init__(id=id, **kwargs)
+        self.name = name
+        self.primary = primary
+        self.enable_accelerated_networking = enable_accelerated_networking
+        self.network_security_group = network_security_group
+        self.dns_settings = dns_settings
+        self.ip_configurations = ip_configurations
+        self.enable_ip_forwarding = enable_ip_forwarding
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_network_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_network_profile.py
new file mode 100644
index 000000000000..6bf7de78bc96
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_network_profile.py
@@ -0,0 +1,38 @@
+# 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 VirtualMachineScaleSetNetworkProfile(Model):
+    """Describes a virtual machine scale set network profile.
+
+    :param health_probe: A reference to a load balancer probe used to
+     determine the health of an instance in the virtual machine scale set. The
+     reference will be in the form:
+     '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/probes/{probeName}'.
+    :type health_probe:
+     ~azure.mgmt.compute.v2018_06_01.models.ApiEntityReference
+    :param network_interface_configurations: The list of network
+     configurations.
+    :type network_interface_configurations:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetNetworkConfiguration]
+    """
+
+    _attribute_map = {
+        'health_probe': {'key': 'healthProbe', 'type': 'ApiEntityReference'},
+        'network_interface_configurations': {'key': 'networkInterfaceConfigurations', 'type': '[VirtualMachineScaleSetNetworkConfiguration]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetNetworkProfile, self).__init__(**kwargs)
+        self.health_probe = kwargs.get('health_probe', None)
+        self.network_interface_configurations = kwargs.get('network_interface_configurations', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_network_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_network_profile_py3.py
new file mode 100644
index 000000000000..f9c5a1b1e6d3
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_network_profile_py3.py
@@ -0,0 +1,38 @@
+# 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 VirtualMachineScaleSetNetworkProfile(Model):
+    """Describes a virtual machine scale set network profile.
+
+    :param health_probe: A reference to a load balancer probe used to
+     determine the health of an instance in the virtual machine scale set. The
+     reference will be in the form:
+     '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/probes/{probeName}'.
+    :type health_probe:
+     ~azure.mgmt.compute.v2018_06_01.models.ApiEntityReference
+    :param network_interface_configurations: The list of network
+     configurations.
+    :type network_interface_configurations:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetNetworkConfiguration]
+    """
+
+    _attribute_map = {
+        'health_probe': {'key': 'healthProbe', 'type': 'ApiEntityReference'},
+        'network_interface_configurations': {'key': 'networkInterfaceConfigurations', 'type': '[VirtualMachineScaleSetNetworkConfiguration]'},
+    }
+
+    def __init__(self, *, health_probe=None, network_interface_configurations=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetNetworkProfile, self).__init__(**kwargs)
+        self.health_probe = health_probe
+        self.network_interface_configurations = network_interface_configurations
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
new file mode 100644
index 000000000000..b6c87a946f94
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_os_disk.py
@@ -0,0 +1,80 @@
+# 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 VirtualMachineScaleSetOSDisk(Model):
+    """Describes a virtual machine scale set operating system disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: The disk name.
+    :type name: str
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_06_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :param create_option: Required. Specifies how the virtual machines in the
+     scale set should be created.<br><br> The only allowed value is:
+     **FromImage** \\u2013 This value is used when you are using an image to
+     create the virtual machine. If you are using a platform image, you also
+     use the imageReference element described above. If you are using a
+     marketplace image, you  also use the plan element previously described.
+     Possible values include: 'FromImage', 'Empty', 'Attach'
+    :type create_option: str or
+     ~azure.mgmt.compute.v2018_06_01.models.DiskCreateOptionTypes
+    :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**
+     <br><br> **Linux**. Possible values include: 'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.OperatingSystemTypes
+    :param image: Specifies information about the unmanaged user image to base
+     the scale set on.
+    :type image: ~azure.mgmt.compute.v2018_06_01.models.VirtualHardDisk
+    :param vhd_containers: Specifies the container urls that are used to store
+     operating system disks for the scale set.
+    :type vhd_containers: list[str]
+    :param managed_disk: The managed disk parameters.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetManagedDiskParameters
+    """
+
+    _validation = {
+        'create_option': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'caching': {'key': 'caching', 'type': 'CachingTypes'},
+        'write_accelerator_enabled': {'key': 'writeAcceleratorEnabled', 'type': 'bool'},
+        'create_option': {'key': 'createOption', 'type': 'str'},
+        '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, **kwargs):
+        super(VirtualMachineScaleSetOSDisk, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        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.os_type = kwargs.get('os_type', 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_os_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_os_disk_py3.py
new file mode 100644
index 000000000000..051ec3187023
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_os_disk_py3.py
@@ -0,0 +1,80 @@
+# 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 VirtualMachineScaleSetOSDisk(Model):
+    """Describes a virtual machine scale set operating system disk.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: The disk name.
+    :type name: str
+    :param caching: Specifies the caching requirements. <br><br> Possible
+     values are: <br><br> **None** <br><br> **ReadOnly** <br><br> **ReadWrite**
+     <br><br> Default: **None for Standard storage. ReadOnly for Premium
+     storage**. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_06_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :param create_option: Required. Specifies how the virtual machines in the
+     scale set should be created.<br><br> The only allowed value is:
+     **FromImage** \\u2013 This value is used when you are using an image to
+     create the virtual machine. If you are using a platform image, you also
+     use the imageReference element described above. If you are using a
+     marketplace image, you  also use the plan element previously described.
+     Possible values include: 'FromImage', 'Empty', 'Attach'
+    :type create_option: str or
+     ~azure.mgmt.compute.v2018_06_01.models.DiskCreateOptionTypes
+    :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**
+     <br><br> **Linux**. Possible values include: 'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.OperatingSystemTypes
+    :param image: Specifies information about the unmanaged user image to base
+     the scale set on.
+    :type image: ~azure.mgmt.compute.v2018_06_01.models.VirtualHardDisk
+    :param vhd_containers: Specifies the container urls that are used to store
+     operating system disks for the scale set.
+    :type vhd_containers: list[str]
+    :param managed_disk: The managed disk parameters.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetManagedDiskParameters
+    """
+
+    _validation = {
+        'create_option': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'caching': {'key': 'caching', 'type': 'CachingTypes'},
+        'write_accelerator_enabled': {'key': 'writeAcceleratorEnabled', 'type': 'bool'},
+        'create_option': {'key': 'createOption', 'type': 'str'},
+        '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:
+        super(VirtualMachineScaleSetOSDisk, self).__init__(**kwargs)
+        self.name = name
+        self.caching = caching
+        self.write_accelerator_enabled = write_accelerator_enabled
+        self.create_option = create_option
+        self.os_type = os_type
+        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_os_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_os_profile.py
new file mode 100644
index 000000000000..c808be381e12
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_os_profile.py
@@ -0,0 +1,97 @@
+# 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 VirtualMachineScaleSetOSProfile(Model):
+    """Describes a virtual machine scale set OS profile.
+
+    :param computer_name_prefix: Specifies the computer name prefix for all of
+     the virtual machines in the scale set. Computer name prefixes must be 1 to
+     15 characters long.
+    :type computer_name_prefix: str
+    :param admin_username: Specifies the name of the administrator account.
+     <br><br> **Windows-only restriction:** Cannot end in "." <br><br>
+     **Disallowed values:** "administrator", "admin", "user", "user1", "test",
+     "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm",
+     "admin2", "aspnet", "backup", "console", "david", "guest", "john",
+     "owner", "root", "server", "sql", "support", "support_388945a0", "sys",
+     "test2", "test3", "user4", "user5". <br><br> **Minimum-length (Linux):** 1
+     character <br><br> **Max-length (Linux):** 64 characters <br><br>
+     **Max-length (Windows):** 20 characters  <br><br><li> For root access to
+     the Linux VM, see [Using root privileges on Linux virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-use-root-privileges?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)<br><li>
+     For a list of built-in system users on Linux that should not be used in
+     this field, see [Selecting User Names for Linux on
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-usernames?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    :type admin_username: str
+    :param admin_password: Specifies the password of the administrator
+     account. <br><br> **Minimum-length (Windows):** 8 characters <br><br>
+     **Minimum-length (Linux):** 6 characters <br><br> **Max-length
+     (Windows):** 123 characters <br><br> **Max-length (Linux):** 72 characters
+     <br><br> **Complexity requirements:** 3 out of 4 conditions below need to
+     be fulfilled <br> Has lower characters <br>Has upper characters <br> Has a
+     digit <br> Has a special character (Regex match [\\W_]) <br><br>
+     **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123",
+     "Pa$$word", "pass@word1", "Password!", "Password1", "Password22",
+     "iloveyou!" <br><br> For resetting the password, see [How to reset the
+     Remote Desktop service or its login password in a Windows
+     VM](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-reset-rdp?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> For resetting root password, see [Manage users, SSH, and check or
+     repair disks on Azure Linux VMs using the VMAccess
+     Extension](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-vmaccess-extension?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#reset-root-password)
+    :type admin_password: str
+    :param custom_data: Specifies a base-64 encoded string of custom data. The
+     base-64 encoded string is decoded to a binary array that is saved as a
+     file on the Virtual Machine. The maximum length of the binary array is
+     65535 bytes. <br><br> For using cloud-init for your VM, see [Using
+     cloud-init to customize a Linux VM during
+     creation](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-cloud-init?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    :type custom_data: str
+    :param windows_configuration: Specifies Windows operating system settings
+     on the virtual machine.
+    :type windows_configuration:
+     ~azure.mgmt.compute.v2018_06_01.models.WindowsConfiguration
+    :param linux_configuration: Specifies the Linux operating system settings
+     on the virtual machine. <br><br>For a list of supported Linux
+     distributions, see [Linux on Azure-Endorsed
+     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+     <br><br> For running non-endorsed distributions, see [Information for
+     Non-Endorsed
+     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
+    :type linux_configuration:
+     ~azure.mgmt.compute.v2018_06_01.models.LinuxConfiguration
+    :param secrets: Specifies set of certificates that should be installed
+     onto the virtual machines in the scale set.
+    :type secrets:
+     list[~azure.mgmt.compute.v2018_06_01.models.VaultSecretGroup]
+    """
+
+    _attribute_map = {
+        'computer_name_prefix': {'key': 'computerNamePrefix', 'type': 'str'},
+        'admin_username': {'key': 'adminUsername', 'type': 'str'},
+        'admin_password': {'key': 'adminPassword', 'type': 'str'},
+        'custom_data': {'key': 'customData', 'type': 'str'},
+        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'WindowsConfiguration'},
+        'linux_configuration': {'key': 'linuxConfiguration', 'type': 'LinuxConfiguration'},
+        'secrets': {'key': 'secrets', 'type': '[VaultSecretGroup]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetOSProfile, self).__init__(**kwargs)
+        self.computer_name_prefix = kwargs.get('computer_name_prefix', None)
+        self.admin_username = kwargs.get('admin_username', None)
+        self.admin_password = kwargs.get('admin_password', None)
+        self.custom_data = kwargs.get('custom_data', None)
+        self.windows_configuration = kwargs.get('windows_configuration', None)
+        self.linux_configuration = kwargs.get('linux_configuration', None)
+        self.secrets = kwargs.get('secrets', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_os_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_os_profile_py3.py
new file mode 100644
index 000000000000..7825dc5cca51
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_os_profile_py3.py
@@ -0,0 +1,97 @@
+# 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 VirtualMachineScaleSetOSProfile(Model):
+    """Describes a virtual machine scale set OS profile.
+
+    :param computer_name_prefix: Specifies the computer name prefix for all of
+     the virtual machines in the scale set. Computer name prefixes must be 1 to
+     15 characters long.
+    :type computer_name_prefix: str
+    :param admin_username: Specifies the name of the administrator account.
+     <br><br> **Windows-only restriction:** Cannot end in "." <br><br>
+     **Disallowed values:** "administrator", "admin", "user", "user1", "test",
+     "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm",
+     "admin2", "aspnet", "backup", "console", "david", "guest", "john",
+     "owner", "root", "server", "sql", "support", "support_388945a0", "sys",
+     "test2", "test3", "user4", "user5". <br><br> **Minimum-length (Linux):** 1
+     character <br><br> **Max-length (Linux):** 64 characters <br><br>
+     **Max-length (Windows):** 20 characters  <br><br><li> For root access to
+     the Linux VM, see [Using root privileges on Linux virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-use-root-privileges?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)<br><li>
+     For a list of built-in system users on Linux that should not be used in
+     this field, see [Selecting User Names for Linux on
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-usernames?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    :type admin_username: str
+    :param admin_password: Specifies the password of the administrator
+     account. <br><br> **Minimum-length (Windows):** 8 characters <br><br>
+     **Minimum-length (Linux):** 6 characters <br><br> **Max-length
+     (Windows):** 123 characters <br><br> **Max-length (Linux):** 72 characters
+     <br><br> **Complexity requirements:** 3 out of 4 conditions below need to
+     be fulfilled <br> Has lower characters <br>Has upper characters <br> Has a
+     digit <br> Has a special character (Regex match [\\W_]) <br><br>
+     **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123",
+     "Pa$$word", "pass@word1", "Password!", "Password1", "Password22",
+     "iloveyou!" <br><br> For resetting the password, see [How to reset the
+     Remote Desktop service or its login password in a Windows
+     VM](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-reset-rdp?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> For resetting root password, see [Manage users, SSH, and check or
+     repair disks on Azure Linux VMs using the VMAccess
+     Extension](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-vmaccess-extension?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json#reset-root-password)
+    :type admin_password: str
+    :param custom_data: Specifies a base-64 encoded string of custom data. The
+     base-64 encoded string is decoded to a binary array that is saved as a
+     file on the Virtual Machine. The maximum length of the binary array is
+     65535 bytes. <br><br> For using cloud-init for your VM, see [Using
+     cloud-init to customize a Linux VM during
+     creation](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-using-cloud-init?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+    :type custom_data: str
+    :param windows_configuration: Specifies Windows operating system settings
+     on the virtual machine.
+    :type windows_configuration:
+     ~azure.mgmt.compute.v2018_06_01.models.WindowsConfiguration
+    :param linux_configuration: Specifies the Linux operating system settings
+     on the virtual machine. <br><br>For a list of supported Linux
+     distributions, see [Linux on Azure-Endorsed
+     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-endorsed-distros?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json)
+     <br><br> For running non-endorsed distributions, see [Information for
+     Non-Endorsed
+     Distributions](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-linux-create-upload-generic?toc=%2fazure%2fvirtual-machines%2flinux%2ftoc.json).
+    :type linux_configuration:
+     ~azure.mgmt.compute.v2018_06_01.models.LinuxConfiguration
+    :param secrets: Specifies set of certificates that should be installed
+     onto the virtual machines in the scale set.
+    :type secrets:
+     list[~azure.mgmt.compute.v2018_06_01.models.VaultSecretGroup]
+    """
+
+    _attribute_map = {
+        'computer_name_prefix': {'key': 'computerNamePrefix', 'type': 'str'},
+        'admin_username': {'key': 'adminUsername', 'type': 'str'},
+        'admin_password': {'key': 'adminPassword', 'type': 'str'},
+        'custom_data': {'key': 'customData', 'type': 'str'},
+        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'WindowsConfiguration'},
+        'linux_configuration': {'key': 'linuxConfiguration', 'type': 'LinuxConfiguration'},
+        'secrets': {'key': 'secrets', 'type': '[VaultSecretGroup]'},
+    }
+
+    def __init__(self, *, computer_name_prefix: str=None, admin_username: str=None, admin_password: str=None, custom_data: str=None, windows_configuration=None, linux_configuration=None, secrets=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetOSProfile, self).__init__(**kwargs)
+        self.computer_name_prefix = computer_name_prefix
+        self.admin_username = admin_username
+        self.admin_password = admin_password
+        self.custom_data = custom_data
+        self.windows_configuration = windows_configuration
+        self.linux_configuration = linux_configuration
+        self.secrets = secrets
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_paged.py
new file mode 100644
index 000000000000..78f7ff3168ab
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_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 VirtualMachineScaleSetPaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`VirtualMachineScaleSet <azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSet>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[VirtualMachineScaleSet]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(VirtualMachineScaleSetPaged, self).__init__(*args, **kwargs)
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
new file mode 100644
index 000000000000..c43e3909c23d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_public_ip_address_configuration.py
@@ -0,0 +1,50 @@
+# 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 VirtualMachineScaleSetPublicIPAddressConfiguration(Model):
+    """Describes a virtual machines scale set IP Configuration's PublicIPAddress
+    configuration.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: Required. The publicIP address configuration name.
+    :type name: str
+    :param idle_timeout_in_minutes: The idle timeout of the public IP address.
+    :type idle_timeout_in_minutes: int
+    :param dns_settings: The dns settings to be applied on the publicIP
+     addresses .
+    :type dns_settings:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings
+    :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]
+    """
+
+    _validation = {
+        'name': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'idle_timeout_in_minutes': {'key': 'properties.idleTimeoutInMinutes', 'type': 'int'},
+        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings'},
+        'ip_tags': {'key': 'properties.ipTags', 'type': '[VirtualMachineScaleSetIpTag]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetPublicIPAddressConfiguration, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings.py
new file mode 100644
index 000000000000..2fe562244372
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings.py
@@ -0,0 +1,37 @@
+# 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 VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings(Model):
+    """Describes a virtual machines scale sets network configuration's DNS
+    settings.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param domain_name_label: Required. The Domain name label.The
+     concatenation of the domain name label and vm index will be the domain
+     name labels of the PublicIPAddress resources that will be created
+    :type domain_name_label: str
+    """
+
+    _validation = {
+        'domain_name_label': {'required': True},
+    }
+
+    _attribute_map = {
+        'domain_name_label': {'key': 'domainNameLabel', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings, self).__init__(**kwargs)
+        self.domain_name_label = kwargs.get('domain_name_label', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings_py3.py
new file mode 100644
index 000000000000..326a36708ff4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_public_ip_address_configuration_dns_settings_py3.py
@@ -0,0 +1,37 @@
+# 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 VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings(Model):
+    """Describes a virtual machines scale sets network configuration's DNS
+    settings.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param domain_name_label: Required. The Domain name label.The
+     concatenation of the domain name label and vm index will be the domain
+     name labels of the PublicIPAddress resources that will be created
+    :type domain_name_label: str
+    """
+
+    _validation = {
+        'domain_name_label': {'required': True},
+    }
+
+    _attribute_map = {
+        'domain_name_label': {'key': 'domainNameLabel', 'type': 'str'},
+    }
+
+    def __init__(self, *, domain_name_label: str, **kwargs) -> None:
+        super(VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings, self).__init__(**kwargs)
+        self.domain_name_label = domain_name_label
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
new file mode 100644
index 000000000000..1997921b01de
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_public_ip_address_configuration_py3.py
@@ -0,0 +1,50 @@
+# 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 VirtualMachineScaleSetPublicIPAddressConfiguration(Model):
+    """Describes a virtual machines scale set IP Configuration's PublicIPAddress
+    configuration.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: Required. The publicIP address configuration name.
+    :type name: str
+    :param idle_timeout_in_minutes: The idle timeout of the public IP address.
+    :type idle_timeout_in_minutes: int
+    :param dns_settings: The dns settings to be applied on the publicIP
+     addresses .
+    :type dns_settings:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings
+    :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]
+    """
+
+    _validation = {
+        'name': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'idle_timeout_in_minutes': {'key': 'properties.idleTimeoutInMinutes', 'type': 'int'},
+        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings'},
+        'ip_tags': {'key': 'properties.ipTags', 'type': '[VirtualMachineScaleSetIpTag]'},
+    }
+
+    def __init__(self, *, name: str, idle_timeout_in_minutes: int=None, dns_settings=None, ip_tags=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
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_py3.py
new file mode 100644
index 000000000000..e45e1f4a14d1
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_py3.py
@@ -0,0 +1,116 @@
+# 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 VirtualMachineScaleSet(Resource):
+    """Describes a Virtual Machine Scale Set.
+
+    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]
+    :param sku: The virtual machine scale set sku.
+    :type sku: ~azure.mgmt.compute.v2018_06_01.models.Sku
+    :param plan: Specifies information about the marketplace image used to
+     create the virtual machine. This element is only used for marketplace
+     images. Before you can use a marketplace image from an API, you must
+     enable the image for programmatic use.  In the Azure portal, find the
+     marketplace image that you want to use and then click **Want to deploy
+     programmatically, Get Started ->**. Enter any required information and
+     then click **Save**.
+    :type plan: ~azure.mgmt.compute.v2018_06_01.models.Plan
+    :param upgrade_policy: The upgrade policy.
+    :type upgrade_policy: ~azure.mgmt.compute.v2018_06_01.models.UpgradePolicy
+    :param virtual_machine_profile: The virtual machine profile.
+    :type virtual_machine_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetVMProfile
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :param overprovision: Specifies whether the Virtual Machine Scale Set
+     should be overprovisioned.
+    :type overprovision: bool
+    :ivar unique_id: Specifies the ID which uniquely identifies a Virtual
+     Machine Scale Set.
+    :vartype unique_id: str
+    :param single_placement_group: When true this limits the scale set to a
+     single placement group, of max size 100 virtual machines.
+    :type single_placement_group: bool
+    :param zone_balance: Whether to force stictly even Virtual Machine
+     distribution cross x-zones in case there is zone outage.
+    :type zone_balance: bool
+    :param platform_fault_domain_count: Fault Domain count for each placement
+     group.
+    :type platform_fault_domain_count: int
+    :param identity: The identity of the virtual machine scale set, if
+     configured.
+    :type identity:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetIdentity
+    :param zones: The virtual machine scale set zones.
+    :type zones: list[str]
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'provisioning_state': {'readonly': True},
+        'unique_id': {'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}'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'upgrade_policy': {'key': 'properties.upgradePolicy', 'type': 'UpgradePolicy'},
+        'virtual_machine_profile': {'key': 'properties.virtualMachineProfile', 'type': 'VirtualMachineScaleSetVMProfile'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'overprovision': {'key': 'properties.overprovision', 'type': 'bool'},
+        'unique_id': {'key': 'properties.uniqueId', 'type': 'str'},
+        'single_placement_group': {'key': 'properties.singlePlacementGroup', 'type': 'bool'},
+        'zone_balance': {'key': 'properties.zoneBalance', 'type': 'bool'},
+        'platform_fault_domain_count': {'key': 'properties.platformFaultDomainCount', 'type': 'int'},
+        'identity': {'key': 'identity', 'type': 'VirtualMachineScaleSetIdentity'},
+        'zones': {'key': 'zones', 'type': '[str]'},
+    }
+
+    def __init__(self, *, location: str, tags=None, sku=None, plan=None, upgrade_policy=None, virtual_machine_profile=None, overprovision: bool=None, single_placement_group: bool=None, zone_balance: bool=None, platform_fault_domain_count: int=None, identity=None, zones=None, **kwargs) -> None:
+        super(VirtualMachineScaleSet, self).__init__(location=location, tags=tags, **kwargs)
+        self.sku = sku
+        self.plan = plan
+        self.upgrade_policy = upgrade_policy
+        self.virtual_machine_profile = virtual_machine_profile
+        self.provisioning_state = None
+        self.overprovision = overprovision
+        self.unique_id = None
+        self.single_placement_group = single_placement_group
+        self.zone_balance = zone_balance
+        self.platform_fault_domain_count = platform_fault_domain_count
+        self.identity = identity
+        self.zones = zones
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_sku.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_sku.py
new file mode 100644
index 000000000000..618b9998cc99
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_sku.py
@@ -0,0 +1,46 @@
+# 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 VirtualMachineScaleSetSku(Model):
+    """Describes an available virtual machine scale set sku.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar resource_type: The type of resource the sku applies to.
+    :vartype resource_type: str
+    :ivar sku: The Sku.
+    :vartype sku: ~azure.mgmt.compute.v2018_06_01.models.Sku
+    :ivar capacity: Specifies the number of virtual machines in the scale set.
+    :vartype capacity:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetSkuCapacity
+    """
+
+    _validation = {
+        'resource_type': {'readonly': True},
+        'sku': {'readonly': True},
+        'capacity': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'resource_type': {'key': 'resourceType', 'type': 'str'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+        'capacity': {'key': 'capacity', 'type': 'VirtualMachineScaleSetSkuCapacity'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetSku, self).__init__(**kwargs)
+        self.resource_type = None
+        self.sku = None
+        self.capacity = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_sku_capacity.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_sku_capacity.py
new file mode 100644
index 000000000000..5d2a2630997e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_sku_capacity.py
@@ -0,0 +1,52 @@
+# 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 VirtualMachineScaleSetSkuCapacity(Model):
+    """Describes scaling information of a sku.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar minimum: The minimum capacity.
+    :vartype minimum: long
+    :ivar maximum: The maximum capacity that can be set.
+    :vartype maximum: long
+    :ivar default_capacity: The default capacity.
+    :vartype default_capacity: long
+    :ivar scale_type: The scale type applicable to the sku. Possible values
+     include: 'Automatic', 'None'
+    :vartype scale_type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetSkuScaleType
+    """
+
+    _validation = {
+        'minimum': {'readonly': True},
+        'maximum': {'readonly': True},
+        'default_capacity': {'readonly': True},
+        'scale_type': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'minimum': {'key': 'minimum', 'type': 'long'},
+        'maximum': {'key': 'maximum', 'type': 'long'},
+        'default_capacity': {'key': 'defaultCapacity', 'type': 'long'},
+        'scale_type': {'key': 'scaleType', 'type': 'VirtualMachineScaleSetSkuScaleType'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetSkuCapacity, self).__init__(**kwargs)
+        self.minimum = None
+        self.maximum = None
+        self.default_capacity = None
+        self.scale_type = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_sku_capacity_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_sku_capacity_py3.py
new file mode 100644
index 000000000000..e7fd9b370581
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_sku_capacity_py3.py
@@ -0,0 +1,52 @@
+# 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 VirtualMachineScaleSetSkuCapacity(Model):
+    """Describes scaling information of a sku.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar minimum: The minimum capacity.
+    :vartype minimum: long
+    :ivar maximum: The maximum capacity that can be set.
+    :vartype maximum: long
+    :ivar default_capacity: The default capacity.
+    :vartype default_capacity: long
+    :ivar scale_type: The scale type applicable to the sku. Possible values
+     include: 'Automatic', 'None'
+    :vartype scale_type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetSkuScaleType
+    """
+
+    _validation = {
+        'minimum': {'readonly': True},
+        'maximum': {'readonly': True},
+        'default_capacity': {'readonly': True},
+        'scale_type': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'minimum': {'key': 'minimum', 'type': 'long'},
+        'maximum': {'key': 'maximum', 'type': 'long'},
+        'default_capacity': {'key': 'defaultCapacity', 'type': 'long'},
+        'scale_type': {'key': 'scaleType', 'type': 'VirtualMachineScaleSetSkuScaleType'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(VirtualMachineScaleSetSkuCapacity, self).__init__(**kwargs)
+        self.minimum = None
+        self.maximum = None
+        self.default_capacity = None
+        self.scale_type = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_sku_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_sku_paged.py
new file mode 100644
index 000000000000..37dc0505a05d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_sku_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 VirtualMachineScaleSetSkuPaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`VirtualMachineScaleSetSku <azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetSku>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[VirtualMachineScaleSetSku]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(VirtualMachineScaleSetSkuPaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_sku_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_sku_py3.py
new file mode 100644
index 000000000000..b36efbcca3ca
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_sku_py3.py
@@ -0,0 +1,46 @@
+# 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 VirtualMachineScaleSetSku(Model):
+    """Describes an available virtual machine scale set sku.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar resource_type: The type of resource the sku applies to.
+    :vartype resource_type: str
+    :ivar sku: The Sku.
+    :vartype sku: ~azure.mgmt.compute.v2018_06_01.models.Sku
+    :ivar capacity: Specifies the number of virtual machines in the scale set.
+    :vartype capacity:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetSkuCapacity
+    """
+
+    _validation = {
+        'resource_type': {'readonly': True},
+        'sku': {'readonly': True},
+        'capacity': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'resource_type': {'key': 'resourceType', 'type': 'str'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+        'capacity': {'key': 'capacity', 'type': 'VirtualMachineScaleSetSkuCapacity'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(VirtualMachineScaleSetSku, self).__init__(**kwargs)
+        self.resource_type = None
+        self.sku = None
+        self.capacity = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_storage_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_storage_profile.py
new file mode 100644
index 000000000000..b26bcc3a7d98
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_storage_profile.py
@@ -0,0 +1,49 @@
+# 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 VirtualMachineScaleSetStorageProfile(Model):
+    """Describes a virtual machine scale set storage profile.
+
+    :param image_reference: Specifies information about the image to use. You
+     can specify information about platform images, marketplace images, or
+     virtual machine images. This element is required when you want to use a
+     platform image, marketplace image, or virtual machine image, but is not
+     used in other creation operations.
+    :type image_reference:
+     ~azure.mgmt.compute.v2018_06_01.models.ImageReference
+    :param os_disk: Specifies information about the operating system disk used
+     by the virtual machines in the scale set. <br><br> For more information
+     about disks, see [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type os_disk:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetOSDisk
+    :param data_disks: Specifies the parameters that are used to add data
+     disks to the virtual machines in the scale set. <br><br> For more
+     information about disks, see [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type data_disks:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetDataDisk]
+    """
+
+    _attribute_map = {
+        'image_reference': {'key': 'imageReference', 'type': 'ImageReference'},
+        'os_disk': {'key': 'osDisk', 'type': 'VirtualMachineScaleSetOSDisk'},
+        'data_disks': {'key': 'dataDisks', 'type': '[VirtualMachineScaleSetDataDisk]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetStorageProfile, self).__init__(**kwargs)
+        self.image_reference = kwargs.get('image_reference', None)
+        self.os_disk = kwargs.get('os_disk', None)
+        self.data_disks = kwargs.get('data_disks', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_storage_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_storage_profile_py3.py
new file mode 100644
index 000000000000..dbaede50817d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_storage_profile_py3.py
@@ -0,0 +1,49 @@
+# 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 VirtualMachineScaleSetStorageProfile(Model):
+    """Describes a virtual machine scale set storage profile.
+
+    :param image_reference: Specifies information about the image to use. You
+     can specify information about platform images, marketplace images, or
+     virtual machine images. This element is required when you want to use a
+     platform image, marketplace image, or virtual machine image, but is not
+     used in other creation operations.
+    :type image_reference:
+     ~azure.mgmt.compute.v2018_06_01.models.ImageReference
+    :param os_disk: Specifies information about the operating system disk used
+     by the virtual machines in the scale set. <br><br> For more information
+     about disks, see [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type os_disk:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetOSDisk
+    :param data_disks: Specifies the parameters that are used to add data
+     disks to the virtual machines in the scale set. <br><br> For more
+     information about disks, see [About disks and VHDs for Azure virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-about-disks-vhds?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+    :type data_disks:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetDataDisk]
+    """
+
+    _attribute_map = {
+        'image_reference': {'key': 'imageReference', 'type': 'ImageReference'},
+        'os_disk': {'key': 'osDisk', 'type': 'VirtualMachineScaleSetOSDisk'},
+        'data_disks': {'key': 'dataDisks', 'type': '[VirtualMachineScaleSetDataDisk]'},
+    }
+
+    def __init__(self, *, image_reference=None, os_disk=None, data_disks=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetStorageProfile, self).__init__(**kwargs)
+        self.image_reference = image_reference
+        self.os_disk = os_disk
+        self.data_disks = data_disks
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update.py
new file mode 100644
index 000000000000..41f4dc1df753
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update.py
@@ -0,0 +1,61 @@
+# 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 .update_resource import UpdateResource
+
+
+class VirtualMachineScaleSetUpdate(UpdateResource):
+    """Describes a Virtual Machine Scale Set.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param sku: The virtual machine scale set sku.
+    :type sku: ~azure.mgmt.compute.v2018_06_01.models.Sku
+    :param plan: The purchase plan when deploying a virtual machine scale set
+     from VM Marketplace images.
+    :type plan: ~azure.mgmt.compute.v2018_06_01.models.Plan
+    :param upgrade_policy: The upgrade policy.
+    :type upgrade_policy: ~azure.mgmt.compute.v2018_06_01.models.UpgradePolicy
+    :param virtual_machine_profile: The virtual machine profile.
+    :type virtual_machine_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetUpdateVMProfile
+    :param overprovision: Specifies whether the Virtual Machine Scale Set
+     should be overprovisioned.
+    :type overprovision: bool
+    :param single_placement_group: When true this limits the scale set to a
+     single placement group, of max size 100 virtual machines.
+    :type single_placement_group: bool
+    :param identity: The identity of the virtual machine scale set, if
+     configured.
+    :type identity:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetIdentity
+    """
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'upgrade_policy': {'key': 'properties.upgradePolicy', 'type': 'UpgradePolicy'},
+        'virtual_machine_profile': {'key': 'properties.virtualMachineProfile', 'type': 'VirtualMachineScaleSetUpdateVMProfile'},
+        'overprovision': {'key': 'properties.overprovision', 'type': 'bool'},
+        'single_placement_group': {'key': 'properties.singlePlacementGroup', 'type': 'bool'},
+        'identity': {'key': 'identity', 'type': 'VirtualMachineScaleSetIdentity'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetUpdate, self).__init__(**kwargs)
+        self.sku = kwargs.get('sku', None)
+        self.plan = kwargs.get('plan', None)
+        self.upgrade_policy = kwargs.get('upgrade_policy', None)
+        self.virtual_machine_profile = kwargs.get('virtual_machine_profile', None)
+        self.overprovision = kwargs.get('overprovision', None)
+        self.single_placement_group = kwargs.get('single_placement_group', None)
+        self.identity = kwargs.get('identity', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_ip_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_ip_configuration.py
new file mode 100644
index 000000000000..323518561eab
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_ip_configuration.py
@@ -0,0 +1,71 @@
+# 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 .sub_resource import SubResource
+
+
+class VirtualMachineScaleSetUpdateIPConfiguration(SubResource):
+    """Describes a virtual machine scale set network profile's IP configuration.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: The IP configuration name.
+    :type name: str
+    :param subnet: The subnet.
+    :type subnet: ~azure.mgmt.compute.v2018_06_01.models.ApiEntityReference
+    :param primary: Specifies the primary IP Configuration in case the network
+     interface has more than one IP Configuration.
+    :type primary: bool
+    :param public_ip_address_configuration: The publicIPAddressConfiguration.
+    :type public_ip_address_configuration:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetUpdatePublicIPAddressConfiguration
+    :param private_ip_address_version: Available from Api-Version 2017-03-30
+     onwards, it represents whether the specific ipconfiguration is IPv4 or
+     IPv6. Default is taken as IPv4.  Possible values are: 'IPv4' and 'IPv6'.
+     Possible values include: 'IPv4', 'IPv6'
+    :type private_ip_address_version: str or
+     ~azure.mgmt.compute.v2018_06_01.models.IPVersion
+    :param application_gateway_backend_address_pools: The application gateway
+     backend address pools.
+    :type application_gateway_backend_address_pools:
+     list[~azure.mgmt.compute.v2018_06_01.models.SubResource]
+    :param load_balancer_backend_address_pools: The load balancer backend
+     address pools.
+    :type load_balancer_backend_address_pools:
+     list[~azure.mgmt.compute.v2018_06_01.models.SubResource]
+    :param load_balancer_inbound_nat_pools: The load balancer inbound nat
+     pools.
+    :type load_balancer_inbound_nat_pools:
+     list[~azure.mgmt.compute.v2018_06_01.models.SubResource]
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'subnet': {'key': 'properties.subnet', 'type': 'ApiEntityReference'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+        'public_ip_address_configuration': {'key': 'properties.publicIPAddressConfiguration', 'type': 'VirtualMachineScaleSetUpdatePublicIPAddressConfiguration'},
+        'private_ip_address_version': {'key': 'properties.privateIPAddressVersion', 'type': 'str'},
+        'application_gateway_backend_address_pools': {'key': 'properties.applicationGatewayBackendAddressPools', 'type': '[SubResource]'},
+        'load_balancer_backend_address_pools': {'key': 'properties.loadBalancerBackendAddressPools', 'type': '[SubResource]'},
+        'load_balancer_inbound_nat_pools': {'key': 'properties.loadBalancerInboundNatPools', 'type': '[SubResource]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetUpdateIPConfiguration, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.subnet = kwargs.get('subnet', None)
+        self.primary = kwargs.get('primary', None)
+        self.public_ip_address_configuration = kwargs.get('public_ip_address_configuration', None)
+        self.private_ip_address_version = kwargs.get('private_ip_address_version', None)
+        self.application_gateway_backend_address_pools = kwargs.get('application_gateway_backend_address_pools', None)
+        self.load_balancer_backend_address_pools = kwargs.get('load_balancer_backend_address_pools', None)
+        self.load_balancer_inbound_nat_pools = kwargs.get('load_balancer_inbound_nat_pools', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_ip_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_ip_configuration_py3.py
new file mode 100644
index 000000000000..421c6cc10de1
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_ip_configuration_py3.py
@@ -0,0 +1,71 @@
+# 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 .sub_resource_py3 import SubResource
+
+
+class VirtualMachineScaleSetUpdateIPConfiguration(SubResource):
+    """Describes a virtual machine scale set network profile's IP configuration.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: The IP configuration name.
+    :type name: str
+    :param subnet: The subnet.
+    :type subnet: ~azure.mgmt.compute.v2018_06_01.models.ApiEntityReference
+    :param primary: Specifies the primary IP Configuration in case the network
+     interface has more than one IP Configuration.
+    :type primary: bool
+    :param public_ip_address_configuration: The publicIPAddressConfiguration.
+    :type public_ip_address_configuration:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetUpdatePublicIPAddressConfiguration
+    :param private_ip_address_version: Available from Api-Version 2017-03-30
+     onwards, it represents whether the specific ipconfiguration is IPv4 or
+     IPv6. Default is taken as IPv4.  Possible values are: 'IPv4' and 'IPv6'.
+     Possible values include: 'IPv4', 'IPv6'
+    :type private_ip_address_version: str or
+     ~azure.mgmt.compute.v2018_06_01.models.IPVersion
+    :param application_gateway_backend_address_pools: The application gateway
+     backend address pools.
+    :type application_gateway_backend_address_pools:
+     list[~azure.mgmt.compute.v2018_06_01.models.SubResource]
+    :param load_balancer_backend_address_pools: The load balancer backend
+     address pools.
+    :type load_balancer_backend_address_pools:
+     list[~azure.mgmt.compute.v2018_06_01.models.SubResource]
+    :param load_balancer_inbound_nat_pools: The load balancer inbound nat
+     pools.
+    :type load_balancer_inbound_nat_pools:
+     list[~azure.mgmt.compute.v2018_06_01.models.SubResource]
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'subnet': {'key': 'properties.subnet', 'type': 'ApiEntityReference'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+        'public_ip_address_configuration': {'key': 'properties.publicIPAddressConfiguration', 'type': 'VirtualMachineScaleSetUpdatePublicIPAddressConfiguration'},
+        'private_ip_address_version': {'key': 'properties.privateIPAddressVersion', 'type': 'str'},
+        'application_gateway_backend_address_pools': {'key': 'properties.applicationGatewayBackendAddressPools', 'type': '[SubResource]'},
+        'load_balancer_backend_address_pools': {'key': 'properties.loadBalancerBackendAddressPools', 'type': '[SubResource]'},
+        'load_balancer_inbound_nat_pools': {'key': 'properties.loadBalancerInboundNatPools', 'type': '[SubResource]'},
+    }
+
+    def __init__(self, *, id: str=None, name: str=None, subnet=None, primary: bool=None, public_ip_address_configuration=None, private_ip_address_version=None, application_gateway_backend_address_pools=None, load_balancer_backend_address_pools=None, load_balancer_inbound_nat_pools=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetUpdateIPConfiguration, self).__init__(id=id, **kwargs)
+        self.name = name
+        self.subnet = subnet
+        self.primary = primary
+        self.public_ip_address_configuration = public_ip_address_configuration
+        self.private_ip_address_version = private_ip_address_version
+        self.application_gateway_backend_address_pools = application_gateway_backend_address_pools
+        self.load_balancer_backend_address_pools = load_balancer_backend_address_pools
+        self.load_balancer_inbound_nat_pools = load_balancer_inbound_nat_pools
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_network_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_network_configuration.py
new file mode 100644
index 000000000000..4893646d98c6
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_network_configuration.py
@@ -0,0 +1,61 @@
+# 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 .sub_resource import SubResource
+
+
+class VirtualMachineScaleSetUpdateNetworkConfiguration(SubResource):
+    """Describes a virtual machine scale set network profile's network
+    configurations.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: The network configuration name.
+    :type name: str
+    :param primary: Whether this is a primary NIC on a virtual machine.
+    :type primary: bool
+    :param enable_accelerated_networking: Specifies whether the network
+     interface is accelerated networking-enabled.
+    :type enable_accelerated_networking: bool
+    :param network_security_group: The network security group.
+    :type network_security_group:
+     ~azure.mgmt.compute.v2018_06_01.models.SubResource
+    :param dns_settings: The dns settings to be applied on the network
+     interfaces.
+    :type dns_settings:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetNetworkConfigurationDnsSettings
+    :param ip_configurations: The virtual machine scale set IP Configuration.
+    :type ip_configurations:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetUpdateIPConfiguration]
+    :param enable_ip_forwarding: Whether IP forwarding enabled on this NIC.
+    :type enable_ip_forwarding: bool
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+        'enable_accelerated_networking': {'key': 'properties.enableAcceleratedNetworking', 'type': 'bool'},
+        'network_security_group': {'key': 'properties.networkSecurityGroup', 'type': 'SubResource'},
+        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetNetworkConfigurationDnsSettings'},
+        'ip_configurations': {'key': 'properties.ipConfigurations', 'type': '[VirtualMachineScaleSetUpdateIPConfiguration]'},
+        'enable_ip_forwarding': {'key': 'properties.enableIPForwarding', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetUpdateNetworkConfiguration, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.primary = kwargs.get('primary', None)
+        self.enable_accelerated_networking = kwargs.get('enable_accelerated_networking', None)
+        self.network_security_group = kwargs.get('network_security_group', None)
+        self.dns_settings = kwargs.get('dns_settings', None)
+        self.ip_configurations = kwargs.get('ip_configurations', None)
+        self.enable_ip_forwarding = kwargs.get('enable_ip_forwarding', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_network_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_network_configuration_py3.py
new file mode 100644
index 000000000000..5d910e8bf206
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_network_configuration_py3.py
@@ -0,0 +1,61 @@
+# 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 .sub_resource_py3 import SubResource
+
+
+class VirtualMachineScaleSetUpdateNetworkConfiguration(SubResource):
+    """Describes a virtual machine scale set network profile's network
+    configurations.
+
+    :param id: Resource Id
+    :type id: str
+    :param name: The network configuration name.
+    :type name: str
+    :param primary: Whether this is a primary NIC on a virtual machine.
+    :type primary: bool
+    :param enable_accelerated_networking: Specifies whether the network
+     interface is accelerated networking-enabled.
+    :type enable_accelerated_networking: bool
+    :param network_security_group: The network security group.
+    :type network_security_group:
+     ~azure.mgmt.compute.v2018_06_01.models.SubResource
+    :param dns_settings: The dns settings to be applied on the network
+     interfaces.
+    :type dns_settings:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetNetworkConfigurationDnsSettings
+    :param ip_configurations: The virtual machine scale set IP Configuration.
+    :type ip_configurations:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetUpdateIPConfiguration]
+    :param enable_ip_forwarding: Whether IP forwarding enabled on this NIC.
+    :type enable_ip_forwarding: bool
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'primary': {'key': 'properties.primary', 'type': 'bool'},
+        'enable_accelerated_networking': {'key': 'properties.enableAcceleratedNetworking', 'type': 'bool'},
+        'network_security_group': {'key': 'properties.networkSecurityGroup', 'type': 'SubResource'},
+        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetNetworkConfigurationDnsSettings'},
+        'ip_configurations': {'key': 'properties.ipConfigurations', 'type': '[VirtualMachineScaleSetUpdateIPConfiguration]'},
+        'enable_ip_forwarding': {'key': 'properties.enableIPForwarding', 'type': 'bool'},
+    }
+
+    def __init__(self, *, id: str=None, name: str=None, primary: bool=None, enable_accelerated_networking: bool=None, network_security_group=None, dns_settings=None, ip_configurations=None, enable_ip_forwarding: bool=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetUpdateNetworkConfiguration, self).__init__(id=id, **kwargs)
+        self.name = name
+        self.primary = primary
+        self.enable_accelerated_networking = enable_accelerated_networking
+        self.network_security_group = network_security_group
+        self.dns_settings = dns_settings
+        self.ip_configurations = ip_configurations
+        self.enable_ip_forwarding = enable_ip_forwarding
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_network_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_network_profile.py
new file mode 100644
index 000000000000..32c65bc418f8
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_network_profile.py
@@ -0,0 +1,30 @@
+# 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 VirtualMachineScaleSetUpdateNetworkProfile(Model):
+    """Describes a virtual machine scale set network profile.
+
+    :param network_interface_configurations: The list of network
+     configurations.
+    :type network_interface_configurations:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetUpdateNetworkConfiguration]
+    """
+
+    _attribute_map = {
+        'network_interface_configurations': {'key': 'networkInterfaceConfigurations', 'type': '[VirtualMachineScaleSetUpdateNetworkConfiguration]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetUpdateNetworkProfile, self).__init__(**kwargs)
+        self.network_interface_configurations = kwargs.get('network_interface_configurations', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_network_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_network_profile_py3.py
new file mode 100644
index 000000000000..de79c3f9051d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_network_profile_py3.py
@@ -0,0 +1,30 @@
+# 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 VirtualMachineScaleSetUpdateNetworkProfile(Model):
+    """Describes a virtual machine scale set network profile.
+
+    :param network_interface_configurations: The list of network
+     configurations.
+    :type network_interface_configurations:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetUpdateNetworkConfiguration]
+    """
+
+    _attribute_map = {
+        'network_interface_configurations': {'key': 'networkInterfaceConfigurations', 'type': '[VirtualMachineScaleSetUpdateNetworkConfiguration]'},
+    }
+
+    def __init__(self, *, network_interface_configurations=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetUpdateNetworkProfile, self).__init__(**kwargs)
+        self.network_interface_configurations = network_interface_configurations
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
new file mode 100644
index 000000000000..8a1968c828c4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_os_disk.py
@@ -0,0 +1,50 @@
+# 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 VirtualMachineScaleSetUpdateOSDisk(Model):
+    """Describes virtual machine scale set operating system disk Update Object.
+    This should be used for Updating VMSS OS Disk.
+
+    :param caching: The caching type. Possible values include: 'None',
+     'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_06_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :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.
+    :type image: ~azure.mgmt.compute.v2018_06_01.models.VirtualHardDisk
+    :param vhd_containers: The list of virtual hard disk container uris.
+    :type vhd_containers: list[str]
+    :param managed_disk: The managed disk parameters.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetManagedDiskParameters
+    """
+
+    _attribute_map = {
+        'caching': {'key': 'caching', 'type': 'CachingTypes'},
+        'write_accelerator_enabled': {'key': 'writeAcceleratorEnabled', 'type': 'bool'},
+        'image': {'key': 'image', 'type': 'VirtualHardDisk'},
+        'vhd_containers': {'key': 'vhdContainers', 'type': '[str]'},
+        'managed_disk': {'key': 'managedDisk', 'type': 'VirtualMachineScaleSetManagedDiskParameters'},
+    }
+
+    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.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
new file mode 100644
index 000000000000..b5b2138e378a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_os_disk_py3.py
@@ -0,0 +1,50 @@
+# 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 VirtualMachineScaleSetUpdateOSDisk(Model):
+    """Describes virtual machine scale set operating system disk Update Object.
+    This should be used for Updating VMSS OS Disk.
+
+    :param caching: The caching type. Possible values include: 'None',
+     'ReadOnly', 'ReadWrite'
+    :type caching: str or ~azure.mgmt.compute.v2018_06_01.models.CachingTypes
+    :param write_accelerator_enabled: Specifies whether writeAccelerator
+     should be enabled or disabled on the disk.
+    :type write_accelerator_enabled: bool
+    :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.
+    :type image: ~azure.mgmt.compute.v2018_06_01.models.VirtualHardDisk
+    :param vhd_containers: The list of virtual hard disk container uris.
+    :type vhd_containers: list[str]
+    :param managed_disk: The managed disk parameters.
+    :type managed_disk:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetManagedDiskParameters
+    """
+
+    _attribute_map = {
+        'caching': {'key': 'caching', 'type': 'CachingTypes'},
+        'write_accelerator_enabled': {'key': 'writeAcceleratorEnabled', 'type': 'bool'},
+        '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:
+        super(VirtualMachineScaleSetUpdateOSDisk, self).__init__(**kwargs)
+        self.caching = caching
+        self.write_accelerator_enabled = write_accelerator_enabled
+        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_update_os_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_os_profile.py
new file mode 100644
index 000000000000..f043e23776ca
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_os_profile.py
@@ -0,0 +1,43 @@
+# 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 VirtualMachineScaleSetUpdateOSProfile(Model):
+    """Describes a virtual machine scale set OS profile.
+
+    :param custom_data: A base-64 encoded string of custom data.
+    :type custom_data: str
+    :param windows_configuration: The Windows Configuration of the OS profile.
+    :type windows_configuration:
+     ~azure.mgmt.compute.v2018_06_01.models.WindowsConfiguration
+    :param linux_configuration: The Linux Configuration of the OS profile.
+    :type linux_configuration:
+     ~azure.mgmt.compute.v2018_06_01.models.LinuxConfiguration
+    :param secrets: The List of certificates for addition to the VM.
+    :type secrets:
+     list[~azure.mgmt.compute.v2018_06_01.models.VaultSecretGroup]
+    """
+
+    _attribute_map = {
+        'custom_data': {'key': 'customData', 'type': 'str'},
+        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'WindowsConfiguration'},
+        'linux_configuration': {'key': 'linuxConfiguration', 'type': 'LinuxConfiguration'},
+        'secrets': {'key': 'secrets', 'type': '[VaultSecretGroup]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetUpdateOSProfile, self).__init__(**kwargs)
+        self.custom_data = kwargs.get('custom_data', None)
+        self.windows_configuration = kwargs.get('windows_configuration', None)
+        self.linux_configuration = kwargs.get('linux_configuration', None)
+        self.secrets = kwargs.get('secrets', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_os_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_os_profile_py3.py
new file mode 100644
index 000000000000..fab18009bdbe
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_os_profile_py3.py
@@ -0,0 +1,43 @@
+# 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 VirtualMachineScaleSetUpdateOSProfile(Model):
+    """Describes a virtual machine scale set OS profile.
+
+    :param custom_data: A base-64 encoded string of custom data.
+    :type custom_data: str
+    :param windows_configuration: The Windows Configuration of the OS profile.
+    :type windows_configuration:
+     ~azure.mgmt.compute.v2018_06_01.models.WindowsConfiguration
+    :param linux_configuration: The Linux Configuration of the OS profile.
+    :type linux_configuration:
+     ~azure.mgmt.compute.v2018_06_01.models.LinuxConfiguration
+    :param secrets: The List of certificates for addition to the VM.
+    :type secrets:
+     list[~azure.mgmt.compute.v2018_06_01.models.VaultSecretGroup]
+    """
+
+    _attribute_map = {
+        'custom_data': {'key': 'customData', 'type': 'str'},
+        'windows_configuration': {'key': 'windowsConfiguration', 'type': 'WindowsConfiguration'},
+        'linux_configuration': {'key': 'linuxConfiguration', 'type': 'LinuxConfiguration'},
+        'secrets': {'key': 'secrets', 'type': '[VaultSecretGroup]'},
+    }
+
+    def __init__(self, *, custom_data: str=None, windows_configuration=None, linux_configuration=None, secrets=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetUpdateOSProfile, self).__init__(**kwargs)
+        self.custom_data = custom_data
+        self.windows_configuration = windows_configuration
+        self.linux_configuration = linux_configuration
+        self.secrets = secrets
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_public_ip_address_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_public_ip_address_configuration.py
new file mode 100644
index 000000000000..9e2c06edb276
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_public_ip_address_configuration.py
@@ -0,0 +1,39 @@
+# 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 VirtualMachineScaleSetUpdatePublicIPAddressConfiguration(Model):
+    """Describes a virtual machines scale set IP Configuration's PublicIPAddress
+    configuration.
+
+    :param name: The publicIP address configuration name.
+    :type name: str
+    :param idle_timeout_in_minutes: The idle timeout of the public IP address.
+    :type idle_timeout_in_minutes: int
+    :param dns_settings: The dns settings to be applied on the publicIP
+     addresses .
+    :type dns_settings:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'idle_timeout_in_minutes': {'key': 'properties.idleTimeoutInMinutes', 'type': 'int'},
+        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetUpdatePublicIPAddressConfiguration, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.idle_timeout_in_minutes = kwargs.get('idle_timeout_in_minutes', None)
+        self.dns_settings = kwargs.get('dns_settings', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_public_ip_address_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_public_ip_address_configuration_py3.py
new file mode 100644
index 000000000000..51444f9b7568
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_public_ip_address_configuration_py3.py
@@ -0,0 +1,39 @@
+# 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 VirtualMachineScaleSetUpdatePublicIPAddressConfiguration(Model):
+    """Describes a virtual machines scale set IP Configuration's PublicIPAddress
+    configuration.
+
+    :param name: The publicIP address configuration name.
+    :type name: str
+    :param idle_timeout_in_minutes: The idle timeout of the public IP address.
+    :type idle_timeout_in_minutes: int
+    :param dns_settings: The dns settings to be applied on the publicIP
+     addresses .
+    :type dns_settings:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'idle_timeout_in_minutes': {'key': 'properties.idleTimeoutInMinutes', 'type': 'int'},
+        'dns_settings': {'key': 'properties.dnsSettings', 'type': 'VirtualMachineScaleSetPublicIPAddressConfigurationDnsSettings'},
+    }
+
+    def __init__(self, *, name: str=None, idle_timeout_in_minutes: int=None, dns_settings=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetUpdatePublicIPAddressConfiguration, self).__init__(**kwargs)
+        self.name = name
+        self.idle_timeout_in_minutes = idle_timeout_in_minutes
+        self.dns_settings = dns_settings
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_py3.py
new file mode 100644
index 000000000000..55dda9c80548
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_py3.py
@@ -0,0 +1,61 @@
+# 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 .update_resource_py3 import UpdateResource
+
+
+class VirtualMachineScaleSetUpdate(UpdateResource):
+    """Describes a Virtual Machine Scale Set.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param sku: The virtual machine scale set sku.
+    :type sku: ~azure.mgmt.compute.v2018_06_01.models.Sku
+    :param plan: The purchase plan when deploying a virtual machine scale set
+     from VM Marketplace images.
+    :type plan: ~azure.mgmt.compute.v2018_06_01.models.Plan
+    :param upgrade_policy: The upgrade policy.
+    :type upgrade_policy: ~azure.mgmt.compute.v2018_06_01.models.UpgradePolicy
+    :param virtual_machine_profile: The virtual machine profile.
+    :type virtual_machine_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetUpdateVMProfile
+    :param overprovision: Specifies whether the Virtual Machine Scale Set
+     should be overprovisioned.
+    :type overprovision: bool
+    :param single_placement_group: When true this limits the scale set to a
+     single placement group, of max size 100 virtual machines.
+    :type single_placement_group: bool
+    :param identity: The identity of the virtual machine scale set, if
+     configured.
+    :type identity:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetIdentity
+    """
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'sku': {'key': 'sku', 'type': 'Sku'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'upgrade_policy': {'key': 'properties.upgradePolicy', 'type': 'UpgradePolicy'},
+        'virtual_machine_profile': {'key': 'properties.virtualMachineProfile', 'type': 'VirtualMachineScaleSetUpdateVMProfile'},
+        'overprovision': {'key': 'properties.overprovision', 'type': 'bool'},
+        'single_placement_group': {'key': 'properties.singlePlacementGroup', 'type': 'bool'},
+        'identity': {'key': 'identity', 'type': 'VirtualMachineScaleSetIdentity'},
+    }
+
+    def __init__(self, *, tags=None, sku=None, plan=None, upgrade_policy=None, virtual_machine_profile=None, overprovision: bool=None, single_placement_group: bool=None, identity=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetUpdate, self).__init__(tags=tags, **kwargs)
+        self.sku = sku
+        self.plan = plan
+        self.upgrade_policy = upgrade_policy
+        self.virtual_machine_profile = virtual_machine_profile
+        self.overprovision = overprovision
+        self.single_placement_group = single_placement_group
+        self.identity = identity
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_storage_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_storage_profile.py
new file mode 100644
index 000000000000..97cd8aea9b24
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_storage_profile.py
@@ -0,0 +1,39 @@
+# 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 VirtualMachineScaleSetUpdateStorageProfile(Model):
+    """Describes a virtual machine scale set storage profile.
+
+    :param image_reference: The image reference.
+    :type image_reference:
+     ~azure.mgmt.compute.v2018_06_01.models.ImageReference
+    :param os_disk: The OS disk.
+    :type os_disk:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetUpdateOSDisk
+    :param data_disks: The data disks.
+    :type data_disks:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetDataDisk]
+    """
+
+    _attribute_map = {
+        'image_reference': {'key': 'imageReference', 'type': 'ImageReference'},
+        'os_disk': {'key': 'osDisk', 'type': 'VirtualMachineScaleSetUpdateOSDisk'},
+        'data_disks': {'key': 'dataDisks', 'type': '[VirtualMachineScaleSetDataDisk]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetUpdateStorageProfile, self).__init__(**kwargs)
+        self.image_reference = kwargs.get('image_reference', None)
+        self.os_disk = kwargs.get('os_disk', None)
+        self.data_disks = kwargs.get('data_disks', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_storage_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_storage_profile_py3.py
new file mode 100644
index 000000000000..f24573c96349
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_storage_profile_py3.py
@@ -0,0 +1,39 @@
+# 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 VirtualMachineScaleSetUpdateStorageProfile(Model):
+    """Describes a virtual machine scale set storage profile.
+
+    :param image_reference: The image reference.
+    :type image_reference:
+     ~azure.mgmt.compute.v2018_06_01.models.ImageReference
+    :param os_disk: The OS disk.
+    :type os_disk:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetUpdateOSDisk
+    :param data_disks: The data disks.
+    :type data_disks:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetDataDisk]
+    """
+
+    _attribute_map = {
+        'image_reference': {'key': 'imageReference', 'type': 'ImageReference'},
+        'os_disk': {'key': 'osDisk', 'type': 'VirtualMachineScaleSetUpdateOSDisk'},
+        'data_disks': {'key': 'dataDisks', 'type': '[VirtualMachineScaleSetDataDisk]'},
+    }
+
+    def __init__(self, *, image_reference=None, os_disk=None, data_disks=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetUpdateStorageProfile, self).__init__(**kwargs)
+        self.image_reference = image_reference
+        self.os_disk = os_disk
+        self.data_disks = data_disks
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_vm_profile.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_vm_profile.py
new file mode 100644
index 000000000000..cb61ee4f68c5
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_vm_profile.py
@@ -0,0 +1,55 @@
+# 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 VirtualMachineScaleSetUpdateVMProfile(Model):
+    """Describes a virtual machine scale set virtual machine profile.
+
+    :param os_profile: The virtual machine scale set OS profile.
+    :type os_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetUpdateOSProfile
+    :param storage_profile: The virtual machine scale set storage profile.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetUpdateStorageProfile
+    :param network_profile: The virtual machine scale set network profile.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetUpdateNetworkProfile
+    :param diagnostics_profile: The virtual machine scale set diagnostics
+     profile.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.DiagnosticsProfile
+    :param extension_profile: The virtual machine scale set extension profile.
+    :type extension_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetExtensionProfile
+    :param license_type: The license type, which is for bring your own license
+     scenario.
+    :type license_type: str
+    """
+
+    _attribute_map = {
+        'os_profile': {'key': 'osProfile', 'type': 'VirtualMachineScaleSetUpdateOSProfile'},
+        'storage_profile': {'key': 'storageProfile', 'type': 'VirtualMachineScaleSetUpdateStorageProfile'},
+        'network_profile': {'key': 'networkProfile', 'type': 'VirtualMachineScaleSetUpdateNetworkProfile'},
+        'diagnostics_profile': {'key': 'diagnosticsProfile', 'type': 'DiagnosticsProfile'},
+        'extension_profile': {'key': 'extensionProfile', 'type': 'VirtualMachineScaleSetExtensionProfile'},
+        'license_type': {'key': 'licenseType', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetUpdateVMProfile, self).__init__(**kwargs)
+        self.os_profile = kwargs.get('os_profile', None)
+        self.storage_profile = kwargs.get('storage_profile', 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)
+        self.license_type = kwargs.get('license_type', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_vm_profile_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_vm_profile_py3.py
new file mode 100644
index 000000000000..d915ae470357
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_vm_profile_py3.py
@@ -0,0 +1,55 @@
+# 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 VirtualMachineScaleSetUpdateVMProfile(Model):
+    """Describes a virtual machine scale set virtual machine profile.
+
+    :param os_profile: The virtual machine scale set OS profile.
+    :type os_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetUpdateOSProfile
+    :param storage_profile: The virtual machine scale set storage profile.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetUpdateStorageProfile
+    :param network_profile: The virtual machine scale set network profile.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetUpdateNetworkProfile
+    :param diagnostics_profile: The virtual machine scale set diagnostics
+     profile.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.DiagnosticsProfile
+    :param extension_profile: The virtual machine scale set extension profile.
+    :type extension_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetExtensionProfile
+    :param license_type: The license type, which is for bring your own license
+     scenario.
+    :type license_type: str
+    """
+
+    _attribute_map = {
+        'os_profile': {'key': 'osProfile', 'type': 'VirtualMachineScaleSetUpdateOSProfile'},
+        'storage_profile': {'key': 'storageProfile', 'type': 'VirtualMachineScaleSetUpdateStorageProfile'},
+        'network_profile': {'key': 'networkProfile', 'type': 'VirtualMachineScaleSetUpdateNetworkProfile'},
+        'diagnostics_profile': {'key': 'diagnosticsProfile', 'type': 'DiagnosticsProfile'},
+        'extension_profile': {'key': 'extensionProfile', 'type': 'VirtualMachineScaleSetExtensionProfile'},
+        'license_type': {'key': 'licenseType', 'type': 'str'},
+    }
+
+    def __init__(self, *, os_profile=None, storage_profile=None, network_profile=None, diagnostics_profile=None, extension_profile=None, license_type: str=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetUpdateVMProfile, self).__init__(**kwargs)
+        self.os_profile = os_profile
+        self.storage_profile = storage_profile
+        self.network_profile = network_profile
+        self.diagnostics_profile = diagnostics_profile
+        self.extension_profile = extension_profile
+        self.license_type = license_type
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
new file mode 100644
index 000000000000..6d091cb02c35
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm.py
@@ -0,0 +1,155 @@
+# 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 VirtualMachineScaleSetVM(Resource):
+    """Describes a virtual machine scale set virtual machine.
+
+    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 instance_id: The virtual machine instance ID.
+    :vartype instance_id: str
+    :ivar sku: The virtual machine SKU.
+    :vartype sku: ~azure.mgmt.compute.v2018_06_01.models.Sku
+    :ivar latest_model_applied: Specifies whether the latest model has been
+     applied to the virtual machine.
+    :vartype latest_model_applied: bool
+    :ivar vm_id: Azure VM unique ID.
+    :vartype vm_id: str
+    :ivar instance_view: The virtual machine instance view.
+    :vartype instance_view:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineInstanceView
+    :param hardware_profile: Specifies the hardware settings for the virtual
+     machine.
+    :type hardware_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.HardwareProfile
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.StorageProfile
+    :param os_profile: Specifies the operating system settings for the virtual
+     machine.
+    :type os_profile: ~azure.mgmt.compute.v2018_06_01.models.OSProfile
+    :param network_profile: Specifies the network interfaces of the virtual
+     machine.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.NetworkProfile
+    :param diagnostics_profile: Specifies the boot diagnostic settings state.
+     <br><br>Minimum api-version: 2015-06-15.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.DiagnosticsProfile
+    :param availability_set: Specifies information about the availability set
+     that the virtual machine should be assigned to. Virtual machines specified
+     in the same availability set are allocated to different nodes to maximize
+     availability. For more information about availability sets, see [Manage
+     the availability of virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+     <br><br> For more information on Azure planned maintainance, see [Planned
+     maintenance for virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Currently, a VM can only be added to availability set at creation
+     time. An existing VM cannot be added to an availability set.
+    :type availability_set: ~azure.mgmt.compute.v2018_06_01.models.SubResource
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :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:
+     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
+     is included in a request for an update, the value must match the initial
+     value. This value cannot be updated. <br><br> For more information, see
+     [Azure Hybrid Use Benefit for Windows
+     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Minimum api-version: 2015-06-15
+    :type license_type: str
+    :param plan: Specifies information about the marketplace image used to
+     create the virtual machine. This element is only used for marketplace
+     images. Before you can use a marketplace image from an API, you must
+     enable the image for programmatic use.  In the Azure portal, find the
+     marketplace image that you want to use and then click **Want to deploy
+     programmatically, Get Started ->**. Enter any required information and
+     then click **Save**.
+    :type plan: ~azure.mgmt.compute.v2018_06_01.models.Plan
+    :ivar resources: The virtual machine child extension resources.
+    :vartype resources:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineExtension]
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'instance_id': {'readonly': True},
+        'sku': {'readonly': True},
+        'latest_model_applied': {'readonly': True},
+        'vm_id': {'readonly': True},
+        'instance_view': {'readonly': True},
+        'provisioning_state': {'readonly': True},
+        'resources': {'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}'},
+        'instance_id': {'key': 'instanceId', 'type': 'str'},
+        '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'},
+        'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
+        'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
+        'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
+        'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'},
+        'availability_set': {'key': 'properties.availabilitySet', 'type': 'SubResource'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'license_type': {'key': 'properties.licenseType', 'type': 'str'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'resources': {'key': 'resources', 'type': '[VirtualMachineExtension]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetVM, self).__init__(**kwargs)
+        self.instance_id = None
+        self.sku = None
+        self.latest_model_applied = None
+        self.vm_id = None
+        self.instance_view = None
+        self.hardware_profile = kwargs.get('hardware_profile', None)
+        self.storage_profile = kwargs.get('storage_profile', 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)
+        self.availability_set = kwargs.get('availability_set', None)
+        self.provisioning_state = None
+        self.license_type = kwargs.get('license_type', None)
+        self.plan = kwargs.get('plan', None)
+        self.resources = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_extensions_summary.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_extensions_summary.py
new file mode 100644
index 000000000000..9a5311199fe5
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_extensions_summary.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 VirtualMachineScaleSetVMExtensionsSummary(Model):
+    """Extensions summary for virtual machines of a virtual machine scale set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar name: The extension name.
+    :vartype name: str
+    :ivar statuses_summary: The extensions information.
+    :vartype statuses_summary:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineStatusCodeCount]
+    """
+
+    _validation = {
+        'name': {'readonly': True},
+        'statuses_summary': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'statuses_summary': {'key': 'statusesSummary', 'type': '[VirtualMachineStatusCodeCount]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetVMExtensionsSummary, self).__init__(**kwargs)
+        self.name = None
+        self.statuses_summary = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_extensions_summary_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_extensions_summary_py3.py
new file mode 100644
index 000000000000..da37a4f927b7
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_extensions_summary_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 VirtualMachineScaleSetVMExtensionsSummary(Model):
+    """Extensions summary for virtual machines of a virtual machine scale set.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar name: The extension name.
+    :vartype name: str
+    :ivar statuses_summary: The extensions information.
+    :vartype statuses_summary:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineStatusCodeCount]
+    """
+
+    _validation = {
+        'name': {'readonly': True},
+        'statuses_summary': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'statuses_summary': {'key': 'statusesSummary', 'type': '[VirtualMachineStatusCodeCount]'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(VirtualMachineScaleSetVMExtensionsSummary, self).__init__(**kwargs)
+        self.name = None
+        self.statuses_summary = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_instance_ids.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_instance_ids.py
new file mode 100644
index 000000000000..772c66dad326
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_instance_ids.py
@@ -0,0 +1,30 @@
+# 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 VirtualMachineScaleSetVMInstanceIDs(Model):
+    """Specifies a list of virtual machine instance IDs from the VM scale set.
+
+    :param instance_ids: The virtual machine scale set instance ids. Omitting
+     the virtual machine scale set instance ids will result in the operation
+     being performed on all virtual machines in the virtual machine scale set.
+    :type instance_ids: list[str]
+    """
+
+    _attribute_map = {
+        'instance_ids': {'key': 'instanceIds', 'type': '[str]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetVMInstanceIDs, self).__init__(**kwargs)
+        self.instance_ids = kwargs.get('instance_ids', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_instance_ids_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_instance_ids_py3.py
new file mode 100644
index 000000000000..658a8ccb87d5
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_instance_ids_py3.py
@@ -0,0 +1,30 @@
+# 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 VirtualMachineScaleSetVMInstanceIDs(Model):
+    """Specifies a list of virtual machine instance IDs from the VM scale set.
+
+    :param instance_ids: The virtual machine scale set instance ids. Omitting
+     the virtual machine scale set instance ids will result in the operation
+     being performed on all virtual machines in the virtual machine scale set.
+    :type instance_ids: list[str]
+    """
+
+    _attribute_map = {
+        'instance_ids': {'key': 'instanceIds', 'type': '[str]'},
+    }
+
+    def __init__(self, *, instance_ids=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetVMInstanceIDs, self).__init__(**kwargs)
+        self.instance_ids = instance_ids
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_instance_required_ids.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_instance_required_ids.py
new file mode 100644
index 000000000000..ece250dd4fd4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_instance_required_ids.py
@@ -0,0 +1,34 @@
+# 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 VirtualMachineScaleSetVMInstanceRequiredIDs(Model):
+    """Specifies a list of virtual machine instance IDs from the VM scale set.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param instance_ids: Required. The virtual machine scale set instance ids.
+    :type instance_ids: list[str]
+    """
+
+    _validation = {
+        'instance_ids': {'required': True},
+    }
+
+    _attribute_map = {
+        'instance_ids': {'key': 'instanceIds', 'type': '[str]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetVMInstanceRequiredIDs, self).__init__(**kwargs)
+        self.instance_ids = kwargs.get('instance_ids', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_instance_required_ids_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_instance_required_ids_py3.py
new file mode 100644
index 000000000000..f32c6181467d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_instance_required_ids_py3.py
@@ -0,0 +1,34 @@
+# 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 VirtualMachineScaleSetVMInstanceRequiredIDs(Model):
+    """Specifies a list of virtual machine instance IDs from the VM scale set.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param instance_ids: Required. The virtual machine scale set instance ids.
+    :type instance_ids: list[str]
+    """
+
+    _validation = {
+        'instance_ids': {'required': True},
+    }
+
+    _attribute_map = {
+        'instance_ids': {'key': 'instanceIds', 'type': '[str]'},
+    }
+
+    def __init__(self, *, instance_ids, **kwargs) -> None:
+        super(VirtualMachineScaleSetVMInstanceRequiredIDs, self).__init__(**kwargs)
+        self.instance_ids = instance_ids
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_instance_view.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_instance_view.py
new file mode 100644
index 000000000000..35e58a234b7f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_instance_view.py
@@ -0,0 +1,87 @@
+# 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 VirtualMachineScaleSetVMInstanceView(Model):
+    """The instance view of a virtual machine scale set VM.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param platform_update_domain: The Update Domain count.
+    :type platform_update_domain: int
+    :param platform_fault_domain: The Fault Domain count.
+    :type platform_fault_domain: int
+    :param rdp_thumb_print: The Remote desktop certificate thumbprint.
+    :type rdp_thumb_print: str
+    :param vm_agent: The VM Agent running on the virtual machine.
+    :type vm_agent:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineAgentInstanceView
+    :param maintenance_redeploy_status: The Maintenance Operation status on
+     the virtual machine.
+    :type maintenance_redeploy_status:
+     ~azure.mgmt.compute.v2018_06_01.models.MaintenanceRedeployStatus
+    :param disks: The disks information.
+    :type disks: list[~azure.mgmt.compute.v2018_06_01.models.DiskInstanceView]
+    :param extensions: The extensions information.
+    :type extensions:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineExtensionInstanceView]
+    :ivar vm_health: The health status for the VM.
+    :vartype vm_health:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineHealthStatus
+    :param boot_diagnostics: Boot Diagnostics is a debugging feature which
+     allows you to view Console Output and Screenshot to diagnose VM status.
+     <br><br> For Linux Virtual Machines, you can easily view the output of
+     your console log. <br><br> For both Windows and Linux virtual machines,
+     Azure also enables you to see a screenshot of the VM from the hypervisor.
+    :type boot_diagnostics:
+     ~azure.mgmt.compute.v2018_06_01.models.BootDiagnosticsInstanceView
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_06_01.models.InstanceViewStatus]
+    :param placement_group_id: The placement group in which the VM is running.
+     If the VM is deallocated it will not have a placementGroupId.
+    :type placement_group_id: str
+    """
+
+    _validation = {
+        'vm_health': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'platform_update_domain': {'key': 'platformUpdateDomain', 'type': 'int'},
+        'platform_fault_domain': {'key': 'platformFaultDomain', 'type': 'int'},
+        'rdp_thumb_print': {'key': 'rdpThumbPrint', 'type': 'str'},
+        'vm_agent': {'key': 'vmAgent', 'type': 'VirtualMachineAgentInstanceView'},
+        'maintenance_redeploy_status': {'key': 'maintenanceRedeployStatus', 'type': 'MaintenanceRedeployStatus'},
+        'disks': {'key': 'disks', 'type': '[DiskInstanceView]'},
+        'extensions': {'key': 'extensions', 'type': '[VirtualMachineExtensionInstanceView]'},
+        'vm_health': {'key': 'vmHealth', 'type': 'VirtualMachineHealthStatus'},
+        'boot_diagnostics': {'key': 'bootDiagnostics', 'type': 'BootDiagnosticsInstanceView'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+        'placement_group_id': {'key': 'placementGroupId', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineScaleSetVMInstanceView, self).__init__(**kwargs)
+        self.platform_update_domain = kwargs.get('platform_update_domain', None)
+        self.platform_fault_domain = kwargs.get('platform_fault_domain', None)
+        self.rdp_thumb_print = kwargs.get('rdp_thumb_print', None)
+        self.vm_agent = kwargs.get('vm_agent', None)
+        self.maintenance_redeploy_status = kwargs.get('maintenance_redeploy_status', None)
+        self.disks = kwargs.get('disks', None)
+        self.extensions = kwargs.get('extensions', None)
+        self.vm_health = None
+        self.boot_diagnostics = kwargs.get('boot_diagnostics', None)
+        self.statuses = kwargs.get('statuses', None)
+        self.placement_group_id = kwargs.get('placement_group_id', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_instance_view_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_instance_view_py3.py
new file mode 100644
index 000000000000..586211ea4af8
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_instance_view_py3.py
@@ -0,0 +1,87 @@
+# 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 VirtualMachineScaleSetVMInstanceView(Model):
+    """The instance view of a virtual machine scale set VM.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param platform_update_domain: The Update Domain count.
+    :type platform_update_domain: int
+    :param platform_fault_domain: The Fault Domain count.
+    :type platform_fault_domain: int
+    :param rdp_thumb_print: The Remote desktop certificate thumbprint.
+    :type rdp_thumb_print: str
+    :param vm_agent: The VM Agent running on the virtual machine.
+    :type vm_agent:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineAgentInstanceView
+    :param maintenance_redeploy_status: The Maintenance Operation status on
+     the virtual machine.
+    :type maintenance_redeploy_status:
+     ~azure.mgmt.compute.v2018_06_01.models.MaintenanceRedeployStatus
+    :param disks: The disks information.
+    :type disks: list[~azure.mgmt.compute.v2018_06_01.models.DiskInstanceView]
+    :param extensions: The extensions information.
+    :type extensions:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineExtensionInstanceView]
+    :ivar vm_health: The health status for the VM.
+    :vartype vm_health:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineHealthStatus
+    :param boot_diagnostics: Boot Diagnostics is a debugging feature which
+     allows you to view Console Output and Screenshot to diagnose VM status.
+     <br><br> For Linux Virtual Machines, you can easily view the output of
+     your console log. <br><br> For both Windows and Linux virtual machines,
+     Azure also enables you to see a screenshot of the VM from the hypervisor.
+    :type boot_diagnostics:
+     ~azure.mgmt.compute.v2018_06_01.models.BootDiagnosticsInstanceView
+    :param statuses: The resource status information.
+    :type statuses:
+     list[~azure.mgmt.compute.v2018_06_01.models.InstanceViewStatus]
+    :param placement_group_id: The placement group in which the VM is running.
+     If the VM is deallocated it will not have a placementGroupId.
+    :type placement_group_id: str
+    """
+
+    _validation = {
+        'vm_health': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'platform_update_domain': {'key': 'platformUpdateDomain', 'type': 'int'},
+        'platform_fault_domain': {'key': 'platformFaultDomain', 'type': 'int'},
+        'rdp_thumb_print': {'key': 'rdpThumbPrint', 'type': 'str'},
+        'vm_agent': {'key': 'vmAgent', 'type': 'VirtualMachineAgentInstanceView'},
+        'maintenance_redeploy_status': {'key': 'maintenanceRedeployStatus', 'type': 'MaintenanceRedeployStatus'},
+        'disks': {'key': 'disks', 'type': '[DiskInstanceView]'},
+        'extensions': {'key': 'extensions', 'type': '[VirtualMachineExtensionInstanceView]'},
+        'vm_health': {'key': 'vmHealth', 'type': 'VirtualMachineHealthStatus'},
+        'boot_diagnostics': {'key': 'bootDiagnostics', 'type': 'BootDiagnosticsInstanceView'},
+        'statuses': {'key': 'statuses', 'type': '[InstanceViewStatus]'},
+        'placement_group_id': {'key': 'placementGroupId', 'type': 'str'},
+    }
+
+    def __init__(self, *, platform_update_domain: int=None, platform_fault_domain: int=None, rdp_thumb_print: str=None, vm_agent=None, maintenance_redeploy_status=None, disks=None, extensions=None, boot_diagnostics=None, statuses=None, placement_group_id: str=None, **kwargs) -> None:
+        super(VirtualMachineScaleSetVMInstanceView, self).__init__(**kwargs)
+        self.platform_update_domain = platform_update_domain
+        self.platform_fault_domain = platform_fault_domain
+        self.rdp_thumb_print = rdp_thumb_print
+        self.vm_agent = vm_agent
+        self.maintenance_redeploy_status = maintenance_redeploy_status
+        self.disks = disks
+        self.extensions = extensions
+        self.vm_health = None
+        self.boot_diagnostics = boot_diagnostics
+        self.statuses = statuses
+        self.placement_group_id = placement_group_id
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_paged.py
new file mode 100644
index 000000000000..1a069e7137aa
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_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 VirtualMachineScaleSetVMPaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`VirtualMachineScaleSetVM <azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetVM>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[VirtualMachineScaleSetVM]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(VirtualMachineScaleSetVMPaged, self).__init__(*args, **kwargs)
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
new file mode 100644
index 000000000000..409ccc950d55
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_profile.py
@@ -0,0 +1,80 @@
+# 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 VirtualMachineScaleSetVMProfile(Model):
+    """Describes a virtual machine scale set virtual machine profile.
+
+    :param os_profile: Specifies the operating system settings for the virtual
+     machines in the scale set.
+    :type os_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetOSProfile
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetStorageProfile
+    :param network_profile: Specifies properties of the network interfaces of
+     the virtual machines in the scale set.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetNetworkProfile
+    :param diagnostics_profile: Specifies the boot diagnostic settings state.
+     <br><br>Minimum api-version: 2015-06-15.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.DiagnosticsProfile
+    :param extension_profile: Specifies a collection of settings for
+     extensions installed on virtual machines in the scale set.
+    :type extension_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetExtensionProfile
+    :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:
+     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
+     is included in a request for an update, the value must match the initial
+     value. This value cannot be updated. <br><br> For more information, see
+     [Azure Hybrid Use Benefit for Windows
+     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Minimum api-version: 2015-06-15
+    :type license_type: str
+    :param priority: Specifies the priority for the virtual machines in the
+     scale set. <br><br>Minimum api-version: 2017-10-30-preview. Possible
+     values include: 'Regular', 'Low'
+    :type priority: str or
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachinePriorityTypes
+    :param eviction_policy: Specifies the eviction policy for virtual machines
+     in a low priority scale set. <br><br>Minimum api-version:
+     2017-10-30-preview. Possible values include: 'Deallocate', 'Delete'
+    :type eviction_policy: str or
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineEvictionPolicyTypes
+    """
+
+    _attribute_map = {
+        'os_profile': {'key': 'osProfile', 'type': 'VirtualMachineScaleSetOSProfile'},
+        'storage_profile': {'key': 'storageProfile', 'type': 'VirtualMachineScaleSetStorageProfile'},
+        'network_profile': {'key': 'networkProfile', 'type': 'VirtualMachineScaleSetNetworkProfile'},
+        'diagnostics_profile': {'key': 'diagnosticsProfile', 'type': 'DiagnosticsProfile'},
+        'extension_profile': {'key': 'extensionProfile', 'type': 'VirtualMachineScaleSetExtensionProfile'},
+        'license_type': {'key': 'licenseType', 'type': 'str'},
+        'priority': {'key': 'priority', 'type': 'str'},
+        'eviction_policy': {'key': 'evictionPolicy', 'type': 'str'},
+    }
+
+    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.network_profile = kwargs.get('network_profile', None)
+        self.diagnostics_profile = kwargs.get('diagnostics_profile', None)
+        self.extension_profile = kwargs.get('extension_profile', None)
+        self.license_type = kwargs.get('license_type', None)
+        self.priority = kwargs.get('priority', None)
+        self.eviction_policy = kwargs.get('eviction_policy', 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
new file mode 100644
index 000000000000..778f52bc6f27
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_profile_py3.py
@@ -0,0 +1,80 @@
+# 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 VirtualMachineScaleSetVMProfile(Model):
+    """Describes a virtual machine scale set virtual machine profile.
+
+    :param os_profile: Specifies the operating system settings for the virtual
+     machines in the scale set.
+    :type os_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetOSProfile
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetStorageProfile
+    :param network_profile: Specifies properties of the network interfaces of
+     the virtual machines in the scale set.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetNetworkProfile
+    :param diagnostics_profile: Specifies the boot diagnostic settings state.
+     <br><br>Minimum api-version: 2015-06-15.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.DiagnosticsProfile
+    :param extension_profile: Specifies a collection of settings for
+     extensions installed on virtual machines in the scale set.
+    :type extension_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetExtensionProfile
+    :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:
+     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
+     is included in a request for an update, the value must match the initial
+     value. This value cannot be updated. <br><br> For more information, see
+     [Azure Hybrid Use Benefit for Windows
+     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Minimum api-version: 2015-06-15
+    :type license_type: str
+    :param priority: Specifies the priority for the virtual machines in the
+     scale set. <br><br>Minimum api-version: 2017-10-30-preview. Possible
+     values include: 'Regular', 'Low'
+    :type priority: str or
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachinePriorityTypes
+    :param eviction_policy: Specifies the eviction policy for virtual machines
+     in a low priority scale set. <br><br>Minimum api-version:
+     2017-10-30-preview. Possible values include: 'Deallocate', 'Delete'
+    :type eviction_policy: str or
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineEvictionPolicyTypes
+    """
+
+    _attribute_map = {
+        'os_profile': {'key': 'osProfile', 'type': 'VirtualMachineScaleSetOSProfile'},
+        'storage_profile': {'key': 'storageProfile', 'type': 'VirtualMachineScaleSetStorageProfile'},
+        'network_profile': {'key': 'networkProfile', 'type': 'VirtualMachineScaleSetNetworkProfile'},
+        'diagnostics_profile': {'key': 'diagnosticsProfile', 'type': 'DiagnosticsProfile'},
+        'extension_profile': {'key': 'extensionProfile', 'type': 'VirtualMachineScaleSetExtensionProfile'},
+        'license_type': {'key': 'licenseType', 'type': 'str'},
+        'priority': {'key': 'priority', 'type': 'str'},
+        '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:
+        super(VirtualMachineScaleSetVMProfile, self).__init__(**kwargs)
+        self.os_profile = os_profile
+        self.storage_profile = storage_profile
+        self.network_profile = network_profile
+        self.diagnostics_profile = diagnostics_profile
+        self.extension_profile = extension_profile
+        self.license_type = license_type
+        self.priority = priority
+        self.eviction_policy = eviction_policy
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
new file mode 100644
index 000000000000..b995e2590f02
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_vm_py3.py
@@ -0,0 +1,155 @@
+# 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 VirtualMachineScaleSetVM(Resource):
+    """Describes a virtual machine scale set virtual machine.
+
+    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 instance_id: The virtual machine instance ID.
+    :vartype instance_id: str
+    :ivar sku: The virtual machine SKU.
+    :vartype sku: ~azure.mgmt.compute.v2018_06_01.models.Sku
+    :ivar latest_model_applied: Specifies whether the latest model has been
+     applied to the virtual machine.
+    :vartype latest_model_applied: bool
+    :ivar vm_id: Azure VM unique ID.
+    :vartype vm_id: str
+    :ivar instance_view: The virtual machine instance view.
+    :vartype instance_view:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineInstanceView
+    :param hardware_profile: Specifies the hardware settings for the virtual
+     machine.
+    :type hardware_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.HardwareProfile
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.StorageProfile
+    :param os_profile: Specifies the operating system settings for the virtual
+     machine.
+    :type os_profile: ~azure.mgmt.compute.v2018_06_01.models.OSProfile
+    :param network_profile: Specifies the network interfaces of the virtual
+     machine.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.NetworkProfile
+    :param diagnostics_profile: Specifies the boot diagnostic settings state.
+     <br><br>Minimum api-version: 2015-06-15.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.DiagnosticsProfile
+    :param availability_set: Specifies information about the availability set
+     that the virtual machine should be assigned to. Virtual machines specified
+     in the same availability set are allocated to different nodes to maximize
+     availability. For more information about availability sets, see [Manage
+     the availability of virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+     <br><br> For more information on Azure planned maintainance, see [Planned
+     maintenance for virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Currently, a VM can only be added to availability set at creation
+     time. An existing VM cannot be added to an availability set.
+    :type availability_set: ~azure.mgmt.compute.v2018_06_01.models.SubResource
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :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:
+     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
+     is included in a request for an update, the value must match the initial
+     value. This value cannot be updated. <br><br> For more information, see
+     [Azure Hybrid Use Benefit for Windows
+     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Minimum api-version: 2015-06-15
+    :type license_type: str
+    :param plan: Specifies information about the marketplace image used to
+     create the virtual machine. This element is only used for marketplace
+     images. Before you can use a marketplace image from an API, you must
+     enable the image for programmatic use.  In the Azure portal, find the
+     marketplace image that you want to use and then click **Want to deploy
+     programmatically, Get Started ->**. Enter any required information and
+     then click **Save**.
+    :type plan: ~azure.mgmt.compute.v2018_06_01.models.Plan
+    :ivar resources: The virtual machine child extension resources.
+    :vartype resources:
+     list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineExtension]
+    """
+
+    _validation = {
+        'id': {'readonly': True},
+        'name': {'readonly': True},
+        'type': {'readonly': True},
+        'location': {'required': True},
+        'instance_id': {'readonly': True},
+        'sku': {'readonly': True},
+        'latest_model_applied': {'readonly': True},
+        'vm_id': {'readonly': True},
+        'instance_view': {'readonly': True},
+        'provisioning_state': {'readonly': True},
+        'resources': {'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}'},
+        'instance_id': {'key': 'instanceId', 'type': 'str'},
+        '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'},
+        'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
+        'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
+        'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
+        'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'},
+        'availability_set': {'key': 'properties.availabilitySet', 'type': 'SubResource'},
+        'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+        'license_type': {'key': 'properties.licenseType', 'type': 'str'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'resources': {'key': 'resources', 'type': '[VirtualMachineExtension]'},
+    }
+
+    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:
+        super(VirtualMachineScaleSetVM, self).__init__(location=location, tags=tags, **kwargs)
+        self.instance_id = None
+        self.sku = None
+        self.latest_model_applied = None
+        self.vm_id = None
+        self.instance_view = None
+        self.hardware_profile = hardware_profile
+        self.storage_profile = storage_profile
+        self.os_profile = os_profile
+        self.network_profile = network_profile
+        self.diagnostics_profile = diagnostics_profile
+        self.availability_set = availability_set
+        self.provisioning_state = None
+        self.license_type = license_type
+        self.plan = plan
+        self.resources = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_size.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_size.py
new file mode 100644
index 000000000000..0fef3efd6c8e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_size.py
@@ -0,0 +1,53 @@
+# 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 VirtualMachineSize(Model):
+    """Describes the properties of a VM size.
+
+    :param name: The name of the virtual machine size.
+    :type name: str
+    :param number_of_cores: The number of cores supported by the virtual
+     machine size.
+    :type number_of_cores: int
+    :param os_disk_size_in_mb: The OS disk size, in MB, allowed by the virtual
+     machine size.
+    :type os_disk_size_in_mb: int
+    :param resource_disk_size_in_mb: The resource disk size, in MB, allowed by
+     the virtual machine size.
+    :type resource_disk_size_in_mb: int
+    :param memory_in_mb: The amount of memory, in MB, supported by the virtual
+     machine size.
+    :type memory_in_mb: int
+    :param max_data_disk_count: The maximum number of data disks that can be
+     attached to the virtual machine size.
+    :type max_data_disk_count: int
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'number_of_cores': {'key': 'numberOfCores', 'type': 'int'},
+        'os_disk_size_in_mb': {'key': 'osDiskSizeInMB', 'type': 'int'},
+        'resource_disk_size_in_mb': {'key': 'resourceDiskSizeInMB', 'type': 'int'},
+        'memory_in_mb': {'key': 'memoryInMB', 'type': 'int'},
+        'max_data_disk_count': {'key': 'maxDataDiskCount', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineSize, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.number_of_cores = kwargs.get('number_of_cores', None)
+        self.os_disk_size_in_mb = kwargs.get('os_disk_size_in_mb', None)
+        self.resource_disk_size_in_mb = kwargs.get('resource_disk_size_in_mb', None)
+        self.memory_in_mb = kwargs.get('memory_in_mb', None)
+        self.max_data_disk_count = kwargs.get('max_data_disk_count', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_size_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_size_paged.py
new file mode 100644
index 000000000000..11c60502fb33
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_size_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 VirtualMachineSizePaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`VirtualMachineSize <azure.mgmt.compute.v2018_06_01.models.VirtualMachineSize>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[VirtualMachineSize]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(VirtualMachineSizePaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_size_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_size_py3.py
new file mode 100644
index 000000000000..9f99ba20ce42
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_size_py3.py
@@ -0,0 +1,53 @@
+# 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 VirtualMachineSize(Model):
+    """Describes the properties of a VM size.
+
+    :param name: The name of the virtual machine size.
+    :type name: str
+    :param number_of_cores: The number of cores supported by the virtual
+     machine size.
+    :type number_of_cores: int
+    :param os_disk_size_in_mb: The OS disk size, in MB, allowed by the virtual
+     machine size.
+    :type os_disk_size_in_mb: int
+    :param resource_disk_size_in_mb: The resource disk size, in MB, allowed by
+     the virtual machine size.
+    :type resource_disk_size_in_mb: int
+    :param memory_in_mb: The amount of memory, in MB, supported by the virtual
+     machine size.
+    :type memory_in_mb: int
+    :param max_data_disk_count: The maximum number of data disks that can be
+     attached to the virtual machine size.
+    :type max_data_disk_count: int
+    """
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'number_of_cores': {'key': 'numberOfCores', 'type': 'int'},
+        'os_disk_size_in_mb': {'key': 'osDiskSizeInMB', 'type': 'int'},
+        'resource_disk_size_in_mb': {'key': 'resourceDiskSizeInMB', 'type': 'int'},
+        'memory_in_mb': {'key': 'memoryInMB', 'type': 'int'},
+        'max_data_disk_count': {'key': 'maxDataDiskCount', 'type': 'int'},
+    }
+
+    def __init__(self, *, name: str=None, number_of_cores: int=None, os_disk_size_in_mb: int=None, resource_disk_size_in_mb: int=None, memory_in_mb: int=None, max_data_disk_count: int=None, **kwargs) -> None:
+        super(VirtualMachineSize, self).__init__(**kwargs)
+        self.name = name
+        self.number_of_cores = number_of_cores
+        self.os_disk_size_in_mb = os_disk_size_in_mb
+        self.resource_disk_size_in_mb = resource_disk_size_in_mb
+        self.memory_in_mb = memory_in_mb
+        self.max_data_disk_count = max_data_disk_count
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_status_code_count.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_status_code_count.py
new file mode 100644
index 000000000000..7df7b702acd7
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_status_code_count.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 VirtualMachineStatusCodeCount(Model):
+    """The status code and count of the virtual machine scale set instance view
+    status summary.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar code: The instance view status code.
+    :vartype code: str
+    :ivar count: The number of instances having a particular status code.
+    :vartype count: int
+    """
+
+    _validation = {
+        'code': {'readonly': True},
+        'count': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'str'},
+        'count': {'key': 'count', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineStatusCodeCount, self).__init__(**kwargs)
+        self.code = None
+        self.count = None
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_status_code_count_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_status_code_count_py3.py
new file mode 100644
index 000000000000..c38800073a95
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_status_code_count_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 VirtualMachineStatusCodeCount(Model):
+    """The status code and count of the virtual machine scale set instance view
+    status summary.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar code: The instance view status code.
+    :vartype code: str
+    :ivar count: The number of instances having a particular status code.
+    :vartype count: int
+    """
+
+    _validation = {
+        'code': {'readonly': True},
+        'count': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'str'},
+        'count': {'key': 'count', 'type': 'int'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(VirtualMachineStatusCodeCount, self).__init__(**kwargs)
+        self.code = None
+        self.count = 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
new file mode 100644
index 000000000000..efd8774c7830
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_update.py
@@ -0,0 +1,126 @@
+# 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 .update_resource import UpdateResource
+
+
+class VirtualMachineUpdate(UpdateResource):
+    """Describes a Virtual Machine Update.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param plan: Specifies information about the marketplace image used to
+     create the virtual machine. This element is only used for marketplace
+     images. Before you can use a marketplace image from an API, you must
+     enable the image for programmatic use.  In the Azure portal, find the
+     marketplace image that you want to use and then click **Want to deploy
+     programmatically, Get Started ->**. Enter any required information and
+     then click **Save**.
+    :type plan: ~azure.mgmt.compute.v2018_06_01.models.Plan
+    :param hardware_profile: Specifies the hardware settings for the virtual
+     machine.
+    :type hardware_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.HardwareProfile
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.StorageProfile
+    :param os_profile: Specifies the operating system settings for the virtual
+     machine.
+    :type os_profile: ~azure.mgmt.compute.v2018_06_01.models.OSProfile
+    :param network_profile: Specifies the network interfaces of the virtual
+     machine.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.NetworkProfile
+    :param diagnostics_profile: Specifies the boot diagnostic settings state.
+     <br><br>Minimum api-version: 2015-06-15.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.DiagnosticsProfile
+    :param availability_set: Specifies information about the availability set
+     that the virtual machine should be assigned to. Virtual machines specified
+     in the same availability set are allocated to different nodes to maximize
+     availability. For more information about availability sets, see [Manage
+     the availability of virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+     <br><br> For more information on Azure planned maintainance, see [Planned
+     maintenance for virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Currently, a VM can only be added to availability set at creation
+     time. An existing VM cannot be added to an availability set.
+    :type availability_set: ~azure.mgmt.compute.v2018_06_01.models.SubResource
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :ivar instance_view: The virtual machine instance view.
+    :vartype instance_view:
+     ~azure.mgmt.compute.v2018_06_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:
+     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
+     is included in a request for an update, the value must match the initial
+     value. This value cannot be updated. <br><br> For more information, see
+     [Azure Hybrid Use Benefit for Windows
+     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Minimum api-version: 2015-06-15
+    :type license_type: str
+    :ivar vm_id: Specifies the VM unique ID which is a 128-bits identifier
+     that is encoded and stored in all Azure IaaS VMs SMBIOS and can be read
+     using platform BIOS commands.
+    :vartype vm_id: str
+    :param identity: The identity of the virtual machine, if configured.
+    :type identity:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineIdentity
+    :param zones: The virtual machine zones.
+    :type zones: list[str]
+    """
+
+    _validation = {
+        'provisioning_state': {'readonly': True},
+        'instance_view': {'readonly': True},
+        'vm_id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
+        'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
+        'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
+        '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': 'VirtualMachineInstanceView'},
+        'license_type': {'key': 'properties.licenseType', 'type': 'str'},
+        'vm_id': {'key': 'properties.vmId', 'type': 'str'},
+        'identity': {'key': 'identity', 'type': 'VirtualMachineIdentity'},
+        'zones': {'key': 'zones', 'type': '[str]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(VirtualMachineUpdate, self).__init__(**kwargs)
+        self.plan = kwargs.get('plan', None)
+        self.hardware_profile = kwargs.get('hardware_profile', None)
+        self.storage_profile = kwargs.get('storage_profile', 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)
+        self.availability_set = kwargs.get('availability_set', None)
+        self.provisioning_state = None
+        self.instance_view = None
+        self.license_type = kwargs.get('license_type', None)
+        self.vm_id = None
+        self.identity = kwargs.get('identity', None)
+        self.zones = kwargs.get('zones', 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
new file mode 100644
index 000000000000..afb1194c2d53
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_update_py3.py
@@ -0,0 +1,126 @@
+# 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 .update_resource_py3 import UpdateResource
+
+
+class VirtualMachineUpdate(UpdateResource):
+    """Describes a Virtual Machine Update.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param tags: Resource tags
+    :type tags: dict[str, str]
+    :param plan: Specifies information about the marketplace image used to
+     create the virtual machine. This element is only used for marketplace
+     images. Before you can use a marketplace image from an API, you must
+     enable the image for programmatic use.  In the Azure portal, find the
+     marketplace image that you want to use and then click **Want to deploy
+     programmatically, Get Started ->**. Enter any required information and
+     then click **Save**.
+    :type plan: ~azure.mgmt.compute.v2018_06_01.models.Plan
+    :param hardware_profile: Specifies the hardware settings for the virtual
+     machine.
+    :type hardware_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.HardwareProfile
+    :param storage_profile: Specifies the storage settings for the virtual
+     machine disks.
+    :type storage_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.StorageProfile
+    :param os_profile: Specifies the operating system settings for the virtual
+     machine.
+    :type os_profile: ~azure.mgmt.compute.v2018_06_01.models.OSProfile
+    :param network_profile: Specifies the network interfaces of the virtual
+     machine.
+    :type network_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.NetworkProfile
+    :param diagnostics_profile: Specifies the boot diagnostic settings state.
+     <br><br>Minimum api-version: 2015-06-15.
+    :type diagnostics_profile:
+     ~azure.mgmt.compute.v2018_06_01.models.DiagnosticsProfile
+    :param availability_set: Specifies information about the availability set
+     that the virtual machine should be assigned to. Virtual machines specified
+     in the same availability set are allocated to different nodes to maximize
+     availability. For more information about availability sets, see [Manage
+     the availability of virtual
+     machines](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-manage-availability?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json).
+     <br><br> For more information on Azure planned maintainance, see [Planned
+     maintenance for virtual machines in
+     Azure](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-planned-maintenance?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Currently, a VM can only be added to availability set at creation
+     time. An existing VM cannot be added to an availability set.
+    :type availability_set: ~azure.mgmt.compute.v2018_06_01.models.SubResource
+    :ivar provisioning_state: The provisioning state, which only appears in
+     the response.
+    :vartype provisioning_state: str
+    :ivar instance_view: The virtual machine instance view.
+    :vartype instance_view:
+     ~azure.mgmt.compute.v2018_06_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:
+     <br><br> Windows_Client <br><br> Windows_Server <br><br> If this element
+     is included in a request for an update, the value must match the initial
+     value. This value cannot be updated. <br><br> For more information, see
+     [Azure Hybrid Use Benefit for Windows
+     Server](https://docs.microsoft.com/azure/virtual-machines/virtual-machines-windows-hybrid-use-benefit-licensing?toc=%2fazure%2fvirtual-machines%2fwindows%2ftoc.json)
+     <br><br> Minimum api-version: 2015-06-15
+    :type license_type: str
+    :ivar vm_id: Specifies the VM unique ID which is a 128-bits identifier
+     that is encoded and stored in all Azure IaaS VMs SMBIOS and can be read
+     using platform BIOS commands.
+    :vartype vm_id: str
+    :param identity: The identity of the virtual machine, if configured.
+    :type identity:
+     ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineIdentity
+    :param zones: The virtual machine zones.
+    :type zones: list[str]
+    """
+
+    _validation = {
+        'provisioning_state': {'readonly': True},
+        'instance_view': {'readonly': True},
+        'vm_id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'tags': {'key': 'tags', 'type': '{str}'},
+        'plan': {'key': 'plan', 'type': 'Plan'},
+        'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
+        'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
+        'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
+        'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'},
+        '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': 'VirtualMachineInstanceView'},
+        'license_type': {'key': 'properties.licenseType', 'type': 'str'},
+        'vm_id': {'key': 'properties.vmId', 'type': 'str'},
+        'identity': {'key': 'identity', 'type': 'VirtualMachineIdentity'},
+        '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:
+        super(VirtualMachineUpdate, self).__init__(tags=tags, **kwargs)
+        self.plan = plan
+        self.hardware_profile = hardware_profile
+        self.storage_profile = storage_profile
+        self.os_profile = os_profile
+        self.network_profile = network_profile
+        self.diagnostics_profile = diagnostics_profile
+        self.availability_set = availability_set
+        self.provisioning_state = None
+        self.instance_view = None
+        self.license_type = license_type
+        self.vm_id = None
+        self.identity = identity
+        self.zones = zones
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/win_rm_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/win_rm_configuration.py
new file mode 100644
index 000000000000..b05699c9bc0f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/win_rm_configuration.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 WinRMConfiguration(Model):
+    """Describes Windows Remote Management configuration of the VM.
+
+    :param listeners: The list of Windows Remote Management listeners
+    :type listeners:
+     list[~azure.mgmt.compute.v2018_06_01.models.WinRMListener]
+    """
+
+    _attribute_map = {
+        'listeners': {'key': 'listeners', 'type': '[WinRMListener]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(WinRMConfiguration, self).__init__(**kwargs)
+        self.listeners = kwargs.get('listeners', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/win_rm_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/win_rm_configuration_py3.py
new file mode 100644
index 000000000000..65abb9524f5a
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/win_rm_configuration_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 WinRMConfiguration(Model):
+    """Describes Windows Remote Management configuration of the VM.
+
+    :param listeners: The list of Windows Remote Management listeners
+    :type listeners:
+     list[~azure.mgmt.compute.v2018_06_01.models.WinRMListener]
+    """
+
+    _attribute_map = {
+        'listeners': {'key': 'listeners', 'type': '[WinRMListener]'},
+    }
+
+    def __init__(self, *, listeners=None, **kwargs) -> None:
+        super(WinRMConfiguration, self).__init__(**kwargs)
+        self.listeners = listeners
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/win_rm_listener.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/win_rm_listener.py
new file mode 100644
index 000000000000..60380cd251ef
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/win_rm_listener.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 WinRMListener(Model):
+    """Describes Protocol and thumbprint of Windows Remote Management listener.
+
+    :param protocol: Specifies the protocol of listener. <br><br> Possible
+     values are: <br>**http** <br><br> **https**. Possible values include:
+     'Http', 'Https'
+    :type protocol: str or
+     ~azure.mgmt.compute.v2018_06_01.models.ProtocolTypes
+    :param certificate_url: This is the URL of a certificate that has been
+     uploaded to Key Vault as a secret. For adding a secret to the Key Vault,
+     see [Add a key or secret to the key
+     vault](https://docs.microsoft.com/azure/key-vault/key-vault-get-started/#add).
+     In this case, your certificate needs to be It is the Base64 encoding of
+     the following JSON Object which is encoded in UTF-8: <br><br> {<br>
+     "data":"<Base64-encoded-certificate>",<br>  "dataType":"pfx",<br>
+     "password":"<pfx-file-password>"<br>}
+    :type certificate_url: str
+    """
+
+    _attribute_map = {
+        'protocol': {'key': 'protocol', 'type': 'ProtocolTypes'},
+        'certificate_url': {'key': 'certificateUrl', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(WinRMListener, self).__init__(**kwargs)
+        self.protocol = kwargs.get('protocol', None)
+        self.certificate_url = kwargs.get('certificate_url', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/win_rm_listener_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/win_rm_listener_py3.py
new file mode 100644
index 000000000000..cb8630cc8979
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/win_rm_listener_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 WinRMListener(Model):
+    """Describes Protocol and thumbprint of Windows Remote Management listener.
+
+    :param protocol: Specifies the protocol of listener. <br><br> Possible
+     values are: <br>**http** <br><br> **https**. Possible values include:
+     'Http', 'Https'
+    :type protocol: str or
+     ~azure.mgmt.compute.v2018_06_01.models.ProtocolTypes
+    :param certificate_url: This is the URL of a certificate that has been
+     uploaded to Key Vault as a secret. For adding a secret to the Key Vault,
+     see [Add a key or secret to the key
+     vault](https://docs.microsoft.com/azure/key-vault/key-vault-get-started/#add).
+     In this case, your certificate needs to be It is the Base64 encoding of
+     the following JSON Object which is encoded in UTF-8: <br><br> {<br>
+     "data":"<Base64-encoded-certificate>",<br>  "dataType":"pfx",<br>
+     "password":"<pfx-file-password>"<br>}
+    :type certificate_url: str
+    """
+
+    _attribute_map = {
+        'protocol': {'key': 'protocol', 'type': 'ProtocolTypes'},
+        'certificate_url': {'key': 'certificateUrl', 'type': 'str'},
+    }
+
+    def __init__(self, *, protocol=None, certificate_url: str=None, **kwargs) -> None:
+        super(WinRMListener, self).__init__(**kwargs)
+        self.protocol = protocol
+        self.certificate_url = certificate_url
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/windows_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/windows_configuration.py
new file mode 100644
index 000000000000..e862239614c7
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/windows_configuration.py
@@ -0,0 +1,54 @@
+# 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 WindowsConfiguration(Model):
+    """Specifies Windows operating system settings on the virtual machine.
+
+    :param provision_vm_agent: Indicates whether virtual machine agent should
+     be provisioned on the virtual machine. <br><br> When this property is not
+     specified in the request body, default behavior is to set it to true.
+     This will ensure that VM Agent is installed on the VM so that extensions
+     can be added to the VM later.
+    :type provision_vm_agent: bool
+    :param enable_automatic_updates: Indicates whether virtual machine is
+     enabled for automatic updates.
+    :type enable_automatic_updates: bool
+    :param time_zone: Specifies the time zone of the virtual machine. e.g.
+     "Pacific Standard Time"
+    :type time_zone: str
+    :param additional_unattend_content: Specifies additional base-64 encoded
+     XML formatted information that can be included in the Unattend.xml file,
+     which is used by Windows Setup.
+    :type additional_unattend_content:
+     list[~azure.mgmt.compute.v2018_06_01.models.AdditionalUnattendContent]
+    :param win_rm: Specifies the Windows Remote Management listeners. This
+     enables remote Windows PowerShell.
+    :type win_rm: ~azure.mgmt.compute.v2018_06_01.models.WinRMConfiguration
+    """
+
+    _attribute_map = {
+        'provision_vm_agent': {'key': 'provisionVMAgent', 'type': 'bool'},
+        'enable_automatic_updates': {'key': 'enableAutomaticUpdates', 'type': 'bool'},
+        'time_zone': {'key': 'timeZone', 'type': 'str'},
+        'additional_unattend_content': {'key': 'additionalUnattendContent', 'type': '[AdditionalUnattendContent]'},
+        'win_rm': {'key': 'winRM', 'type': 'WinRMConfiguration'},
+    }
+
+    def __init__(self, **kwargs):
+        super(WindowsConfiguration, self).__init__(**kwargs)
+        self.provision_vm_agent = kwargs.get('provision_vm_agent', None)
+        self.enable_automatic_updates = kwargs.get('enable_automatic_updates', None)
+        self.time_zone = kwargs.get('time_zone', None)
+        self.additional_unattend_content = kwargs.get('additional_unattend_content', None)
+        self.win_rm = kwargs.get('win_rm', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/windows_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/windows_configuration_py3.py
new file mode 100644
index 000000000000..d05164409126
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/windows_configuration_py3.py
@@ -0,0 +1,54 @@
+# 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 WindowsConfiguration(Model):
+    """Specifies Windows operating system settings on the virtual machine.
+
+    :param provision_vm_agent: Indicates whether virtual machine agent should
+     be provisioned on the virtual machine. <br><br> When this property is not
+     specified in the request body, default behavior is to set it to true.
+     This will ensure that VM Agent is installed on the VM so that extensions
+     can be added to the VM later.
+    :type provision_vm_agent: bool
+    :param enable_automatic_updates: Indicates whether virtual machine is
+     enabled for automatic updates.
+    :type enable_automatic_updates: bool
+    :param time_zone: Specifies the time zone of the virtual machine. e.g.
+     "Pacific Standard Time"
+    :type time_zone: str
+    :param additional_unattend_content: Specifies additional base-64 encoded
+     XML formatted information that can be included in the Unattend.xml file,
+     which is used by Windows Setup.
+    :type additional_unattend_content:
+     list[~azure.mgmt.compute.v2018_06_01.models.AdditionalUnattendContent]
+    :param win_rm: Specifies the Windows Remote Management listeners. This
+     enables remote Windows PowerShell.
+    :type win_rm: ~azure.mgmt.compute.v2018_06_01.models.WinRMConfiguration
+    """
+
+    _attribute_map = {
+        'provision_vm_agent': {'key': 'provisionVMAgent', 'type': 'bool'},
+        'enable_automatic_updates': {'key': 'enableAutomaticUpdates', 'type': 'bool'},
+        'time_zone': {'key': 'timeZone', 'type': 'str'},
+        'additional_unattend_content': {'key': 'additionalUnattendContent', 'type': '[AdditionalUnattendContent]'},
+        'win_rm': {'key': 'winRM', 'type': 'WinRMConfiguration'},
+    }
+
+    def __init__(self, *, provision_vm_agent: bool=None, enable_automatic_updates: bool=None, time_zone: str=None, additional_unattend_content=None, win_rm=None, **kwargs) -> None:
+        super(WindowsConfiguration, self).__init__(**kwargs)
+        self.provision_vm_agent = provision_vm_agent
+        self.enable_automatic_updates = enable_automatic_updates
+        self.time_zone = time_zone
+        self.additional_unattend_content = additional_unattend_content
+        self.win_rm = win_rm
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 e058803d6884..8700f11026cf 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
@@ -9,11 +9,39 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
+from .operations import Operations
+from .availability_sets_operations import AvailabilitySetsOperations
+from .virtual_machine_extension_images_operations import VirtualMachineExtensionImagesOperations
+from .virtual_machine_extensions_operations import VirtualMachineExtensionsOperations
+from .virtual_machine_images_operations import VirtualMachineImagesOperations
+from .usage_operations import UsageOperations
+from .virtual_machine_sizes_operations import VirtualMachineSizesOperations
+from .images_operations import ImagesOperations
+from .virtual_machines_operations import VirtualMachinesOperations
+from .virtual_machine_scale_sets_operations import VirtualMachineScaleSetsOperations
+from .virtual_machine_scale_set_extensions_operations import VirtualMachineScaleSetExtensionsOperations
+from .virtual_machine_scale_set_rolling_upgrades_operations import VirtualMachineScaleSetRollingUpgradesOperations
+from .virtual_machine_scale_set_vms_operations import VirtualMachineScaleSetVMsOperations
+from .log_analytics_operations import LogAnalyticsOperations
 from .galleries_operations import GalleriesOperations
 from .gallery_images_operations import GalleryImagesOperations
 from .gallery_image_versions_operations import GalleryImageVersionsOperations
 
 __all__ = [
+    'Operations',
+    'AvailabilitySetsOperations',
+    'VirtualMachineExtensionImagesOperations',
+    'VirtualMachineExtensionsOperations',
+    'VirtualMachineImagesOperations',
+    'UsageOperations',
+    'VirtualMachineSizesOperations',
+    'ImagesOperations',
+    'VirtualMachinesOperations',
+    'VirtualMachineScaleSetsOperations',
+    'VirtualMachineScaleSetExtensionsOperations',
+    'VirtualMachineScaleSetRollingUpgradesOperations',
+    'VirtualMachineScaleSetVMsOperations',
+    'LogAnalyticsOperations',
     'GalleriesOperations',
     'GalleryImagesOperations',
     'GalleryImageVersionsOperations',
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/availability_sets_operations.py
new file mode 100644
index 000000000000..cb57521579bb
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/availability_sets_operations.py
@@ -0,0 +1,499 @@
+# 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 .. import models
+
+
+class AvailabilitySetsOperations(object):
+    """AvailabilitySetsOperations 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(
+            self, resource_group_name, availability_set_name, parameters, custom_headers=None, raw=False, **operation_config):
+        """Create or update an availability set.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param availability_set_name: The name of the availability set.
+        :type availability_set_name: str
+        :param parameters: Parameters supplied to the Create Availability Set
+         operation.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_06_01.models.AvailabilitySet
+        :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: AvailabilitySet or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_06_01.models.AvailabilitySet or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.create_or_update.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'availabilitySetName': self._serialize.url("availability_set_name", availability_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 = {}
+        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(parameters, 'AvailabilitySet')
+
+        # Construct and send request
+        request = self._client.put(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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('AvailabilitySet', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
+
+    def update(
+            self, resource_group_name, availability_set_name, parameters, custom_headers=None, raw=False, **operation_config):
+        """Update an availability set.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param availability_set_name: The name of the availability set.
+        :type availability_set_name: str
+        :param parameters: Parameters supplied to the Update Availability Set
+         operation.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_06_01.models.AvailabilitySetUpdate
+        :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: AvailabilitySet or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_06_01.models.AvailabilitySet or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.update.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'availabilitySetName': self._serialize.url("availability_set_name", availability_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 = {}
+        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(parameters, 'AvailabilitySetUpdate')
+
+        # Construct and send request
+        request = self._client.patch(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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('AvailabilitySet', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
+
+    def delete(
+            self, resource_group_name, availability_set_name, custom_headers=None, raw=False, **operation_config):
+        """Delete an availability set.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param availability_set_name: The name of the availability set.
+        :type availability_set_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: None or ClientRawResponse if raw=true
+        :rtype: None or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.delete.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'availabilitySetName': self._serialize.url("availability_set_name", availability_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 = {}
+        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 and send request
+        request = self._client.delete(url, query_parameters)
+        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+
+        if response.status_code not in [200, 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
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}'}
+
+    def get(
+            self, resource_group_name, availability_set_name, custom_headers=None, raw=False, **operation_config):
+        """Retrieves information about an availability set.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param availability_set_name: The name of the availability set.
+        :type availability_set_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: AvailabilitySet or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_06_01.models.AvailabilitySet or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'availabilitySetName': self._serialize.url("availability_set_name", availability_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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('AvailabilitySet', 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/availabilitySets/{availabilitySetName}'}
+
+    def list_by_subscription(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Lists all availability sets in 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 AvailabilitySet
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.AvailabilitySetPaged[~azure.mgmt.compute.v2018_06_01.models.AvailabilitySet]
+        :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_subscription.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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/availabilitySets'}
+
+    def list(
+            self, resource_group_name, custom_headers=None, raw=False, **operation_config):
+        """Lists all availability sets in 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 AvailabilitySet
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.AvailabilitySetPaged[~azure.mgmt.compute.v2018_06_01.models.AvailabilitySet]
+        :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 = {
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_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')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.AvailabilitySetPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets'}
+
+    def list_available_sizes(
+            self, resource_group_name, availability_set_name, custom_headers=None, raw=False, **operation_config):
+        """Lists all available virtual machine sizes that can be used to create a
+        new virtual machine in an existing availability set.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param availability_set_name: The name of the availability set.
+        :type availability_set_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 VirtualMachineSize
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineSizePaged[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineSize]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        def internal_paging(next_link=None, raw=False):
+
+            if not next_link:
+                # Construct URL
+                url = self.list_available_sizes.metadata['url']
+                path_format_arguments = {
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+                    'availabilitySetName': self._serialize.url("availability_set_name", availability_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')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachineSizePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachineSizePaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_available_sizes.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/availabilitySets/{availabilitySetName}/vmSizes'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/images_operations.py
new file mode 100644
index 000000000000..8fc41911ae76
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/images_operations.py
@@ -0,0 +1,525 @@
+# 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 ImagesOperations(object):
+    """ImagesOperations 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, image_name, parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.create_or_update.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'imageName': self._serialize.url("image_name", image_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 = {}
+        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(parameters, 'Image')
+
+        # Construct and send request
+        request = self._client.put(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, stream=False, **operation_config)
+
+        if response.status_code not in [200, 201]:
+            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('Image', response)
+        if response.status_code == 201:
+            deserialized = self._deserialize('Image', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def create_or_update(
+            self, resource_group_name, image_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Create or update an image.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param image_name: The name of the image.
+        :type image_name: str
+        :param parameters: Parameters supplied to the Create Image operation.
+        :type parameters: ~azure.mgmt.compute.v2018_06_01.models.Image
+        :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 Image or
+         ClientRawResponse<Image> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.Image]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.Image]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._create_or_update_initial(
+            resource_group_name=resource_group_name,
+            image_name=image_name,
+            parameters=parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('Image', 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/images/{imageName}'}
+
+
+    def _update_initial(
+            self, resource_group_name, image_name, parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.update.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'imageName': self._serialize.url("image_name", image_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 = {}
+        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(parameters, 'ImageUpdate')
+
+        # Construct and send request
+        request = self._client.patch(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, stream=False, **operation_config)
+
+        if response.status_code not in [200, 201]:
+            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('Image', response)
+        if response.status_code == 201:
+            deserialized = self._deserialize('Image', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def update(
+            self, resource_group_name, image_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Update an image.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param image_name: The name of the image.
+        :type image_name: str
+        :param parameters: Parameters supplied to the Update Image operation.
+        :type parameters: ~azure.mgmt.compute.v2018_06_01.models.ImageUpdate
+        :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 Image or
+         ClientRawResponse<Image> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.Image]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.Image]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._update_initial(
+            resource_group_name=resource_group_name,
+            image_name=image_name,
+            parameters=parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('Image', 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/images/{imageName}'}
+
+
+    def _delete_initial(
+            self, resource_group_name, image_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.delete.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'imageName': self._serialize.url("image_name", image_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 = {}
+        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 and send request
+        request = self._client.delete(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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, image_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Deletes an Image.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param image_name: The name of the image.
+        :type image_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,
+            image_name=image_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/images/{imageName}'}
+
+    def get(
+            self, resource_group_name, image_name, expand=None, custom_headers=None, raw=False, **operation_config):
+        """Gets an image.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param image_name: The name of the image.
+        :type image_name: str
+        :param expand: The expand expression to apply on the operation.
+        :type expand: 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: Image or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_06_01.models.Image or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'imageName': self._serialize.url("image_name", image_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 = {}
+        if expand is not None:
+            query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('Image', 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/images/{imageName}'}
+
+    def list_by_resource_group(
+            self, resource_group_name, custom_headers=None, raw=False, **operation_config):
+        """Gets the list of images 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 Image
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.ImagePaged[~azure.mgmt.compute.v2018_06_01.models.Image]
+        :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 = {
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_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')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.ImagePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.ImagePaged(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/images'}
+
+    def list(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Gets the list of Images in the subscription. Use nextLink property in
+        the response to get the next page of Images. Do this till nextLink is
+        null to fetch all the Images.
+
+        :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 Image
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.ImagePaged[~azure.mgmt.compute.v2018_06_01.models.Image]
+        :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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.ImagePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.ImagePaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/images'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/log_analytics_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/log_analytics_operations.py
new file mode 100644
index 000000000000..3657b5a35b4d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/log_analytics_operations.py
@@ -0,0 +1,242 @@
+# 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 LogAnalyticsOperations(object):
+    """LogAnalyticsOperations 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 _export_request_rate_by_interval_initial(
+            self, parameters, location, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.export_request_rate_by_interval.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str', pattern=r'^[-\w\._]+$'),
+            '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 = {}
+        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(parameters, 'RequestRateByIntervalInput')
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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('LogAnalyticsOperationResult', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def export_request_rate_by_interval(
+            self, parameters, location, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Export logs that show Api requests made by this subscription in the
+        given time window to show throttling activities.
+
+        :param parameters: Parameters supplied to the LogAnalytics
+         getRequestRateByInterval Api.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_06_01.models.RequestRateByIntervalInput
+        :param location: The location upon which virtual-machine-sizes is
+         queried.
+        :type location: 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
+         LogAnalyticsOperationResult or
+         ClientRawResponse<LogAnalyticsOperationResult> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.LogAnalyticsOperationResult]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.LogAnalyticsOperationResult]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._export_request_rate_by_interval_initial(
+            parameters=parameters,
+            location=location,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('LogAnalyticsOperationResult', 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)
+    export_request_rate_by_interval.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/logAnalytics/apiAccess/getRequestRateByInterval'}
+
+
+    def _export_throttled_requests_initial(
+            self, parameters, location, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.export_throttled_requests.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str', pattern=r'^[-\w\._]+$'),
+            '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 = {}
+        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(parameters, 'ThrottledRequestsInput')
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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('LogAnalyticsOperationResult', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def export_throttled_requests(
+            self, parameters, location, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Export logs that show total throttled Api requests for this
+        subscription in the given time window.
+
+        :param parameters: Parameters supplied to the LogAnalytics
+         getThrottledRequests Api.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_06_01.models.ThrottledRequestsInput
+        :param location: The location upon which virtual-machine-sizes is
+         queried.
+        :type location: 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
+         LogAnalyticsOperationResult or
+         ClientRawResponse<LogAnalyticsOperationResult> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.LogAnalyticsOperationResult]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.LogAnalyticsOperationResult]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._export_throttled_requests_initial(
+            parameters=parameters,
+            location=location,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('LogAnalyticsOperationResult', 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)
+    export_throttled_requests.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/logAnalytics/apiAccess/getThrottledRequests'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/operations.py
new file mode 100644
index 000000000000..55d0445f932f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/operations.py
@@ -0,0 +1,99 @@
+# 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 .. import models
+
+
+class Operations(object):
+    """Operations 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 list(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of compute operations.
+
+        :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 ComputeOperationValue
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.ComputeOperationValuePaged[~azure.mgmt.compute.v2018_06_01.models.ComputeOperationValue]
+        :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']
+
+                # 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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.ComputeOperationValuePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.ComputeOperationValuePaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/providers/Microsoft.Compute/operations'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/usage_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/usage_operations.py
new file mode 100644
index 000000000000..93b83115fe31
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/usage_operations.py
@@ -0,0 +1,108 @@
+# 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 .. import models
+
+
+class UsageOperations(object):
+    """UsageOperations 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 list(
+            self, location, custom_headers=None, raw=False, **operation_config):
+        """Gets, for the specified location, the current compute resource usage
+        information as well as the limits for compute resources under the
+        subscription.
+
+        :param location: The location for which resource usage is queried.
+        :type location: 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 Usage
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.UsagePaged[~azure.mgmt.compute.v2018_06_01.models.Usage]
+        :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 = {
+                    'location': self._serialize.url("location", location, 'str', pattern=r'^[-\w\._]+$'),
+                    '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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.UsagePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.UsagePaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/usages'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_extension_images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_extension_images_operations.py
new file mode 100644
index 000000000000..a89d05a84c30
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_extension_images_operations.py
@@ -0,0 +1,248 @@
+# 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 .. import models
+
+
+class VirtualMachineExtensionImagesOperations(object):
+    """VirtualMachineExtensionImagesOperations 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 get(
+            self, location, publisher_name, type, version, custom_headers=None, raw=False, **operation_config):
+        """Gets a virtual machine extension image.
+
+        :param location: The name of a supported Azure region.
+        :type location: str
+        :param publisher_name:
+        :type publisher_name: str
+        :param type:
+        :type type: str
+        :param version:
+        :type version: 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: VirtualMachineExtensionImage or ClientRawResponse if raw=true
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineExtensionImage or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str'),
+            'publisherName': self._serialize.url("publisher_name", publisher_name, 'str'),
+            'type': self._serialize.url("type", type, 'str'),
+            'version': self._serialize.url("version", version, '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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineExtensionImage', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmextension/types/{type}/versions/{version}'}
+
+    def list_types(
+            self, location, publisher_name, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of virtual machine extension image types.
+
+        :param location: The name of a supported Azure region.
+        :type location: str
+        :param publisher_name:
+        :type publisher_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: list or ClientRawResponse if raw=true
+        :rtype:
+         list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineExtensionImage]
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.list_types.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str'),
+            'publisherName': self._serialize.url("publisher_name", publisher_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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('[VirtualMachineExtensionImage]', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    list_types.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmextension/types'}
+
+    def list_versions(
+            self, location, publisher_name, type, filter=None, top=None, orderby=None, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of virtual machine extension image versions.
+
+        :param location: The name of a supported Azure region.
+        :type location: str
+        :param publisher_name:
+        :type publisher_name: str
+        :param type:
+        :type type: str
+        :param filter: The filter to apply on the operation.
+        :type filter: str
+        :param top:
+        :type top: int
+        :param orderby:
+        :type orderby: 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: list or ClientRawResponse if raw=true
+        :rtype:
+         list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineExtensionImage]
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.list_versions.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str'),
+            'publisherName': self._serialize.url("publisher_name", publisher_name, 'str'),
+            'type': self._serialize.url("type", type, '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 = {}
+        if filter is not None:
+            query_parameters['$filter'] = self._serialize.query("filter", filter, 'str')
+        if top is not None:
+            query_parameters['$top'] = self._serialize.query("top", top, 'int')
+        if orderby is not None:
+            query_parameters['$orderby'] = self._serialize.query("orderby", orderby, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('[VirtualMachineExtensionImage]', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    list_versions.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmextension/types/{type}/versions'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_extensions_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_extensions_operations.py
new file mode 100644
index 000000000000..3e24de90ff75
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_extensions_operations.py
@@ -0,0 +1,480 @@
+# 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 VirtualMachineExtensionsOperations(object):
+    """VirtualMachineExtensionsOperations 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, vm_name, vm_extension_name, extension_parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.create_or_update.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_name, 'str'),
+            'vmExtensionName': self._serialize.url("vm_extension_name", vm_extension_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 = {}
+        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(extension_parameters, 'VirtualMachineExtension')
+
+        # Construct and send request
+        request = self._client.put(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, stream=False, **operation_config)
+
+        if response.status_code not in [200, 201]:
+            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('VirtualMachineExtension', response)
+        if response.status_code == 201:
+            deserialized = self._deserialize('VirtualMachineExtension', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def create_or_update(
+            self, resource_group_name, vm_name, vm_extension_name, extension_parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to create or update the extension.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine where the extension
+         should be created or updated.
+        :type vm_name: str
+        :param vm_extension_name: The name of the virtual machine extension.
+        :type vm_extension_name: str
+        :param extension_parameters: Parameters supplied to the Create Virtual
+         Machine Extension operation.
+        :type extension_parameters:
+         ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineExtension
+        :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 VirtualMachineExtension
+         or ClientRawResponse<VirtualMachineExtension> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineExtension]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineExtension]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._create_or_update_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_name,
+            vm_extension_name=vm_extension_name,
+            extension_parameters=extension_parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('VirtualMachineExtension', 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/virtualMachines/{vmName}/extensions/{vmExtensionName}'}
+
+
+    def _update_initial(
+            self, resource_group_name, vm_name, vm_extension_name, extension_parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.update.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_name, 'str'),
+            'vmExtensionName': self._serialize.url("vm_extension_name", vm_extension_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 = {}
+        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(extension_parameters, 'VirtualMachineExtensionUpdate')
+
+        # Construct and send request
+        request = self._client.patch(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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('VirtualMachineExtension', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def update(
+            self, resource_group_name, vm_name, vm_extension_name, extension_parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to update the extension.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine where the extension
+         should be updated.
+        :type vm_name: str
+        :param vm_extension_name: The name of the virtual machine extension.
+        :type vm_extension_name: str
+        :param extension_parameters: Parameters supplied to the Update Virtual
+         Machine Extension operation.
+        :type extension_parameters:
+         ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineExtensionUpdate
+        :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 VirtualMachineExtension
+         or ClientRawResponse<VirtualMachineExtension> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineExtension]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineExtension]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._update_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_name,
+            vm_extension_name=vm_extension_name,
+            extension_parameters=extension_parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('VirtualMachineExtension', 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/virtualMachines/{vmName}/extensions/{vmExtensionName}'}
+
+
+    def _delete_initial(
+            self, resource_group_name, vm_name, vm_extension_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.delete.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_name, 'str'),
+            'vmExtensionName': self._serialize.url("vm_extension_name", vm_extension_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 = {}
+        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 and send request
+        request = self._client.delete(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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, vm_name, vm_extension_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to delete the extension.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine where the extension
+         should be deleted.
+        :type vm_name: str
+        :param vm_extension_name: The name of the virtual machine extension.
+        :type vm_extension_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,
+            vm_name=vm_name,
+            vm_extension_name=vm_extension_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/virtualMachines/{vmName}/extensions/{vmExtensionName}'}
+
+    def get(
+            self, resource_group_name, vm_name, vm_extension_name, expand=None, custom_headers=None, raw=False, **operation_config):
+        """The operation to get the extension.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine containing the
+         extension.
+        :type vm_name: str
+        :param vm_extension_name: The name of the virtual machine extension.
+        :type vm_extension_name: str
+        :param expand: The expand expression to apply on the operation.
+        :type expand: 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: VirtualMachineExtension or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineExtension
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_name, 'str'),
+            'vmExtensionName': self._serialize.url("vm_extension_name", vm_extension_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 = {}
+        if expand is not None:
+            query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineExtension', 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/virtualMachines/{vmName}/extensions/{vmExtensionName}'}
+
+    def list(
+            self, resource_group_name, vm_name, expand=None, custom_headers=None, raw=False, **operation_config):
+        """The operation to get all extensions of a Virtual Machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine containing the
+         extension.
+        :type vm_name: str
+        :param expand: The expand expression to apply on the operation.
+        :type expand: 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: VirtualMachineExtensionsListResult or ClientRawResponse if
+         raw=true
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineExtensionsListResult
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.list.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        if expand is not None:
+            query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineExtensionsListResult', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/extensions'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_images_operations.py
new file mode 100644
index 000000000000..16b455cff731
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_images_operations.py
@@ -0,0 +1,383 @@
+# 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 .. import models
+
+
+class VirtualMachineImagesOperations(object):
+    """VirtualMachineImagesOperations 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 get(
+            self, location, publisher_name, offer, skus, version, custom_headers=None, raw=False, **operation_config):
+        """Gets a virtual machine image.
+
+        :param location: The name of a supported Azure region.
+        :type location: str
+        :param publisher_name: A valid image publisher.
+        :type publisher_name: str
+        :param offer: A valid image publisher offer.
+        :type offer: str
+        :param skus: A valid image SKU.
+        :type skus: str
+        :param version: A valid image SKU version.
+        :type version: 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: VirtualMachineImage or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineImage or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str'),
+            'publisherName': self._serialize.url("publisher_name", publisher_name, 'str'),
+            'offer': self._serialize.url("offer", offer, 'str'),
+            'skus': self._serialize.url("skus", skus, 'str'),
+            'version': self._serialize.url("version", version, '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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineImage', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmimage/offers/{offer}/skus/{skus}/versions/{version}'}
+
+    def list(
+            self, location, publisher_name, offer, skus, filter=None, top=None, orderby=None, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of all virtual machine image versions for the specified
+        location, publisher, offer, and SKU.
+
+        :param location: The name of a supported Azure region.
+        :type location: str
+        :param publisher_name: A valid image publisher.
+        :type publisher_name: str
+        :param offer: A valid image publisher offer.
+        :type offer: str
+        :param skus: A valid image SKU.
+        :type skus: str
+        :param filter: The filter to apply on the operation.
+        :type filter: str
+        :param top:
+        :type top: int
+        :param orderby:
+        :type orderby: 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: list or ClientRawResponse if raw=true
+        :rtype:
+         list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineImageResource]
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.list.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str'),
+            'publisherName': self._serialize.url("publisher_name", publisher_name, 'str'),
+            'offer': self._serialize.url("offer", offer, 'str'),
+            'skus': self._serialize.url("skus", skus, '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 = {}
+        if filter is not None:
+            query_parameters['$filter'] = self._serialize.query("filter", filter, 'str')
+        if top is not None:
+            query_parameters['$top'] = self._serialize.query("top", top, 'int')
+        if orderby is not None:
+            query_parameters['$orderby'] = self._serialize.query("orderby", orderby, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('[VirtualMachineImageResource]', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmimage/offers/{offer}/skus/{skus}/versions'}
+
+    def list_offers(
+            self, location, publisher_name, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of virtual machine image offers for the specified location
+        and publisher.
+
+        :param location: The name of a supported Azure region.
+        :type location: str
+        :param publisher_name: A valid image publisher.
+        :type publisher_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: list or ClientRawResponse if raw=true
+        :rtype:
+         list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineImageResource]
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.list_offers.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str'),
+            'publisherName': self._serialize.url("publisher_name", publisher_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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('[VirtualMachineImageResource]', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    list_offers.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmimage/offers'}
+
+    def list_publishers(
+            self, location, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of virtual machine image publishers for the specified Azure
+        location.
+
+        :param location: The name of a supported Azure region.
+        :type location: 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: list or ClientRawResponse if raw=true
+        :rtype:
+         list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineImageResource]
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.list_publishers.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, '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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('[VirtualMachineImageResource]', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    list_publishers.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers'}
+
+    def list_skus(
+            self, location, publisher_name, offer, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of virtual machine image SKUs for the specified location,
+        publisher, and offer.
+
+        :param location: The name of a supported Azure region.
+        :type location: str
+        :param publisher_name: A valid image publisher.
+        :type publisher_name: str
+        :param offer: A valid image publisher offer.
+        :type offer: 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: list or ClientRawResponse if raw=true
+        :rtype:
+         list[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineImageResource]
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.list_skus.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str'),
+            'publisherName': self._serialize.url("publisher_name", publisher_name, 'str'),
+            'offer': self._serialize.url("offer", offer, '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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('[VirtualMachineImageResource]', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    list_skus.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/publishers/{publisherName}/artifacttypes/vmimage/offers/{offer}/skus'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_set_extensions_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_set_extensions_operations.py
new file mode 100644
index 000000000000..e7310679f11d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_set_extensions_operations.py
@@ -0,0 +1,379 @@
+# 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 VirtualMachineScaleSetExtensionsOperations(object):
+    """VirtualMachineScaleSetExtensionsOperations 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, vm_scale_set_name, vmss_extension_name, extension_parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.create_or_update.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'),
+            'vmssExtensionName': self._serialize.url("vmss_extension_name", vmss_extension_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 = {}
+        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(extension_parameters, 'VirtualMachineScaleSetExtension')
+
+        # Construct and send request
+        request = self._client.put(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, stream=False, **operation_config)
+
+        if response.status_code not in [200, 201]:
+            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('VirtualMachineScaleSetExtension', response)
+        if response.status_code == 201:
+            deserialized = self._deserialize('VirtualMachineScaleSetExtension', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def create_or_update(
+            self, resource_group_name, vm_scale_set_name, vmss_extension_name, extension_parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to create or update an extension.
+
+        :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 where the
+         extension should be create or updated.
+        :type vm_scale_set_name: str
+        :param vmss_extension_name: The name of the VM scale set extension.
+        :type vmss_extension_name: str
+        :param extension_parameters: Parameters supplied to the Create VM
+         scale set Extension operation.
+        :type extension_parameters:
+         ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetExtension
+        :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
+         VirtualMachineScaleSetExtension or
+         ClientRawResponse<VirtualMachineScaleSetExtension> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetExtension]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetExtension]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._create_or_update_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            vmss_extension_name=vmss_extension_name,
+            extension_parameters=extension_parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('VirtualMachineScaleSetExtension', 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/virtualMachineScaleSets/{vmScaleSetName}/extensions/{vmssExtensionName}'}
+
+
+    def _delete_initial(
+            self, resource_group_name, vm_scale_set_name, vmss_extension_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.delete.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'),
+            'vmssExtensionName': self._serialize.url("vmss_extension_name", vmss_extension_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 = {}
+        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 and send request
+        request = self._client.delete(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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, vm_scale_set_name, vmss_extension_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to delete the extension.
+
+        :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 where the
+         extension should be deleted.
+        :type vm_scale_set_name: str
+        :param vmss_extension_name: The name of the VM scale set extension.
+        :type vmss_extension_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,
+            vm_scale_set_name=vm_scale_set_name,
+            vmss_extension_name=vmss_extension_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/virtualMachineScaleSets/{vmScaleSetName}/extensions/{vmssExtensionName}'}
+
+    def get(
+            self, resource_group_name, vm_scale_set_name, vmss_extension_name, expand=None, custom_headers=None, raw=False, **operation_config):
+        """The operation to get the extension.
+
+        :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 containing the
+         extension.
+        :type vm_scale_set_name: str
+        :param vmss_extension_name: The name of the VM scale set extension.
+        :type vmss_extension_name: str
+        :param expand: The expand expression to apply on the operation.
+        :type expand: 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: VirtualMachineScaleSetExtension or ClientRawResponse if
+         raw=true
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetExtension
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.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'),
+            'vmssExtensionName': self._serialize.url("vmss_extension_name", vmss_extension_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 = {}
+        if expand is not None:
+            query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineScaleSetExtension', 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/virtualMachineScaleSets/{vmScaleSetName}/extensions/{vmssExtensionName}'}
+
+    def list(
+            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of all extensions in a VM scale set.
+
+        :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 containing the
+         extension.
+        :type vm_scale_set_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 VirtualMachineScaleSetExtension
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetExtensionPaged[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetExtension]
+        :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 = {
+                    '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')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachineScaleSetExtensionPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachineScaleSetExtensionPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/extensions'}
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
new file mode 100644
index 000000000000..30a7d4f91a11
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_set_rolling_upgrades_operations.py
@@ -0,0 +1,267 @@
+# 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 VirtualMachineScaleSetRollingUpgradesOperations(object):
+    """VirtualMachineScaleSetRollingUpgradesOperations 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 _cancel_initial(
+            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.cancel.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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 cancel(
+            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Cancels the current virtual machine scale set rolling upgrade.
+
+        :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._cancel_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)
+    cancel.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/rollingUpgrades/cancel'}
+
+
+    def _start_os_upgrade_initial(
+            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.start_os_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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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_os_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 virtual machine scale set
+        instances to the latest available Platform Image OS version. Instances
+        which are already running the latest available OS version 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_os_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_os_upgrade.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/osRollingUpgrade'}
+
+    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
+        upgrade.
+
+        :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: returns the direct response alongside the
+         deserialized response
+        :param operation_config: :ref:`Operation configuration
+         overrides<msrest:optionsforoperations>`.
+        :return: RollingUpgradeStatusInfo or ClientRawResponse if raw=true
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.RollingUpgradeStatusInfo or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get_latest.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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('RollingUpgradeStatusInfo', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    get_latest.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/rollingUpgrades/latest'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_set_vms_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_set_vms_operations.py
new file mode 100644
index 000000000000..41305faab6a4
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_set_vms_operations.py
@@ -0,0 +1,1131 @@
+# 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 VirtualMachineScaleSetVMsOperations(object):
+    """VirtualMachineScaleSetVMsOperations 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 _reimage_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.reimage.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 reimage(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Reimages (upgrade the operating system) a specific virtual machine in a
+        VM scale set.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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._reimage_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            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)
+    reimage.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/reimage'}
+
+
+    def _reimage_all_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.reimage_all.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 reimage_all(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Allows you to re-image all the disks ( including data disks ) in the a
+        VM scale set instance. This operation is only supported for managed
+        disks.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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._reimage_all_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            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)
+    reimage_all.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/reimageall'}
+
+
+    def _deallocate_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.deallocate.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 deallocate(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Deallocates a specific virtual machine in a VM scale set. Shuts down
+        the virtual machine and releases the compute resources it uses. You are
+        not billed for the compute resources of this virtual machine once it is
+        deallocated.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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._deallocate_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            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)
+    deallocate.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/deallocate'}
+
+
+    def _update_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.update.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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(parameters, 'VirtualMachineScaleSetVM')
+
+        # Construct and send request
+        request = self._client.put(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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('VirtualMachineScaleSetVM', response)
+        if response.status_code == 202:
+            deserialized = self._deserialize('VirtualMachineScaleSetVM', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def update(
+            self, resource_group_name, vm_scale_set_name, instance_id, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Updates a virtual machine of a VM scale set.
+
+        :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 where the
+         extension should be create or updated.
+        :type vm_scale_set_name: str
+        :param instance_id: The instance ID of the virtual machine.
+        :type instance_id: str
+        :param parameters: Parameters supplied to the Update Virtual Machine
+         Scale Sets VM operation.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetVM
+        :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
+         VirtualMachineScaleSetVM or
+         ClientRawResponse<VirtualMachineScaleSetVM> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetVM]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetVM]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._update_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            parameters=parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('VirtualMachineScaleSetVM', 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/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}'}
+
+
+    def _delete_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.delete.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.delete(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Deletes a virtual machine from a VM scale set.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            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/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}'}
+
+    def get(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        """Gets a virtual machine from a VM scale set.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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: VirtualMachineScaleSetVM or ClientRawResponse if raw=true
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetVM or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineScaleSetVM', 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/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}'}
+
+    def get_instance_view(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        """Gets the status of a virtual machine from a VM scale set.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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: VirtualMachineScaleSetVMInstanceView or ClientRawResponse if
+         raw=true
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetVMInstanceView
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get_instance_view.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineScaleSetVMInstanceView', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    get_instance_view.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/instanceView'}
+
+    def list(
+            self, resource_group_name, virtual_machine_scale_set_name, filter=None, select=None, expand=None, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of all virtual machines in a VM scale sets.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param virtual_machine_scale_set_name: The name of the VM scale set.
+        :type virtual_machine_scale_set_name: str
+        :param filter: The filter to apply to the operation.
+        :type filter: str
+        :param select: The list parameters.
+        :type select: str
+        :param expand: The expand expression to apply to the operation.
+        :type expand: 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 VirtualMachineScaleSetVM
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetVMPaged[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetVM]
+        :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 = {
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+                    'virtualMachineScaleSetName': self._serialize.url("virtual_machine_scale_set_name", virtual_machine_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 = {}
+                if filter is not None:
+                    query_parameters['$filter'] = self._serialize.query("filter", filter, 'str')
+                if select is not None:
+                    query_parameters['$select'] = self._serialize.query("select", select, 'str')
+                if expand is not None:
+                    query_parameters['$expand'] = self._serialize.query("expand", expand, 'str')
+                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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachineScaleSetVMPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachineScaleSetVMPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{virtualMachineScaleSetName}/virtualMachines'}
+
+
+    def _power_off_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.power_off.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 power_off(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Power off (stop) a virtual machine in a VM scale set. Note that
+        resources are still attached and you are getting charged for the
+        resources. Instead, use deallocate to release resources and avoid
+        charges.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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._power_off_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            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)
+    power_off.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/poweroff'}
+
+
+    def _restart_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.restart.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 restart(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Restarts a virtual machine in a VM scale set.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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._restart_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            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)
+    restart.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/restart'}
+
+
+    def _start_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.start.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Starts a virtual machine in a VM scale set.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            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.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/start'}
+
+
+    def _redeploy_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.redeploy.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 redeploy(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Redeploys a virtual machine in a VM scale set.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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._redeploy_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            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)
+    redeploy.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/redeploy'}
+
+
+    def _perform_maintenance_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.perform_maintenance.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 perform_maintenance(
+            self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Performs maintenance on a virtual machine in a VM scale set.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: 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._perform_maintenance_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            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)
+    perform_maintenance.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/performMaintenance'}
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
new file mode 100644
index 000000000000..52cc62169ef9
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_sets_operations.py
@@ -0,0 +1,1762 @@
+# 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 VirtualMachineScaleSetsOperations(object):
+    """VirtualMachineScaleSetsOperations 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, vm_scale_set_name, parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.create_or_update.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 = {}
+        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(parameters, 'VirtualMachineScaleSet')
+
+        # Construct and send request
+        request = self._client.put(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, stream=False, **operation_config)
+
+        if response.status_code not in [200, 201]:
+            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('VirtualMachineScaleSet', response)
+        if response.status_code == 201:
+            deserialized = self._deserialize('VirtualMachineScaleSet', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def create_or_update(
+            self, resource_group_name, vm_scale_set_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Create or update a VM scale set.
+
+        :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 to create or
+         update.
+        :type vm_scale_set_name: str
+        :param parameters: The scale set object.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSet
+        :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 VirtualMachineScaleSet
+         or ClientRawResponse<VirtualMachineScaleSet> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSet]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSet]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._create_or_update_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            parameters=parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('VirtualMachineScaleSet', 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/virtualMachineScaleSets/{vmScaleSetName}'}
+
+
+    def _update_initial(
+            self, resource_group_name, vm_scale_set_name, parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.update.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 = {}
+        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(parameters, 'VirtualMachineScaleSetUpdate')
+
+        # Construct and send request
+        request = self._client.patch(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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('VirtualMachineScaleSet', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def update(
+            self, resource_group_name, vm_scale_set_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Update a VM scale set.
+
+        :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 to create or
+         update.
+        :type vm_scale_set_name: str
+        :param parameters: The scale set object.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetUpdate
+        :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 VirtualMachineScaleSet
+         or ClientRawResponse<VirtualMachineScaleSet> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSet]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSet]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._update_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            parameters=parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('VirtualMachineScaleSet', 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/virtualMachineScaleSets/{vmScaleSetName}'}
+
+
+    def _delete_initial(
+            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.delete.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 = {}
+        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 and send request
+        request = self._client.delete(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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, vm_scale_set_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Deletes a VM scale set.
+
+        :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._delete_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)
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}'}
+
+    def get(
+            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
+        """Display information about a virtual machine scale set.
+
+        :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: returns the direct response alongside the
+         deserialized response
+        :param operation_config: :ref:`Operation configuration
+         overrides<msrest:optionsforoperations>`.
+        :return: VirtualMachineScaleSet or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSet
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineScaleSet', 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/virtualMachineScaleSets/{vmScaleSetName}'}
+
+
+    def _deallocate_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = None
+        if instance_ids is not None:
+            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.deallocate.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 = {}
+        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
+        if vm_instance_ids is not None:
+            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
+        else:
+            body_content = None
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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 deallocate(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Deallocates specific virtual machines in a VM scale set. Shuts down the
+        virtual machines and releases the compute resources. You are not billed
+        for the compute resources that this virtual machine scale set
+        deallocates.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+         Omitting the virtual machine scale set instance ids will result in the
+         operation being performed on all virtual machines in the virtual
+         machine scale set.
+        :type instance_ids: list[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._deallocate_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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)
+    deallocate.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/deallocate'}
+
+
+    def _delete_instances_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = models.VirtualMachineScaleSetVMInstanceRequiredIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.delete_instances.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 = {}
+        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(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceRequiredIDs')
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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 delete_instances(
+            self, resource_group_name, vm_scale_set_name, instance_ids, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Deletes virtual machines in a VM scale set.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+        :type instance_ids: list[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_instances_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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_instances.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/delete'}
+
+    def get_instance_view(
+            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
+        """Gets the status of a VM scale set instance.
+
+        :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: returns the direct response alongside the
+         deserialized response
+        :param operation_config: :ref:`Operation configuration
+         overrides<msrest:optionsforoperations>`.
+        :return: VirtualMachineScaleSetInstanceView or ClientRawResponse if
+         raw=true
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetInstanceView
+         or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get_instance_view.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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineScaleSetInstanceView', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    get_instance_view.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/instanceView'}
+
+    def list(
+            self, resource_group_name, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of all VM scale sets 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 VirtualMachineScaleSet
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetPaged[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSet]
+        :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 = {
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_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')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachineScaleSetPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachineScaleSetPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets'}
+
+    def list_all(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of all VM Scale Sets in the subscription, regardless of the
+        associated resource group. Use nextLink property in the response to get
+        the next page of VM Scale Sets. Do this till nextLink is null to fetch
+        all the VM Scale Sets.
+
+        :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 VirtualMachineScaleSet
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetPaged[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSet]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        def internal_paging(next_link=None, raw=False):
+
+            if not next_link:
+                # Construct URL
+                url = self.list_all.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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachineScaleSetPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachineScaleSetPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_all.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/virtualMachineScaleSets'}
+
+    def list_skus(
+            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
+        """Gets a list of SKUs available for your VM scale set, including the
+        minimum and maximum VM instances allowed for each SKU.
+
+        :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: returns the direct response alongside the
+         deserialized response
+        :param operation_config: :ref:`Operation configuration
+         overrides<msrest:optionsforoperations>`.
+        :return: An iterator like instance of VirtualMachineScaleSetSku
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetSkuPaged[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineScaleSetSku]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        def internal_paging(next_link=None, raw=False):
+
+            if not next_link:
+                # Construct URL
+                url = self.list_skus.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')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachineScaleSetSkuPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachineScaleSetSkuPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_skus.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/skus'}
+
+    def get_os_upgrade_history(
+            self, resource_group_name, vm_scale_set_name, custom_headers=None, raw=False, **operation_config):
+        """Gets list of OS upgrades on a VM scale set instance.
+
+        :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: returns the direct response alongside the
+         deserialized response
+        :param operation_config: :ref:`Operation configuration
+         overrides<msrest:optionsforoperations>`.
+        :return: An iterator like instance of
+         UpgradeOperationHistoricalStatusInfo
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.UpgradeOperationHistoricalStatusInfoPaged[~azure.mgmt.compute.v2018_06_01.models.UpgradeOperationHistoricalStatusInfo]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        def internal_paging(next_link=None, raw=False):
+
+            if not next_link:
+                # Construct URL
+                url = self.get_os_upgrade_history.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')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.UpgradeOperationHistoricalStatusInfoPaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.UpgradeOperationHistoricalStatusInfoPaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    get_os_upgrade_history.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/osUpgradeHistory'}
+
+
+    def _power_off_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = None
+        if instance_ids is not None:
+            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.power_off.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 = {}
+        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
+        if vm_instance_ids is not None:
+            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
+        else:
+            body_content = None
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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 power_off(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Power off (stop) one or more virtual machines in a VM scale set. Note
+        that resources are still attached and you are getting charged for the
+        resources. Instead, use deallocate to release resources and avoid
+        charges.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+         Omitting the virtual machine scale set instance ids will result in the
+         operation being performed on all virtual machines in the virtual
+         machine scale set.
+        :type instance_ids: list[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._power_off_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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)
+    power_off.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/poweroff'}
+
+
+    def _restart_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = None
+        if instance_ids is not None:
+            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.restart.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 = {}
+        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
+        if vm_instance_ids is not None:
+            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
+        else:
+            body_content = None
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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 restart(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Restarts one or more virtual machines in a VM scale set.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+         Omitting the virtual machine scale set instance ids will result in the
+         operation being performed on all virtual machines in the virtual
+         machine scale set.
+        :type instance_ids: list[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._restart_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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)
+    restart.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/restart'}
+
+
+    def _start_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = None
+        if instance_ids is not None:
+            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.start.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 = {}
+        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
+        if vm_instance_ids is not None:
+            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
+        else:
+            body_content = None
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Starts one or more virtual machines in a VM scale set.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+         Omitting the virtual machine scale set instance ids will result in the
+         operation being performed on all virtual machines in the virtual
+         machine scale set.
+        :type instance_ids: list[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_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/start'}
+
+
+    def _redeploy_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = None
+        if instance_ids is not None:
+            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.redeploy.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 = {}
+        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
+        if vm_instance_ids is not None:
+            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
+        else:
+            body_content = None
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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 redeploy(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Redeploy one or more virtual machines in a VM scale set.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+         Omitting the virtual machine scale set instance ids will result in the
+         operation being performed on all virtual machines in the virtual
+         machine scale set.
+        :type instance_ids: list[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._redeploy_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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)
+    redeploy.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/redeploy'}
+
+
+    def _perform_maintenance_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = None
+        if instance_ids is not None:
+            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.perform_maintenance.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 = {}
+        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
+        if vm_instance_ids is not None:
+            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
+        else:
+            body_content = None
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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 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.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+         Omitting the virtual machine scale set instance ids will result in the
+         operation being performed on all virtual machines in the virtual
+         machine scale set.
+        :type instance_ids: list[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._perform_maintenance_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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)
+    perform_maintenance.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/performMaintenance'}
+
+
+    def _update_instances_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = models.VirtualMachineScaleSetVMInstanceRequiredIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.update_instances.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 = {}
+        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(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceRequiredIDs')
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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 update_instances(
+            self, resource_group_name, vm_scale_set_name, instance_ids, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Upgrades one or more virtual machines to the latest SKU set in the VM
+        scale set model.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+        :type instance_ids: list[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._update_instances_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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)
+    update_instances.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/manualupgrade'}
+
+
+    def _reimage_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = None
+        if instance_ids is not None:
+            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.reimage.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 = {}
+        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
+        if vm_instance_ids is not None:
+            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
+        else:
+            body_content = None
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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 reimage(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Reimages (upgrade the operating system) one or more virtual machines in
+        a VM scale set.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+         Omitting the virtual machine scale set instance ids will result in the
+         operation being performed on all virtual machines in the virtual
+         machine scale set.
+        :type instance_ids: list[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._reimage_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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)
+    reimage.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/reimage'}
+
+
+    def _reimage_all_initial(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, **operation_config):
+        vm_instance_ids = None
+        if instance_ids is not None:
+            vm_instance_ids = models.VirtualMachineScaleSetVMInstanceIDs(instance_ids=instance_ids)
+
+        # Construct URL
+        url = self.reimage_all.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 = {}
+        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
+        if vm_instance_ids is not None:
+            body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceIDs')
+        else:
+            body_content = None
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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 reimage_all(
+            self, resource_group_name, vm_scale_set_name, instance_ids=None, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Reimages all the disks ( including data disks ) in the virtual machines
+        in a VM scale set. This operation is only supported for managed disks.
+
+        :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 instance_ids: The virtual machine scale set instance ids.
+         Omitting the virtual machine scale set instance ids will result in the
+         operation being performed on all virtual machines in the virtual
+         machine scale set.
+        :type instance_ids: list[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._reimage_all_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_ids=instance_ids,
+            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)
+    reimage_all.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/reimageall'}
+
+    def force_recovery_service_fabric_platform_update_domain_walk(
+            self, resource_group_name, vm_scale_set_name, platform_update_domain, custom_headers=None, raw=False, **operation_config):
+        """Manual platform update domain walk to update virtual machines in a
+        service fabric virtual machine scale set.
+
+        :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 platform_update_domain: The platform update domain for which a
+         manual recovery walk is requested
+        :type platform_update_domain: int
+        :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: RecoveryWalkResponse or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_06_01.models.RecoveryWalkResponse or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.force_recovery_service_fabric_platform_update_domain_walk.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')
+        query_parameters['platformUpdateDomain'] = self._serialize.query("platform_update_domain", platform_update_domain, 'int')
+
+        # Construct headers
+        header_parameters = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('RecoveryWalkResponse', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    force_recovery_service_fabric_platform_update_domain_walk.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/forceRecoveryServiceFabricPlatformUpdateDomainWalk'}
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
new file mode 100644
index 000000000000..5f2cd409660e
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_sizes_operations.py
@@ -0,0 +1,108 @@
+# 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 .. import models
+
+
+class VirtualMachineSizesOperations(object):
+    """VirtualMachineSizesOperations 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 list(
+            self, location, custom_headers=None, raw=False, **operation_config):
+        """Lists all available virtual machine sizes for a subscription in a
+        location.
+
+        :param location: The location upon which virtual-machine-sizes is
+         queried.
+        :type location: 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 VirtualMachineSize
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineSizePaged[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineSize]
+        :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 = {
+                    'location': self._serialize.url("location", location, 'str', pattern=r'^[-\w\._]+$'),
+                    '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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachineSizePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachineSizePaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/vmSizes'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machines_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machines_operations.py
new file mode 100644
index 000000000000..53c36ce96535
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machines_operations.py
@@ -0,0 +1,1393 @@
+# 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 VirtualMachinesOperations(object):
+    """VirtualMachinesOperations 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 _capture_initial(
+            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.capture.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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(parameters, 'VirtualMachineCaptureParameters')
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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('VirtualMachineCaptureResult', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def capture(
+            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Captures the VM by copying virtual hard disks of the VM and outputs a
+        template that can be used to create similar VMs.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_name: str
+        :param parameters: Parameters supplied to the Capture Virtual Machine
+         operation.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineCaptureParameters
+        :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
+         VirtualMachineCaptureResult or
+         ClientRawResponse<VirtualMachineCaptureResult> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineCaptureResult]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineCaptureResult]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._capture_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_name,
+            parameters=parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('VirtualMachineCaptureResult', 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)
+    capture.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/capture'}
+
+
+    def _create_or_update_initial(
+            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.create_or_update.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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(parameters, 'VirtualMachine')
+
+        # Construct and send request
+        request = self._client.put(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, stream=False, **operation_config)
+
+        if response.status_code not in [200, 201]:
+            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('VirtualMachine', response)
+        if response.status_code == 201:
+            deserialized = self._deserialize('VirtualMachine', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def create_or_update(
+            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to create or update a virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_name: str
+        :param parameters: Parameters supplied to the Create Virtual Machine
+         operation.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_06_01.models.VirtualMachine
+        :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 VirtualMachine or
+         ClientRawResponse<VirtualMachine> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.VirtualMachine]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.VirtualMachine]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._create_or_update_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_name,
+            parameters=parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('VirtualMachine', 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/virtualMachines/{vmName}'}
+
+
+    def _update_initial(
+            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.update.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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(parameters, 'VirtualMachineUpdate')
+
+        # Construct and send request
+        request = self._client.patch(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, stream=False, **operation_config)
+
+        if response.status_code not in [200, 201]:
+            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('VirtualMachine', response)
+        if response.status_code == 201:
+            deserialized = self._deserialize('VirtualMachine', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def update(
+            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to update a virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_name: str
+        :param parameters: Parameters supplied to the Update Virtual Machine
+         operation.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineUpdate
+        :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 VirtualMachine or
+         ClientRawResponse<VirtualMachine> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.VirtualMachine]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.VirtualMachine]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._update_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_name,
+            parameters=parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('VirtualMachine', 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/virtualMachines/{vmName}'}
+
+
+    def _delete_initial(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.delete.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.delete(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to delete a virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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,
+            vm_name=vm_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/virtualMachines/{vmName}'}
+
+    def get(
+            self, resource_group_name, vm_name, expand=None, custom_headers=None, raw=False, **operation_config):
+        """Retrieves information about the model view or the instance view of a
+        virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_name: str
+        :param expand: The expand expression to apply on the operation.
+         Possible values include: 'instanceView'
+        :type expand: str or
+         ~azure.mgmt.compute.v2018_06_01.models.InstanceViewTypes
+        :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: VirtualMachine or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_06_01.models.VirtualMachine or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        if expand is not None:
+            query_parameters['$expand'] = self._serialize.query("expand", expand, 'InstanceViewTypes')
+        query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str')
+
+        # Construct headers
+        header_parameters = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachine', 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/virtualMachines/{vmName}'}
+
+    def instance_view(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        """Retrieves information about the run-time state of a virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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: VirtualMachineInstanceView or ClientRawResponse if raw=true
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineInstanceView or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.instance_view.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('VirtualMachineInstanceView', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    instance_view.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/instanceView'}
+
+
+    def _convert_to_managed_disks_initial(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.convert_to_managed_disks.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 convert_to_managed_disks(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Converts virtual machine disks from blob-based to managed disks.
+        Virtual machine must be stop-deallocated before invoking this
+        operation.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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._convert_to_managed_disks_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_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)
+    convert_to_managed_disks.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/convertToManagedDisks'}
+
+
+    def _deallocate_initial(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.deallocate.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 deallocate(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Shuts down the virtual machine and releases the compute resources. You
+        are not billed for the compute resources that this virtual machine
+        uses.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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._deallocate_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_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)
+    deallocate.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/deallocate'}
+
+    def generalize(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        """Sets the state of the virtual machine to generalized.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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: None or ClientRawResponse if raw=true
+        :rtype: None or ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.generalize.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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
+
+        if raw:
+            client_raw_response = ClientRawResponse(None, response)
+            return client_raw_response
+    generalize.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/generalize'}
+
+    def list(
+            self, resource_group_name, custom_headers=None, raw=False, **operation_config):
+        """Lists all of the virtual machines in the specified resource group. Use
+        the nextLink property in the response to get the next page of virtual
+        machines.
+
+        :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 VirtualMachine
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.VirtualMachinePaged[~azure.mgmt.compute.v2018_06_01.models.VirtualMachine]
+        :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 = {
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_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')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachinePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachinePaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines'}
+
+    def list_all(
+            self, custom_headers=None, raw=False, **operation_config):
+        """Lists all of the virtual machines in the specified subscription. Use
+        the nextLink property in the response to get the next page of virtual
+        machines.
+
+        :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 VirtualMachine
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.VirtualMachinePaged[~azure.mgmt.compute.v2018_06_01.models.VirtualMachine]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        def internal_paging(next_link=None, raw=False):
+
+            if not next_link:
+                # Construct URL
+                url = self.list_all.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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachinePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachinePaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_all.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/virtualMachines'}
+
+    def list_available_sizes(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        """Lists all available virtual machine sizes to which the specified
+        virtual machine can be resized.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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 VirtualMachineSize
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.VirtualMachineSizePaged[~azure.mgmt.compute.v2018_06_01.models.VirtualMachineSize]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        def internal_paging(next_link=None, raw=False):
+
+            if not next_link:
+                # Construct URL
+                url = self.list_available_sizes.metadata['url']
+                path_format_arguments = {
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+                    'vmName': self._serialize.url("vm_name", vm_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')
+
+            else:
+                url = next_link
+                query_parameters = {}
+
+            # Construct headers
+            header_parameters = {}
+            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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.VirtualMachineSizePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.VirtualMachineSizePaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list_available_sizes.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/vmSizes'}
+
+
+    def _power_off_initial(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.power_off.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 power_off(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to power off (stop) a virtual machine. The virtual
+        machine can be restarted with the same provisioned resources. You are
+        still charged for this virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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._power_off_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_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)
+    power_off.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/powerOff'}
+
+
+    def _restart_initial(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.restart.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 restart(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to restart a virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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._restart_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_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)
+    restart.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/restart'}
+
+
+    def _start_initial(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.start.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to start a virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_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.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/start'}
+
+
+    def _redeploy_initial(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.redeploy.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 redeploy(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to redeploy a virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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._redeploy_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_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)
+    redeploy.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/redeploy'}
+
+
+    def _perform_maintenance_initial(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.perform_maintenance.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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 and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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 perform_maintenance(
+            self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
+        """The operation to perform maintenance on a virtual machine.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_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._perform_maintenance_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_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)
+    perform_maintenance.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/performMaintenance'}

From 4c7955b7fae4e2487bd69f2a6e29b5c57a5acfaf Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Mon, 9 Jul 2018 23:03:20 -0700
Subject: [PATCH 18/29] [AutoPR compute/resource-manager] Update RunCommand
 operation output as valid json object (#2888)

* Generated from e3d9ca01eb41c555b03705a38e58173de2196194

Update RunCommand operation output as valid json object

* Generated from e3d9ca01eb41c555b03705a38e58173de2196194

Update RunCommand operation output as valid json object
---
 .../v2018_04_01/models/run_command_result.py  |  11 +-
 .../models/run_command_result_py3.py          |  13 ++-
 ...irtual_machine_scale_set_vms_operations.py | 105 ++++++++++++++++++
 .../operations/virtual_machines_operations.py |  12 +-
 4 files changed, 124 insertions(+), 17 deletions(-)

diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result.py
index 8fafc31dd548..751a49481d82 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result.py
@@ -13,16 +13,17 @@
 
 
 class RunCommandResult(Model):
-    """Run command operation response.
+    """RunCommandResult.
 
-    :param output: Operation output data (raw JSON)
-    :type output: object
+    :param value: Run command operation response.
+    :type value:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
     """
 
     _attribute_map = {
-        'output': {'key': 'properties.output', 'type': 'object'},
+        'value': {'key': 'value', 'type': '[InstanceViewStatus]'},
     }
 
     def __init__(self, **kwargs):
         super(RunCommandResult, self).__init__(**kwargs)
-        self.output = kwargs.get('output', None)
+        self.value = kwargs.get('value', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result_py3.py
index 852c2895dcee..659243f62725 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/run_command_result_py3.py
@@ -13,16 +13,17 @@
 
 
 class RunCommandResult(Model):
-    """Run command operation response.
+    """RunCommandResult.
 
-    :param output: Operation output data (raw JSON)
-    :type output: object
+    :param value: Run command operation response.
+    :type value:
+     list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]
     """
 
     _attribute_map = {
-        'output': {'key': 'properties.output', 'type': 'object'},
+        'value': {'key': 'value', 'type': '[InstanceViewStatus]'},
     }
 
-    def __init__(self, *, output=None, **kwargs) -> None:
+    def __init__(self, *, value=None, **kwargs) -> None:
         super(RunCommandResult, self).__init__(**kwargs)
-        self.output = output
+        self.value = value
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_vms_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_vms_operations.py
index 8ebd8a2fd266..d3ae10792c92 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_vms_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_vms_operations.py
@@ -1129,3 +1129,108 @@ def get_long_running_output(response):
         else: polling_method = polling
         return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
     perform_maintenance.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/performMaintenance'}
+
+
+    def _run_command_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.run_command.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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(parameters, 'RunCommandInput')
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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('RunCommandResult', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def run_command(
+            self, resource_group_name, vm_scale_set_name, instance_id, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Run command on a virtual machine in a VM scale set.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: str
+        :param parameters: Parameters supplied to the Run command operation.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_04_01.models.RunCommandInput
+        :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 RunCommandResult or
+         ClientRawResponse<RunCommandResult> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.RunCommandResult]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.RunCommandResult]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._run_command_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            parameters=parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('RunCommandResult', 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)
+    run_command.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/runCommand'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machines_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machines_operations.py
index ebe8cbd87fd8..0dcf00e25f5c 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machines_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machines_operations.py
@@ -1434,7 +1434,7 @@ def _run_command_initial(
         deserialized = None
 
         if response.status_code == 200:
-            deserialized = self._deserialize('[InstanceViewStatus]', response)
+            deserialized = self._deserialize('RunCommandResult', response)
 
         if raw:
             client_raw_response = ClientRawResponse(deserialized, response)
@@ -1458,12 +1458,12 @@ def run_command(
          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 list or
-         ClientRawResponse<list> if raw==True
+        :return: An instance of LROPoller that returns RunCommandResult or
+         ClientRawResponse<RunCommandResult> if raw==True
         :rtype:
-         ~msrestazure.azure_operation.AzureOperationPoller[list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]]
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_04_01.models.RunCommandResult]
          or
-         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[list[~azure.mgmt.compute.v2018_04_01.models.InstanceViewStatus]]]
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_04_01.models.RunCommandResult]]
         :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
         """
         raw_result = self._run_command_initial(
@@ -1476,7 +1476,7 @@ def run_command(
         )
 
         def get_long_running_output(response):
-            deserialized = self._deserialize('[InstanceViewStatus]', response)
+            deserialized = self._deserialize('RunCommandResult', response)
 
             if raw:
                 client_raw_response = ClientRawResponse(deserialized, response)

From 595c28a4ecdd710fc8f78970ca652e97f8b19460 Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Wed, 11 Jul 2018 09:38:56 -0700
Subject: [PATCH 19/29] Generated from ac9f623bcc6d676360abc57b52b6ee8b0341ea18
 (#2914)

Modeling ASG association with VMSS (Service support this hence updating swagger)
---
 .../models/virtual_machine_scale_set_ip_configuration.py  | 6 ++++++
 .../virtual_machine_scale_set_ip_configuration_py3.py     | 8 +++++++-
 .../virtual_machine_scale_set_update_ip_configuration.py  | 6 ++++++
 ...rtual_machine_scale_set_update_ip_configuration_py3.py | 8 +++++++-
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_ip_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_ip_configuration.py
index 74cf9550b79f..6d5d3dfcb3e3 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_ip_configuration.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_ip_configuration.py
@@ -41,6 +41,10 @@ class VirtualMachineScaleSetIPConfiguration(SubResource):
      Multiple scale sets cannot use the same application gateway.
     :type application_gateway_backend_address_pools:
      list[~azure.mgmt.compute.v2018_06_01.models.SubResource]
+    :param application_security_groups: Specifies an array of references to
+     application security group.
+    :type application_security_groups:
+     list[~azure.mgmt.compute.v2018_06_01.models.SubResource]
     :param load_balancer_backend_address_pools: Specifies an array of
      references to backend address pools of load balancers. A scale set can
      reference backend address pools of one public and one internal load
@@ -67,6 +71,7 @@ class VirtualMachineScaleSetIPConfiguration(SubResource):
         'public_ip_address_configuration': {'key': 'properties.publicIPAddressConfiguration', 'type': 'VirtualMachineScaleSetPublicIPAddressConfiguration'},
         'private_ip_address_version': {'key': 'properties.privateIPAddressVersion', 'type': 'str'},
         'application_gateway_backend_address_pools': {'key': 'properties.applicationGatewayBackendAddressPools', 'type': '[SubResource]'},
+        'application_security_groups': {'key': 'properties.applicationSecurityGroups', 'type': '[SubResource]'},
         'load_balancer_backend_address_pools': {'key': 'properties.loadBalancerBackendAddressPools', 'type': '[SubResource]'},
         'load_balancer_inbound_nat_pools': {'key': 'properties.loadBalancerInboundNatPools', 'type': '[SubResource]'},
     }
@@ -79,5 +84,6 @@ def __init__(self, **kwargs):
         self.public_ip_address_configuration = kwargs.get('public_ip_address_configuration', None)
         self.private_ip_address_version = kwargs.get('private_ip_address_version', None)
         self.application_gateway_backend_address_pools = kwargs.get('application_gateway_backend_address_pools', None)
+        self.application_security_groups = kwargs.get('application_security_groups', None)
         self.load_balancer_backend_address_pools = kwargs.get('load_balancer_backend_address_pools', None)
         self.load_balancer_inbound_nat_pools = kwargs.get('load_balancer_inbound_nat_pools', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_ip_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_ip_configuration_py3.py
index 80a43520122c..52ef1edeac0c 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_ip_configuration_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_ip_configuration_py3.py
@@ -41,6 +41,10 @@ class VirtualMachineScaleSetIPConfiguration(SubResource):
      Multiple scale sets cannot use the same application gateway.
     :type application_gateway_backend_address_pools:
      list[~azure.mgmt.compute.v2018_06_01.models.SubResource]
+    :param application_security_groups: Specifies an array of references to
+     application security group.
+    :type application_security_groups:
+     list[~azure.mgmt.compute.v2018_06_01.models.SubResource]
     :param load_balancer_backend_address_pools: Specifies an array of
      references to backend address pools of load balancers. A scale set can
      reference backend address pools of one public and one internal load
@@ -67,11 +71,12 @@ class VirtualMachineScaleSetIPConfiguration(SubResource):
         'public_ip_address_configuration': {'key': 'properties.publicIPAddressConfiguration', 'type': 'VirtualMachineScaleSetPublicIPAddressConfiguration'},
         'private_ip_address_version': {'key': 'properties.privateIPAddressVersion', 'type': 'str'},
         'application_gateway_backend_address_pools': {'key': 'properties.applicationGatewayBackendAddressPools', 'type': '[SubResource]'},
+        'application_security_groups': {'key': 'properties.applicationSecurityGroups', 'type': '[SubResource]'},
         'load_balancer_backend_address_pools': {'key': 'properties.loadBalancerBackendAddressPools', 'type': '[SubResource]'},
         'load_balancer_inbound_nat_pools': {'key': 'properties.loadBalancerInboundNatPools', 'type': '[SubResource]'},
     }
 
-    def __init__(self, *, name: str, id: str=None, subnet=None, primary: bool=None, public_ip_address_configuration=None, private_ip_address_version=None, application_gateway_backend_address_pools=None, load_balancer_backend_address_pools=None, load_balancer_inbound_nat_pools=None, **kwargs) -> None:
+    def __init__(self, *, name: str, id: str=None, subnet=None, primary: bool=None, public_ip_address_configuration=None, private_ip_address_version=None, application_gateway_backend_address_pools=None, application_security_groups=None, load_balancer_backend_address_pools=None, load_balancer_inbound_nat_pools=None, **kwargs) -> None:
         super(VirtualMachineScaleSetIPConfiguration, self).__init__(id=id, **kwargs)
         self.name = name
         self.subnet = subnet
@@ -79,5 +84,6 @@ def __init__(self, *, name: str, id: str=None, subnet=None, primary: bool=None,
         self.public_ip_address_configuration = public_ip_address_configuration
         self.private_ip_address_version = private_ip_address_version
         self.application_gateway_backend_address_pools = application_gateway_backend_address_pools
+        self.application_security_groups = application_security_groups
         self.load_balancer_backend_address_pools = load_balancer_backend_address_pools
         self.load_balancer_inbound_nat_pools = load_balancer_inbound_nat_pools
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_ip_configuration.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_ip_configuration.py
index 323518561eab..231785638f0f 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_ip_configuration.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_ip_configuration.py
@@ -37,6 +37,10 @@ class VirtualMachineScaleSetUpdateIPConfiguration(SubResource):
      backend address pools.
     :type application_gateway_backend_address_pools:
      list[~azure.mgmt.compute.v2018_06_01.models.SubResource]
+    :param application_security_groups: Specifies an array of references to
+     application security group.
+    :type application_security_groups:
+     list[~azure.mgmt.compute.v2018_06_01.models.SubResource]
     :param load_balancer_backend_address_pools: The load balancer backend
      address pools.
     :type load_balancer_backend_address_pools:
@@ -55,6 +59,7 @@ class VirtualMachineScaleSetUpdateIPConfiguration(SubResource):
         'public_ip_address_configuration': {'key': 'properties.publicIPAddressConfiguration', 'type': 'VirtualMachineScaleSetUpdatePublicIPAddressConfiguration'},
         'private_ip_address_version': {'key': 'properties.privateIPAddressVersion', 'type': 'str'},
         'application_gateway_backend_address_pools': {'key': 'properties.applicationGatewayBackendAddressPools', 'type': '[SubResource]'},
+        'application_security_groups': {'key': 'properties.applicationSecurityGroups', 'type': '[SubResource]'},
         'load_balancer_backend_address_pools': {'key': 'properties.loadBalancerBackendAddressPools', 'type': '[SubResource]'},
         'load_balancer_inbound_nat_pools': {'key': 'properties.loadBalancerInboundNatPools', 'type': '[SubResource]'},
     }
@@ -67,5 +72,6 @@ def __init__(self, **kwargs):
         self.public_ip_address_configuration = kwargs.get('public_ip_address_configuration', None)
         self.private_ip_address_version = kwargs.get('private_ip_address_version', None)
         self.application_gateway_backend_address_pools = kwargs.get('application_gateway_backend_address_pools', None)
+        self.application_security_groups = kwargs.get('application_security_groups', None)
         self.load_balancer_backend_address_pools = kwargs.get('load_balancer_backend_address_pools', None)
         self.load_balancer_inbound_nat_pools = kwargs.get('load_balancer_inbound_nat_pools', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_ip_configuration_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_ip_configuration_py3.py
index 421c6cc10de1..69d9b652cca1 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_ip_configuration_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/virtual_machine_scale_set_update_ip_configuration_py3.py
@@ -37,6 +37,10 @@ class VirtualMachineScaleSetUpdateIPConfiguration(SubResource):
      backend address pools.
     :type application_gateway_backend_address_pools:
      list[~azure.mgmt.compute.v2018_06_01.models.SubResource]
+    :param application_security_groups: Specifies an array of references to
+     application security group.
+    :type application_security_groups:
+     list[~azure.mgmt.compute.v2018_06_01.models.SubResource]
     :param load_balancer_backend_address_pools: The load balancer backend
      address pools.
     :type load_balancer_backend_address_pools:
@@ -55,11 +59,12 @@ class VirtualMachineScaleSetUpdateIPConfiguration(SubResource):
         'public_ip_address_configuration': {'key': 'properties.publicIPAddressConfiguration', 'type': 'VirtualMachineScaleSetUpdatePublicIPAddressConfiguration'},
         'private_ip_address_version': {'key': 'properties.privateIPAddressVersion', 'type': 'str'},
         'application_gateway_backend_address_pools': {'key': 'properties.applicationGatewayBackendAddressPools', 'type': '[SubResource]'},
+        'application_security_groups': {'key': 'properties.applicationSecurityGroups', 'type': '[SubResource]'},
         'load_balancer_backend_address_pools': {'key': 'properties.loadBalancerBackendAddressPools', 'type': '[SubResource]'},
         'load_balancer_inbound_nat_pools': {'key': 'properties.loadBalancerInboundNatPools', 'type': '[SubResource]'},
     }
 
-    def __init__(self, *, id: str=None, name: str=None, subnet=None, primary: bool=None, public_ip_address_configuration=None, private_ip_address_version=None, application_gateway_backend_address_pools=None, load_balancer_backend_address_pools=None, load_balancer_inbound_nat_pools=None, **kwargs) -> None:
+    def __init__(self, *, id: str=None, name: str=None, subnet=None, primary: bool=None, public_ip_address_configuration=None, private_ip_address_version=None, application_gateway_backend_address_pools=None, application_security_groups=None, load_balancer_backend_address_pools=None, load_balancer_inbound_nat_pools=None, **kwargs) -> None:
         super(VirtualMachineScaleSetUpdateIPConfiguration, self).__init__(id=id, **kwargs)
         self.name = name
         self.subnet = subnet
@@ -67,5 +72,6 @@ def __init__(self, *, id: str=None, name: str=None, subnet=None, primary: bool=N
         self.public_ip_address_configuration = public_ip_address_configuration
         self.private_ip_address_version = private_ip_address_version
         self.application_gateway_backend_address_pools = application_gateway_backend_address_pools
+        self.application_security_groups = application_security_groups
         self.load_balancer_backend_address_pools = load_balancer_backend_address_pools
         self.load_balancer_inbound_nat_pools = load_balancer_inbound_nat_pools

From 1d5ff4929ab6b4ee0977871a81590329ca967d08 Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Wed, 11 Jul 2018 10:35:25 -0700
Subject: [PATCH 20/29] [AutoPR compute/resource-manager] Update VMSS planned
 maintenance description to refer to best practices doc (#2911)

* Generated from 93bfe8fd52fa3907af3496b4d37c6a50655cf8ea

Update VMSS planned maintenance description to refer to best practices doc

* Generated from 93bfe8fd52fa3907af3496b4d37c6a50655cf8ea

Update VMSS planned maintenance description to refer to best practices doc
---
 .../operations/virtual_machine_scale_sets_operations.py        | 3 +++
 .../operations/virtual_machine_scale_sets_operations.py        | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_sets_operations.py
index e83614092358..871f1d9ee4ce 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_sets_operations.py
@@ -1462,6 +1462,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_04_01/operations/virtual_machine_scale_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_sets_operations.py
index 0b8f451521c5..e6f49af582f1 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_sets_operations.py
@@ -1364,6 +1364,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

From 663e409631a410cb5ebf468d9332b3b89079e7a0 Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Fri, 13 Jul 2018 08:28:55 -0700
Subject: [PATCH 21/29] Generated from cb39de62c1bac51455eaf7ad3fbe8ac9ec84df58
 (#2918)

Add missing ScaleSet properties

The change adds the following missing properties
 1) "zones" property to VirtualMachineScaleSetVM
 2) DiskSizeInGB to VirtualMachineScaleSetOSDisk
 3) DiskSizeInGB to VirtualMachineScaleSetUpdateOSDisk
---
 .../models/virtual_machine_scale_set_data_disk.py         | 2 +-
 .../models/virtual_machine_scale_set_data_disk_py3.py     | 2 +-
 .../models/virtual_machine_scale_set_os_disk.py           | 6 ++++++
 .../models/virtual_machine_scale_set_os_disk_py3.py       | 8 +++++++-
 .../models/virtual_machine_scale_set_update_os_disk.py    | 6 ++++++
 .../virtual_machine_scale_set_update_os_disk_py3.py       | 8 +++++++-
 .../v2018_04_01/models/virtual_machine_scale_set_vm.py    | 5 +++++
 .../models/virtual_machine_scale_set_vm_py3.py            | 5 +++++
 8 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_data_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_data_disk.py
index 945726144fd2..9b732ee4b771 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_data_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_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_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/virtual_machine_scale_set_data_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_data_disk_py3.py
index 8ff1b974e334..d90ede5f54e0 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_data_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_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_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/virtual_machine_scale_set_os_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_disk.py
index 3c27a4373376..b2ac0d43825c 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_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_04_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_04_01/models/virtual_machine_scale_set_os_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_disk_py3.py
index a9e21e153d4d..e71cadd64a16 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_os_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_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_04_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_04_01/models/virtual_machine_scale_set_update_os_disk.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_disk.py
index 1f48890ba840..937e6570a99f 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_disk.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_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_04_01/models/virtual_machine_scale_set_update_os_disk_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_disk_py3.py
index 420daf4f2dcf..feb0156c7a78 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_update_os_disk_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_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_04_01/models/virtual_machine_scale_set_vm.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm.py
index 204a62f62a0c..5d88cc259a93 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm.py
@@ -97,6 +97,8 @@ class VirtualMachineScaleSetVM(Resource):
     :ivar resources: The virtual machine child extension resources.
     :vartype resources:
      list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]
+    :ivar zones: The virtual machine zones.
+    :vartype zones: list[str]
     """
 
     _validation = {
@@ -111,6 +113,7 @@ class VirtualMachineScaleSetVM(Resource):
         'instance_view': {'readonly': True},
         'provisioning_state': {'readonly': True},
         'resources': {'readonly': True},
+        'zones': {'readonly': True},
     }
 
     _attribute_map = {
@@ -134,6 +137,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):
@@ -153,3 +157,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_04_01/models/virtual_machine_scale_set_vm_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_py3.py
index bf822844f993..ac05a0f168c4 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_py3.py
@@ -97,6 +97,8 @@ class VirtualMachineScaleSetVM(Resource):
     :ivar resources: The virtual machine child extension resources.
     :vartype resources:
      list[~azure.mgmt.compute.v2018_04_01.models.VirtualMachineExtension]
+    :ivar zones: The virtual machine zones.
+    :vartype zones: list[str]
     """
 
     _validation = {
@@ -111,6 +113,7 @@ class VirtualMachineScaleSetVM(Resource):
         'instance_view': {'readonly': True},
         'provisioning_state': {'readonly': True},
         'resources': {'readonly': True},
+        'zones': {'readonly': True},
     }
 
     _attribute_map = {
@@ -134,6 +137,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, *, 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:
@@ -153,3 +157,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

From 8175b81a56be9dbf0f5032834b241c529b7f614b Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Wed, 18 Jul 2018 11:31:58 -0700
Subject: [PATCH 22/29] Generated from b59db77683f3a9c65d0edec17b5f05e458a68897
 (#2942)

Revert AccessUri description to make it correspond to server response
---
 .../azure/mgmt/compute/v2018_04_01/models/access_uri.py         | 2 +-
 .../azure/mgmt/compute/v2018_04_01/models/access_uri_py3.py     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 fec7ad1244ab..9ee6b01de1e1 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': 'accessSAS', 'type': 'str'},
+        'access_sas': {'key': 'properties.output.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 c13208a20d8d..bb9e56aa4221 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': 'accessSAS', 'type': 'str'},
+        'access_sas': {'key': 'properties.output.accessSAS', 'type': 'str'},
     }
 
     def __init__(self, **kwargs) -> None:

From 2a6625e656edf431db5a4f6a2b8bade62856c7c6 Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Thu, 19 Jul 2018 10:22:59 -0700
Subject: [PATCH 23/29] [AutoPR compute/resource-manager] RunCommands
 2018-06-01 (#2935)

* Generated from 8d08b9c279f07fa5a919205934fd785e329dad64

RunCommands 2018-06-01

* Generated from 9c64257f21823a1d72ec25cd640375f0100638e2

Take examples from 2018-04-01
---
 .../mgmt/compute/compute_management_client.py |   3 +
 .../v2018_06_01/compute_management_client.py  |   5 +
 .../compute/v2018_06_01/models/__init__.py    |  20 +++
 .../models/run_command_document.py            |  61 +++++++
 .../models/run_command_document_base.py       |  56 ++++++
 .../models/run_command_document_base_paged.py |  27 +++
 .../models/run_command_document_base_py3.py   |  56 ++++++
 .../models/run_command_document_py3.py        |  61 +++++++
 .../v2018_06_01/models/run_command_input.py   |  44 +++++
 .../models/run_command_input_parameter.py     |  39 ++++
 .../models/run_command_input_parameter_py3.py |  39 ++++
 .../models/run_command_input_py3.py           |  44 +++++
 .../run_command_parameter_definition.py       |  48 +++++
 .../run_command_parameter_definition_py3.py   |  48 +++++
 .../v2018_06_01/models/run_command_result.py  |  29 +++
 .../models/run_command_result_py3.py          |  29 +++
 .../v2018_06_01/operations/__init__.py        |   2 +
 ...virtual_machine_run_commands_operations.py | 168 ++++++++++++++++++
 ...irtual_machine_scale_set_vms_operations.py | 105 +++++++++++
 .../operations/virtual_machines_operations.py | 101 +++++++++++
 20 files changed, 985 insertions(+)
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_document.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_document_base.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_document_base_paged.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_document_base_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_document_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_input.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_input_parameter.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_input_parameter_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_input_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_parameter_definition.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_parameter_definition_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_result.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_result_py3.py
 create mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_run_commands_operations.py

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 d81ad13372e9..b8853ddfdfbb 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py
@@ -467,6 +467,7 @@ def virtual_machine_run_commands(self):
            * 2017-03-30: :class:`VirtualMachineRunCommandsOperations<azure.mgmt.compute.v2017_03_30.operations.VirtualMachineRunCommandsOperations>`
            * 2017-12-01: :class:`VirtualMachineRunCommandsOperations<azure.mgmt.compute.v2017_12_01.operations.VirtualMachineRunCommandsOperations>`
            * 2018-04-01: :class:`VirtualMachineRunCommandsOperations<azure.mgmt.compute.v2018_04_01.operations.VirtualMachineRunCommandsOperations>`
+           * 2018-06-01: :class:`VirtualMachineRunCommandsOperations<azure.mgmt.compute.v2018_06_01.operations.VirtualMachineRunCommandsOperations>`
         """
         api_version = self._get_api_version('virtual_machine_run_commands')
         if api_version == '2017-03-30':
@@ -475,6 +476,8 @@ def virtual_machine_run_commands(self):
             from .v2017_12_01.operations import VirtualMachineRunCommandsOperations as OperationClass
         elif api_version == '2018-04-01':
             from .v2018_04_01.operations import VirtualMachineRunCommandsOperations as OperationClass
+        elif api_version == '2018-06-01':
+            from .v2018_06_01.operations import VirtualMachineRunCommandsOperations 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/v2018_06_01/compute_management_client.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/compute_management_client.py
index ea3dc47fbf80..4d182b701b72 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
@@ -27,6 +27,7 @@
 from .operations.virtual_machine_scale_set_rolling_upgrades_operations import VirtualMachineScaleSetRollingUpgradesOperations
 from .operations.virtual_machine_scale_set_vms_operations import VirtualMachineScaleSetVMsOperations
 from .operations.log_analytics_operations import LogAnalyticsOperations
+from .operations.virtual_machine_run_commands_operations import VirtualMachineRunCommandsOperations
 from .operations.galleries_operations import GalleriesOperations
 from .operations.gallery_images_operations import GalleryImagesOperations
 from .operations.gallery_image_versions_operations import GalleryImageVersionsOperations
@@ -101,6 +102,8 @@ class ComputeManagementClient(SDKClient):
     :vartype virtual_machine_scale_set_vms: azure.mgmt.compute.v2018_06_01.operations.VirtualMachineScaleSetVMsOperations
     :ivar log_analytics: LogAnalytics operations
     :vartype log_analytics: azure.mgmt.compute.v2018_06_01.operations.LogAnalyticsOperations
+    :ivar virtual_machine_run_commands: VirtualMachineRunCommands operations
+    :vartype virtual_machine_run_commands: azure.mgmt.compute.v2018_06_01.operations.VirtualMachineRunCommandsOperations
     :ivar galleries: Galleries operations
     :vartype galleries: azure.mgmt.compute.v2018_06_01.operations.GalleriesOperations
     :ivar gallery_images: GalleryImages operations
@@ -157,6 +160,8 @@ def __init__(
             self._client, self.config, self._serialize, self._deserialize)
         self.log_analytics = LogAnalyticsOperations(
             self._client, self.config, self._serialize, self._deserialize)
+        self.virtual_machine_run_commands = VirtualMachineRunCommandsOperations(
+            self._client, self.config, self._serialize, self._deserialize)
         self.galleries = GalleriesOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.gallery_images = GalleryImagesOperations(
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 019a19c87ece..2d1d285f58b5 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
@@ -132,6 +132,12 @@
     from .log_analytics_input_base_py3 import LogAnalyticsInputBase
     from .log_analytics_output_py3 import LogAnalyticsOutput
     from .log_analytics_operation_result_py3 import LogAnalyticsOperationResult
+    from .run_command_input_parameter_py3 import RunCommandInputParameter
+    from .run_command_input_py3 import RunCommandInput
+    from .run_command_parameter_definition_py3 import RunCommandParameterDefinition
+    from .run_command_document_base_py3 import RunCommandDocumentBase
+    from .run_command_document_py3 import RunCommandDocument
+    from .run_command_result_py3 import RunCommandResult
     from .gallery_identifier_py3 import GalleryIdentifier
     from .gallery_py3 import Gallery
     from .gallery_image_identifier_py3 import GalleryImageIdentifier
@@ -274,6 +280,12 @@
     from .log_analytics_input_base import LogAnalyticsInputBase
     from .log_analytics_output import LogAnalyticsOutput
     from .log_analytics_operation_result import LogAnalyticsOperationResult
+    from .run_command_input_parameter import RunCommandInputParameter
+    from .run_command_input import RunCommandInput
+    from .run_command_parameter_definition import RunCommandParameterDefinition
+    from .run_command_document_base import RunCommandDocumentBase
+    from .run_command_document import RunCommandDocument
+    from .run_command_result import RunCommandResult
     from .gallery_identifier import GalleryIdentifier
     from .gallery import Gallery
     from .gallery_image_identifier import GalleryImageIdentifier
@@ -304,6 +316,7 @@
 from .upgrade_operation_historical_status_info_paged import UpgradeOperationHistoricalStatusInfoPaged
 from .virtual_machine_scale_set_extension_paged import VirtualMachineScaleSetExtensionPaged
 from .virtual_machine_scale_set_vm_paged import VirtualMachineScaleSetVMPaged
+from .run_command_document_base_paged import RunCommandDocumentBasePaged
 from .gallery_paged import GalleryPaged
 from .gallery_image_paged import GalleryImagePaged
 from .gallery_image_version_paged import GalleryImageVersionPaged
@@ -462,6 +475,12 @@
     'LogAnalyticsInputBase',
     'LogAnalyticsOutput',
     'LogAnalyticsOperationResult',
+    'RunCommandInputParameter',
+    'RunCommandInput',
+    'RunCommandParameterDefinition',
+    'RunCommandDocumentBase',
+    'RunCommandDocument',
+    'RunCommandResult',
     'GalleryIdentifier',
     'Gallery',
     'GalleryImageIdentifier',
@@ -492,6 +511,7 @@
     'UpgradeOperationHistoricalStatusInfoPaged',
     'VirtualMachineScaleSetExtensionPaged',
     'VirtualMachineScaleSetVMPaged',
+    'RunCommandDocumentBasePaged',
     'GalleryPaged',
     'GalleryImagePaged',
     'GalleryImageVersionPaged',
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_document.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_document.py
new file mode 100644
index 000000000000..c4f94125b69b
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_document.py
@@ -0,0 +1,61 @@
+# 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 .run_command_document_base import RunCommandDocumentBase
+
+
+class RunCommandDocument(RunCommandDocumentBase):
+    """Describes the properties of a Run Command.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param schema: Required. The VM run command schema.
+    :type schema: str
+    :param id: Required. The VM run command id.
+    :type id: str
+    :param os_type: Required. The Operating System type. Possible values
+     include: 'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.OperatingSystemTypes
+    :param label: Required. The VM run command label.
+    :type label: str
+    :param description: Required. The VM run command description.
+    :type description: str
+    :param script: Required. The script to be executed.
+    :type script: list[str]
+    :param parameters: The parameters used by the script.
+    :type parameters:
+     list[~azure.mgmt.compute.v2018_06_01.models.RunCommandParameterDefinition]
+    """
+
+    _validation = {
+        'schema': {'required': True},
+        'id': {'required': True},
+        'os_type': {'required': True},
+        'label': {'required': True},
+        'description': {'required': True},
+        'script': {'required': True},
+    }
+
+    _attribute_map = {
+        'schema': {'key': '$schema', 'type': 'str'},
+        'id': {'key': 'id', 'type': 'str'},
+        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
+        'label': {'key': 'label', 'type': 'str'},
+        'description': {'key': 'description', 'type': 'str'},
+        'script': {'key': 'script', 'type': '[str]'},
+        'parameters': {'key': 'parameters', 'type': '[RunCommandParameterDefinition]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RunCommandDocument, self).__init__(**kwargs)
+        self.script = kwargs.get('script', None)
+        self.parameters = kwargs.get('parameters', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_document_base.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_document_base.py
new file mode 100644
index 000000000000..194bd6703d71
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_document_base.py
@@ -0,0 +1,56 @@
+# 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 RunCommandDocumentBase(Model):
+    """Describes the properties of a Run Command metadata.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param schema: Required. The VM run command schema.
+    :type schema: str
+    :param id: Required. The VM run command id.
+    :type id: str
+    :param os_type: Required. The Operating System type. Possible values
+     include: 'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.OperatingSystemTypes
+    :param label: Required. The VM run command label.
+    :type label: str
+    :param description: Required. The VM run command description.
+    :type description: str
+    """
+
+    _validation = {
+        'schema': {'required': True},
+        'id': {'required': True},
+        'os_type': {'required': True},
+        'label': {'required': True},
+        'description': {'required': True},
+    }
+
+    _attribute_map = {
+        'schema': {'key': '$schema', 'type': 'str'},
+        'id': {'key': 'id', 'type': 'str'},
+        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
+        'label': {'key': 'label', 'type': 'str'},
+        'description': {'key': 'description', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RunCommandDocumentBase, self).__init__(**kwargs)
+        self.schema = kwargs.get('schema', None)
+        self.id = kwargs.get('id', None)
+        self.os_type = kwargs.get('os_type', None)
+        self.label = kwargs.get('label', None)
+        self.description = kwargs.get('description', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_document_base_paged.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_document_base_paged.py
new file mode 100644
index 000000000000..59eee10b12bf
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_document_base_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 RunCommandDocumentBasePaged(Paged):
+    """
+    A paging container for iterating over a list of :class:`RunCommandDocumentBase <azure.mgmt.compute.v2018_06_01.models.RunCommandDocumentBase>` object
+    """
+
+    _attribute_map = {
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+        'current_page': {'key': 'value', 'type': '[RunCommandDocumentBase]'}
+    }
+
+    def __init__(self, *args, **kwargs):
+
+        super(RunCommandDocumentBasePaged, self).__init__(*args, **kwargs)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_document_base_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_document_base_py3.py
new file mode 100644
index 000000000000..e82b42e4328d
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_document_base_py3.py
@@ -0,0 +1,56 @@
+# 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 RunCommandDocumentBase(Model):
+    """Describes the properties of a Run Command metadata.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param schema: Required. The VM run command schema.
+    :type schema: str
+    :param id: Required. The VM run command id.
+    :type id: str
+    :param os_type: Required. The Operating System type. Possible values
+     include: 'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.OperatingSystemTypes
+    :param label: Required. The VM run command label.
+    :type label: str
+    :param description: Required. The VM run command description.
+    :type description: str
+    """
+
+    _validation = {
+        'schema': {'required': True},
+        'id': {'required': True},
+        'os_type': {'required': True},
+        'label': {'required': True},
+        'description': {'required': True},
+    }
+
+    _attribute_map = {
+        'schema': {'key': '$schema', 'type': 'str'},
+        'id': {'key': 'id', 'type': 'str'},
+        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
+        'label': {'key': 'label', 'type': 'str'},
+        'description': {'key': 'description', 'type': 'str'},
+    }
+
+    def __init__(self, *, schema: str, id: str, os_type, label: str, description: str, **kwargs) -> None:
+        super(RunCommandDocumentBase, self).__init__(**kwargs)
+        self.schema = schema
+        self.id = id
+        self.os_type = os_type
+        self.label = label
+        self.description = description
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_document_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_document_py3.py
new file mode 100644
index 000000000000..698a77668818
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_document_py3.py
@@ -0,0 +1,61 @@
+# 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 .run_command_document_base_py3 import RunCommandDocumentBase
+
+
+class RunCommandDocument(RunCommandDocumentBase):
+    """Describes the properties of a Run Command.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param schema: Required. The VM run command schema.
+    :type schema: str
+    :param id: Required. The VM run command id.
+    :type id: str
+    :param os_type: Required. The Operating System type. Possible values
+     include: 'Windows', 'Linux'
+    :type os_type: str or
+     ~azure.mgmt.compute.v2018_06_01.models.OperatingSystemTypes
+    :param label: Required. The VM run command label.
+    :type label: str
+    :param description: Required. The VM run command description.
+    :type description: str
+    :param script: Required. The script to be executed.
+    :type script: list[str]
+    :param parameters: The parameters used by the script.
+    :type parameters:
+     list[~azure.mgmt.compute.v2018_06_01.models.RunCommandParameterDefinition]
+    """
+
+    _validation = {
+        'schema': {'required': True},
+        'id': {'required': True},
+        'os_type': {'required': True},
+        'label': {'required': True},
+        'description': {'required': True},
+        'script': {'required': True},
+    }
+
+    _attribute_map = {
+        'schema': {'key': '$schema', 'type': 'str'},
+        'id': {'key': 'id', 'type': 'str'},
+        'os_type': {'key': 'osType', 'type': 'OperatingSystemTypes'},
+        'label': {'key': 'label', 'type': 'str'},
+        'description': {'key': 'description', 'type': 'str'},
+        'script': {'key': 'script', 'type': '[str]'},
+        'parameters': {'key': 'parameters', 'type': '[RunCommandParameterDefinition]'},
+    }
+
+    def __init__(self, *, schema: str, id: str, os_type, label: str, description: str, script, parameters=None, **kwargs) -> None:
+        super(RunCommandDocument, self).__init__(schema=schema, id=id, os_type=os_type, label=label, description=description, **kwargs)
+        self.script = script
+        self.parameters = parameters
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_input.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_input.py
new file mode 100644
index 000000000000..90dd6d6a5c1f
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_input.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 RunCommandInput(Model):
+    """Capture Virtual Machine parameters.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param command_id: Required. The run command id.
+    :type command_id: str
+    :param script: Optional. The script to be executed.  When this value is
+     given, the given script will override the default script of the command.
+    :type script: list[str]
+    :param parameters: The run command parameters.
+    :type parameters:
+     list[~azure.mgmt.compute.v2018_06_01.models.RunCommandInputParameter]
+    """
+
+    _validation = {
+        'command_id': {'required': True},
+    }
+
+    _attribute_map = {
+        'command_id': {'key': 'commandId', 'type': 'str'},
+        'script': {'key': 'script', 'type': '[str]'},
+        'parameters': {'key': 'parameters', 'type': '[RunCommandInputParameter]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RunCommandInput, self).__init__(**kwargs)
+        self.command_id = kwargs.get('command_id', None)
+        self.script = kwargs.get('script', None)
+        self.parameters = kwargs.get('parameters', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_input_parameter.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_input_parameter.py
new file mode 100644
index 000000000000..cd76ad81bfa2
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_input_parameter.py
@@ -0,0 +1,39 @@
+# 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 RunCommandInputParameter(Model):
+    """Describes the properties of a run command parameter.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: Required. The run command parameter name.
+    :type name: str
+    :param value: Required. The run command parameter value.
+    :type value: str
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'value': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'value': {'key': 'value', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RunCommandInputParameter, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.value = kwargs.get('value', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_input_parameter_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_input_parameter_py3.py
new file mode 100644
index 000000000000..6013f038a1c3
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_input_parameter_py3.py
@@ -0,0 +1,39 @@
+# 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 RunCommandInputParameter(Model):
+    """Describes the properties of a run command parameter.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: Required. The run command parameter name.
+    :type name: str
+    :param value: Required. The run command parameter value.
+    :type value: str
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'value': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'value': {'key': 'value', 'type': 'str'},
+    }
+
+    def __init__(self, *, name: str, value: str, **kwargs) -> None:
+        super(RunCommandInputParameter, self).__init__(**kwargs)
+        self.name = name
+        self.value = value
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_input_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_input_py3.py
new file mode 100644
index 000000000000..cb2c7da12b4c
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_input_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 RunCommandInput(Model):
+    """Capture Virtual Machine parameters.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param command_id: Required. The run command id.
+    :type command_id: str
+    :param script: Optional. The script to be executed.  When this value is
+     given, the given script will override the default script of the command.
+    :type script: list[str]
+    :param parameters: The run command parameters.
+    :type parameters:
+     list[~azure.mgmt.compute.v2018_06_01.models.RunCommandInputParameter]
+    """
+
+    _validation = {
+        'command_id': {'required': True},
+    }
+
+    _attribute_map = {
+        'command_id': {'key': 'commandId', 'type': 'str'},
+        'script': {'key': 'script', 'type': '[str]'},
+        'parameters': {'key': 'parameters', 'type': '[RunCommandInputParameter]'},
+    }
+
+    def __init__(self, *, command_id: str, script=None, parameters=None, **kwargs) -> None:
+        super(RunCommandInput, self).__init__(**kwargs)
+        self.command_id = command_id
+        self.script = script
+        self.parameters = parameters
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_parameter_definition.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_parameter_definition.py
new file mode 100644
index 000000000000..e09f774d8241
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_parameter_definition.py
@@ -0,0 +1,48 @@
+# 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 RunCommandParameterDefinition(Model):
+    """Describes the properties of a run command parameter.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: Required. The run command parameter name.
+    :type name: str
+    :param type: Required. The run command parameter type.
+    :type type: str
+    :param default_value: The run command parameter default value.
+    :type default_value: str
+    :param required: The run command parameter required. Default value: False
+     .
+    :type required: bool
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'type': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'default_value': {'key': 'defaultValue', 'type': 'str'},
+        'required': {'key': 'required', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RunCommandParameterDefinition, self).__init__(**kwargs)
+        self.name = kwargs.get('name', None)
+        self.type = kwargs.get('type', None)
+        self.default_value = kwargs.get('default_value', None)
+        self.required = kwargs.get('required', False)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_parameter_definition_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_parameter_definition_py3.py
new file mode 100644
index 000000000000..e5fbc708f965
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_parameter_definition_py3.py
@@ -0,0 +1,48 @@
+# 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 RunCommandParameterDefinition(Model):
+    """Describes the properties of a run command parameter.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param name: Required. The run command parameter name.
+    :type name: str
+    :param type: Required. The run command parameter type.
+    :type type: str
+    :param default_value: The run command parameter default value.
+    :type default_value: str
+    :param required: The run command parameter required. Default value: False
+     .
+    :type required: bool
+    """
+
+    _validation = {
+        'name': {'required': True},
+        'type': {'required': True},
+    }
+
+    _attribute_map = {
+        'name': {'key': 'name', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'str'},
+        'default_value': {'key': 'defaultValue', 'type': 'str'},
+        'required': {'key': 'required', 'type': 'bool'},
+    }
+
+    def __init__(self, *, name: str, type: str, default_value: str=None, required: bool=False, **kwargs) -> None:
+        super(RunCommandParameterDefinition, self).__init__(**kwargs)
+        self.name = name
+        self.type = type
+        self.default_value = default_value
+        self.required = required
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_result.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_result.py
new file mode 100644
index 000000000000..927839a4451b
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_result.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 RunCommandResult(Model):
+    """RunCommandResult.
+
+    :param value: Run command operation response.
+    :type value:
+     list[~azure.mgmt.compute.v2018_06_01.models.InstanceViewStatus]
+    """
+
+    _attribute_map = {
+        'value': {'key': 'value', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(RunCommandResult, self).__init__(**kwargs)
+        self.value = kwargs.get('value', None)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_result_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_result_py3.py
new file mode 100644
index 000000000000..bf0e76643ad6
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/run_command_result_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 RunCommandResult(Model):
+    """RunCommandResult.
+
+    :param value: Run command operation response.
+    :type value:
+     list[~azure.mgmt.compute.v2018_06_01.models.InstanceViewStatus]
+    """
+
+    _attribute_map = {
+        'value': {'key': 'value', 'type': '[InstanceViewStatus]'},
+    }
+
+    def __init__(self, *, value=None, **kwargs) -> None:
+        super(RunCommandResult, self).__init__(**kwargs)
+        self.value = value
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 8700f11026cf..7f77ecf69132 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
@@ -23,6 +23,7 @@
 from .virtual_machine_scale_set_rolling_upgrades_operations import VirtualMachineScaleSetRollingUpgradesOperations
 from .virtual_machine_scale_set_vms_operations import VirtualMachineScaleSetVMsOperations
 from .log_analytics_operations import LogAnalyticsOperations
+from .virtual_machine_run_commands_operations import VirtualMachineRunCommandsOperations
 from .galleries_operations import GalleriesOperations
 from .gallery_images_operations import GalleryImagesOperations
 from .gallery_image_versions_operations import GalleryImageVersionsOperations
@@ -42,6 +43,7 @@
     'VirtualMachineScaleSetRollingUpgradesOperations',
     'VirtualMachineScaleSetVMsOperations',
     'LogAnalyticsOperations',
+    'VirtualMachineRunCommandsOperations',
     'GalleriesOperations',
     'GalleryImagesOperations',
     'GalleryImageVersionsOperations',
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_run_commands_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_run_commands_operations.py
new file mode 100644
index 000000000000..02c71c658dc6
--- /dev/null
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_run_commands_operations.py
@@ -0,0 +1,168 @@
+# 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 .. import models
+
+
+class VirtualMachineRunCommandsOperations(object):
+    """VirtualMachineRunCommandsOperations 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 list(
+            self, location, custom_headers=None, raw=False, **operation_config):
+        """Lists all available run commands for a subscription in a location.
+
+        :param location: The location upon which run commands is queried.
+        :type location: 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 RunCommandDocumentBase
+        :rtype:
+         ~azure.mgmt.compute.v2018_06_01.models.RunCommandDocumentBasePaged[~azure.mgmt.compute.v2018_06_01.models.RunCommandDocumentBase]
+        :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 = {
+                    'location': self._serialize.url("location", location, 'str', pattern=r'^[-\w\._]+$'),
+                    '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['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 and send request
+            request = self._client.get(url, query_parameters)
+            response = self._client.send(
+                request, header_parameters, 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.RunCommandDocumentBasePaged(internal_paging, self._deserialize.dependencies)
+
+        if raw:
+            header_dict = {}
+            client_raw_response = models.RunCommandDocumentBasePaged(internal_paging, self._deserialize.dependencies, header_dict)
+            return client_raw_response
+
+        return deserialized
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/runCommands'}
+
+    def get(
+            self, location, command_id, custom_headers=None, raw=False, **operation_config):
+        """Gets specific run command for a subscription in a location.
+
+        :param location: The location upon which run commands is queried.
+        :type location: str
+        :param command_id: The command id.
+        :type command_id: 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: RunCommandDocument or ClientRawResponse if raw=true
+        :rtype: ~azure.mgmt.compute.v2018_06_01.models.RunCommandDocument or
+         ~msrest.pipeline.ClientRawResponse
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        # Construct URL
+        url = self.get.metadata['url']
+        path_format_arguments = {
+            'location': self._serialize.url("location", location, 'str', pattern=r'^[-\w\._]+$'),
+            'commandId': self._serialize.url("command_id", command_id, '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 = {}
+        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 and send request
+        request = self._client.get(url, query_parameters)
+        response = self._client.send(request, header_parameters, 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('RunCommandDocument', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Compute/locations/{location}/runCommands/{commandId}'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_set_vms_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_set_vms_operations.py
index 41305faab6a4..482195142987 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_set_vms_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_set_vms_operations.py
@@ -1129,3 +1129,108 @@ def get_long_running_output(response):
         else: polling_method = polling
         return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
     perform_maintenance.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/performMaintenance'}
+
+
+    def _run_command_initial(
+            self, resource_group_name, vm_scale_set_name, instance_id, parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.run_command.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'),
+            'instanceId': self._serialize.url("instance_id", instance_id, '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 = {}
+        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(parameters, 'RunCommandInput')
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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('RunCommandResult', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def run_command(
+            self, resource_group_name, vm_scale_set_name, instance_id, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Run command on a virtual machine in a VM scale set.
+
+        :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 instance_id: The instance ID of the virtual machine.
+        :type instance_id: str
+        :param parameters: Parameters supplied to the Run command operation.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_06_01.models.RunCommandInput
+        :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 RunCommandResult or
+         ClientRawResponse<RunCommandResult> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.RunCommandResult]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.RunCommandResult]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._run_command_initial(
+            resource_group_name=resource_group_name,
+            vm_scale_set_name=vm_scale_set_name,
+            instance_id=instance_id,
+            parameters=parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('RunCommandResult', 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)
+    run_command.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachineScaleSets/{vmScaleSetName}/virtualmachines/{instanceId}/runCommand'}
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machines_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machines_operations.py
index 53c36ce96535..e113d0aedbb2 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machines_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machines_operations.py
@@ -1391,3 +1391,104 @@ def get_long_running_output(response):
         else: polling_method = polling
         return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
     perform_maintenance.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/performMaintenance'}
+
+
+    def _run_command_initial(
+            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, **operation_config):
+        # Construct URL
+        url = self.run_command.metadata['url']
+        path_format_arguments = {
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
+            'vmName': self._serialize.url("vm_name", vm_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 = {}
+        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(parameters, 'RunCommandInput')
+
+        # Construct and send request
+        request = self._client.post(url, query_parameters)
+        response = self._client.send(
+            request, header_parameters, body_content, 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('RunCommandResult', response)
+
+        if raw:
+            client_raw_response = ClientRawResponse(deserialized, response)
+            return client_raw_response
+
+        return deserialized
+
+    def run_command(
+            self, resource_group_name, vm_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
+        """Run command on the VM.
+
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
+        :param vm_name: The name of the virtual machine.
+        :type vm_name: str
+        :param parameters: Parameters supplied to the Run command operation.
+        :type parameters:
+         ~azure.mgmt.compute.v2018_06_01.models.RunCommandInput
+        :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 RunCommandResult or
+         ClientRawResponse<RunCommandResult> if raw==True
+        :rtype:
+         ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.compute.v2018_06_01.models.RunCommandResult]
+         or
+         ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.compute.v2018_06_01.models.RunCommandResult]]
+        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        """
+        raw_result = self._run_command_initial(
+            resource_group_name=resource_group_name,
+            vm_name=vm_name,
+            parameters=parameters,
+            custom_headers=custom_headers,
+            raw=True,
+            **operation_config
+        )
+
+        def get_long_running_output(response):
+            deserialized = self._deserialize('RunCommandResult', 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)
+    run_command.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/runCommand'}

From 219480cf62bbf8fb9ffbb2da5e8060d95813f95c Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Thu, 19 Jul 2018 17:03:45 -0700
Subject: [PATCH 24/29] Generated from 8f17cd0bc03fad3ed3a5259ec37e9add84ff73a7
 (#2965)

Fixing instance view object definition in VMSSVMProperties
---
 .../mgmt/compute/v2015_06_15/models/__init__.py      |  6 +++---
 .../models/virtual_machine_scale_set_vm.py           |  4 ++--
 .../models/virtual_machine_scale_set_vm_py3.py       |  4 ++--
 .../mgmt/compute/v2016_03_30/models/__init__.py      |  6 +++---
 .../models/virtual_machine_scale_set_vm.py           |  4 ++--
 .../models/virtual_machine_scale_set_vm_py3.py       |  4 ++--
 .../compute/v2016_04_30_preview/models/__init__.py   |  6 +++---
 .../models/virtual_machine_scale_set_vm.py           |  4 ++--
 .../models/virtual_machine_scale_set_vm_py3.py       |  4 ++--
 .../mgmt/compute/v2017_03_30/models/__init__.py      |  6 +++---
 .../models/virtual_machine_scale_set_vm.py           |  4 ++--
 .../models/virtual_machine_scale_set_vm_py3.py       |  4 ++--
 .../mgmt/compute/v2017_12_01/models/__init__.py      | 12 ++++++------
 .../compute/v2017_12_01/models/virtual_machine.py    |  4 ++--
 .../v2017_12_01/models/virtual_machine_py3.py        |  4 ++--
 .../v2017_12_01/models/virtual_machine_update.py     |  4 ++--
 .../v2017_12_01/models/virtual_machine_update_py3.py |  4 ++--
 .../mgmt/compute/v2018_04_01/models/__init__.py      |  6 +++---
 .../models/virtual_machine_scale_set_vm.py           |  4 ++--
 .../models/virtual_machine_scale_set_vm_py3.py       |  4 ++--
 .../mgmt/compute/v2018_06_01/models/__init__.py      |  6 +++---
 .../models/virtual_machine_scale_set_vm.py           |  4 ++--
 .../models/virtual_machine_scale_set_vm_py3.py       |  4 ++--
 23 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/__init__.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/__init__.py
index 96f7a34ac2e1..bcfde62fcd03 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/__init__.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/__init__.py
@@ -78,8 +78,8 @@
     from .virtual_machine_scale_set_instance_view_py3 import VirtualMachineScaleSetInstanceView
     from .virtual_machine_scale_set_sku_capacity_py3 import VirtualMachineScaleSetSkuCapacity
     from .virtual_machine_scale_set_sku_py3 import VirtualMachineScaleSetSku
-    from .virtual_machine_scale_set_vm_py3 import VirtualMachineScaleSetVM
     from .virtual_machine_scale_set_vm_instance_view_py3 import VirtualMachineScaleSetVMInstanceView
+    from .virtual_machine_scale_set_vm_py3 import VirtualMachineScaleSetVM
     from .api_error_base_py3 import ApiErrorBase
     from .inner_error_py3 import InnerError
     from .api_error_py3 import ApiError
@@ -156,8 +156,8 @@
     from .virtual_machine_scale_set_instance_view import VirtualMachineScaleSetInstanceView
     from .virtual_machine_scale_set_sku_capacity import VirtualMachineScaleSetSkuCapacity
     from .virtual_machine_scale_set_sku import VirtualMachineScaleSetSku
-    from .virtual_machine_scale_set_vm import VirtualMachineScaleSetVM
     from .virtual_machine_scale_set_vm_instance_view import VirtualMachineScaleSetVMInstanceView
+    from .virtual_machine_scale_set_vm import VirtualMachineScaleSetVM
     from .api_error_base import ApiErrorBase
     from .inner_error import InnerError
     from .api_error import ApiError
@@ -256,8 +256,8 @@
     'VirtualMachineScaleSetInstanceView',
     'VirtualMachineScaleSetSkuCapacity',
     'VirtualMachineScaleSetSku',
-    'VirtualMachineScaleSetVM',
     'VirtualMachineScaleSetVMInstanceView',
+    'VirtualMachineScaleSetVM',
     'ApiErrorBase',
     'InnerError',
     'ApiError',
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_scale_set_vm.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_scale_set_vm.py
index e6022b62cddf..339788ff3659 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_scale_set_vm.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_scale_set_vm.py
@@ -39,7 +39,7 @@ class VirtualMachineScaleSetVM(Resource):
     :vartype latest_model_applied: bool
     :ivar instance_view: The virtual machine instance view.
     :vartype instance_view:
-     ~azure.mgmt.compute.v2015_06_15.models.VirtualMachineInstanceView
+     ~azure.mgmt.compute.v2015_06_15.models.VirtualMachineScaleSetVMInstanceView
     :param hardware_profile: Specifies the hardware settings for the virtual
      machine.
     :type hardware_profile:
@@ -118,7 +118,7 @@ class VirtualMachineScaleSetVM(Resource):
         'instance_id': {'key': 'instanceId', 'type': 'str'},
         'sku': {'key': 'sku', 'type': 'Sku'},
         'latest_model_applied': {'key': 'properties.latestModelApplied', 'type': 'bool'},
-        '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/v2015_06_15/models/virtual_machine_scale_set_vm_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_scale_set_vm_py3.py
index 5d83f88fe97d..9988c1eded21 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_scale_set_vm_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/models/virtual_machine_scale_set_vm_py3.py
@@ -39,7 +39,7 @@ class VirtualMachineScaleSetVM(Resource):
     :vartype latest_model_applied: bool
     :ivar instance_view: The virtual machine instance view.
     :vartype instance_view:
-     ~azure.mgmt.compute.v2015_06_15.models.VirtualMachineInstanceView
+     ~azure.mgmt.compute.v2015_06_15.models.VirtualMachineScaleSetVMInstanceView
     :param hardware_profile: Specifies the hardware settings for the virtual
      machine.
     :type hardware_profile:
@@ -118,7 +118,7 @@ class VirtualMachineScaleSetVM(Resource):
         'instance_id': {'key': 'instanceId', 'type': 'str'},
         'sku': {'key': 'sku', 'type': 'Sku'},
         'latest_model_applied': {'key': 'properties.latestModelApplied', 'type': 'bool'},
-        '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/v2016_03_30/models/__init__.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/__init__.py
index ec069ff87f74..9b3919d10096 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/__init__.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/__init__.py
@@ -81,8 +81,8 @@
     from .virtual_machine_scale_set_instance_view_py3 import VirtualMachineScaleSetInstanceView
     from .virtual_machine_scale_set_sku_capacity_py3 import VirtualMachineScaleSetSkuCapacity
     from .virtual_machine_scale_set_sku_py3 import VirtualMachineScaleSetSku
-    from .virtual_machine_scale_set_vm_py3 import VirtualMachineScaleSetVM
     from .virtual_machine_scale_set_vm_instance_view_py3 import VirtualMachineScaleSetVMInstanceView
+    from .virtual_machine_scale_set_vm_py3 import VirtualMachineScaleSetVM
     from .api_error_base_py3 import ApiErrorBase
     from .inner_error_py3 import InnerError
     from .api_error_py3 import ApiError
@@ -162,8 +162,8 @@
     from .virtual_machine_scale_set_instance_view import VirtualMachineScaleSetInstanceView
     from .virtual_machine_scale_set_sku_capacity import VirtualMachineScaleSetSkuCapacity
     from .virtual_machine_scale_set_sku import VirtualMachineScaleSetSku
-    from .virtual_machine_scale_set_vm import VirtualMachineScaleSetVM
     from .virtual_machine_scale_set_vm_instance_view import VirtualMachineScaleSetVMInstanceView
+    from .virtual_machine_scale_set_vm import VirtualMachineScaleSetVM
     from .api_error_base import ApiErrorBase
     from .inner_error import InnerError
     from .api_error import ApiError
@@ -266,8 +266,8 @@
     'VirtualMachineScaleSetInstanceView',
     'VirtualMachineScaleSetSkuCapacity',
     'VirtualMachineScaleSetSku',
-    'VirtualMachineScaleSetVM',
     'VirtualMachineScaleSetVMInstanceView',
+    'VirtualMachineScaleSetVM',
     'ApiErrorBase',
     'InnerError',
     'ApiError',
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_scale_set_vm.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_scale_set_vm.py
index 5aeb889909f7..38b45e32ad35 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_scale_set_vm.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/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.v2016_03_30.models.VirtualMachineInstanceView
+     ~azure.mgmt.compute.v2016_03_30.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/v2016_03_30/models/virtual_machine_scale_set_vm_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_scale_set_vm_py3.py
index f759b6c80e4e..e0fda166e0eb 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/models/virtual_machine_scale_set_vm_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/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.v2016_03_30.models.VirtualMachineInstanceView
+     ~azure.mgmt.compute.v2016_03_30.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/v2016_04_30_preview/models/__init__.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/__init__.py
index 159cabb3d4e6..925ba8a919ba 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/__init__.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/__init__.py
@@ -88,8 +88,8 @@
     from .virtual_machine_scale_set_instance_view_py3 import VirtualMachineScaleSetInstanceView
     from .virtual_machine_scale_set_sku_capacity_py3 import VirtualMachineScaleSetSkuCapacity
     from .virtual_machine_scale_set_sku_py3 import VirtualMachineScaleSetSku
-    from .virtual_machine_scale_set_vm_py3 import VirtualMachineScaleSetVM
     from .virtual_machine_scale_set_vm_instance_view_py3 import VirtualMachineScaleSetVMInstanceView
+    from .virtual_machine_scale_set_vm_py3 import VirtualMachineScaleSetVM
     from .api_error_base_py3 import ApiErrorBase
     from .inner_error_py3 import InnerError
     from .api_error_py3 import ApiError
@@ -190,8 +190,8 @@
     from .virtual_machine_scale_set_instance_view import VirtualMachineScaleSetInstanceView
     from .virtual_machine_scale_set_sku_capacity import VirtualMachineScaleSetSkuCapacity
     from .virtual_machine_scale_set_sku import VirtualMachineScaleSetSku
-    from .virtual_machine_scale_set_vm import VirtualMachineScaleSetVM
     from .virtual_machine_scale_set_vm_instance_view import VirtualMachineScaleSetVMInstanceView
+    from .virtual_machine_scale_set_vm import VirtualMachineScaleSetVM
     from .api_error_base import ApiErrorBase
     from .inner_error import InnerError
     from .api_error import ApiError
@@ -322,8 +322,8 @@
     'VirtualMachineScaleSetInstanceView',
     'VirtualMachineScaleSetSkuCapacity',
     'VirtualMachineScaleSetSku',
-    'VirtualMachineScaleSetVM',
     'VirtualMachineScaleSetVMInstanceView',
+    'VirtualMachineScaleSetVM',
     'ApiErrorBase',
     'InnerError',
     'ApiError',
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_vm.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_vm.py
index b50a65c4da56..173d219b3c15 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_vm.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/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.v2016_04_30_preview.models.VirtualMachineInstanceView
+     ~azure.mgmt.compute.v2016_04_30_preview.models.VirtualMachineScaleSetVMInstanceView
     :param hardware_profile: Specifies the hardware settings for the virtual
      machine.
     :type hardware_profile:
@@ -124,7 +124,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/v2016_04_30_preview/models/virtual_machine_scale_set_vm_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_vm_py3.py
index f2a8ded088ed..54765ad93479 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/models/virtual_machine_scale_set_vm_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/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.v2016_04_30_preview.models.VirtualMachineInstanceView
+     ~azure.mgmt.compute.v2016_04_30_preview.models.VirtualMachineScaleSetVMInstanceView
     :param hardware_profile: Specifies the hardware settings for the virtual
      machine.
     :type hardware_profile:
@@ -124,7 +124,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_03_30/models/__init__.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/__init__.py
index a0c09b6b7dd5..828f7a8f7b29 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/__init__.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/__init__.py
@@ -107,9 +107,9 @@
     from .virtual_machine_scale_set_instance_view_py3 import VirtualMachineScaleSetInstanceView
     from .virtual_machine_scale_set_sku_capacity_py3 import VirtualMachineScaleSetSkuCapacity
     from .virtual_machine_scale_set_sku_py3 import VirtualMachineScaleSetSku
-    from .virtual_machine_scale_set_vm_py3 import VirtualMachineScaleSetVM
     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_progress_info_py3 import RollingUpgradeProgressInfo
     from .api_error_base_py3 import ApiErrorBase
@@ -239,9 +239,9 @@
     from .virtual_machine_scale_set_instance_view import VirtualMachineScaleSetInstanceView
     from .virtual_machine_scale_set_sku_capacity import VirtualMachineScaleSetSkuCapacity
     from .virtual_machine_scale_set_sku import VirtualMachineScaleSetSku
-    from .virtual_machine_scale_set_vm import VirtualMachineScaleSetVM
     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_progress_info import RollingUpgradeProgressInfo
     from .api_error_base import ApiErrorBase
@@ -411,9 +411,9 @@
     'VirtualMachineScaleSetInstanceView',
     'VirtualMachineScaleSetSkuCapacity',
     'VirtualMachineScaleSetSku',
-    'VirtualMachineScaleSetVM',
     'VirtualMachineHealthStatus',
     'VirtualMachineScaleSetVMInstanceView',
+    'VirtualMachineScaleSetVM',
     'RollingUpgradeRunningStatus',
     'RollingUpgradeProgressInfo',
     'ApiErrorBase',
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_vm.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_vm.py
index 8a36a7dff817..48df19e713c1 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_vm.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/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_03_30.models.VirtualMachineInstanceView
+     ~azure.mgmt.compute.v2017_03_30.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_03_30/models/virtual_machine_scale_set_vm_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_vm_py3.py
index 7a92604b6f19..f6c51321ed8f 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/models/virtual_machine_scale_set_vm_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/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_03_30.models.VirtualMachineInstanceView
+     ~azure.mgmt.compute.v2017_03_30.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/__init__.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/__init__.py
index 9f65b3c2c1e2..ace2f7aed980 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,6 +63,8 @@
     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
@@ -116,8 +118,6 @@
     from .upgrade_operation_historical_status_info_properties_py3 import UpgradeOperationHistoricalStatusInfoProperties
     from .upgrade_operation_historical_status_info_py3 import UpgradeOperationHistoricalStatusInfo
     from .virtual_machine_scale_set_vm_py3 import VirtualMachineScaleSetVM
-    from .virtual_machine_health_status_py3 import VirtualMachineHealthStatus
-    from .virtual_machine_scale_set_vm_instance_view_py3 import VirtualMachineScaleSetVMInstanceView
     from .rolling_upgrade_running_status_py3 import RollingUpgradeRunningStatus
     from .rolling_upgrade_status_info_py3 import RollingUpgradeStatusInfo
     from .compute_long_running_operation_properties_py3 import ComputeLongRunningOperationProperties
@@ -191,6 +191,8 @@
     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
@@ -244,8 +246,6 @@
     from .upgrade_operation_historical_status_info_properties import UpgradeOperationHistoricalStatusInfoProperties
     from .upgrade_operation_historical_status_info import UpgradeOperationHistoricalStatusInfo
     from .virtual_machine_scale_set_vm import VirtualMachineScaleSetVM
-    from .virtual_machine_health_status import VirtualMachineHealthStatus
-    from .virtual_machine_scale_set_vm_instance_view import VirtualMachineScaleSetVMInstanceView
     from .rolling_upgrade_running_status import RollingUpgradeRunningStatus
     from .rolling_upgrade_status_info import RollingUpgradeStatusInfo
     from .compute_long_running_operation_properties import ComputeLongRunningOperationProperties
@@ -358,6 +358,8 @@
     'VirtualMachineIdentity',
     'MaintenanceRedeployStatus',
     'VirtualMachineInstanceView',
+    'VirtualMachineHealthStatus',
+    'VirtualMachineScaleSetVMInstanceView',
     'VirtualMachine',
     'VirtualMachineUpdate',
     'AutoOSUpgradePolicy',
@@ -411,8 +413,6 @@
     'UpgradeOperationHistoricalStatusInfoProperties',
     'UpgradeOperationHistoricalStatusInfo',
     'VirtualMachineScaleSetVM',
-    'VirtualMachineHealthStatus',
-    'VirtualMachineScaleSetVMInstanceView',
     'RollingUpgradeRunningStatus',
     'RollingUpgradeStatusInfo',
     'ComputeLongRunningOperationProperties',
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 5810c1a09641..8f9d1a3bb872 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.VirtualMachineInstanceView
+     ~azure.mgmt.compute.v2017_12_01.models.VirtualMachineScaleSetVMInstanceView
     :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': 'VirtualMachineInstanceView'},
+        'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineScaleSetVMInstanceView'},
         '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 53a7270afebc..c3f1a274e98e 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.VirtualMachineInstanceView
+     ~azure.mgmt.compute.v2017_12_01.models.VirtualMachineScaleSetVMInstanceView
     :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': 'VirtualMachineInstanceView'},
+        'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineScaleSetVMInstanceView'},
         '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_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_update.py
index 710df35dad13..1d3cfde50468 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.VirtualMachineInstanceView
+     ~azure.mgmt.compute.v2017_12_01.models.VirtualMachineScaleSetVMInstanceView
     :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': 'VirtualMachineInstanceView'},
+        'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineScaleSetVMInstanceView'},
         '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 33abe81fdb0b..d90f69d892df 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.VirtualMachineInstanceView
+     ~azure.mgmt.compute.v2017_12_01.models.VirtualMachineScaleSetVMInstanceView
     :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': 'VirtualMachineInstanceView'},
+        'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineScaleSetVMInstanceView'},
         '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/__init__.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/__init__.py
index 0dddc66aae88..c88cde3dde9f 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/__init__.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/__init__.py
@@ -116,9 +116,9 @@
     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_scale_set_vm_py3 import VirtualMachineScaleSetVM
     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
     from .resource_py3 import Resource
@@ -257,9 +257,9 @@
     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_scale_set_vm import VirtualMachineScaleSetVM
     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
     from .resource import Resource
@@ -442,9 +442,9 @@
     'RollingUpgradeProgressInfo',
     'UpgradeOperationHistoricalStatusInfoProperties',
     'UpgradeOperationHistoricalStatusInfo',
-    'VirtualMachineScaleSetVM',
     'VirtualMachineHealthStatus',
     'VirtualMachineScaleSetVMInstanceView',
+    'VirtualMachineScaleSetVM',
     'RollingUpgradeRunningStatus',
     'RollingUpgradeStatusInfo',
     'Resource',
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm.py
index 5d88cc259a93..7ef0418661a4 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_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.v2018_04_01.models.VirtualMachineInstanceView
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVMInstanceView
     :param hardware_profile: Specifies the hardware settings for the virtual
      machine.
     :type hardware_profile:
@@ -126,7 +126,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/v2018_04_01/models/virtual_machine_scale_set_vm_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_py3.py
index ac05a0f168c4..5cbf3eae370e 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/virtual_machine_scale_set_vm_py3.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_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.v2018_04_01.models.VirtualMachineInstanceView
+     ~azure.mgmt.compute.v2018_04_01.models.VirtualMachineScaleSetVMInstanceView
     :param hardware_profile: Specifies the hardware settings for the virtual
      machine.
     :type hardware_profile:
@@ -126,7 +126,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/v2018_06_01/models/__init__.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/__init__.py
index 2d1d285f58b5..71cbc14a54ae 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
@@ -118,9 +118,9 @@
     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_scale_set_vm_py3 import VirtualMachineScaleSetVM
     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
     from .resource_py3 import Resource
@@ -266,9 +266,9 @@
     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_scale_set_vm import VirtualMachineScaleSetVM
     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
     from .resource import Resource
@@ -461,9 +461,9 @@
     'RollingUpgradeProgressInfo',
     'UpgradeOperationHistoricalStatusInfoProperties',
     'UpgradeOperationHistoricalStatusInfo',
-    'VirtualMachineScaleSetVM',
     'VirtualMachineHealthStatus',
     'VirtualMachineScaleSetVMInstanceView',
+    'VirtualMachineScaleSetVM',
     'RollingUpgradeRunningStatus',
     'RollingUpgradeStatusInfo',
     'Resource',
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 6d091cb02c35..503bd3c007fd 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
@@ -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.v2018_06_01.models.VirtualMachineInstanceView
+     ~azure.mgmt.compute.v2018_06_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/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 b995e2590f02..c64077b1c210 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
@@ -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.v2018_06_01.models.VirtualMachineInstanceView
+     ~azure.mgmt.compute.v2018_06_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'},

From d26c3a1dfa702193eb93703877e5db0fc1f4b3b4 Mon Sep 17 00:00:00 2001
From: Laurent Mazuel <laurent.mazuel@gmail.com>
Date: Fri, 20 Jul 2018 10:09:06 -0700
Subject: [PATCH 25/29] Fix multi api client

---
 .../mgmt/compute/compute_management_client.py   | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

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 b8853ddfdfbb..aba1f207f2bb 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.service_client import ServiceClient
+from msrest.service_client import SDKClient
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 
@@ -52,7 +52,7 @@ def __init__(
         self.subscription_id = subscription_id
 
 
-class ComputeManagementClient(MultiApiClientMixin):
+class ComputeManagementClient(MultiApiClientMixin, SDKClient):
     """Compute Client.
 
     This ready contains multiple API versions, to help you deal with all Azure clouds
@@ -60,7 +60,7 @@ class ComputeManagementClient(MultiApiClientMixin):
     By default, uses latest API version available on public Azure.
     For production, you should stick a particular api-version and/or profile.
     The profile sets a mapping between the operation group and an API version.
-    The api-version parameter sets the default API version if the operation 
+    The api-version parameter sets the default API version if the operation
     group is not described in the profile.
 
     :ivar config: Configuration for client.
@@ -93,17 +93,14 @@ class ComputeManagementClient(MultiApiClientMixin):
     )
 
     def __init__(self, credentials, subscription_id, api_version=None, base_url=None, profile=KnownProfiles.default):
+        self.config = ComputeManagementClientConfiguration(credentials, subscription_id, base_url)
         super(ComputeManagementClient, self).__init__(
-            credentials=credentials,
-            subscription_id=subscription_id,
+            credentials,
+            self.config,
             api_version=api_version,
-            base_url=base_url,
             profile=profile
         )
 
-        self.config = ComputeManagementClientConfiguration(credentials, subscription_id, base_url)
-        self._client = ServiceClient(self.config.credentials, self.config)
-
 ############ Generated from here ############
 
     @classmethod
@@ -148,7 +145,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:

From b45ffbeb81133e6725c28647bd9cff79425b4ca3 Mon Sep 17 00:00:00 2001
From: Laurent Mazuel <laurent.mazuel@gmail.com>
Date: Fri, 20 Jul 2018 11:57:12 -0700
Subject: [PATCH 26/29] Update Autorest min version for Compute

---
 .../mgmt/compute/compute_management_client.py |   4 +-
 .../availability_sets_operations.py           |  32 ++--
 .../operations/usage_operations.py            |   7 +-
 ...ual_machine_extension_images_operations.py |  18 +--
 .../virtual_machine_extensions_operations.py  |  24 +--
 .../virtual_machine_images_operations.py      |  30 ++--
 ...irtual_machine_scale_set_vms_operations.py |  65 ++++----
 .../virtual_machine_scale_sets_operations.py  | 101 ++++++------
 .../virtual_machine_sizes_operations.py       |   7 +-
 .../operations/virtual_machines_operations.py |  93 ++++++-----
 .../availability_sets_operations.py           |  39 +++--
 .../operations/usage_operations.py            |   7 +-
 ...ual_machine_extension_images_operations.py |  18 +--
 .../virtual_machine_extensions_operations.py  |  24 +--
 .../virtual_machine_images_operations.py      |  30 ++--
 ...irtual_machine_scale_set_vms_operations.py |  65 ++++----
 .../virtual_machine_scale_sets_operations.py  | 101 ++++++------
 .../virtual_machine_sizes_operations.py       |   7 +-
 .../operations/virtual_machines_operations.py |  99 ++++++------
 .../availability_sets_operations.py           |  39 +++--
 .../operations/disks_operations.py            |  52 +++----
 .../operations/images_operations.py           |  32 ++--
 .../operations/snapshots_operations.py        |  52 +++----
 .../operations/usage_operations.py            |   7 +-
 ...ual_machine_extension_images_operations.py |  18 +--
 .../virtual_machine_extensions_operations.py  |  24 +--
 .../virtual_machine_images_operations.py      |  30 ++--
 ...irtual_machine_scale_set_vms_operations.py |  73 +++++----
 .../virtual_machine_scale_sets_operations.py  | 109 +++++++------
 .../virtual_machine_sizes_operations.py       |   7 +-
 .../operations/virtual_machines_operations.py | 107 +++++++------
 .../availability_sets_operations.py           |  39 +++--
 .../operations/disks_operations.py            |  52 +++----
 .../operations/images_operations.py           |  32 ++--
 .../operations/resource_skus_operations.py    |   7 +-
 .../operations/snapshots_operations.py        |  52 +++----
 .../operations/usage_operations.py            |   7 +-
 ...ual_machine_extension_images_operations.py |  18 +--
 .../virtual_machine_extensions_operations.py  |  24 +--
 .../virtual_machine_images_operations.py      |  30 ++--
 ...virtual_machine_run_commands_operations.py |  13 +-
 ...machine_scale_set_extensions_operations.py |  25 ++-
 ...e_scale_set_rolling_upgrades_operations.py |  22 +--
 ...irtual_machine_scale_set_vms_operations.py |  73 +++++----
 .../virtual_machine_scale_sets_operations.py  | 115 +++++++-------
 .../virtual_machine_sizes_operations.py       |   7 +-
 .../operations/virtual_machines_operations.py | 129 ++++++++--------
 .../operations/resource_skus_operations.py    |   7 +-
 .../availability_sets_operations.py           |  45 +++---
 .../operations/images_operations.py           |  38 +++--
 .../operations/log_analytics_operations.py    |  16 +-
 .../v2017_12_01/operations/operations.py      |   7 +-
 .../operations/usage_operations.py            |   7 +-
 ...ual_machine_extension_images_operations.py |  18 +--
 .../virtual_machine_extensions_operations.py  |  24 +--
 .../virtual_machine_images_operations.py      |  30 ++--
 ...virtual_machine_run_commands_operations.py |  13 +-
 ...machine_scale_set_extensions_operations.py |  25 ++-
 ...e_scale_set_rolling_upgrades_operations.py |  22 +--
 ...irtual_machine_scale_set_vms_operations.py |  95 ++++++------
 .../virtual_machine_scale_sets_operations.py  | 144 +++++++++---------
 .../virtual_machine_sizes_operations.py       |   7 +-
 .../operations/virtual_machines_operations.py | 135 ++++++++--------
 .../availability_sets_operations.py           |  44 +++---
 .../operations/disks_operations.py            |  48 +++---
 .../operations/images_operations.py           |  37 +++--
 .../operations/log_analytics_operations.py    |  16 +-
 .../v2018_04_01/operations/operations.py      |   7 +-
 .../operations/snapshots_operations.py        |  48 +++---
 .../operations/usage_operations.py            |   7 +-
 ...ual_machine_extension_images_operations.py |  18 +--
 .../virtual_machine_extensions_operations.py  |  29 ++--
 .../virtual_machine_images_operations.py      |  30 ++--
 ...virtual_machine_run_commands_operations.py |  13 +-
 ...machine_scale_set_extensions_operations.py |  24 ++-
 ...e_scale_set_rolling_upgrades_operations.py |  16 +-
 ...irtual_machine_scale_set_vms_operations.py |  78 +++++-----
 .../virtual_machine_scale_sets_operations.py  | 113 ++++++--------
 .../virtual_machine_sizes_operations.py       |   7 +-
 .../operations/virtual_machines_operations.py | 106 ++++++-------
 .../availability_sets_operations.py           |  44 +++---
 .../operations/galleries_operations.py        |  31 ++--
 .../gallery_image_versions_operations.py      |  24 ++-
 .../operations/gallery_images_operations.py   |  24 ++-
 .../operations/images_operations.py           |  37 +++--
 .../operations/log_analytics_operations.py    |  16 +-
 .../v2018_06_01/operations/operations.py      |   7 +-
 .../operations/usage_operations.py            |   7 +-
 ...ual_machine_extension_images_operations.py |  18 +--
 .../virtual_machine_extensions_operations.py  |  29 ++--
 .../virtual_machine_images_operations.py      |  30 ++--
 ...virtual_machine_run_commands_operations.py |  13 +-
 ...machine_scale_set_extensions_operations.py |  24 ++-
 ...e_scale_set_rolling_upgrades_operations.py |  16 +-
 ...irtual_machine_scale_set_vms_operations.py |  78 +++++-----
 .../virtual_machine_scale_sets_operations.py  | 113 ++++++--------
 .../virtual_machine_sizes_operations.py       |   7 +-
 .../operations/virtual_machines_operations.py | 106 ++++++-------
 azure-mgmt-compute/setup.py                   |   1 +
 .../packaging_tools/templates/setup.py        |   1 +
 swagger_to_sdk_config.json                    |   2 +-
 101 files changed, 1834 insertions(+), 2034 deletions(-)

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 aba1f207f2bb..76776466d5d0 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py
@@ -80,7 +80,7 @@ class ComputeManagementClient(MultiApiClientMixin, SDKClient):
     :type profile: azure.profiles.KnownProfiles
     """
 
-    DEFAULT_API_VERSION = '2017-12-01'
+    DEFAULT_API_VERSION = '2018-06-01'
     _PROFILE_TAG = "azure.mgmt.compute.ComputeManagementClient"
     LATEST_PROFILE = ProfileDefinition({
         _PROFILE_TAG: {
@@ -145,7 +145,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:
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/availability_sets_operations.py
index 968b224ab676..2483918080ce 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/availability_sets_operations.py
@@ -74,6 +74,7 @@ def create_or_update(
 
         # 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())
@@ -86,9 +87,8 @@ def create_or_update(
         body_content = self._serialize.body(parameters, 'AvailabilitySet')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
@@ -140,7 +140,7 @@ def delete(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -149,8 +149,8 @@ def delete(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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, 204]:
             exp = CloudError(response)
@@ -202,7 +202,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -211,8 +211,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -268,7 +268,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -277,9 +277,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -340,7 +339,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -349,9 +348,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/usage_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/usage_operations.py
index 57aed11c304f..43e96cce9c08 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/usage_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/usage_operations.py
@@ -76,7 +76,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -85,9 +85,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_extension_images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_extension_images_operations.py
index 09017a98cde6..efabace1bf1b 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_extension_images_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_extension_images_operations.py
@@ -77,7 +77,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -86,8 +86,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -140,7 +140,7 @@ def list_types(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -149,8 +149,8 @@ def list_types(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -218,7 +218,7 @@ def list_versions(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -227,8 +227,8 @@ def list_versions(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_extensions_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_extensions_operations.py
index 6b56e4ee45e6..629ed38a0b41 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_extensions_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_extensions_operations.py
@@ -58,6 +58,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -70,9 +71,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(extension_parameters, 'VirtualMachineExtension')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -167,6 +167,7 @@ def _update_initial(
 
         # 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())
@@ -179,9 +180,8 @@ def _update_initial(
         body_content = self._serialize.body(extension_parameters, 'VirtualMachineExtensionUpdate')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
@@ -274,7 +274,7 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -283,8 +283,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -394,7 +394,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -403,8 +403,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_images_operations.py
index e339aff73761..f8dcedcfc530 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_images_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_images_operations.py
@@ -79,7 +79,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -88,8 +88,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -161,7 +161,7 @@ def list(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -170,8 +170,8 @@ def list(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -225,7 +225,7 @@ def list_offers(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -234,8 +234,8 @@ def list_offers(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -286,7 +286,7 @@ def list_publishers(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -295,8 +295,8 @@ def list_publishers(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -353,7 +353,7 @@ def list_skus(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -362,8 +362,8 @@ def list_skus(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_scale_set_vms_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_scale_set_vms_operations.py
index 66a9d41aed6e..20cc9568827e 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_scale_set_vms_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_scale_set_vms_operations.py
@@ -58,7 +58,7 @@ def _reimage_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -67,8 +67,8 @@ def _reimage_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -131,7 +131,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -156,7 +156,7 @@ def _deallocate_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -165,8 +165,8 @@ def _deallocate_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -231,7 +231,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -256,7 +256,7 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -265,8 +265,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -371,7 +371,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -380,8 +380,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -438,7 +438,7 @@ def get_instance_view(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -447,8 +447,8 @@ def get_instance_view(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -519,7 +519,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -528,9 +528,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -569,7 +568,7 @@ def _power_off_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -578,8 +577,8 @@ def _power_off_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -644,7 +643,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -669,7 +668,7 @@ def _restart_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -678,8 +677,8 @@ def _restart_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -741,7 +740,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -766,7 +765,7 @@ def _start_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -775,8 +774,8 @@ def _start_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -838,7 +837,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_scale_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_scale_sets_operations.py
index 7f5c7ee6d78e..3a80260673b6 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_scale_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_scale_sets_operations.py
@@ -57,6 +57,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -69,9 +70,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachineScaleSet')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -160,7 +160,7 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -169,8 +169,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -268,7 +268,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -277,8 +277,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -319,6 +319,7 @@ def _deallocate_initial(
 
         # 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())
@@ -334,9 +335,8 @@ def _deallocate_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -404,7 +404,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -430,6 +430,7 @@ def _delete_instances_initial(
 
         # 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())
@@ -442,9 +443,8 @@ def _delete_instances_initial(
         body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceRequiredIDs')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -506,7 +506,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -547,7 +547,7 @@ def get_instance_view(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -556,8 +556,8 @@ def get_instance_view(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -613,7 +613,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -622,9 +622,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -681,7 +680,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -690,9 +689,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -753,7 +751,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -762,9 +760,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -806,6 +803,7 @@ def _power_off_initial(
 
         # 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())
@@ -821,9 +819,8 @@ def _power_off_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -891,7 +888,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -919,6 +916,7 @@ def _restart_initial(
 
         # 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())
@@ -934,9 +932,8 @@ def _restart_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1001,7 +998,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1029,6 +1026,7 @@ def _start_initial(
 
         # 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())
@@ -1044,9 +1042,8 @@ def _start_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1111,7 +1108,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1137,6 +1134,7 @@ def _update_instances_initial(
 
         # 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())
@@ -1149,9 +1147,8 @@ def _update_instances_initial(
         body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceRequiredIDs')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1214,7 +1211,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1238,7 +1235,7 @@ def _reimage_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -1247,8 +1244,8 @@ def _reimage_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1308,7 +1305,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_sizes_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_sizes_operations.py
index 609b00e4ec30..db3f18f0dad9 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_sizes_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machine_sizes_operations.py
@@ -76,7 +76,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -85,9 +85,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machines_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machines_operations.py
index 27776073ef24..45142531df96 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machines_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/operations/virtual_machines_operations.py
@@ -57,6 +57,7 @@ def _capture_initial(
 
         # 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())
@@ -69,9 +70,8 @@ def _capture_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachineCaptureParameters')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -137,7 +137,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -161,6 +161,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -173,9 +174,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachine')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -265,7 +265,7 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -274,8 +274,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -380,7 +380,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -389,8 +389,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -427,7 +427,7 @@ def _deallocate_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -436,8 +436,8 @@ def _deallocate_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -498,7 +498,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -537,7 +537,7 @@ def generalize(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -546,8 +546,8 @@ def generalize(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
@@ -605,7 +605,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -614,9 +614,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -672,7 +671,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -681,9 +680,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -744,7 +742,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -753,9 +751,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -793,7 +790,7 @@ def _power_off_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -802,8 +799,8 @@ def _power_off_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -864,7 +861,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -888,7 +885,7 @@ def _restart_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -897,8 +894,8 @@ def _restart_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -957,7 +954,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -981,7 +978,7 @@ def _start_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -990,8 +987,8 @@ def _start_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1050,7 +1047,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1074,7 +1071,7 @@ def _redeploy_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -1083,8 +1080,8 @@ def _redeploy_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1143,7 +1140,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/availability_sets_operations.py
index dd549283c784..a7890fbf4de1 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/availability_sets_operations.py
@@ -74,6 +74,7 @@ def create_or_update(
 
         # 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())
@@ -86,9 +87,8 @@ def create_or_update(
         body_content = self._serialize.body(parameters, 'AvailabilitySet')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
@@ -140,7 +140,7 @@ def delete(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -149,8 +149,8 @@ def delete(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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, 204]:
             exp = CloudError(response)
@@ -202,7 +202,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -211,8 +211,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -265,7 +265,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -274,9 +274,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -333,7 +332,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -342,9 +341,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -405,7 +403,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -414,9 +412,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/usage_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/usage_operations.py
index 2ccadc8f4885..2ca87e98cfaf 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/usage_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/usage_operations.py
@@ -76,7 +76,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -85,9 +85,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_extension_images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_extension_images_operations.py
index 6183efef9c2b..eee74faaf3b8 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_extension_images_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_extension_images_operations.py
@@ -77,7 +77,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -86,8 +86,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -140,7 +140,7 @@ def list_types(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -149,8 +149,8 @@ def list_types(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -218,7 +218,7 @@ def list_versions(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -227,8 +227,8 @@ def list_versions(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_extensions_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_extensions_operations.py
index 76cf9217d944..756ded71da17 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_extensions_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_extensions_operations.py
@@ -58,6 +58,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -70,9 +71,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(extension_parameters, 'VirtualMachineExtension')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -167,6 +167,7 @@ def _update_initial(
 
         # 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())
@@ -179,9 +180,8 @@ def _update_initial(
         body_content = self._serialize.body(extension_parameters, 'VirtualMachineExtensionUpdate')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
@@ -274,7 +274,7 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -283,8 +283,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -394,7 +394,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -403,8 +403,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_images_operations.py
index 3f646c7ab15d..b38bebea0e38 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_images_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_images_operations.py
@@ -79,7 +79,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -88,8 +88,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -161,7 +161,7 @@ def list(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -170,8 +170,8 @@ def list(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -225,7 +225,7 @@ def list_offers(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -234,8 +234,8 @@ def list_offers(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -286,7 +286,7 @@ def list_publishers(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -295,8 +295,8 @@ def list_publishers(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -353,7 +353,7 @@ def list_skus(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -362,8 +362,8 @@ def list_skus(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_scale_set_vms_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_scale_set_vms_operations.py
index 8891c9a33a47..090d0eed4e03 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_scale_set_vms_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_scale_set_vms_operations.py
@@ -58,7 +58,7 @@ def _reimage_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -67,8 +67,8 @@ def _reimage_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -131,7 +131,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -156,7 +156,7 @@ def _deallocate_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -165,8 +165,8 @@ def _deallocate_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -231,7 +231,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -256,7 +256,7 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -265,8 +265,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -371,7 +371,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -380,8 +380,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -438,7 +438,7 @@ def get_instance_view(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -447,8 +447,8 @@ def get_instance_view(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -519,7 +519,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -528,9 +528,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -569,7 +568,7 @@ def _power_off_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -578,8 +577,8 @@ def _power_off_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -644,7 +643,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -669,7 +668,7 @@ def _restart_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -678,8 +677,8 @@ def _restart_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -741,7 +740,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -766,7 +765,7 @@ def _start_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -775,8 +774,8 @@ def _start_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -838,7 +837,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_scale_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_scale_sets_operations.py
index 664138f0dde0..35cfe00744d6 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_scale_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_scale_sets_operations.py
@@ -57,6 +57,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -69,9 +70,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachineScaleSet')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -160,7 +160,7 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -169,8 +169,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -268,7 +268,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -277,8 +277,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -319,6 +319,7 @@ def _deallocate_initial(
 
         # 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())
@@ -334,9 +335,8 @@ def _deallocate_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -404,7 +404,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -430,6 +430,7 @@ def _delete_instances_initial(
 
         # 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())
@@ -442,9 +443,8 @@ def _delete_instances_initial(
         body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceRequiredIDs')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -506,7 +506,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -547,7 +547,7 @@ def get_instance_view(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -556,8 +556,8 @@ def get_instance_view(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -613,7 +613,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -622,9 +622,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -681,7 +680,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -690,9 +689,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -753,7 +751,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -762,9 +760,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -806,6 +803,7 @@ def _power_off_initial(
 
         # 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())
@@ -821,9 +819,8 @@ def _power_off_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -891,7 +888,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -919,6 +916,7 @@ def _restart_initial(
 
         # 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())
@@ -934,9 +932,8 @@ def _restart_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1001,7 +998,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1029,6 +1026,7 @@ def _start_initial(
 
         # 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())
@@ -1044,9 +1042,8 @@ def _start_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1111,7 +1108,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1137,6 +1134,7 @@ def _update_instances_initial(
 
         # 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())
@@ -1149,9 +1147,8 @@ def _update_instances_initial(
         body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceRequiredIDs')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1214,7 +1211,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1238,7 +1235,7 @@ def _reimage_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -1247,8 +1244,8 @@ def _reimage_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1308,7 +1305,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_sizes_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_sizes_operations.py
index 4c049de4e3d3..139e560421a7 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_sizes_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machine_sizes_operations.py
@@ -76,7 +76,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -85,9 +85,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machines_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machines_operations.py
index 20c72c5fde3c..a2a420ba78a9 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machines_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/operations/virtual_machines_operations.py
@@ -79,7 +79,7 @@ def get_extensions(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -88,8 +88,8 @@ def get_extensions(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -126,6 +126,7 @@ def _capture_initial(
 
         # 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())
@@ -138,9 +139,8 @@ def _capture_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachineCaptureParameters')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -206,7 +206,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -230,6 +230,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -242,9 +243,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachine')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -334,7 +334,7 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -343,8 +343,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -449,7 +449,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -458,8 +458,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -496,7 +496,7 @@ def _deallocate_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -505,8 +505,8 @@ def _deallocate_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -567,7 +567,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -606,7 +606,7 @@ def generalize(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -615,8 +615,8 @@ def generalize(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
@@ -674,7 +674,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -683,9 +683,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -741,7 +740,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -750,9 +749,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -813,7 +811,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -822,9 +820,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -862,7 +859,7 @@ def _power_off_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -871,8 +868,8 @@ def _power_off_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -933,7 +930,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -957,7 +954,7 @@ def _restart_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -966,8 +963,8 @@ def _restart_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1026,7 +1023,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1050,7 +1047,7 @@ def _start_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -1059,8 +1056,8 @@ def _start_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1119,7 +1116,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1143,7 +1140,7 @@ def _redeploy_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -1152,8 +1149,8 @@ def _redeploy_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1212,7 +1209,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/availability_sets_operations.py
index 8eb5f352915b..914dcf1d0d51 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/availability_sets_operations.py
@@ -74,6 +74,7 @@ def create_or_update(
 
         # 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())
@@ -86,9 +87,8 @@ def create_or_update(
         body_content = self._serialize.body(parameters, 'AvailabilitySet')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
@@ -141,7 +141,7 @@ def delete(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -150,8 +150,8 @@ def delete(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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, 204]:
             exp = CloudError(response)
@@ -203,7 +203,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -212,8 +212,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -266,7 +266,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -275,9 +275,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -334,7 +333,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -343,9 +342,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -406,7 +404,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -415,9 +413,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/disks_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/disks_operations.py
index 1bb9532e2524..2b75b3433e92 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/disks_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/disks_operations.py
@@ -57,6 +57,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -69,9 +70,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(disk, 'Disk')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -163,6 +163,7 @@ def _update_initial(
 
         # 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())
@@ -175,9 +176,8 @@ def _update_initial(
         body_content = self._serialize.body(disk, 'DiskUpdate')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -287,7 +287,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -296,8 +296,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -334,7 +334,7 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -343,8 +343,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -449,7 +449,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -458,9 +458,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -514,7 +513,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -523,9 +522,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -565,6 +563,7 @@ def _grant_access_initial(
 
         # 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())
@@ -577,9 +576,8 @@ def _grant_access_initial(
         body_content = self._serialize.body(grant_access_data, 'GrantAccessData')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -673,7 +671,7 @@ def _revoke_access_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -682,8 +680,8 @@ def _revoke_access_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -745,7 +743,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/images_operations.py
index a9f7099d9cff..cdbdd51ff055 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/images_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/images_operations.py
@@ -57,6 +57,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -69,9 +70,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(parameters, 'Image')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -159,7 +159,7 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -168,8 +168,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -271,7 +271,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -280,8 +280,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -337,7 +337,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -346,9 +346,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -404,7 +403,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -413,9 +412,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/snapshots_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/snapshots_operations.py
index 4d0356d0abed..0492d1420a49 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/snapshots_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/snapshots_operations.py
@@ -57,6 +57,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -69,9 +70,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(snapshot, 'Snapshot')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -162,6 +162,7 @@ def _update_initial(
 
         # 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())
@@ -174,9 +175,8 @@ def _update_initial(
         body_content = self._serialize.body(snapshot, 'SnapshotUpdate')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -283,7 +283,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -292,8 +292,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -330,7 +330,7 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -339,8 +339,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -443,7 +443,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -452,9 +452,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -508,7 +507,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -517,9 +516,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -559,6 +557,7 @@ def _grant_access_initial(
 
         # 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())
@@ -571,9 +570,8 @@ def _grant_access_initial(
         body_content = self._serialize.body(grant_access_data, 'GrantAccessData')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -665,7 +663,7 @@ def _revoke_access_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -674,8 +672,8 @@ def _revoke_access_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -735,7 +733,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/usage_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/usage_operations.py
index 51996f303a0d..3b1be4c564ce 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/usage_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/usage_operations.py
@@ -76,7 +76,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -85,9 +85,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_extension_images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_extension_images_operations.py
index 34b10c839d82..3db3c657a95c 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_extension_images_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_extension_images_operations.py
@@ -77,7 +77,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -86,8 +86,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -140,7 +140,7 @@ def list_types(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -149,8 +149,8 @@ def list_types(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -218,7 +218,7 @@ def list_versions(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -227,8 +227,8 @@ def list_versions(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_extensions_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_extensions_operations.py
index cabc0592473e..02f2d5e9aafb 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_extensions_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_extensions_operations.py
@@ -58,6 +58,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -70,9 +71,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(extension_parameters, 'VirtualMachineExtension')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -167,6 +167,7 @@ def _update_initial(
 
         # 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())
@@ -179,9 +180,8 @@ def _update_initial(
         body_content = self._serialize.body(extension_parameters, 'VirtualMachineExtensionUpdate')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
@@ -274,7 +274,7 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -283,8 +283,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -395,7 +395,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -404,8 +404,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_images_operations.py
index e1e3fc9b16b7..094fbf753649 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_images_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_images_operations.py
@@ -80,7 +80,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -89,8 +89,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -162,7 +162,7 @@ def list(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -171,8 +171,8 @@ def list(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -226,7 +226,7 @@ def list_offers(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -235,8 +235,8 @@ def list_offers(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -287,7 +287,7 @@ def list_publishers(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -296,8 +296,8 @@ def list_publishers(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -354,7 +354,7 @@ def list_skus(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -363,8 +363,8 @@ def list_skus(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_scale_set_vms_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_scale_set_vms_operations.py
index 61b70093702b..5fe85ddc68a0 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_scale_set_vms_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_scale_set_vms_operations.py
@@ -58,7 +58,7 @@ def _reimage_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -67,8 +67,8 @@ def _reimage_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -131,7 +131,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -156,7 +156,7 @@ def _reimage_all_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -165,8 +165,8 @@ def _reimage_all_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -230,7 +230,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -255,7 +255,7 @@ def _deallocate_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -264,8 +264,8 @@ def _deallocate_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -330,7 +330,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -355,7 +355,7 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -364,8 +364,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -470,7 +470,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -479,8 +479,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -537,7 +537,7 @@ def get_instance_view(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -546,8 +546,8 @@ def get_instance_view(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -618,7 +618,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -627,9 +627,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -668,7 +667,7 @@ def _power_off_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -677,8 +676,8 @@ def _power_off_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -743,7 +742,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -768,7 +767,7 @@ def _restart_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -777,8 +776,8 @@ def _restart_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -840,7 +839,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -865,7 +864,7 @@ def _start_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -874,8 +873,8 @@ def _start_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -937,7 +936,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_scale_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_scale_sets_operations.py
index 32b27d043583..bb778963c631 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_scale_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_scale_sets_operations.py
@@ -57,6 +57,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -69,9 +70,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachineScaleSet')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -160,7 +160,7 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -169,8 +169,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -269,7 +269,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -278,8 +278,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -320,6 +320,7 @@ def _deallocate_initial(
 
         # 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())
@@ -335,9 +336,8 @@ def _deallocate_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -405,7 +405,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -431,6 +431,7 @@ def _delete_instances_initial(
 
         # 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())
@@ -443,9 +444,8 @@ def _delete_instances_initial(
         body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceRequiredIDs')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -507,7 +507,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -548,7 +548,7 @@ def get_instance_view(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -557,8 +557,8 @@ def get_instance_view(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -614,7 +614,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -623,9 +623,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -682,7 +681,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -691,9 +690,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -754,7 +752,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -763,9 +761,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -807,6 +804,7 @@ def _power_off_initial(
 
         # 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())
@@ -822,9 +820,8 @@ def _power_off_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -892,7 +889,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -920,6 +917,7 @@ def _restart_initial(
 
         # 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())
@@ -935,9 +933,8 @@ def _restart_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1002,7 +999,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1030,6 +1027,7 @@ def _start_initial(
 
         # 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())
@@ -1045,9 +1043,8 @@ def _start_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1112,7 +1109,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1138,6 +1135,7 @@ def _update_instances_initial(
 
         # 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())
@@ -1150,9 +1148,8 @@ def _update_instances_initial(
         body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceRequiredIDs')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1215,7 +1212,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1239,7 +1236,7 @@ def _reimage_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -1248,8 +1245,8 @@ def _reimage_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1309,7 +1306,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1333,7 +1330,7 @@ def _reimage_all_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -1342,8 +1339,8 @@ def _reimage_all_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1403,7 +1400,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_sizes_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_sizes_operations.py
index 5c7173bc8dfa..6a2b5647fbb5 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_sizes_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machine_sizes_operations.py
@@ -76,7 +76,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -85,9 +85,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machines_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machines_operations.py
index 953129d99d88..4bd60de1201d 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machines_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/operations/virtual_machines_operations.py
@@ -79,7 +79,7 @@ def get_extensions(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -88,8 +88,8 @@ def get_extensions(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -126,6 +126,7 @@ def _capture_initial(
 
         # 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())
@@ -138,9 +139,8 @@ def _capture_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachineCaptureParameters')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -206,7 +206,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -230,6 +230,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -242,9 +243,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachine')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -334,7 +334,7 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -343,8 +343,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -449,7 +449,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -458,8 +458,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -496,7 +496,7 @@ def _convert_to_managed_disks_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -505,8 +505,8 @@ def _convert_to_managed_disks_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -567,7 +567,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -591,7 +591,7 @@ def _deallocate_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -600,8 +600,8 @@ def _deallocate_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -662,7 +662,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -702,7 +702,7 @@ def generalize(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -711,8 +711,8 @@ def generalize(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
@@ -770,7 +770,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -779,9 +779,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -837,7 +836,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -846,9 +845,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -909,7 +907,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -918,9 +916,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -958,7 +955,7 @@ def _power_off_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -967,8 +964,8 @@ def _power_off_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1029,7 +1026,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1053,7 +1050,7 @@ def _restart_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -1062,8 +1059,8 @@ def _restart_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1122,7 +1119,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1146,7 +1143,7 @@ def _start_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -1155,8 +1152,8 @@ def _start_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1215,7 +1212,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1239,7 +1236,7 @@ def _redeploy_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -1248,8 +1245,8 @@ def _redeploy_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1308,7 +1305,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/availability_sets_operations.py
index 4e7b3494c55a..9daf031a7176 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/availability_sets_operations.py
@@ -74,6 +74,7 @@ def create_or_update(
 
         # 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())
@@ -86,9 +87,8 @@ def create_or_update(
         body_content = self._serialize.body(parameters, 'AvailabilitySet')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
@@ -140,7 +140,7 @@ def delete(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -149,8 +149,8 @@ def delete(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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, 204]:
             exp = CloudError(response)
@@ -202,7 +202,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -211,8 +211,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -265,7 +265,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -274,9 +274,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -333,7 +332,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -342,9 +341,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -405,7 +403,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -414,9 +412,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/disks_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/disks_operations.py
index c2b0c8aabe46..b08fbfae4857 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/disks_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/disks_operations.py
@@ -57,6 +57,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -69,9 +70,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(disk, 'Disk')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -163,6 +163,7 @@ def _update_initial(
 
         # 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())
@@ -175,9 +176,8 @@ def _update_initial(
         body_content = self._serialize.body(disk, 'DiskUpdate')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -287,7 +287,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -296,8 +296,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -334,7 +334,7 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -343,8 +343,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -449,7 +449,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -458,9 +458,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -514,7 +513,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -523,9 +522,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -565,6 +563,7 @@ def _grant_access_initial(
 
         # 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())
@@ -577,9 +576,8 @@ def _grant_access_initial(
         body_content = self._serialize.body(grant_access_data, 'GrantAccessData')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -673,7 +671,7 @@ def _revoke_access_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -682,8 +680,8 @@ def _revoke_access_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -745,7 +743,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/images_operations.py
index 684b505f7197..2fe70ded6261 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/images_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/images_operations.py
@@ -57,6 +57,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -69,9 +70,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(parameters, 'Image')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -159,7 +159,7 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -168,8 +168,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -271,7 +271,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -280,8 +280,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -337,7 +337,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -346,9 +346,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -404,7 +403,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -413,9 +412,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/resource_skus_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/resource_skus_operations.py
index 036647ac8e85..b80d9d58c5fc 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/resource_skus_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/resource_skus_operations.py
@@ -72,7 +72,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -81,9 +81,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/snapshots_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/snapshots_operations.py
index 9c209cb1ac47..8376dd00a438 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/snapshots_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/snapshots_operations.py
@@ -57,6 +57,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -69,9 +70,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(snapshot, 'Snapshot')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -163,6 +163,7 @@ def _update_initial(
 
         # 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())
@@ -175,9 +176,8 @@ def _update_initial(
         body_content = self._serialize.body(snapshot, 'SnapshotUpdate')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -287,7 +287,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -296,8 +296,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -334,7 +334,7 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -343,8 +343,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -449,7 +449,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -458,9 +458,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -514,7 +513,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -523,9 +522,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -565,6 +563,7 @@ def _grant_access_initial(
 
         # 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())
@@ -577,9 +576,8 @@ def _grant_access_initial(
         body_content = self._serialize.body(grant_access_data, 'GrantAccessData')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -673,7 +671,7 @@ def _revoke_access_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -682,8 +680,8 @@ def _revoke_access_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -745,7 +743,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/usage_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/usage_operations.py
index 6c1900a7c5ea..29cc76c0123e 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/usage_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/usage_operations.py
@@ -76,7 +76,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -85,9 +85,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_extension_images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_extension_images_operations.py
index 63453c94920f..4ef7026c08f6 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_extension_images_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_extension_images_operations.py
@@ -77,7 +77,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -86,8 +86,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -140,7 +140,7 @@ def list_types(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -149,8 +149,8 @@ def list_types(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -218,7 +218,7 @@ def list_versions(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -227,8 +227,8 @@ def list_versions(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_extensions_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_extensions_operations.py
index 993c0890df6a..75c04ea3ab0b 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_extensions_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_extensions_operations.py
@@ -58,6 +58,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -70,9 +71,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(extension_parameters, 'VirtualMachineExtension')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -167,6 +167,7 @@ def _update_initial(
 
         # 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())
@@ -179,9 +180,8 @@ def _update_initial(
         body_content = self._serialize.body(extension_parameters, 'VirtualMachineExtensionUpdate')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
@@ -274,7 +274,7 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -283,8 +283,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -394,7 +394,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -403,8 +403,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_images_operations.py
index d222bf9aa7e7..81bc28042a35 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_images_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_images_operations.py
@@ -79,7 +79,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -88,8 +88,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -161,7 +161,7 @@ def list(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -170,8 +170,8 @@ def list(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -225,7 +225,7 @@ def list_offers(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -234,8 +234,8 @@ def list_offers(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -286,7 +286,7 @@ def list_publishers(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -295,8 +295,8 @@ def list_publishers(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -353,7 +353,7 @@ def list_skus(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -362,8 +362,8 @@ def list_skus(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_run_commands_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_run_commands_operations.py
index 60c0ba0cb259..3a26aa227665 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_run_commands_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_run_commands_operations.py
@@ -74,7 +74,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -83,9 +83,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -138,7 +137,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -147,8 +146,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_scale_set_extensions_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_scale_set_extensions_operations.py
index 737744d28691..86bf05e10c56 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_scale_set_extensions_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_scale_set_extensions_operations.py
@@ -58,6 +58,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -70,9 +71,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(extension_parameters, 'VirtualMachineScaleSetExtension')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -168,7 +168,7 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -177,8 +177,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -290,7 +290,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -299,8 +299,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -360,7 +360,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -369,9 +369,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_scale_set_rolling_upgrades_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_scale_set_rolling_upgrades_operations.py
index 510c2e37faff..10a79ee43f28 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_scale_set_rolling_upgrades_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_scale_set_rolling_upgrades_operations.py
@@ -57,7 +57,7 @@ def _cancel_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -66,8 +66,8 @@ def _cancel_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -126,7 +126,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -150,7 +150,7 @@ def _start_os_upgrade_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -159,8 +159,8 @@ def _start_os_upgrade_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -222,7 +222,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -263,7 +263,7 @@ def get_latest(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -272,8 +272,8 @@ def get_latest(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_scale_set_vms_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_scale_set_vms_operations.py
index 121b1a331375..91d12700629e 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_scale_set_vms_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_scale_set_vms_operations.py
@@ -58,7 +58,7 @@ def _reimage_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -67,8 +67,8 @@ def _reimage_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -131,7 +131,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -156,7 +156,7 @@ def _reimage_all_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -165,8 +165,8 @@ def _reimage_all_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -230,7 +230,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -255,7 +255,7 @@ def _deallocate_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -264,8 +264,8 @@ def _deallocate_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -330,7 +330,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -355,7 +355,7 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -364,8 +364,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -470,7 +470,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -479,8 +479,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -537,7 +537,7 @@ def get_instance_view(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -546,8 +546,8 @@ def get_instance_view(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -618,7 +618,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -627,9 +627,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -668,7 +667,7 @@ def _power_off_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -677,8 +676,8 @@ def _power_off_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -743,7 +742,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -768,7 +767,7 @@ def _restart_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -777,8 +776,8 @@ def _restart_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -840,7 +839,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -865,7 +864,7 @@ def _start_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -874,8 +873,8 @@ def _start_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -937,7 +936,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_scale_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_scale_sets_operations.py
index 2b3ad31f8937..80babcb3948f 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_scale_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_scale_sets_operations.py
@@ -57,6 +57,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -69,9 +70,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachineScaleSet')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -161,6 +161,7 @@ def _update_initial(
 
         # 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())
@@ -173,9 +174,8 @@ def _update_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachineScaleSetUpdate')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
@@ -263,7 +263,7 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -272,8 +272,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -371,7 +371,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -380,8 +380,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -422,6 +422,7 @@ def _deallocate_initial(
 
         # 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())
@@ -437,9 +438,8 @@ def _deallocate_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -507,7 +507,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -533,6 +533,7 @@ def _delete_instances_initial(
 
         # 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())
@@ -545,9 +546,8 @@ def _delete_instances_initial(
         body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceRequiredIDs')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -609,7 +609,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -650,7 +650,7 @@ def get_instance_view(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -659,8 +659,8 @@ def get_instance_view(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -716,7 +716,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -725,9 +725,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -784,7 +783,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -793,9 +792,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -856,7 +854,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -865,9 +863,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -909,6 +906,7 @@ def _power_off_initial(
 
         # 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())
@@ -924,9 +922,8 @@ def _power_off_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -994,7 +991,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1022,6 +1019,7 @@ def _restart_initial(
 
         # 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())
@@ -1037,9 +1035,8 @@ def _restart_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1104,7 +1101,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1132,6 +1129,7 @@ def _start_initial(
 
         # 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())
@@ -1147,9 +1145,8 @@ def _start_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1214,7 +1211,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1240,6 +1237,7 @@ def _update_instances_initial(
 
         # 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())
@@ -1252,9 +1250,8 @@ def _update_instances_initial(
         body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceRequiredIDs')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1317,7 +1314,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1345,6 +1342,7 @@ def _reimage_initial(
 
         # 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())
@@ -1360,9 +1358,8 @@ def _reimage_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1428,7 +1425,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1456,6 +1453,7 @@ def _reimage_all_initial(
 
         # 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())
@@ -1471,9 +1469,8 @@ def _reimage_all_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1539,7 +1536,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_sizes_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_sizes_operations.py
index 58bfd693c7e2..e840f5be2e8b 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_sizes_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machine_sizes_operations.py
@@ -76,7 +76,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -85,9 +85,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machines_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machines_operations.py
index c64c6385fcfb..0e91caa6f3e5 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machines_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/operations/virtual_machines_operations.py
@@ -79,7 +79,7 @@ def get_extensions(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -88,8 +88,8 @@ def get_extensions(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -126,6 +126,7 @@ def _capture_initial(
 
         # 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())
@@ -138,9 +139,8 @@ def _capture_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachineCaptureParameters')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -206,7 +206,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -230,6 +230,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -242,9 +243,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachine')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -334,7 +334,7 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -343,8 +343,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -449,7 +449,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -458,8 +458,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -512,7 +512,7 @@ def instance_view(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -521,8 +521,8 @@ def instance_view(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -559,7 +559,7 @@ def _convert_to_managed_disks_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -568,8 +568,8 @@ def _convert_to_managed_disks_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -630,7 +630,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -654,7 +654,7 @@ def _deallocate_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -663,8 +663,8 @@ def _deallocate_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -725,7 +725,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -764,7 +764,7 @@ def generalize(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -773,8 +773,8 @@ def generalize(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
@@ -832,7 +832,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -841,9 +841,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -899,7 +898,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -908,9 +907,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -971,7 +969,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -980,9 +978,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -1020,7 +1017,7 @@ def _power_off_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -1029,8 +1026,8 @@ def _power_off_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1091,7 +1088,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1115,7 +1112,7 @@ def _restart_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -1124,8 +1121,8 @@ def _restart_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1184,7 +1181,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1208,7 +1205,7 @@ def _start_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -1217,8 +1214,8 @@ def _start_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1277,7 +1274,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1301,7 +1298,7 @@ def _redeploy_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -1310,8 +1307,8 @@ def _redeploy_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1370,7 +1367,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1394,7 +1391,7 @@ def _perform_maintenance_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -1403,8 +1400,8 @@ def _perform_maintenance_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1463,7 +1460,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1487,6 +1484,7 @@ def _run_command_initial(
 
         # 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())
@@ -1499,9 +1497,8 @@ def _run_command_initial(
         body_content = self._serialize.body(parameters, 'RunCommandInput')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1564,7 +1561,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_09_01/operations/resource_skus_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_09_01/operations/resource_skus_operations.py
index a6b8de4df819..a1e7842f3de1 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_09_01/operations/resource_skus_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_09_01/operations/resource_skus_operations.py
@@ -72,7 +72,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -81,9 +81,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/availability_sets_operations.py
index 5f03fa563156..1c03e1db2dc7 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/availability_sets_operations.py
@@ -74,6 +74,7 @@ def create_or_update(
 
         # 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())
@@ -86,9 +87,8 @@ def create_or_update(
         body_content = self._serialize.body(parameters, 'AvailabilitySet')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
@@ -144,6 +144,7 @@ def update(
 
         # 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())
@@ -156,9 +157,8 @@ def update(
         body_content = self._serialize.body(parameters, 'AvailabilitySetUpdate')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
@@ -210,7 +210,7 @@ def delete(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -219,8 +219,8 @@ def delete(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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, 204]:
             exp = CloudError(response)
@@ -272,7 +272,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -281,8 +281,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -335,7 +335,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -344,9 +344,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -403,7 +402,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -412,9 +411,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -475,7 +473,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -484,9 +482,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/images_operations.py
index 34a376803fc1..cb581ace00f5 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/images_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/images_operations.py
@@ -57,6 +57,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -69,9 +70,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(parameters, 'Image')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -159,6 +159,7 @@ def _update_initial(
 
         # 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())
@@ -171,9 +172,8 @@ def _update_initial(
         body_content = self._serialize.body(parameters, 'ImageUpdate')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -261,7 +261,7 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -270,8 +270,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -373,7 +373,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -382,8 +382,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -439,7 +439,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -448,9 +448,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -506,7 +505,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -515,9 +514,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/log_analytics_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/log_analytics_operations.py
index 939b62a0e59f..20b8a08d6dca 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/log_analytics_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/log_analytics_operations.py
@@ -56,6 +56,7 @@ def _export_request_rate_by_interval_initial(
 
         # 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())
@@ -68,9 +69,8 @@ def _export_request_rate_by_interval_initial(
         body_content = self._serialize.body(parameters, 'RequestRateByIntervalInput')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -134,7 +134,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -157,6 +157,7 @@ def _export_throttled_requests_initial(
 
         # 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())
@@ -169,9 +170,8 @@ def _export_throttled_requests_initial(
         body_content = self._serialize.body(parameters, 'ThrottledRequestsInput')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -235,7 +235,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/operations.py
index 5681f620623e..36fb56164d1d 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/operations.py
@@ -67,7 +67,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -76,9 +76,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/usage_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/usage_operations.py
index 11805c1bafdb..f73139736d7e 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/usage_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/usage_operations.py
@@ -76,7 +76,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -85,9 +85,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_extension_images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_extension_images_operations.py
index a4f70c5e6e2e..06828379f550 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_extension_images_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_extension_images_operations.py
@@ -77,7 +77,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -86,8 +86,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -140,7 +140,7 @@ def list_types(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -149,8 +149,8 @@ def list_types(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -218,7 +218,7 @@ def list_versions(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -227,8 +227,8 @@ def list_versions(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_extensions_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_extensions_operations.py
index a888f594af2a..c19b4f7b9512 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_extensions_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_extensions_operations.py
@@ -58,6 +58,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -70,9 +71,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(extension_parameters, 'VirtualMachineExtension')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -167,6 +167,7 @@ def _update_initial(
 
         # 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())
@@ -179,9 +180,8 @@ def _update_initial(
         body_content = self._serialize.body(extension_parameters, 'VirtualMachineExtensionUpdate')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
@@ -274,7 +274,7 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -283,8 +283,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -394,7 +394,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -403,8 +403,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_images_operations.py
index e53a3fccdfe0..d6f28937b4fc 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_images_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_images_operations.py
@@ -79,7 +79,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -88,8 +88,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -161,7 +161,7 @@ def list(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -170,8 +170,8 @@ def list(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -225,7 +225,7 @@ def list_offers(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -234,8 +234,8 @@ def list_offers(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -286,7 +286,7 @@ def list_publishers(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -295,8 +295,8 @@ def list_publishers(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -353,7 +353,7 @@ def list_skus(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -362,8 +362,8 @@ def list_skus(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_run_commands_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_run_commands_operations.py
index b150d3aac5e3..8d9b516aa004 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_run_commands_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_run_commands_operations.py
@@ -74,7 +74,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -83,9 +83,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -138,7 +137,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -147,8 +146,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_set_extensions_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_set_extensions_operations.py
index 3804ba43e51b..e4e9013bd3f5 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_set_extensions_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_set_extensions_operations.py
@@ -58,6 +58,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -70,9 +71,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(extension_parameters, 'VirtualMachineScaleSetExtension')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -168,7 +168,7 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -177,8 +177,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -290,7 +290,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -299,8 +299,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -360,7 +360,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -369,9 +369,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_set_rolling_upgrades_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_set_rolling_upgrades_operations.py
index 064485bea0c8..f7998c1ead7b 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_set_rolling_upgrades_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_set_rolling_upgrades_operations.py
@@ -57,7 +57,7 @@ def _cancel_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -66,8 +66,8 @@ def _cancel_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -126,7 +126,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -150,7 +150,7 @@ def _start_os_upgrade_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -159,8 +159,8 @@ def _start_os_upgrade_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -222,7 +222,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -263,7 +263,7 @@ def get_latest(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -272,8 +272,8 @@ def get_latest(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_set_vms_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_set_vms_operations.py
index 6682590a3781..8617fd76f233 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_set_vms_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_set_vms_operations.py
@@ -58,7 +58,7 @@ def _reimage_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -67,8 +67,8 @@ def _reimage_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -131,7 +131,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -156,7 +156,7 @@ def _reimage_all_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -165,8 +165,8 @@ def _reimage_all_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -230,7 +230,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -255,7 +255,7 @@ def _deallocate_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -264,8 +264,8 @@ def _deallocate_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -330,7 +330,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -355,6 +355,7 @@ def _update_initial(
 
         # 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())
@@ -367,9 +368,8 @@ def _update_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachineScaleSetVM')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -465,7 +465,7 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -474,8 +474,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -580,7 +580,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -589,8 +589,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -647,7 +647,7 @@ def get_instance_view(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -656,8 +656,8 @@ def get_instance_view(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -728,7 +728,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -737,9 +737,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -778,7 +777,7 @@ def _power_off_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -787,8 +786,8 @@ def _power_off_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -853,7 +852,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -878,7 +877,7 @@ def _restart_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -887,8 +886,8 @@ def _restart_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -950,7 +949,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -975,7 +974,7 @@ def _start_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -984,8 +983,8 @@ def _start_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1047,7 +1046,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1072,7 +1071,7 @@ def _redeploy_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -1081,8 +1080,8 @@ def _redeploy_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1144,7 +1143,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1169,7 +1168,7 @@ def _perform_maintenance_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -1178,8 +1177,8 @@ def _perform_maintenance_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1241,7 +1240,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_sets_operations.py
index 871f1d9ee4ce..4333c766aba1 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_scale_sets_operations.py
@@ -57,6 +57,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -69,9 +70,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachineScaleSet')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -161,6 +161,7 @@ def _update_initial(
 
         # 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())
@@ -173,9 +174,8 @@ def _update_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachineScaleSetUpdate')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
@@ -263,7 +263,7 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -272,8 +272,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -371,7 +371,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -380,8 +380,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -422,6 +422,7 @@ def _deallocate_initial(
 
         # 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())
@@ -437,9 +438,8 @@ def _deallocate_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -507,7 +507,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -533,6 +533,7 @@ def _delete_instances_initial(
 
         # 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())
@@ -545,9 +546,8 @@ def _delete_instances_initial(
         body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceRequiredIDs')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -609,7 +609,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -650,7 +650,7 @@ def get_instance_view(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -659,8 +659,8 @@ def get_instance_view(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -716,7 +716,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -725,9 +725,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -784,7 +783,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -793,9 +792,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -856,7 +854,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -865,9 +863,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -928,7 +925,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -937,9 +934,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -981,6 +977,7 @@ def _power_off_initial(
 
         # 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())
@@ -996,9 +993,8 @@ def _power_off_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1066,7 +1062,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1094,6 +1090,7 @@ def _restart_initial(
 
         # 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())
@@ -1109,9 +1106,8 @@ def _restart_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1176,7 +1172,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1204,6 +1200,7 @@ def _start_initial(
 
         # 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())
@@ -1219,9 +1216,8 @@ def _start_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1286,7 +1282,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1314,6 +1310,7 @@ def _redeploy_initial(
 
         # 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())
@@ -1329,9 +1326,8 @@ def _redeploy_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1396,7 +1392,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1424,6 +1420,7 @@ def _perform_maintenance_initial(
 
         # 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())
@@ -1439,9 +1436,8 @@ def _perform_maintenance_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1509,7 +1505,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1535,6 +1531,7 @@ def _update_instances_initial(
 
         # 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())
@@ -1547,9 +1544,8 @@ def _update_instances_initial(
         body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceRequiredIDs')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1612,7 +1608,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1640,6 +1636,7 @@ def _reimage_initial(
 
         # 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())
@@ -1655,9 +1652,8 @@ def _reimage_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1723,7 +1719,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1751,6 +1747,7 @@ def _reimage_all_initial(
 
         # 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())
@@ -1766,9 +1763,8 @@ def _reimage_all_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1834,7 +1830,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1878,7 +1874,7 @@ def force_recovery_service_fabric_platform_update_domain_walk(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -1887,8 +1883,8 @@ def force_recovery_service_fabric_platform_update_domain_walk(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_sizes_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_sizes_operations.py
index fac51386b9b6..a00a3e7f346b 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_sizes_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machine_sizes_operations.py
@@ -76,7 +76,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -85,9 +85,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machines_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machines_operations.py
index 204714dad612..fafb141bd641 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machines_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/operations/virtual_machines_operations.py
@@ -79,7 +79,7 @@ def get_extensions(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -88,8 +88,8 @@ def get_extensions(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -126,6 +126,7 @@ def _capture_initial(
 
         # 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())
@@ -138,9 +139,8 @@ def _capture_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachineCaptureParameters')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -206,7 +206,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -230,6 +230,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -242,9 +243,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachine')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -334,6 +334,7 @@ def _update_initial(
 
         # 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())
@@ -346,9 +347,8 @@ def _update_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachineUpdate')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -438,7 +438,7 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -447,8 +447,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -553,7 +553,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -562,8 +562,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -616,7 +616,7 @@ def instance_view(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -625,8 +625,8 @@ def instance_view(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -663,7 +663,7 @@ def _convert_to_managed_disks_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -672,8 +672,8 @@ def _convert_to_managed_disks_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -734,7 +734,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -758,7 +758,7 @@ def _deallocate_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -767,8 +767,8 @@ def _deallocate_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -829,7 +829,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -868,7 +868,7 @@ def generalize(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -877,8 +877,8 @@ def generalize(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
@@ -936,7 +936,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -945,9 +945,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -1003,7 +1002,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -1012,9 +1011,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -1075,7 +1073,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -1084,9 +1082,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -1124,7 +1121,7 @@ def _power_off_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -1133,8 +1130,8 @@ def _power_off_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1195,7 +1192,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1219,7 +1216,7 @@ def _restart_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -1228,8 +1225,8 @@ def _restart_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1288,7 +1285,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1312,7 +1309,7 @@ def _start_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -1321,8 +1318,8 @@ def _start_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1381,7 +1378,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1405,7 +1402,7 @@ def _redeploy_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -1414,8 +1411,8 @@ def _redeploy_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1474,7 +1471,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1498,7 +1495,7 @@ def _perform_maintenance_initial(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -1507,8 +1504,8 @@ def _perform_maintenance_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1567,7 +1564,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -1591,6 +1588,7 @@ def _run_command_initial(
 
         # 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())
@@ -1603,9 +1601,8 @@ def _run_command_initial(
         body_content = self._serialize.body(parameters, 'RunCommandInput')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1668,7 +1665,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py
index 2c6a7d2a0f18..8b4cdc61f273 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/availability_sets_operations.py
@@ -74,6 +74,7 @@ def create_or_update(
 
         # 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())
@@ -86,9 +87,8 @@ def create_or_update(
         body_content = self._serialize.body(parameters, 'AvailabilitySet')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
@@ -144,6 +144,7 @@ def update(
 
         # 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())
@@ -156,9 +157,8 @@ def update(
         body_content = self._serialize.body(parameters, 'AvailabilitySetUpdate')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
@@ -209,7 +209,6 @@ def delete(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -218,8 +217,8 @@ def delete(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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, 204]:
             exp = CloudError(response)
@@ -264,7 +263,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -273,8 +272,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -327,7 +326,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -336,9 +335,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -395,7 +393,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -404,9 +402,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -467,7 +464,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -476,9 +473,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/disks_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/disks_operations.py
index fbc2afa3489b..f6fef80307e1 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/disks_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/disks_operations.py
@@ -57,6 +57,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -69,9 +70,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(disk, 'Disk')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -163,6 +163,7 @@ def _update_initial(
 
         # 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())
@@ -175,9 +176,8 @@ def _update_initial(
         body_content = self._serialize.body(disk, 'DiskUpdate')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -287,7 +287,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -296,8 +296,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -334,7 +334,6 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -343,8 +342,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -436,7 +435,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -445,9 +444,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -501,7 +499,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -510,9 +508,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -552,6 +549,7 @@ def _grant_access_initial(
 
         # 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())
@@ -564,9 +562,8 @@ def _grant_access_initial(
         body_content = self._serialize.body(grant_access_data, 'GrantAccessData')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -660,7 +657,6 @@ def _revoke_access_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -669,8 +665,8 @@ def _revoke_access_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/images_operations.py
index 030bf14e5115..e50c243bf1b4 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/images_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/images_operations.py
@@ -57,6 +57,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -69,9 +70,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(parameters, 'Image')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -159,6 +159,7 @@ def _update_initial(
 
         # 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())
@@ -171,9 +172,8 @@ def _update_initial(
         body_content = self._serialize.body(parameters, 'ImageUpdate')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -261,7 +261,6 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -270,8 +269,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -360,7 +359,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -369,8 +368,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -426,7 +425,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -435,9 +434,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -493,7 +491,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -502,9 +500,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/log_analytics_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/log_analytics_operations.py
index 0471d6db9c03..519044fc41f7 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/log_analytics_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/log_analytics_operations.py
@@ -56,6 +56,7 @@ def _export_request_rate_by_interval_initial(
 
         # 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())
@@ -68,9 +69,8 @@ def _export_request_rate_by_interval_initial(
         body_content = self._serialize.body(parameters, 'RequestRateByIntervalInput')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -134,7 +134,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -157,6 +157,7 @@ def _export_throttled_requests_initial(
 
         # 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())
@@ -169,9 +170,8 @@ def _export_throttled_requests_initial(
         body_content = self._serialize.body(parameters, 'ThrottledRequestsInput')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -235,7 +235,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/operations.py
index a392e2cea622..389ece6362f8 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/operations.py
@@ -67,7 +67,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -76,9 +76,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/snapshots_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/snapshots_operations.py
index c65e1d1dc86b..1110f5205dcf 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/snapshots_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/snapshots_operations.py
@@ -57,6 +57,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -69,9 +70,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(snapshot, 'Snapshot')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -163,6 +163,7 @@ def _update_initial(
 
         # 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())
@@ -175,9 +176,8 @@ def _update_initial(
         body_content = self._serialize.body(snapshot, 'SnapshotUpdate')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -287,7 +287,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -296,8 +296,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -334,7 +334,6 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -343,8 +342,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -436,7 +435,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -445,9 +444,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -501,7 +499,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -510,9 +508,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -552,6 +549,7 @@ def _grant_access_initial(
 
         # 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())
@@ -564,9 +562,8 @@ def _grant_access_initial(
         body_content = self._serialize.body(grant_access_data, 'GrantAccessData')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -660,7 +657,6 @@ def _revoke_access_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -669,8 +665,8 @@ def _revoke_access_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/usage_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/usage_operations.py
index 607b8419477c..50d843d46355 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/usage_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/usage_operations.py
@@ -76,7 +76,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -85,9 +85,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extension_images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extension_images_operations.py
index f190183923a8..91cfcbfa9db4 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extension_images_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extension_images_operations.py
@@ -77,7 +77,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -86,8 +86,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -140,7 +140,7 @@ def list_types(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -149,8 +149,8 @@ def list_types(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -218,7 +218,7 @@ def list_versions(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -227,8 +227,8 @@ def list_versions(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extensions_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extensions_operations.py
index 5acd2642f6e4..253dfe24a8f3 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extensions_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_extensions_operations.py
@@ -58,6 +58,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -70,9 +71,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(extension_parameters, 'VirtualMachineExtension')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -167,6 +167,7 @@ def _update_initial(
 
         # 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())
@@ -179,9 +180,8 @@ def _update_initial(
         body_content = self._serialize.body(extension_parameters, 'VirtualMachineExtensionUpdate')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
@@ -274,7 +274,6 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -283,8 +282,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -381,7 +380,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -390,8 +389,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -450,7 +449,7 @@ def list(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -459,8 +458,8 @@ def list(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_images_operations.py
index a58d2e394655..290a55dd5c19 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_images_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_images_operations.py
@@ -79,7 +79,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -88,8 +88,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -161,7 +161,7 @@ def list(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -170,8 +170,8 @@ def list(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -225,7 +225,7 @@ def list_offers(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -234,8 +234,8 @@ def list_offers(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -286,7 +286,7 @@ def list_publishers(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -295,8 +295,8 @@ def list_publishers(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -353,7 +353,7 @@ def list_skus(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -362,8 +362,8 @@ def list_skus(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_run_commands_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_run_commands_operations.py
index 9d04988797f7..0c8eeab43450 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_run_commands_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_run_commands_operations.py
@@ -74,7 +74,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -83,9 +83,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -138,7 +137,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -147,8 +146,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_extensions_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_extensions_operations.py
index 5d5476f92263..093cfd9bd739 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_extensions_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_extensions_operations.py
@@ -58,6 +58,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -70,9 +71,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(extension_parameters, 'VirtualMachineScaleSetExtension')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -168,7 +168,6 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -177,8 +176,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -277,7 +276,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -286,8 +285,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -347,7 +346,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -356,9 +355,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_rolling_upgrades_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_rolling_upgrades_operations.py
index 81ffdda5f87e..53d2f79560d3 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_rolling_upgrades_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_rolling_upgrades_operations.py
@@ -57,7 +57,6 @@ def _cancel_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -66,8 +65,8 @@ def _cancel_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -137,7 +136,6 @@ def _start_os_upgrade_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -146,8 +144,8 @@ def _start_os_upgrade_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -237,7 +235,7 @@ def get_latest(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -246,8 +244,8 @@ def get_latest(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_vms_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_vms_operations.py
index d3ae10792c92..fa2de2d4f985 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_vms_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_set_vms_operations.py
@@ -58,7 +58,6 @@ def _reimage_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -67,8 +66,8 @@ def _reimage_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -143,7 +142,6 @@ def _reimage_all_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -152,8 +150,8 @@ def _reimage_all_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -229,7 +227,6 @@ def _deallocate_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -238,8 +235,8 @@ def _deallocate_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -316,6 +313,7 @@ def _update_initial(
 
         # 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())
@@ -328,9 +326,8 @@ def _update_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachineScaleSetVM')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -426,7 +423,6 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -435,8 +431,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -528,7 +524,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -537,8 +533,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -595,7 +591,7 @@ def get_instance_view(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -604,8 +600,8 @@ def get_instance_view(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -676,7 +672,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -685,9 +681,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -726,7 +721,6 @@ def _power_off_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -735,8 +729,8 @@ def _power_off_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -813,7 +807,6 @@ def _restart_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -822,8 +815,8 @@ def _restart_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -897,7 +890,6 @@ def _start_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -906,8 +898,8 @@ def _start_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -981,7 +973,6 @@ def _redeploy_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -990,8 +981,8 @@ def _redeploy_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1065,7 +1056,6 @@ def _perform_maintenance_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -1074,8 +1064,8 @@ def _perform_maintenance_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1149,6 +1139,7 @@ def _run_command_initial(
 
         # 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())
@@ -1161,9 +1152,8 @@ def _run_command_initial(
         body_content = self._serialize.body(parameters, 'RunCommandInput')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1229,7 +1219,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'location'}, **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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_sets_operations.py
index e6f49af582f1..e2ec6fe9dcd1 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_scale_sets_operations.py
@@ -57,6 +57,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -69,9 +70,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachineScaleSet')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -161,6 +161,7 @@ def _update_initial(
 
         # 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())
@@ -173,9 +174,8 @@ def _update_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachineScaleSetUpdate')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
@@ -263,7 +263,6 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -272,8 +271,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -358,7 +357,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -367,8 +366,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -424,9 +423,8 @@ def _deallocate_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -519,9 +517,8 @@ def _delete_instances_initial(
         body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceRequiredIDs')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -611,7 +608,7 @@ def get_instance_view(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -620,8 +617,8 @@ def get_instance_view(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -677,7 +674,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -686,9 +683,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -745,7 +741,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -754,9 +750,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -817,7 +812,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -826,9 +821,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -889,7 +883,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -898,9 +892,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -957,9 +950,8 @@ def _power_off_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1057,9 +1049,8 @@ def _restart_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1154,9 +1145,8 @@ def _start_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1251,9 +1241,8 @@ def _redeploy_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1348,9 +1337,8 @@ def _perform_maintenance_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1443,9 +1431,8 @@ def _update_instances_initial(
         body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceRequiredIDs')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1538,9 +1525,8 @@ def _reimage_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1636,9 +1622,8 @@ def _reimage_all_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1735,7 +1720,7 @@ def force_recovery_service_fabric_platform_update_domain_walk(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -1744,8 +1729,8 @@ def force_recovery_service_fabric_platform_update_domain_walk(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_sizes_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_sizes_operations.py
index 0eef7f65066c..b25f7f135d02 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_sizes_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machine_sizes_operations.py
@@ -76,7 +76,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -85,9 +85,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machines_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machines_operations.py
index 0dcf00e25f5c..eacf80e3186d 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machines_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/operations/virtual_machines_operations.py
@@ -57,6 +57,7 @@ def _capture_initial(
 
         # 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())
@@ -69,9 +70,8 @@ def _capture_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachineCaptureParameters')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -137,7 +137,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'location'}, **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)
@@ -161,6 +161,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -173,9 +174,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachine')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -265,6 +265,7 @@ def _update_initial(
 
         # 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())
@@ -277,9 +278,8 @@ def _update_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachineUpdate')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -369,7 +369,6 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -378,8 +377,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -471,7 +470,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -480,8 +479,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -534,7 +533,7 @@ def instance_view(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -543,8 +542,8 @@ def instance_view(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -581,7 +580,6 @@ def _convert_to_managed_disks_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -590,8 +588,8 @@ def _convert_to_managed_disks_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -663,7 +661,6 @@ def _deallocate_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -672,8 +669,8 @@ def _deallocate_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -759,7 +756,6 @@ def generalize(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -768,8 +764,8 @@ def generalize(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
@@ -820,7 +816,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -829,9 +825,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -887,7 +882,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -896,9 +891,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -959,7 +953,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -968,9 +962,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -1008,7 +1001,6 @@ def _power_off_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -1017,8 +1009,8 @@ def _power_off_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1090,7 +1082,6 @@ def _restart_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -1099,8 +1090,8 @@ def _restart_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1170,7 +1161,6 @@ def _start_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -1179,8 +1169,8 @@ def _start_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1250,7 +1240,6 @@ def _redeploy_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -1259,8 +1248,8 @@ def _redeploy_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1330,7 +1319,6 @@ def _perform_maintenance_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -1339,8 +1327,8 @@ def _perform_maintenance_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1410,6 +1398,7 @@ def _run_command_initial(
 
         # 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())
@@ -1422,9 +1411,8 @@ def _run_command_initial(
         body_content = self._serialize.body(parameters, 'RunCommandInput')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1487,7 +1475,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'location'}, **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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/availability_sets_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/availability_sets_operations.py
index cb57521579bb..2028e318b9b5 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/availability_sets_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/availability_sets_operations.py
@@ -74,6 +74,7 @@ def create_or_update(
 
         # 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())
@@ -86,9 +87,8 @@ def create_or_update(
         body_content = self._serialize.body(parameters, 'AvailabilitySet')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
@@ -144,6 +144,7 @@ def update(
 
         # 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())
@@ -156,9 +157,8 @@ def update(
         body_content = self._serialize.body(parameters, 'AvailabilitySetUpdate')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
@@ -209,7 +209,6 @@ def delete(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -218,8 +217,8 @@ def delete(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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, 204]:
             exp = CloudError(response)
@@ -264,7 +263,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -273,8 +272,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -327,7 +326,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -336,9 +335,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -395,7 +393,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -404,9 +402,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -467,7 +464,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -476,9 +473,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/galleries_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/galleries_operations.py
index b05139317ddf..f58f5b0e2301 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/galleries_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/galleries_operations.py
@@ -57,6 +57,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -69,9 +70,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(gallery, 'Gallery')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201, 202]:
             exp = CloudError(response)
@@ -177,7 +177,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -186,8 +186,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -224,7 +224,6 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -233,8 +232,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -323,7 +322,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -332,9 +331,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -388,7 +386,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -397,9 +395,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_image_versions_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_image_versions_operations.py
index 3acc16a4d1bc..d46449b5920c 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_image_versions_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_image_versions_operations.py
@@ -59,6 +59,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -71,9 +72,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(gallery_image_version, 'GalleryImageVersion')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201, 202]:
             exp = CloudError(response)
@@ -202,7 +202,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -211,8 +211,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -251,7 +251,6 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -260,8 +259,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -363,7 +362,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -372,9 +371,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_images_operations.py
index fc8b6ff9f1ac..310e941acdaa 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_images_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/gallery_images_operations.py
@@ -58,6 +58,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -70,9 +71,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(gallery_image, 'GalleryImage')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201, 202]:
             exp = CloudError(response)
@@ -185,7 +185,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -194,8 +194,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -233,7 +233,6 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -242,8 +241,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -338,7 +337,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -347,9 +346,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/images_operations.py
index 8fc41911ae76..27d51e7c4b66 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/images_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/images_operations.py
@@ -57,6 +57,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -69,9 +70,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(parameters, 'Image')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -159,6 +159,7 @@ def _update_initial(
 
         # 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())
@@ -171,9 +172,8 @@ def _update_initial(
         body_content = self._serialize.body(parameters, 'ImageUpdate')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -261,7 +261,6 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -270,8 +269,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -360,7 +359,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -369,8 +368,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -426,7 +425,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -435,9 +434,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -493,7 +491,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -502,9 +500,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/log_analytics_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/log_analytics_operations.py
index 3657b5a35b4d..cdbc436a43c9 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/log_analytics_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/log_analytics_operations.py
@@ -56,6 +56,7 @@ def _export_request_rate_by_interval_initial(
 
         # 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())
@@ -68,9 +69,8 @@ def _export_request_rate_by_interval_initial(
         body_content = self._serialize.body(parameters, 'RequestRateByIntervalInput')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -134,7 +134,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
@@ -157,6 +157,7 @@ def _export_throttled_requests_initial(
 
         # 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())
@@ -169,9 +170,8 @@ def _export_throttled_requests_initial(
         body_content = self._serialize.body(parameters, 'ThrottledRequestsInput')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -235,7 +235,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'azure-async-operation'}, **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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/operations.py
index 55d0445f932f..08c4de77f78d 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/operations.py
@@ -67,7 +67,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -76,9 +76,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/usage_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/usage_operations.py
index 93b83115fe31..9e13544b0b0c 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/usage_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/usage_operations.py
@@ -76,7 +76,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -85,9 +85,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_extension_images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_extension_images_operations.py
index a89d05a84c30..f2f0f1ef9296 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_extension_images_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_extension_images_operations.py
@@ -77,7 +77,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -86,8 +86,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -140,7 +140,7 @@ def list_types(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -149,8 +149,8 @@ def list_types(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -218,7 +218,7 @@ def list_versions(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -227,8 +227,8 @@ def list_versions(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_extensions_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_extensions_operations.py
index 3e24de90ff75..0e6777f54ca8 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_extensions_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_extensions_operations.py
@@ -58,6 +58,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -70,9 +71,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(extension_parameters, 'VirtualMachineExtension')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -167,6 +167,7 @@ def _update_initial(
 
         # 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())
@@ -179,9 +180,8 @@ def _update_initial(
         body_content = self._serialize.body(extension_parameters, 'VirtualMachineExtensionUpdate')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
@@ -274,7 +274,6 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -283,8 +282,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -381,7 +380,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -390,8 +389,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -450,7 +449,7 @@ def list(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -459,8 +458,8 @@ def list(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_images_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_images_operations.py
index 16b455cff731..65daa8e4524b 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_images_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_images_operations.py
@@ -79,7 +79,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -88,8 +88,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -161,7 +161,7 @@ def list(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -170,8 +170,8 @@ def list(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -225,7 +225,7 @@ def list_offers(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -234,8 +234,8 @@ def list_offers(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -286,7 +286,7 @@ def list_publishers(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -295,8 +295,8 @@ def list_publishers(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -353,7 +353,7 @@ def list_skus(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -362,8 +362,8 @@ def list_skus(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_run_commands_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_run_commands_operations.py
index 02c71c658dc6..a1408b92aa2e 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_run_commands_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_run_commands_operations.py
@@ -74,7 +74,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -83,9 +83,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -138,7 +137,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -147,8 +146,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_set_extensions_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_set_extensions_operations.py
index e7310679f11d..15118f7a5d69 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_set_extensions_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_set_extensions_operations.py
@@ -58,6 +58,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -70,9 +71,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(extension_parameters, 'VirtualMachineScaleSetExtension')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -168,7 +168,6 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -177,8 +176,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -277,7 +276,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -286,8 +285,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -347,7 +346,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -356,9 +355,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
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 30a7d4f91a11..0fb3a482349b 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
@@ -57,7 +57,6 @@ def _cancel_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -66,8 +65,8 @@ def _cancel_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -137,7 +136,6 @@ def _start_os_upgrade_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -146,8 +144,8 @@ def _start_os_upgrade_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -237,7 +235,7 @@ def get_latest(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -246,8 +244,8 @@ def get_latest(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_set_vms_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_set_vms_operations.py
index 482195142987..bccd6e0f8349 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_set_vms_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machine_scale_set_vms_operations.py
@@ -58,7 +58,6 @@ def _reimage_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -67,8 +66,8 @@ def _reimage_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -143,7 +142,6 @@ def _reimage_all_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -152,8 +150,8 @@ def _reimage_all_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -229,7 +227,6 @@ def _deallocate_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -238,8 +235,8 @@ def _deallocate_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -316,6 +313,7 @@ def _update_initial(
 
         # 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())
@@ -328,9 +326,8 @@ def _update_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachineScaleSetVM')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -426,7 +423,6 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -435,8 +431,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -528,7 +524,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -537,8 +533,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -595,7 +591,7 @@ def get_instance_view(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -604,8 +600,8 @@ def get_instance_view(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -676,7 +672,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -685,9 +681,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -726,7 +721,6 @@ def _power_off_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -735,8 +729,8 @@ def _power_off_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -813,7 +807,6 @@ def _restart_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -822,8 +815,8 @@ def _restart_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -897,7 +890,6 @@ def _start_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -906,8 +898,8 @@ def _start_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -981,7 +973,6 @@ def _redeploy_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -990,8 +981,8 @@ def _redeploy_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1065,7 +1056,6 @@ def _perform_maintenance_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -1074,8 +1064,8 @@ def _perform_maintenance_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1149,6 +1139,7 @@ def _run_command_initial(
 
         # 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())
@@ -1161,9 +1152,8 @@ def _run_command_initial(
         body_content = self._serialize.body(parameters, 'RunCommandInput')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1229,7 +1219,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'location'}, **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)
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 52cc62169ef9..ee4c53596d64 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
@@ -57,6 +57,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -69,9 +70,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachineScaleSet')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -161,6 +161,7 @@ def _update_initial(
 
         # 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())
@@ -173,9 +174,8 @@ def _update_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachineScaleSetUpdate')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
@@ -263,7 +263,6 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -272,8 +271,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -358,7 +357,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -367,8 +366,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -424,9 +423,8 @@ def _deallocate_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -519,9 +517,8 @@ def _delete_instances_initial(
         body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceRequiredIDs')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -611,7 +608,7 @@ def get_instance_view(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -620,8 +617,8 @@ def get_instance_view(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -677,7 +674,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -686,9 +683,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -745,7 +741,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -754,9 +750,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -817,7 +812,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -826,9 +821,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -889,7 +883,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -898,9 +892,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -957,9 +950,8 @@ def _power_off_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1057,9 +1049,8 @@ def _restart_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1154,9 +1145,8 @@ def _start_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1251,9 +1241,8 @@ def _redeploy_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1348,9 +1337,8 @@ def _perform_maintenance_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1440,9 +1428,8 @@ def _update_instances_initial(
         body_content = self._serialize.body(vm_instance_ids, 'VirtualMachineScaleSetVMInstanceRequiredIDs')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1535,9 +1522,8 @@ def _reimage_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1633,9 +1619,8 @@ def _reimage_all_initial(
             body_content = None
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1732,7 +1717,7 @@ def force_recovery_service_fabric_platform_update_domain_walk(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -1741,8 +1726,8 @@ def force_recovery_service_fabric_platform_update_domain_walk(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
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 5f2cd409660e..a9f96e9c4f70 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
@@ -76,7 +76,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -85,9 +85,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machines_operations.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machines_operations.py
index e113d0aedbb2..6550e47a4fe0 100644
--- a/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machines_operations.py
+++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/operations/virtual_machines_operations.py
@@ -57,6 +57,7 @@ def _capture_initial(
 
         # 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())
@@ -69,9 +70,8 @@ def _capture_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachineCaptureParameters')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -137,7 +137,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'location'}, **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)
@@ -161,6 +161,7 @@ def _create_or_update_initial(
 
         # 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())
@@ -173,9 +174,8 @@ def _create_or_update_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachine')
 
         # Construct and send request
-        request = self._client.put(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -265,6 +265,7 @@ def _update_initial(
 
         # 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())
@@ -277,9 +278,8 @@ def _update_initial(
         body_content = self._serialize.body(parameters, 'VirtualMachineUpdate')
 
         # Construct and send request
-        request = self._client.patch(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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, 201]:
             exp = CloudError(response)
@@ -369,7 +369,6 @@ def _delete_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -378,8 +377,8 @@ def _delete_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -471,7 +470,7 @@ def get(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -480,8 +479,8 @@ def get(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -534,7 +533,7 @@ def instance_view(
 
         # Construct headers
         header_parameters = {}
-        header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+        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:
@@ -543,8 +542,8 @@ def instance_view(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -581,7 +580,6 @@ def _convert_to_managed_disks_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -590,8 +588,8 @@ def _convert_to_managed_disks_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -663,7 +661,6 @@ def _deallocate_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -672,8 +669,8 @@ def _deallocate_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -759,7 +756,6 @@ def generalize(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -768,8 +764,8 @@ def generalize(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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]:
             exp = CloudError(response)
@@ -820,7 +816,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -829,9 +825,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -887,7 +882,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -896,9 +891,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -959,7 +953,7 @@ def internal_paging(next_link=None, raw=False):
 
             # Construct headers
             header_parameters = {}
-            header_parameters['Content-Type'] = 'application/json; charset=utf-8'
+            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:
@@ -968,9 +962,8 @@ def internal_paging(next_link=None, raw=False):
                 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)
-            response = self._client.send(
-                request, header_parameters, stream=False, **operation_config)
+            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)
@@ -1008,7 +1001,6 @@ def _power_off_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -1017,8 +1009,8 @@ def _power_off_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1090,7 +1082,6 @@ def _restart_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -1099,8 +1090,8 @@ def _restart_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1170,7 +1161,6 @@ def _start_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -1179,8 +1169,8 @@ def _start_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1250,7 +1240,6 @@ def _redeploy_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -1259,8 +1248,8 @@ def _redeploy_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1330,7 +1319,6 @@ def _perform_maintenance_initial(
 
         # Construct headers
         header_parameters = {}
-        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:
@@ -1339,8 +1327,8 @@ def _perform_maintenance_initial(
             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)
-        response = self._client.send(request, header_parameters, stream=False, **operation_config)
+        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)
@@ -1410,6 +1398,7 @@ def _run_command_initial(
 
         # 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())
@@ -1422,9 +1411,8 @@ def _run_command_initial(
         body_content = self._serialize.body(parameters, 'RunCommandInput')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        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)
@@ -1487,7 +1475,7 @@ def get_long_running_output(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)
+        if polling is True: polling_method = ARMPolling(lro_delay, lro_options={'final-state-via': 'location'}, **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)
diff --git a/azure-mgmt-compute/setup.py b/azure-mgmt-compute/setup.py
index d74bbb645ef3..496fd34c6324 100644
--- a/azure-mgmt-compute/setup.py
+++ b/azure-mgmt-compute/setup.py
@@ -77,6 +77,7 @@
     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',
     ],
diff --git a/azure-sdk-tools/packaging_tools/templates/setup.py b/azure-sdk-tools/packaging_tools/templates/setup.py
index 584d888a218e..02028c6c5491 100644
--- a/azure-sdk-tools/packaging_tools/templates/setup.py
+++ b/azure-sdk-tools/packaging_tools/templates/setup.py
@@ -77,6 +77,7 @@
     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',
     ],
diff --git a/swagger_to_sdk_config.json b/swagger_to_sdk_config.json
index faea631defd6..9083259187d9 100644
--- a/swagger_to_sdk_config.json
+++ b/swagger_to_sdk_config.json
@@ -2,7 +2,7 @@
   "meta": {
     "autorest_options": {
       "version": "preview",
-      "use": "@microsoft.azure/autorest.python@~3.0",
+      "use": "@microsoft.azure/autorest.python@~3.0.56",
       "python": "",
       "python-mode": "update",
       "sdkrel:python-sdks-folder": ".",

From b6c3396492b676e10138ed4382a7db77baace7d0 Mon Sep 17 00:00:00 2001
From: Laurent Mazuel <laurent.mazuel@gmail.com>
Date: Fri, 20 Jul 2018 11:57:41 -0700
Subject: [PATCH 27/29] Fixing tests for latest Compute

---
 ...t_mgmt_compute.test_availability_sets.yaml |  502 +--
 .../test_mgmt_compute.test_usage.yaml         |  168 +-
 ..._compute.test_virtual_machine_capture.yaml |  534 ++--
 ...pute.test_virtual_machines_operations.yaml |  857 ++---
 ...mgmt_compute.test_vm_extension_images.yaml |  518 ++-
 .../test_mgmt_compute.test_vm_extensions.yaml | 2813 ++++++++++++++---
 .../test_mgmt_compute.test_vm_images.yaml     |  423 ++-
 .../test_mgmt_compute.test_vm_sizes.yaml      |  456 +--
 ...ged_disks.test_create_image_from_blob.yaml |    8 +-
 ...test_create_virtual_machine_scale_set.yaml |  218 +-
 ...aged_disks.test_create_vm_implicit_md.yaml |  388 +--
 ...t_mgmt_msi.test_create_msi_enabled_vm.yaml |  553 ++--
 azure-mgmt-compute/tests/test_mgmt_compute.py |    6 +-
 azure-mgmt-compute/tests/test_mgmt_msi.py     |   40 +-
 14 files changed, 4874 insertions(+), 2610 deletions(-)

diff --git a/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_availability_sets.yaml b/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_availability_sets.yaml
index a2171cd4617f..0327be7f9186 100644
--- a/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_availability_sets.yaml
+++ b/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_availability_sets.yaml
@@ -8,11 +8,11 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['129']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_availability_sets53ac1097/providers/Microsoft.Compute/availabilitySets/pyarmset53ac1097?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_availability_sets53ac1097/providers/Microsoft.Compute/availabilitySets/pyarmset53ac1097?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"properties\": {\r\n    \"platformUpdateDomainCount\"\
         : 4,\r\n    \"platformFaultDomainCount\": 2\r\n  },\r\n  \"type\": \"Microsoft.Compute/availabilitySets\"\
@@ -24,14 +24,15 @@ interactions:
       cache-control: [no-cache]
       content-length: ['477']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:38:11 GMT']
+      date: ['Fri, 20 Jul 2018 17:12:25 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateUpdateVM3Min;299,Microsoft.Compute/CreateUpdateVM30Min;1499']
+      x-content-type-options: [nosniff]
+      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:
@@ -41,11 +42,11 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_availability_sets53ac1097/providers/Microsoft.Compute/availabilitySets/pyarmset53ac1097?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_availability_sets53ac1097/providers/Microsoft.Compute/availabilitySets/pyarmset53ac1097?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"properties\": {\r\n    \"platformUpdateDomainCount\"\
         : 4,\r\n    \"platformFaultDomainCount\": 2,\r\n    \"virtualMachines\": []\r\
@@ -58,14 +59,15 @@ interactions:
       cache-control: [no-cache]
       content-length: ['505']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:38:12 GMT']
+      date: ['Fri, 20 Jul 2018 17:12:25 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4984,Microsoft.Compute/LowCostGet30Min;39892']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4195,Microsoft.Compute/LowCostGet30Min;33593']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -74,11 +76,11 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_availability_sets53ac1097/providers/Microsoft.Compute/availabilitySets?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_availability_sets53ac1097/providers/Microsoft.Compute/availabilitySets?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"value\": [\r\n    {\r\n      \"properties\": {\r\n  \
         \      \"platformUpdateDomainCount\": 4,\r\n        \"platformFaultDomainCount\"\
@@ -92,14 +94,15 @@ interactions:
       cache-control: [no-cache]
       content-length: ['598']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:38:13 GMT']
+      date: ['Fri, 20 Jul 2018 17:12:25 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4983,Microsoft.Compute/LowCostGet30Min;39891']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4194,Microsoft.Compute/LowCostGet30Min;33592']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -108,13 +111,31 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_availability_sets53ac1097/providers/Microsoft.Compute/availabilitySets/pyarmset53ac1097/vmSizes?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_availability_sets53ac1097/providers/Microsoft.Compute/availabilitySets/pyarmset53ac1097/vmSizes?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"value\": [\r\n    {\r\n      \"name\": \"Standard_DS1_v2\"\
+    body: {string: "{\r\n  \"value\": [\r\n    {\r\n      \"name\": \"Standard_B1ms\"\
+        ,\r\n      \"numberOfCores\": 1,\r\n      \"osDiskSizeInMB\": 1047552,\r\n\
+        \      \"resourceDiskSizeInMB\": 4096,\r\n      \"memoryInMB\": 2048,\r\n\
+        \      \"maxDataDiskCount\": 2\r\n    },\r\n    {\r\n      \"name\": \"Standard_B1s\"\
+        ,\r\n      \"numberOfCores\": 1,\r\n      \"osDiskSizeInMB\": 1047552,\r\n\
+        \      \"resourceDiskSizeInMB\": 2048,\r\n      \"memoryInMB\": 1024,\r\n\
+        \      \"maxDataDiskCount\": 2\r\n    },\r\n    {\r\n      \"name\": \"Standard_B2ms\"\
+        ,\r\n      \"numberOfCores\": 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n\
+        \      \"resourceDiskSizeInMB\": 16384,\r\n      \"memoryInMB\": 8192,\r\n\
+        \      \"maxDataDiskCount\": 4\r\n    },\r\n    {\r\n      \"name\": \"Standard_B2s\"\
+        ,\r\n      \"numberOfCores\": 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n\
+        \      \"resourceDiskSizeInMB\": 8192,\r\n      \"memoryInMB\": 4096,\r\n\
+        \      \"maxDataDiskCount\": 4\r\n    },\r\n    {\r\n      \"name\": \"Standard_B4ms\"\
+        ,\r\n      \"numberOfCores\": 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n\
+        \      \"resourceDiskSizeInMB\": 32768,\r\n      \"memoryInMB\": 16384,\r\n\
+        \      \"maxDataDiskCount\": 8\r\n    },\r\n    {\r\n      \"name\": \"Standard_B8ms\"\
+        ,\r\n      \"numberOfCores\": 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n\
+        \      \"resourceDiskSizeInMB\": 65536,\r\n      \"memoryInMB\": 32768,\r\n\
+        \      \"maxDataDiskCount\": 16\r\n    },\r\n    {\r\n      \"name\": \"Standard_DS1_v2\"\
         ,\r\n      \"numberOfCores\": 1,\r\n      \"osDiskSizeInMB\": 1047552,\r\n\
         \      \"resourceDiskSizeInMB\": 7168,\r\n      \"memoryInMB\": 3584,\r\n\
         \      \"maxDataDiskCount\": 4\r\n    },\r\n    {\r\n      \"name\": \"Standard_DS2_v2\"\
@@ -130,16 +151,25 @@ interactions:
         ,\r\n      \"numberOfCores\": 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n\
         \      \"resourceDiskSizeInMB\": 114688,\r\n      \"memoryInMB\": 57344,\r\
         \n      \"maxDataDiskCount\": 64\r\n    },\r\n    {\r\n      \"name\": \"\
-        Standard_DS11_v2\",\r\n      \"numberOfCores\": 2,\r\n      \"osDiskSizeInMB\"\
+        Standard_DS11-1_v2\",\r\n      \"numberOfCores\": 2,\r\n      \"osDiskSizeInMB\"\
+        : 1047552,\r\n      \"resourceDiskSizeInMB\": 28672,\r\n      \"memoryInMB\"\
+        : 14336,\r\n      \"maxDataDiskCount\": 8\r\n    },\r\n    {\r\n      \"name\"\
+        : \"Standard_DS11_v2\",\r\n      \"numberOfCores\": 2,\r\n      \"osDiskSizeInMB\"\
         : 1047552,\r\n      \"resourceDiskSizeInMB\": 28672,\r\n      \"memoryInMB\"\
         : 14336,\r\n      \"maxDataDiskCount\": 8\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Standard_DS12_v2\",\r\n      \"numberOfCores\": 4,\r\n      \"osDiskSizeInMB\"\
+        : \"Standard_DS12-1_v2\",\r\n      \"numberOfCores\": 4,\r\n      \"osDiskSizeInMB\"\
         : 1047552,\r\n      \"resourceDiskSizeInMB\": 57344,\r\n      \"memoryInMB\"\
         : 28672,\r\n      \"maxDataDiskCount\": 16\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_DS13-2_v2\",\r\n      \"numberOfCores\": 8,\r\n      \"\
-        osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 114688,\r\n\
-        \      \"memoryInMB\": 57344,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\
-        \n    {\r\n      \"name\": \"Standard_DS13-4_v2\",\r\n      \"numberOfCores\"\
+        name\": \"Standard_DS12-2_v2\",\r\n      \"numberOfCores\": 4,\r\n      \"\
+        osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 57344,\r\n \
+        \     \"memoryInMB\": 28672,\r\n      \"maxDataDiskCount\": 16\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_DS12_v2\",\r\n      \"numberOfCores\"\
+        : 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 57344,\r\n      \"memoryInMB\": 28672,\r\n      \"maxDataDiskCount\": 16\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_DS13-2_v2\",\r\n      \"numberOfCores\"\
+        : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 114688,\r\n      \"memoryInMB\": 57344,\r\n      \"maxDataDiskCount\": 32\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_DS13-4_v2\",\r\n      \"numberOfCores\"\
         : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
         : 114688,\r\n      \"memoryInMB\": 57344,\r\n      \"maxDataDiskCount\": 32\r\
         \n    },\r\n    {\r\n      \"name\": \"Standard_DS13_v2\",\r\n      \"numberOfCores\"\
@@ -198,89 +228,105 @@ interactions:
         name\": \"Standard_F16s\",\r\n      \"numberOfCores\": 16,\r\n      \"osDiskSizeInMB\"\
         : 1047552,\r\n      \"resourceDiskSizeInMB\": 65536,\r\n      \"memoryInMB\"\
         : 32768,\r\n      \"maxDataDiskCount\": 64\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_A0\",\r\n      \"numberOfCores\": 1,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 20480,\r\n      \"memoryInMB\"\
-        : 768,\r\n      \"maxDataDiskCount\": 1\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Standard_A1\",\r\n      \"numberOfCores\": 1,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 71680,\r\n      \"memoryInMB\"\
-        : 1792,\r\n      \"maxDataDiskCount\": 2\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Standard_A2\",\r\n      \"numberOfCores\": 2,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 138240,\r\n      \"memoryInMB\"\
-        : 3584,\r\n      \"maxDataDiskCount\": 4\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Standard_A3\",\r\n      \"numberOfCores\": 4,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 291840,\r\n      \"memoryInMB\"\
-        : 7168,\r\n      \"maxDataDiskCount\": 8\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Standard_A5\",\r\n      \"numberOfCores\": 2,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 138240,\r\n      \"memoryInMB\"\
-        : 14336,\r\n      \"maxDataDiskCount\": 4\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Standard_A4\",\r\n      \"numberOfCores\": 8,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 619520,\r\n      \"memoryInMB\"\
-        : 14336,\r\n      \"maxDataDiskCount\": 16\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_A6\",\r\n      \"numberOfCores\": 4,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 291840,\r\n      \"memoryInMB\"\
-        : 28672,\r\n      \"maxDataDiskCount\": 8\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Standard_A7\",\r\n      \"numberOfCores\": 8,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 619520,\r\n      \"memoryInMB\"\
-        : 57344,\r\n      \"maxDataDiskCount\": 16\r\n    },\r\n    {\r\n      \"\
-        name\": \"Basic_A0\",\r\n      \"numberOfCores\": 1,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 20480,\r\n      \"memoryInMB\"\
-        : 768,\r\n      \"maxDataDiskCount\": 1\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Basic_A1\",\r\n      \"numberOfCores\": 1,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 40960,\r\n      \"memoryInMB\"\
-        : 1792,\r\n      \"maxDataDiskCount\": 2\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Basic_A2\",\r\n      \"numberOfCores\": 2,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 61440,\r\n      \"memoryInMB\"\
-        : 3584,\r\n      \"maxDataDiskCount\": 4\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Basic_A3\",\r\n      \"numberOfCores\": 4,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 122880,\r\n      \"memoryInMB\"\
-        : 7168,\r\n      \"maxDataDiskCount\": 8\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Basic_A4\",\r\n      \"numberOfCores\": 8,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 245760,\r\n      \"memoryInMB\"\
-        : 14336,\r\n      \"maxDataDiskCount\": 16\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_D1_v2\",\r\n      \"numberOfCores\": 1,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 51200,\r\n      \"memoryInMB\"\
-        : 3584,\r\n      \"maxDataDiskCount\": 4\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Standard_D2_v2\",\r\n      \"numberOfCores\": 2,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 102400,\r\n      \"memoryInMB\"\
-        : 7168,\r\n      \"maxDataDiskCount\": 8\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Standard_D3_v2\",\r\n      \"numberOfCores\": 4,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 204800,\r\n      \"memoryInMB\"\
-        : 14336,\r\n      \"maxDataDiskCount\": 16\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_D4_v2\",\r\n      \"numberOfCores\": 8,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 409600,\r\n      \"memoryInMB\"\
-        : 28672,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_D5_v2\",\r\n      \"numberOfCores\": 16,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 819200,\r\n      \"memoryInMB\"\
-        : 57344,\r\n      \"maxDataDiskCount\": 64\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_D11_v2\",\r\n      \"numberOfCores\": 2,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 102400,\r\n      \"memoryInMB\"\
-        : 14336,\r\n      \"maxDataDiskCount\": 8\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Standard_D12_v2\",\r\n      \"numberOfCores\": 4,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 204800,\r\n      \"memoryInMB\"\
-        : 28672,\r\n      \"maxDataDiskCount\": 16\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_D13_v2\",\r\n      \"numberOfCores\": 8,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 409600,\r\n      \"memoryInMB\"\
-        : 57344,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_D14_v2\",\r\n      \"numberOfCores\": 16,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 819200,\r\n      \"memoryInMB\"\
-        : 114688,\r\n      \"maxDataDiskCount\": 64\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_D15_v2\",\r\n      \"numberOfCores\": 20,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 286720,\r\n      \"memoryInMB\"\
-        : 143360,\r\n      \"maxDataDiskCount\": 64\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_D2_v2_Promo\",\r\n      \"numberOfCores\": 2,\r\n     \
-        \ \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 102400,\r\
-        \n      \"memoryInMB\": 7168,\r\n      \"maxDataDiskCount\": 8\r\n    },\r\
-        \n    {\r\n      \"name\": \"Standard_D3_v2_Promo\",\r\n      \"numberOfCores\"\
+        name\": \"Standard_D2s_v3\",\r\n      \"numberOfCores\": 2,\r\n      \"osDiskSizeInMB\"\
+        : 1047552,\r\n      \"resourceDiskSizeInMB\": 16384,\r\n      \"memoryInMB\"\
+        : 8192,\r\n      \"maxDataDiskCount\": 4\r\n    },\r\n    {\r\n      \"name\"\
+        : \"Standard_D4s_v3\",\r\n      \"numberOfCores\": 4,\r\n      \"osDiskSizeInMB\"\
+        : 1047552,\r\n      \"resourceDiskSizeInMB\": 32768,\r\n      \"memoryInMB\"\
+        : 16384,\r\n      \"maxDataDiskCount\": 8\r\n    },\r\n    {\r\n      \"name\"\
+        : \"Standard_D8s_v3\",\r\n      \"numberOfCores\": 8,\r\n      \"osDiskSizeInMB\"\
+        : 1047552,\r\n      \"resourceDiskSizeInMB\": 65536,\r\n      \"memoryInMB\"\
+        : 32768,\r\n      \"maxDataDiskCount\": 16\r\n    },\r\n    {\r\n      \"\
+        name\": \"Standard_D16s_v3\",\r\n      \"numberOfCores\": 16,\r\n      \"\
+        osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 131072,\r\n\
+        \      \"memoryInMB\": 65536,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_D32s_v3\",\r\n      \"numberOfCores\"\
+        : 32,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 262144,\r\n      \"memoryInMB\": 131072,\r\n      \"maxDataDiskCount\":\
+        \ 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_A0\",\r\n      \"numberOfCores\"\
+        : 1,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 20480,\r\n      \"memoryInMB\": 768,\r\n      \"maxDataDiskCount\": 1\r\n\
+        \    },\r\n    {\r\n      \"name\": \"Standard_A1\",\r\n      \"numberOfCores\"\
+        : 1,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 71680,\r\n      \"memoryInMB\": 1792,\r\n      \"maxDataDiskCount\": 2\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_A2\",\r\n      \"numberOfCores\"\
+        : 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 138240,\r\n      \"memoryInMB\": 3584,\r\n      \"maxDataDiskCount\": 4\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_A3\",\r\n      \"numberOfCores\"\
+        : 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 291840,\r\n      \"memoryInMB\": 7168,\r\n      \"maxDataDiskCount\": 8\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_A5\",\r\n      \"numberOfCores\"\
+        : 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 138240,\r\n      \"memoryInMB\": 14336,\r\n      \"maxDataDiskCount\": 4\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_A4\",\r\n      \"numberOfCores\"\
+        : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 619520,\r\n      \"memoryInMB\": 14336,\r\n      \"maxDataDiskCount\": 16\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_A6\",\r\n      \"numberOfCores\"\
+        : 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 291840,\r\n      \"memoryInMB\": 28672,\r\n      \"maxDataDiskCount\": 8\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_A7\",\r\n      \"numberOfCores\"\
+        : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 619520,\r\n      \"memoryInMB\": 57344,\r\n      \"maxDataDiskCount\": 16\r\
+        \n    },\r\n    {\r\n      \"name\": \"Basic_A0\",\r\n      \"numberOfCores\"\
+        : 1,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 20480,\r\n      \"memoryInMB\": 768,\r\n      \"maxDataDiskCount\": 1\r\n\
+        \    },\r\n    {\r\n      \"name\": \"Basic_A1\",\r\n      \"numberOfCores\"\
+        : 1,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 40960,\r\n      \"memoryInMB\": 1792,\r\n      \"maxDataDiskCount\": 2\r\
+        \n    },\r\n    {\r\n      \"name\": \"Basic_A2\",\r\n      \"numberOfCores\"\
+        : 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 61440,\r\n      \"memoryInMB\": 3584,\r\n      \"maxDataDiskCount\": 4\r\
+        \n    },\r\n    {\r\n      \"name\": \"Basic_A3\",\r\n      \"numberOfCores\"\
+        : 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 122880,\r\n      \"memoryInMB\": 7168,\r\n      \"maxDataDiskCount\": 8\r\
+        \n    },\r\n    {\r\n      \"name\": \"Basic_A4\",\r\n      \"numberOfCores\"\
+        : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 245760,\r\n      \"memoryInMB\": 14336,\r\n      \"maxDataDiskCount\": 16\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_D1_v2\",\r\n      \"numberOfCores\"\
+        : 1,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 51200,\r\n      \"memoryInMB\": 3584,\r\n      \"maxDataDiskCount\": 4\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_D2_v2\",\r\n      \"numberOfCores\"\
+        : 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 102400,\r\n      \"memoryInMB\": 7168,\r\n      \"maxDataDiskCount\": 8\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_D3_v2\",\r\n      \"numberOfCores\"\
         : 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
         : 204800,\r\n      \"memoryInMB\": 14336,\r\n      \"maxDataDiskCount\": 16\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_D4_v2_Promo\",\r\n      \"\
-        numberOfCores\": 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_D4_v2\",\r\n      \"numberOfCores\"\
+        : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
         : 409600,\r\n      \"memoryInMB\": 28672,\r\n      \"maxDataDiskCount\": 32\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_D5_v2_Promo\",\r\n      \"\
-        numberOfCores\": 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_D5_v2\",\r\n      \"numberOfCores\"\
+        : 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
         : 819200,\r\n      \"memoryInMB\": 57344,\r\n      \"maxDataDiskCount\": 64\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_D11_v2_Promo\",\r\n      \"\
-        numberOfCores\": 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_D11_v2\",\r\n      \"numberOfCores\"\
+        : 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 102400,\r\n      \"memoryInMB\": 14336,\r\n      \"maxDataDiskCount\": 8\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_D12_v2\",\r\n      \"numberOfCores\"\
+        : 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 204800,\r\n      \"memoryInMB\": 28672,\r\n      \"maxDataDiskCount\": 16\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_D13_v2\",\r\n      \"numberOfCores\"\
+        : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 409600,\r\n      \"memoryInMB\": 57344,\r\n      \"maxDataDiskCount\": 32\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_D14_v2\",\r\n      \"numberOfCores\"\
+        : 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 819200,\r\n      \"memoryInMB\": 114688,\r\n      \"maxDataDiskCount\":\
+        \ 64\r\n    },\r\n    {\r\n      \"name\": \"Standard_D15_v2\",\r\n      \"\
+        numberOfCores\": 20,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 286720,\r\n      \"memoryInMB\": 143360,\r\n      \"maxDataDiskCount\":\
+        \ 64\r\n    },\r\n    {\r\n      \"name\": \"Standard_D2_v2_Promo\",\r\n \
+        \     \"numberOfCores\": 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n    \
+        \  \"resourceDiskSizeInMB\": 102400,\r\n      \"memoryInMB\": 7168,\r\n  \
+        \    \"maxDataDiskCount\": 8\r\n    },\r\n    {\r\n      \"name\": \"Standard_D3_v2_Promo\"\
+        ,\r\n      \"numberOfCores\": 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n\
+        \      \"resourceDiskSizeInMB\": 204800,\r\n      \"memoryInMB\": 14336,\r\
+        \n      \"maxDataDiskCount\": 16\r\n    },\r\n    {\r\n      \"name\": \"\
+        Standard_D4_v2_Promo\",\r\n      \"numberOfCores\": 8,\r\n      \"osDiskSizeInMB\"\
+        : 1047552,\r\n      \"resourceDiskSizeInMB\": 409600,\r\n      \"memoryInMB\"\
+        : 28672,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"\
+        name\": \"Standard_D5_v2_Promo\",\r\n      \"numberOfCores\": 16,\r\n    \
+        \  \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 819200,\r\
+        \n      \"memoryInMB\": 57344,\r\n      \"maxDataDiskCount\": 64\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_D11_v2_Promo\",\r\n      \"numberOfCores\"\
+        : 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
         : 102400,\r\n      \"memoryInMB\": 14336,\r\n      \"maxDataDiskCount\": 8\r\
         \n    },\r\n    {\r\n      \"name\": \"Standard_D12_v2_Promo\",\r\n      \"\
         numberOfCores\": 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
@@ -327,7 +373,22 @@ interactions:
         \n    },\r\n    {\r\n      \"name\": \"Standard_A8_v2\",\r\n      \"numberOfCores\"\
         : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
         : 81920,\r\n      \"memoryInMB\": 16384,\r\n      \"maxDataDiskCount\": 16\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_D1\",\r\n      \"numberOfCores\"\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_D2_v3\",\r\n      \"numberOfCores\"\
+        : 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 51200,\r\n      \"memoryInMB\": 8192,\r\n      \"maxDataDiskCount\": 4\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_D4_v3\",\r\n      \"numberOfCores\"\
+        : 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 102400,\r\n      \"memoryInMB\": 16384,\r\n      \"maxDataDiskCount\": 8\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_D8_v3\",\r\n      \"numberOfCores\"\
+        : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 204800,\r\n      \"memoryInMB\": 32768,\r\n      \"maxDataDiskCount\": 16\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_D16_v3\",\r\n      \"numberOfCores\"\
+        : 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 409600,\r\n      \"memoryInMB\": 65636,\r\n      \"maxDataDiskCount\": 32\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_D32_v3\",\r\n      \"numberOfCores\"\
+        : 32,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 819200,\r\n      \"memoryInMB\": 131072,\r\n      \"maxDataDiskCount\":\
+        \ 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_D1\",\r\n      \"numberOfCores\"\
         : 1,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
         : 51200,\r\n      \"memoryInMB\": 3584,\r\n      \"maxDataDiskCount\": 4\r\
         \n    },\r\n    {\r\n      \"name\": \"Standard_D2\",\r\n      \"numberOfCores\"\
@@ -375,58 +436,10 @@ interactions:
         \n    },\r\n    {\r\n      \"name\": \"Standard_DS14\",\r\n      \"numberOfCores\"\
         : 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
         : 229376,\r\n      \"memoryInMB\": 114688,\r\n      \"maxDataDiskCount\":\
-        \ 64\r\n    },\r\n    {\r\n      \"name\": \"Standard_B1ms\",\r\n      \"\
-        numberOfCores\": 1,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 4096,\r\n      \"memoryInMB\": 2048,\r\n      \"maxDataDiskCount\": 2\r\n\
-        \    },\r\n    {\r\n      \"name\": \"Standard_B1s\",\r\n      \"numberOfCores\"\
-        : 1,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 2048,\r\n      \"memoryInMB\": 1024,\r\n      \"maxDataDiskCount\": 2\r\n\
-        \    },\r\n    {\r\n      \"name\": \"Standard_B2ms\",\r\n      \"numberOfCores\"\
-        : 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 16384,\r\n      \"memoryInMB\": 8192,\r\n      \"maxDataDiskCount\": 4\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_B2s\",\r\n      \"numberOfCores\"\
-        : 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 8192,\r\n      \"memoryInMB\": 4096,\r\n      \"maxDataDiskCount\": 4\r\n\
-        \    },\r\n    {\r\n      \"name\": \"Standard_B4ms\",\r\n      \"numberOfCores\"\
-        : 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 32768,\r\n      \"memoryInMB\": 16384,\r\n      \"maxDataDiskCount\": 8\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_B8ms\",\r\n      \"numberOfCores\"\
-        : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 65536,\r\n      \"memoryInMB\": 32768,\r\n      \"maxDataDiskCount\": 16\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_D2_v3\",\r\n      \"numberOfCores\"\
-        : 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 51200,\r\n      \"memoryInMB\": 8192,\r\n      \"maxDataDiskCount\": 4\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_D4_v3\",\r\n      \"numberOfCores\"\
-        : 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 102400,\r\n      \"memoryInMB\": 16384,\r\n      \"maxDataDiskCount\": 8\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_D8_v3\",\r\n      \"numberOfCores\"\
-        : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 204800,\r\n      \"memoryInMB\": 32768,\r\n      \"maxDataDiskCount\": 16\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_D16_v3\",\r\n      \"numberOfCores\"\
-        : 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 409600,\r\n      \"memoryInMB\": 65636,\r\n      \"maxDataDiskCount\": 32\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_D32_v3\",\r\n      \"numberOfCores\"\
-        : 32,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 819200,\r\n      \"memoryInMB\": 131072,\r\n      \"maxDataDiskCount\":\
-        \ 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_D64_v3\",\r\n      \"\
+        \ 64\r\n    },\r\n    {\r\n      \"name\": \"Standard_D64_v3\",\r\n      \"\
         numberOfCores\": 64,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
         : 1638400,\r\n      \"memoryInMB\": 262144,\r\n      \"maxDataDiskCount\"\
-        : 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_D2s_v3\",\r\n      \"\
-        numberOfCores\": 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 16384,\r\n      \"memoryInMB\": 8192,\r\n      \"maxDataDiskCount\": 4\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_D4s_v3\",\r\n      \"numberOfCores\"\
-        : 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 32768,\r\n      \"memoryInMB\": 16384,\r\n      \"maxDataDiskCount\": 8\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_D8s_v3\",\r\n      \"numberOfCores\"\
-        : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 65536,\r\n      \"memoryInMB\": 32768,\r\n      \"maxDataDiskCount\": 16\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_D16s_v3\",\r\n      \"numberOfCores\"\
-        : 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 131072,\r\n      \"memoryInMB\": 65536,\r\n      \"maxDataDiskCount\": 32\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_D32s_v3\",\r\n      \"numberOfCores\"\
-        : 32,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 262144,\r\n      \"memoryInMB\": 131072,\r\n      \"maxDataDiskCount\":\
-        \ 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_D64s_v3\",\r\n     \
+        : 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_D64s_v3\",\r\n     \
         \ \"numberOfCores\": 64,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"\
         resourceDiskSizeInMB\": 524288,\r\n      \"memoryInMB\": 262144,\r\n     \
         \ \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_E2_v3\"\
@@ -445,70 +458,92 @@ interactions:
         name\": \"Standard_E32_v3\",\r\n      \"numberOfCores\": 32,\r\n      \"osDiskSizeInMB\"\
         : 1047552,\r\n      \"resourceDiskSizeInMB\": 819200,\r\n      \"memoryInMB\"\
         : 262144,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_E64_v3\",\r\n      \"numberOfCores\": 64,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 1638400,\r\n      \"memoryInMB\"\
-        : 442368,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_E2s_v3\",\r\n      \"numberOfCores\": 2,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 32768,\r\n      \"memoryInMB\"\
-        : 16384,\r\n      \"maxDataDiskCount\": 4\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Standard_E4s_v3\",\r\n      \"numberOfCores\": 4,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 65536,\r\n      \"memoryInMB\"\
-        : 32768,\r\n      \"maxDataDiskCount\": 8\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Standard_E8s_v3\",\r\n      \"numberOfCores\": 8,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 131072,\r\n      \"memoryInMB\"\
-        : 65536,\r\n      \"maxDataDiskCount\": 16\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_E16s_v3\",\r\n      \"numberOfCores\": 16,\r\n      \"\
-        osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 262144,\r\n\
-        \      \"memoryInMB\": 131072,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\
-        \n    {\r\n      \"name\": \"Standard_E32-8s_v3\",\r\n      \"numberOfCores\"\
-        : 32,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 524288,\r\n      \"memoryInMB\": 262144,\r\n      \"maxDataDiskCount\":\
-        \ 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_E32-16s_v3\",\r\n  \
-        \    \"numberOfCores\": 32,\r\n      \"osDiskSizeInMB\": 1047552,\r\n    \
-        \  \"resourceDiskSizeInMB\": 524288,\r\n      \"memoryInMB\": 262144,\r\n\
-        \      \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_E32s_v3\"\
-        ,\r\n      \"numberOfCores\": 32,\r\n      \"osDiskSizeInMB\": 1047552,\r\n\
-        \      \"resourceDiskSizeInMB\": 524288,\r\n      \"memoryInMB\": 262144,\r\
-        \n      \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"name\": \"\
-        Standard_E64-16s_v3\",\r\n      \"numberOfCores\": 64,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 884736,\r\n      \"memoryInMB\"\
-        : 442368,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_E64-32s_v3\",\r\n      \"numberOfCores\": 64,\r\n     \
-        \ \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 884736,\r\
-        \n      \"memoryInMB\": 442368,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\
-        \n    {\r\n      \"name\": \"Standard_E64s_v3\",\r\n      \"numberOfCores\"\
+        name\": \"Standard_E64i_v3\",\r\n      \"numberOfCores\": 64,\r\n      \"\
+        osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 1638400,\r\n\
+        \      \"memoryInMB\": 442368,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_E64_v3\",\r\n      \"numberOfCores\"\
         : 64,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 884736,\r\n      \"memoryInMB\": 442368,\r\n      \"maxDataDiskCount\":\
-        \ 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_G1\",\r\n      \"numberOfCores\"\
-        : 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 393216,\r\n      \"memoryInMB\": 28672,\r\n      \"maxDataDiskCount\": 8\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_G2\",\r\n      \"numberOfCores\"\
+        : 1638400,\r\n      \"memoryInMB\": 442368,\r\n      \"maxDataDiskCount\"\
+        : 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_E2s_v3\",\r\n      \"\
+        numberOfCores\": 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 32768,\r\n      \"memoryInMB\": 16384,\r\n      \"maxDataDiskCount\": 4\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_E4-2s_v3\",\r\n      \"numberOfCores\"\
         : 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 786432,\r\n      \"memoryInMB\": 57344,\r\n      \"maxDataDiskCount\": 16\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_G3\",\r\n      \"numberOfCores\"\
+        : 65536,\r\n      \"memoryInMB\": 32768,\r\n      \"maxDataDiskCount\": 8\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_E4s_v3\",\r\n      \"numberOfCores\"\
+        : 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 65536,\r\n      \"memoryInMB\": 32768,\r\n      \"maxDataDiskCount\": 8\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_E8-2s_v3\",\r\n      \"numberOfCores\"\
+        : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 131072,\r\n      \"memoryInMB\": 65536,\r\n      \"maxDataDiskCount\": 16\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_E8-4s_v3\",\r\n      \"numberOfCores\"\
         : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 1572864,\r\n      \"memoryInMB\": 114688,\r\n      \"maxDataDiskCount\"\
-        : 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_G4\",\r\n      \"numberOfCores\"\
+        : 131072,\r\n      \"memoryInMB\": 65536,\r\n      \"maxDataDiskCount\": 16\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_E8s_v3\",\r\n      \"numberOfCores\"\
+        : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 131072,\r\n      \"memoryInMB\": 65536,\r\n      \"maxDataDiskCount\": 16\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_E16-4s_v3\",\r\n      \"numberOfCores\"\
         : 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 3145728,\r\n      \"memoryInMB\": 229376,\r\n      \"maxDataDiskCount\"\
-        : 64\r\n    },\r\n    {\r\n      \"name\": \"Standard_G5\",\r\n      \"numberOfCores\"\
+        : 262144,\r\n      \"memoryInMB\": 131072,\r\n      \"maxDataDiskCount\":\
+        \ 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_E16-8s_v3\",\r\n   \
+        \   \"numberOfCores\": 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n     \
+        \ \"resourceDiskSizeInMB\": 262144,\r\n      \"memoryInMB\": 131072,\r\n \
+        \     \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_E16s_v3\"\
+        ,\r\n      \"numberOfCores\": 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n\
+        \      \"resourceDiskSizeInMB\": 262144,\r\n      \"memoryInMB\": 131072,\r\
+        \n      \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"name\": \"\
+        Standard_E32-8s_v3\",\r\n      \"numberOfCores\": 32,\r\n      \"osDiskSizeInMB\"\
+        : 1047552,\r\n      \"resourceDiskSizeInMB\": 524288,\r\n      \"memoryInMB\"\
+        : 262144,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"\
+        name\": \"Standard_E32-16s_v3\",\r\n      \"numberOfCores\": 32,\r\n     \
+        \ \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 524288,\r\
+        \n      \"memoryInMB\": 262144,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_E32s_v3\",\r\n      \"numberOfCores\"\
         : 32,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 6291456,\r\n      \"memoryInMB\": 458752,\r\n      \"maxDataDiskCount\"\
-        : 64\r\n    },\r\n    {\r\n      \"name\": \"Standard_GS1\",\r\n      \"numberOfCores\"\
-        : 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 57344,\r\n      \"memoryInMB\": 28672,\r\n      \"maxDataDiskCount\": 8\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_GS2\",\r\n      \"numberOfCores\"\
-        : 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 114688,\r\n      \"memoryInMB\": 57344,\r\n      \"maxDataDiskCount\": 16\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_GS3\",\r\n      \"numberOfCores\"\
-        : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 229376,\r\n      \"memoryInMB\": 114688,\r\n      \"maxDataDiskCount\":\
-        \ 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_GS4\",\r\n      \"numberOfCores\"\
+        : 524288,\r\n      \"memoryInMB\": 262144,\r\n      \"maxDataDiskCount\":\
+        \ 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_E64-16s_v3\",\r\n  \
+        \    \"numberOfCores\": 64,\r\n      \"osDiskSizeInMB\": 1047552,\r\n    \
+        \  \"resourceDiskSizeInMB\": 884736,\r\n      \"memoryInMB\": 442368,\r\n\
+        \      \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_E64-32s_v3\"\
+        ,\r\n      \"numberOfCores\": 64,\r\n      \"osDiskSizeInMB\": 1047552,\r\n\
+        \      \"resourceDiskSizeInMB\": 884736,\r\n      \"memoryInMB\": 442368,\r\
+        \n      \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"name\": \"\
+        Standard_E64is_v3\",\r\n      \"numberOfCores\": 64,\r\n      \"osDiskSizeInMB\"\
+        : 1047552,\r\n      \"resourceDiskSizeInMB\": 884736,\r\n      \"memoryInMB\"\
+        : 442368,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"\
+        name\": \"Standard_E64s_v3\",\r\n      \"numberOfCores\": 64,\r\n      \"\
+        osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 884736,\r\n\
+        \      \"memoryInMB\": 442368,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_G1\",\r\n      \"numberOfCores\": 2,\r\
+        \n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 393216,\r\
+        \n      \"memoryInMB\": 28672,\r\n      \"maxDataDiskCount\": 8\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_G2\",\r\n      \"numberOfCores\": 4,\r\
+        \n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 786432,\r\
+        \n      \"memoryInMB\": 57344,\r\n      \"maxDataDiskCount\": 16\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_G3\",\r\n      \"numberOfCores\": 8,\r\
+        \n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 1572864,\r\
+        \n      \"memoryInMB\": 114688,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_G4\",\r\n      \"numberOfCores\": 16,\r\
+        \n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 3145728,\r\
+        \n      \"memoryInMB\": 229376,\r\n      \"maxDataDiskCount\": 64\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_G5\",\r\n      \"numberOfCores\": 32,\r\
+        \n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 6291456,\r\
+        \n      \"memoryInMB\": 458752,\r\n      \"maxDataDiskCount\": 64\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_GS1\",\r\n      \"numberOfCores\": 2,\r\
+        \n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 57344,\r\
+        \n      \"memoryInMB\": 28672,\r\n      \"maxDataDiskCount\": 8\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_GS2\",\r\n      \"numberOfCores\": 4,\r\
+        \n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 114688,\r\
+        \n      \"memoryInMB\": 57344,\r\n      \"maxDataDiskCount\": 16\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_GS3\",\r\n      \"numberOfCores\": 8,\r\
+        \n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 229376,\r\
+        \n      \"memoryInMB\": 114688,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_GS4\",\r\n      \"numberOfCores\": 16,\r\
+        \n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 458752,\r\
+        \n      \"memoryInMB\": 229376,\r\n      \"maxDataDiskCount\": 64\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_GS4-4\",\r\n      \"numberOfCores\"\
         : 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
         : 458752,\r\n      \"memoryInMB\": 229376,\r\n      \"maxDataDiskCount\":\
-        \ 64\r\n    },\r\n    {\r\n      \"name\": \"Standard_GS4-4\",\r\n      \"\
-        numberOfCores\": 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 458752,\r\n      \"memoryInMB\": 229376,\r\n      \"maxDataDiskCount\":\
         \ 64\r\n    },\r\n    {\r\n      \"name\": \"Standard_GS4-8\",\r\n      \"\
         numberOfCores\": 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
         : 458752,\r\n      \"memoryInMB\": 229376,\r\n      \"maxDataDiskCount\":\
@@ -563,19 +598,41 @@ interactions:
         : 64\r\n    },\r\n    {\r\n      \"name\": \"Standard_H16mr\",\r\n      \"\
         numberOfCores\": 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
         : 2048000,\r\n      \"memoryInMB\": 229376,\r\n      \"maxDataDiskCount\"\
-        : 64\r\n    }\r\n  ]\r\n}"}
+        : 64\r\n    },\r\n    {\r\n      \"name\": \"Standard_F2s_v2\",\r\n      \"\
+        numberOfCores\": 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 16384,\r\n      \"memoryInMB\": 4096,\r\n      \"maxDataDiskCount\": 4\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_F4s_v2\",\r\n      \"numberOfCores\"\
+        : 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 32768,\r\n      \"memoryInMB\": 8192,\r\n      \"maxDataDiskCount\": 8\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_F8s_v2\",\r\n      \"numberOfCores\"\
+        : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 65536,\r\n      \"memoryInMB\": 16384,\r\n      \"maxDataDiskCount\": 16\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_F16s_v2\",\r\n      \"numberOfCores\"\
+        : 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 131072,\r\n      \"memoryInMB\": 32768,\r\n      \"maxDataDiskCount\": 32\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_F32s_v2\",\r\n      \"numberOfCores\"\
+        : 32,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 262144,\r\n      \"memoryInMB\": 65536,\r\n      \"maxDataDiskCount\": 32\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_F64s_v2\",\r\n      \"numberOfCores\"\
+        : 64,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 524288,\r\n      \"memoryInMB\": 131072,\r\n      \"maxDataDiskCount\":\
+        \ 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_F72s_v2\",\r\n     \
+        \ \"numberOfCores\": 72,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"\
+        resourceDiskSizeInMB\": 589824,\r\n      \"memoryInMB\": 147456,\r\n     \
+        \ \"maxDataDiskCount\": 32\r\n    }\r\n  ]\r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['30498']
+      content-length: ['34047']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:38:15 GMT']
+      date: ['Fri, 20 Jul 2018 17:12:26 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4982,Microsoft.Compute/LowCostGet30Min;39890']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4193,Microsoft.Compute/LowCostGet30Min;33591']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -585,22 +642,23 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['0']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: DELETE
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_availability_sets53ac1097/providers/Microsoft.Compute/availabilitySets/pyarmset53ac1097?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_availability_sets53ac1097/providers/Microsoft.Compute/availabilitySets/pyarmset53ac1097?api-version=2018-06-01
   response:
     body: {string: ''}
     headers:
       cache-control: [no-cache]
       content-length: ['0']
-      date: ['Wed, 22 Nov 2017 17:38:16 GMT']
+      date: ['Fri, 20 Jul 2018 17:12:28 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/DeleteVM3Min;299,Microsoft.Compute/DeleteVM30Min;1499']
-      x-ms-ratelimit-remaining-subscription-writes: ['1199']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/DeleteVM3Min;238,Microsoft.Compute/DeleteVM30Min;1198']
+      x-ms-ratelimit-remaining-subscription-deletes: ['14999']
     status: {code: 200, message: OK}
 version: 1
diff --git a/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_usage.yaml b/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_usage.yaml
index 2243ca33867b..2e1d96d206c1 100644
--- a/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_usage.yaml
+++ b/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_usage.yaml
@@ -6,63 +6,66 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/usages?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/usages?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"value\": [\r\n    {\r\n      \"limit\": 2000,\r\n   \
-        \   \"unit\": \"Count\",\r\n      \"currentValue\": 1,\r\n      \"name\":\
+        \   \"unit\": \"Count\",\r\n      \"currentValue\": 0,\r\n      \"name\":\
         \ {\r\n        \"value\": \"availabilitySets\",\r\n        \"localizedValue\"\
         : \"Availability Sets\"\r\n      }\r\n    },\r\n    {\r\n      \"limit\":\
-        \ 100,\r\n      \"unit\": \"Count\",\r\n      \"currentValue\": 9,\r\n   \
+        \ 100,\r\n      \"unit\": \"Count\",\r\n      \"currentValue\": 4,\r\n   \
         \   \"name\": {\r\n        \"value\": \"cores\",\r\n        \"localizedValue\"\
         : \"Total Regional vCPUs\"\r\n      }\r\n    },\r\n    {\r\n      \"limit\"\
-        : 10000,\r\n      \"unit\": \"Count\",\r\n      \"currentValue\": 7,\r\n \
+        : 10000,\r\n      \"unit\": \"Count\",\r\n      \"currentValue\": 1,\r\n \
         \     \"name\": {\r\n        \"value\": \"virtualMachines\",\r\n        \"\
         localizedValue\": \"Virtual Machines\"\r\n      }\r\n    },\r\n    {\r\n \
         \     \"limit\": 2000,\r\n      \"unit\": \"Count\",\r\n      \"currentValue\"\
-        : 2,\r\n      \"name\": {\r\n        \"value\": \"virtualMachineScaleSets\"\
+        : 0,\r\n      \"name\": {\r\n        \"value\": \"virtualMachineScaleSets\"\
         ,\r\n        \"localizedValue\": \"Virtual Machine Scale Sets\"\r\n      }\r\
         \n    },\r\n    {\r\n      \"limit\": 100,\r\n      \"unit\": \"Count\",\r\
-        \n      \"currentValue\": 5,\r\n      \"name\": {\r\n        \"value\": \"\
-        standardDSv2Family\",\r\n        \"localizedValue\": \"Standard DSv2 Family\
+        \n      \"currentValue\": 4,\r\n      \"name\": {\r\n        \"value\": \"\
+        standardDSv3Family\",\r\n        \"localizedValue\": \"Standard DSv3 Family\
         \ vCPUs\"\r\n      }\r\n    },\r\n    {\r\n      \"limit\": 100,\r\n     \
-        \ \"unit\": \"Count\",\r\n      \"currentValue\": 4,\r\n      \"name\": {\r\
-        \n        \"value\": \"standardDv2Family\",\r\n        \"localizedValue\"\
-        : \"Standard Dv2 Family vCPUs\"\r\n      }\r\n    },\r\n    {\r\n      \"\
+        \ \"unit\": \"Count\",\r\n      \"currentValue\": 0,\r\n      \"name\": {\r\
+        \n        \"value\": \"basicAFamily\",\r\n        \"localizedValue\": \"Basic\
+        \ A Family vCPUs\"\r\n      }\r\n    },\r\n    {\r\n      \"limit\": 100,\r\
+        \n      \"unit\": \"Count\",\r\n      \"currentValue\": 0,\r\n      \"name\"\
+        : {\r\n        \"value\": \"standardA0_A7Family\",\r\n        \"localizedValue\"\
+        : \"Standard A0-A7 Family vCPUs\"\r\n      }\r\n    },\r\n    {\r\n      \"\
         limit\": 100,\r\n      \"unit\": \"Count\",\r\n      \"currentValue\": 0,\r\
-        \n      \"name\": {\r\n        \"value\": \"standardA0_A7Family\",\r\n   \
-        \     \"localizedValue\": \"Standard A0-A7 Family vCPUs\"\r\n      }\r\n \
-        \   },\r\n    {\r\n      \"limit\": 100,\r\n      \"unit\": \"Count\",\r\n\
+        \n      \"name\": {\r\n        \"value\": \"standardA8_A11Family\",\r\n  \
+        \      \"localizedValue\": \"Standard A8-A11 Family vCPUs\"\r\n      }\r\n\
+        \    },\r\n    {\r\n      \"limit\": 100,\r\n      \"unit\": \"Count\",\r\n\
         \      \"currentValue\": 0,\r\n      \"name\": {\r\n        \"value\": \"\
-        basicAFamily\",\r\n        \"localizedValue\": \"Basic A Family vCPUs\"\r\n\
-        \      }\r\n    },\r\n    {\r\n      \"limit\": 100,\r\n      \"unit\": \"\
-        Count\",\r\n      \"currentValue\": 0,\r\n      \"name\": {\r\n        \"\
-        value\": \"standardA8_A11Family\",\r\n        \"localizedValue\": \"Standard\
-        \ A8-A11 Family vCPUs\"\r\n      }\r\n    },\r\n    {\r\n      \"limit\":\
-        \ 100,\r\n      \"unit\": \"Count\",\r\n      \"currentValue\": 0,\r\n   \
-        \   \"name\": {\r\n        \"value\": \"standardDFamily\",\r\n        \"localizedValue\"\
-        : \"Standard D Family vCPUs\"\r\n      }\r\n    },\r\n    {\r\n      \"limit\"\
-        : 100,\r\n      \"unit\": \"Count\",\r\n      \"currentValue\": 0,\r\n   \
-        \   \"name\": {\r\n        \"value\": \"standardGFamily\",\r\n        \"localizedValue\"\
-        : \"Standard G Family vCPUs\"\r\n      }\r\n    },\r\n    {\r\n      \"limit\"\
+        standardDFamily\",\r\n        \"localizedValue\": \"Standard D Family vCPUs\"\
+        \r\n      }\r\n    },\r\n    {\r\n      \"limit\": 100,\r\n      \"unit\"\
+        : \"Count\",\r\n      \"currentValue\": 0,\r\n      \"name\": {\r\n      \
+        \  \"value\": \"standardDv2Family\",\r\n        \"localizedValue\": \"Standard\
+        \ Dv2 Family vCPUs\"\r\n      }\r\n    },\r\n    {\r\n      \"limit\": 100,\r\
+        \n      \"unit\": \"Count\",\r\n      \"currentValue\": 0,\r\n      \"name\"\
+        : {\r\n        \"value\": \"standardDSFamily\",\r\n        \"localizedValue\"\
+        : \"Standard DS Family vCPUs\"\r\n      }\r\n    },\r\n    {\r\n      \"limit\"\
         : 100,\r\n      \"unit\": \"Count\",\r\n      \"currentValue\": 0,\r\n   \
-        \   \"name\": {\r\n        \"value\": \"standardDSFamily\",\r\n        \"\
-        localizedValue\": \"Standard DS Family vCPUs\"\r\n      }\r\n    },\r\n  \
-        \  {\r\n      \"limit\": 100,\r\n      \"unit\": \"Count\",\r\n      \"currentValue\"\
-        : 0,\r\n      \"name\": {\r\n        \"value\": \"standardGSFamily\",\r\n\
-        \        \"localizedValue\": \"Standard GS Family vCPUs\"\r\n      }\r\n \
-        \   },\r\n    {\r\n      \"limit\": 100,\r\n      \"unit\": \"Count\",\r\n\
+        \   \"name\": {\r\n        \"value\": \"standardDSv2Family\",\r\n        \"\
+        localizedValue\": \"Standard DSv2 Family vCPUs\"\r\n      }\r\n    },\r\n\
+        \    {\r\n      \"limit\": 100,\r\n      \"unit\": \"Count\",\r\n      \"\
+        currentValue\": 0,\r\n      \"name\": {\r\n        \"value\": \"standardGFamily\"\
+        ,\r\n        \"localizedValue\": \"Standard G Family vCPUs\"\r\n      }\r\n\
+        \    },\r\n    {\r\n      \"limit\": 100,\r\n      \"unit\": \"Count\",\r\n\
         \      \"currentValue\": 0,\r\n      \"name\": {\r\n        \"value\": \"\
-        standardFFamily\",\r\n        \"localizedValue\": \"Standard F Family vCPUs\"\
+        standardGSFamily\",\r\n        \"localizedValue\": \"Standard GS Family vCPUs\"\
         \r\n      }\r\n    },\r\n    {\r\n      \"limit\": 100,\r\n      \"unit\"\
         : \"Count\",\r\n      \"currentValue\": 0,\r\n      \"name\": {\r\n      \
-        \  \"value\": \"standardFSFamily\",\r\n        \"localizedValue\": \"Standard\
-        \ FS Family vCPUs\"\r\n      }\r\n    },\r\n    {\r\n      \"limit\": 24,\r\
+        \  \"value\": \"standardFFamily\",\r\n        \"localizedValue\": \"Standard\
+        \ F Family vCPUs\"\r\n      }\r\n    },\r\n    {\r\n      \"limit\": 100,\r\
         \n      \"unit\": \"Count\",\r\n      \"currentValue\": 0,\r\n      \"name\"\
-        : {\r\n        \"value\": \"standardNVFamily\",\r\n        \"localizedValue\"\
+        : {\r\n        \"value\": \"standardFSFamily\",\r\n        \"localizedValue\"\
+        : \"Standard FS Family vCPUs\"\r\n      }\r\n    },\r\n    {\r\n      \"limit\"\
+        : 24,\r\n      \"unit\": \"Count\",\r\n      \"currentValue\": 0,\r\n    \
+        \  \"name\": {\r\n        \"value\": \"standardNVFamily\",\r\n        \"localizedValue\"\
         : \"Standard NV Family vCPUs\"\r\n      }\r\n    },\r\n    {\r\n      \"limit\"\
         : 48,\r\n      \"unit\": \"Count\",\r\n      \"currentValue\": 0,\r\n    \
         \  \"name\": {\r\n        \"value\": \"standardNCFamily\",\r\n        \"localizedValue\"\
@@ -91,52 +94,73 @@ interactions:
         standardDv3Family\",\r\n        \"localizedValue\": \"Standard Dv3 Family\
         \ vCPUs\"\r\n      }\r\n    },\r\n    {\r\n      \"limit\": 100,\r\n     \
         \ \"unit\": \"Count\",\r\n      \"currentValue\": 0,\r\n      \"name\": {\r\
-        \n        \"value\": \"standardDSv3Family\",\r\n        \"localizedValue\"\
-        : \"Standard DSv3 Family vCPUs\"\r\n      }\r\n    },\r\n    {\r\n      \"\
+        \n        \"value\": \"standardEv3Family\",\r\n        \"localizedValue\"\
+        : \"Standard Ev3 Family vCPUs\"\r\n      }\r\n    },\r\n    {\r\n      \"\
         limit\": 100,\r\n      \"unit\": \"Count\",\r\n      \"currentValue\": 0,\r\
-        \n      \"name\": {\r\n        \"value\": \"standardEv3Family\",\r\n     \
-        \   \"localizedValue\": \"Standard Ev3 Family vCPUs\"\r\n      }\r\n    },\r\
-        \n    {\r\n      \"limit\": 100,\r\n      \"unit\": \"Count\",\r\n      \"\
-        currentValue\": 0,\r\n      \"name\": {\r\n        \"value\": \"standardESv3Family\"\
-        ,\r\n        \"localizedValue\": \"Standard ESv3 Family vCPUs\"\r\n      }\r\
-        \n    },\r\n    {\r\n      \"limit\": 10,\r\n      \"unit\": \"Count\",\r\n\
-        \      \"currentValue\": 0,\r\n      \"name\": {\r\n        \"value\": \"\
-        standardBFamily\",\r\n        \"localizedValue\": \"Standard B Family vCPUs\"\
-        \r\n      }\r\n    },\r\n    {\r\n      \"limit\": 100,\r\n      \"unit\"\
+        \n      \"name\": {\r\n        \"value\": \"standardESv3Family\",\r\n    \
+        \    \"localizedValue\": \"Standard ESv3 Family vCPUs\"\r\n      }\r\n   \
+        \ },\r\n    {\r\n      \"limit\": 10,\r\n      \"unit\": \"Count\",\r\n  \
+        \    \"currentValue\": 0,\r\n      \"name\": {\r\n        \"value\": \"standardBSFamily\"\
+        ,\r\n        \"localizedValue\": \"Standard BS Family vCPUs\"\r\n      }\r\
+        \n    },\r\n    {\r\n      \"limit\": 100,\r\n      \"unit\": \"Count\",\r\
+        \n      \"currentValue\": 0,\r\n      \"name\": {\r\n        \"value\": \"\
+        standardFSv2Family\",\r\n        \"localizedValue\": \"Standard FSv2 Family\
+        \ vCPUs\"\r\n      }\r\n    },\r\n    {\r\n      \"limit\": 0,\r\n      \"\
+        unit\": \"Count\",\r\n      \"currentValue\": 0,\r\n      \"name\": {\r\n\
+        \        \"value\": \"standardNDSFamily\",\r\n        \"localizedValue\":\
+        \ \"Standard NDS Family vCPUs\"\r\n      }\r\n    },\r\n    {\r\n      \"\
+        limit\": 0,\r\n      \"unit\": \"Count\",\r\n      \"currentValue\": 0,\r\n\
+        \      \"name\": {\r\n        \"value\": \"standardNCSv2Family\",\r\n    \
+        \    \"localizedValue\": \"Standard NCSv2 Family vCPUs\"\r\n      }\r\n  \
+        \  },\r\n    {\r\n      \"limit\": 0,\r\n      \"unit\": \"Count\",\r\n  \
+        \    \"currentValue\": 0,\r\n      \"name\": {\r\n        \"value\": \"standardNCSv3Family\"\
+        ,\r\n        \"localizedValue\": \"Standard NCSv3 Family vCPUs\"\r\n     \
+        \ }\r\n    },\r\n    {\r\n      \"limit\": 0,\r\n      \"unit\": \"Count\"\
+        ,\r\n      \"currentValue\": 0,\r\n      \"name\": {\r\n        \"value\"\
+        : \"standardLSv2Family\",\r\n        \"localizedValue\": \"Standard LSv2 Family\
+        \ vCPUs\"\r\n      }\r\n    },\r\n    {\r\n      \"limit\": 100,\r\n     \
+        \ \"unit\": \"Count\",\r\n      \"currentValue\": 0,\r\n      \"name\": {\r\
+        \n        \"value\": \"standardEIv3Family\",\r\n        \"localizedValue\"\
+        : \"Standard EIv3 Family vCPUs\"\r\n      }\r\n    },\r\n    {\r\n      \"\
+        limit\": 100,\r\n      \"unit\": \"Count\",\r\n      \"currentValue\": 0,\r\
+        \n      \"name\": {\r\n        \"value\": \"standardEISv3Family\",\r\n   \
+        \     \"localizedValue\": \"Standard EISv3 Family vCPUs\"\r\n      }\r\n \
+        \   },\r\n    {\r\n      \"limit\": 10000,\r\n      \"unit\": \"Count\",\r\
+        \n      \"currentValue\": 0,\r\n      \"name\": {\r\n        \"value\": \"\
+        StandardDiskCount\",\r\n        \"localizedValue\": \"Standard Storage Managed\
+        \ Disks\"\r\n      }\r\n    },\r\n    {\r\n      \"limit\": 10000,\r\n   \
+        \   \"unit\": \"Count\",\r\n      \"currentValue\": 1,\r\n      \"name\":\
+        \ {\r\n        \"value\": \"PremiumDiskCount\",\r\n        \"localizedValue\"\
+        : \"Premium Storage Managed Disks\"\r\n      }\r\n    },\r\n    {\r\n    \
+        \  \"limit\": 10000,\r\n      \"unit\": \"Count\",\r\n      \"currentValue\"\
+        : 0,\r\n      \"name\": {\r\n        \"value\": \"StandardSSDDiskCount\",\r\
+        \n        \"localizedValue\": \"StandardSSDStorageDisks\"\r\n      }\r\n \
+        \   },\r\n    {\r\n      \"limit\": 10000,\r\n      \"unit\": \"Count\",\r\
+        \n      \"currentValue\": 0,\r\n      \"name\": {\r\n        \"value\": \"\
+        DirectDriveDiskCount\",\r\n        \"localizedValue\": \"DirectDriveDisks\"\
+        \r\n      }\r\n    },\r\n    {\r\n      \"limit\": 10000,\r\n      \"unit\"\
         : \"Count\",\r\n      \"currentValue\": 0,\r\n      \"name\": {\r\n      \
-        \  \"value\": \"standardFSv2Family\",\r\n        \"localizedValue\": \"Standard\
-        \ FSv2 Family vCPUs\"\r\n      }\r\n    },\r\n    {\r\n      \"limit\": 0,\r\
-        \n      \"unit\": \"Count\",\r\n      \"currentValue\": 0,\r\n      \"name\"\
-        : {\r\n        \"value\": \"standardNDFamily\",\r\n        \"localizedValue\"\
-        : \"Standard ND Family vCPUs\"\r\n      }\r\n    },\r\n    {\r\n      \"limit\"\
-        : 0,\r\n      \"unit\": \"Count\",\r\n      \"currentValue\": 0,\r\n     \
-        \ \"name\": {\r\n        \"value\": \"standardNCv2Family\",\r\n        \"\
-        localizedValue\": \"Standard NCv2 Family vCPUs\"\r\n      }\r\n    },\r\n\
-        \    {\r\n      \"limit\": 0,\r\n      \"unit\": \"Count\",\r\n      \"currentValue\"\
-        : 0,\r\n      \"name\": {\r\n        \"value\": \"standardNCv3Family\",\r\n\
-        \        \"localizedValue\": \"Standard NCv3 Family vCPUs\"\r\n      }\r\n\
-        \    },\r\n    {\r\n      \"limit\": 0,\r\n      \"unit\": \"Count\",\r\n\
-        \      \"currentValue\": 0,\r\n      \"name\": {\r\n        \"value\": \"\
-        standardLSv2Family\",\r\n        \"localizedValue\": \"Standard LSv2 Family\
-        \ vCPUs\"\r\n      }\r\n    },\r\n    {\r\n      \"limit\": 10000,\r\n   \
-        \   \"unit\": \"Count\",\r\n      \"currentValue\": 16,\r\n      \"name\"\
-        : {\r\n        \"value\": \"StandardDiskCount\",\r\n        \"localizedValue\"\
-        : \"Standard Storage Managed Disks\"\r\n      }\r\n    },\r\n    {\r\n   \
-        \   \"limit\": 10000,\r\n      \"unit\": \"Count\",\r\n      \"currentValue\"\
-        : 7,\r\n      \"name\": {\r\n        \"value\": \"PremiumDiskCount\",\r\n\
-        \        \"localizedValue\": \"Premium Storage Managed Disks\"\r\n      }\r\
-        \n    }\r\n  ]\r\n}"}
+        \  \"value\": \"StandardSnapshotCount\",\r\n        \"localizedValue\": \"\
+        StandardStorageSnapshots\"\r\n      }\r\n    },\r\n    {\r\n      \"limit\"\
+        : 10000,\r\n      \"unit\": \"Count\",\r\n      \"currentValue\": 0,\r\n \
+        \     \"name\": {\r\n        \"value\": \"PremiumSnapshotCount\",\r\n    \
+        \    \"localizedValue\": \"PremiumStorageSnapshots\"\r\n      }\r\n    },\r\
+        \n    {\r\n      \"limit\": 10000,\r\n      \"unit\": \"Count\",\r\n     \
+        \ \"currentValue\": 0,\r\n      \"name\": {\r\n        \"value\": \"ZRSSnapshotCount\"\
+        ,\r\n        \"localizedValue\": \"ZrsStorageSnapshots\"\r\n      }\r\n  \
+        \  }\r\n  ]\r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['7206']
+      content-length: ['8663']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:38:21 GMT']
+      date: ['Fri, 20 Jul 2018 17:12:34 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-ms-ratelimit-remaining-resource: [Microsoft.Compute/LowCostGet30Min;39889]
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: [Microsoft.Compute/GetSubscriptionInfo3Min;477]
     status: {code: 200, message: OK}
 version: 1
diff --git a/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_virtual_machine_capture.yaml b/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_virtual_machine_capture.yaml
index 5ef2e82c7ec4..a96226503251 100644
--- a/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_virtual_machine_capture.yaml
+++ b/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_virtual_machine_capture.yaml
@@ -1,29 +1,32 @@
 interactions:
 - request:
     body: '{"sku": {"name": "Standard_LRS"}, "kind": "Storage", "location": "westus",
-      "properties": {"supportsHttpsTrafficOnly": false}}'
+      "properties": {"supportsHttpsTrafficOnly": false, "isHnsEnabled": false}}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Length: ['125']
+      Content-Length: ['148']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 storagemanagementclient/1.4.0 Azure-SDK-For-Python]
+      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 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Storage/storageAccounts/pyvmirstorc0f9130c?api-version=2017-06-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Storage/storageAccounts/pyvmirstorc0f9130c?api-version=2018-02-01
   response:
     body: {string: ''}
     headers:
       cache-control: [no-cache]
       content-length: ['0']
-      date: ['Wed, 22 Nov 2017 17:38:27 GMT']
+      content-type: [text/plain; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:48:56 GMT']
       expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/locations/westus/asyncoperations/e69b0505-ff85-4546-87d7-e5de2783ecd9?monitor=true&api-version=2017-06-01']
+      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/locations/westus/asyncoperations/22033b85-fcbd-423f-9928-f3afde9c9727?monitor=true&api-version=2018-02-01']
       pragma: [no-cache]
-      server: [Microsoft-Azure-Storage-Resource-Provider/1.0, Microsoft-HTTPAPI/2.0]
+      server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0
+          Microsoft-HTTPAPI/2.0']
       strict-transport-security: [max-age=31536000; includeSubDomains]
+      x-content-type-options: [nosniff]
       x-ms-ratelimit-remaining-subscription-writes: ['1199']
     status: {code: 202, message: Accepted}
 - request:
@@ -32,27 +35,25 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 storagemanagementclient/1.4.0 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      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 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/locations/westus/asyncoperations/e69b0505-ff85-4546-87d7-e5de2783ecd9?monitor=true&api-version=2017-06-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/locations/westus/asyncoperations/22033b85-fcbd-423f-9928-f3afde9c9727?monitor=true&api-version=2018-02-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Storage/storageAccounts/pyvmirstorc0f9130c","kind":"Storage","location":"westus","name":"pyvmirstorc0f9130c","properties":{"creationTime":"2017-11-22T17:38:28.2043298Z","encryption":{"keySource":"Microsoft.Storage","services":{"blob":{"enabled":true,"lastEnabledTime":"2017-11-22T17:38:28.2063298Z"},"file":{"enabled":true,"lastEnabledTime":"2017-11-22T17:38:28.2063298Z"}}},"networkAcls":{"bypass":"AzureServices","defaultAction":"Allow","ipRules":[],"virtualNetworkRules":[]},"primaryEndpoints":{"blob":"https://pyvmirstorc0f9130c.blob.core.windows.net/","file":"https://pyvmirstorc0f9130c.file.core.windows.net/","queue":"https://pyvmirstorc0f9130c.queue.core.windows.net/","table":"https://pyvmirstorc0f9130c.table.core.windows.net/"},"primaryLocation":"westus","provisioningState":"Succeeded","statusOfPrimary":"available","supportsHttpsTrafficOnly":false},"sku":{"name":"Standard_LRS","tier":"Standard"},"tags":{},"type":"Microsoft.Storage/storageAccounts"}
-
-        '}
+    body: {string: '{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Storage/storageAccounts/pyvmirstorc0f9130c","name":"pyvmirstorc0f9130c","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"isHnsEnabled":false,"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-07-20T18:48:56.5421603Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-07-20T18:48:56.5421603Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-07-20T18:48:56.4327660Z","primaryEndpoints":{"blob":"https://pyvmirstorc0f9130c.blob.core.windows.net/","queue":"https://pyvmirstorc0f9130c.queue.core.windows.net/","table":"https://pyvmirstorc0f9130c.table.core.windows.net/","file":"https://pyvmirstorc0f9130c.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available"}}'}
     headers:
       cache-control: [no-cache]
-      content-length: ['1113']
+      content-length: ['1195']
       content-type: [application/json]
-      date: ['Wed, 22 Nov 2017 17:38:47 GMT']
+      date: ['Fri, 20 Jul 2018 18:49:13 GMT']
       expires: ['-1']
       pragma: [no-cache]
-      server: [Microsoft-Azure-Storage-Resource-Provider/1.0, Microsoft-HTTPAPI/2.0]
+      server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,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]
     status: {code: 200, message: OK}
 - request:
     body: '{"location": "westus", "properties": {"addressSpace": {"addressPrefixes":
@@ -64,35 +65,36 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['184']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 networkmanagementclient/1.6.0 Azure-SDK-For-Python]
+      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]
       accept-language: [en-US]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Network/virtualNetworks/pyvmirnetc0f9130c?api-version=2017-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Network/virtualNetworks/pyvmirnetc0f9130c?api-version=2018-02-01
   response:
     body: {string: "{\r\n  \"name\": \"pyvmirnetc0f9130c\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Network/virtualNetworks/pyvmirnetc0f9130c\"\
-        ,\r\n  \"etag\": \"W/\\\"77c39993-c21b-47f4-b1e3-5d520af31e30\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"08e743ce-7a29-422d-a741-30441ab9c6de\\\"\",\r\n \
         \ \"type\": \"Microsoft.Network/virtualNetworks\",\r\n  \"location\": \"westus\"\
         ,\r\n  \"properties\": {\r\n    \"provisioningState\": \"Updating\",\r\n \
-        \   \"resourceGuid\": \"e768e918-3875-400f-8d20-3ec78c16d89e\",\r\n    \"\
+        \   \"resourceGuid\": \"462281e4-30e9-4865-9ed9-6d7a4db606ed\",\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\"\
         : \"pyvmirsubc0f9130c\",\r\n        \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Network/virtualNetworks/pyvmirnetc0f9130c/subnets/pyvmirsubc0f9130c\"\
-        ,\r\n        \"etag\": \"W/\\\"77c39993-c21b-47f4-b1e3-5d520af31e30\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"08e743ce-7a29-422d-a741-30441ab9c6de\\\"\"\
         ,\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\"\
         : 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/caa1655f-ffeb-466b-8b2a-dc58326fd47d?api-version=2017-09-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/ee4785d7-a150-42a7-a288-254fe83ee425?api-version=2018-02-01']
       cache-control: [no-cache]
       content-length: ['1175']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:38:49 GMT']
+      date: ['Fri, 20 Jul 2018 18:49:16 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-subscription-writes: ['1199']
     status: {code: 201, message: Created}
 - request:
@@ -101,25 +103,49 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 networkmanagementclient/1.6.0 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      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]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/caa1655f-ffeb-466b-8b2a-dc58326fd47d?api-version=2017-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/ee4785d7-a150-42a7-a288-254fe83ee425?api-version=2018-02-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 18:49:21 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]
+    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 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
+    method: GET
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/ee4785d7-a150-42a7-a288-254fe83ee425?api-version=2018-02-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: ['Wed, 22 Nov 2017 17:38:52 GMT']
+      date: ['Fri, 20 Jul 2018 18:49:31 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]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -127,22 +153,20 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 networkmanagementclient/1.6.0 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      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]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Network/virtualNetworks/pyvmirnetc0f9130c?api-version=2017-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Network/virtualNetworks/pyvmirnetc0f9130c?api-version=2018-02-01
   response:
     body: {string: "{\r\n  \"name\": \"pyvmirnetc0f9130c\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Network/virtualNetworks/pyvmirnetc0f9130c\"\
-        ,\r\n  \"etag\": \"W/\\\"5fde8c2a-0cc4-4063-b02f-6b3f18cff784\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"3a15b0dd-0968-42bf-b3e6-9d0ab1319a49\\\"\",\r\n \
         \ \"type\": \"Microsoft.Network/virtualNetworks\",\r\n  \"location\": \"westus\"\
         ,\r\n  \"properties\": {\r\n    \"provisioningState\": \"Succeeded\",\r\n\
-        \    \"resourceGuid\": \"e768e918-3875-400f-8d20-3ec78c16d89e\",\r\n    \"\
+        \    \"resourceGuid\": \"462281e4-30e9-4865-9ed9-6d7a4db606ed\",\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\"\
         : \"pyvmirsubc0f9130c\",\r\n        \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Network/virtualNetworks/pyvmirnetc0f9130c/subnets/pyvmirsubc0f9130c\"\
-        ,\r\n        \"etag\": \"W/\\\"5fde8c2a-0cc4-4063-b02f-6b3f18cff784\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"3a15b0dd-0968-42bf-b3e6-9d0ab1319a49\\\"\"\
         ,\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\"\
@@ -151,14 +175,15 @@ interactions:
       cache-control: [no-cache]
       content-length: ['1177']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:38:53 GMT']
-      etag: [W/"5fde8c2a-0cc4-4063-b02f-6b3f18cff784"]
+      date: ['Fri, 20 Jul 2018 18:49:32 GMT']
+      etag: [W/"3a15b0dd-0968-42bf-b3e6-9d0ab1319a49"]
       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]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -167,74 +192,77 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 networkmanagementclient/1.6.0 Azure-SDK-For-Python]
+      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]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Network/virtualNetworks/pyvmirnetc0f9130c/subnets/pyvmirsubc0f9130c?api-version=2017-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Network/virtualNetworks/pyvmirnetc0f9130c/subnets/pyvmirsubc0f9130c?api-version=2018-02-01
   response:
     body: {string: "{\r\n  \"name\": \"pyvmirsubc0f9130c\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Network/virtualNetworks/pyvmirnetc0f9130c/subnets/pyvmirsubc0f9130c\"\
-        ,\r\n  \"etag\": \"W/\\\"5fde8c2a-0cc4-4063-b02f-6b3f18cff784\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"3a15b0dd-0968-42bf-b3e6-9d0ab1319a49\\\"\",\r\n \
         \ \"properties\": {\r\n    \"provisioningState\": \"Succeeded\",\r\n    \"\
         addressPrefix\": \"10.0.0.0/24\"\r\n  }\r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['414']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:38:54 GMT']
-      etag: [W/"5fde8c2a-0cc4-4063-b02f-6b3f18cff784"]
+      date: ['Fri, 20 Jul 2018 18:49:33 GMT']
+      etag: [W/"3a15b0dd-0968-42bf-b3e6-9d0ab1319a49"]
       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]
     status: {code: 200, message: OK}
 - request:
-    body: 'b''b\''b\\\''{"location": "westus", "properties": {"ipConfigurations":
+    body: 'b''b\''b\\\''b\\\\\\\''{"location": "westus", "properties": {"ipConfigurations":
       [{"properties": {"privateIPAllocationMethod": "Dynamic", "subnet": {"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Network/virtualNetworks/pyvmirnetc0f9130c/subnets/pyvmirsubc0f9130c",
       "properties": {"addressPrefix": "10.0.0.0/24", "provisioningState": "Succeeded"},
-      "name": "pyvmirsubc0f9130c", "etag": "W/\\\\\\\\"5fde8c2a-0cc4-4063-b02f-6b3f18cff784\\\\\\\\""}},
-      "name": "pyarmconfig"}]}}\\\''\'''''
+      "name": "pyvmirsubc0f9130c", "etag": "W/\\\\\\\\\\\\\\\\"3a15b0dd-0968-42bf-b3e6-9d0ab1319a49\\\\\\\\\\\\\\\\""}},
+      "name": "pyarmconfig"}]}}\\\\\\\''\\\''\'''''
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['537']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 networkmanagementclient/1.6.0 Azure-SDK-For-Python]
+      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]
       accept-language: [en-US]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Network/networkInterfaces/pyvmirnicc0f9130c?api-version=2017-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Network/networkInterfaces/pyvmirnicc0f9130c?api-version=2018-02-01
   response:
     body: {string: "{\r\n  \"name\": \"pyvmirnicc0f9130c\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Network/networkInterfaces/pyvmirnicc0f9130c\"\
-        ,\r\n  \"etag\": \"W/\\\"899a0002-0059-4152-abb5-82c4565044ee\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"f6e9811c-fa24-4b4d-8612-db7e3223b74d\\\"\",\r\n \
         \ \"location\": \"westus\",\r\n  \"properties\": {\r\n    \"provisioningState\"\
-        : \"Succeeded\",\r\n    \"resourceGuid\": \"04706c7a-f781-4f7c-adfb-84bdf3dc7cd3\"\
+        : \"Succeeded\",\r\n    \"resourceGuid\": \"139216f0-52b2-40a8-8db3-c9e5cc35f02d\"\
         ,\r\n    \"ipConfigurations\": [\r\n      {\r\n        \"name\": \"pyarmconfig\"\
         ,\r\n        \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Network/networkInterfaces/pyvmirnicc0f9130c/ipConfigurations/pyarmconfig\"\
-        ,\r\n        \"etag\": \"W/\\\"899a0002-0059-4152-abb5-82c4565044ee\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"f6e9811c-fa24-4b4d-8612-db7e3223b74d\\\"\"\
         ,\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_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Network/virtualNetworks/pyvmirnetc0f9130c/subnets/pyvmirsubc0f9130c\"\
         \r\n          },\r\n          \"primary\": true,\r\n          \"privateIPAddressVersion\"\
-        : \"IPv4\"\r\n        }\r\n      }\r\n    ],\r\n    \"dnsSettings\": {\r\n\
-        \      \"dnsServers\": [],\r\n      \"appliedDnsServers\": [],\r\n      \"\
-        internalDomainNameSuffix\": \"dduwrz1vhahubdjah1dyyfwytg.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/2bac248f-0206-4027-8e61-970ea4c83692?api-version=2017-09-01']
+        : \"IPv4\",\r\n          \"isInUseWithService\": false\r\n        }\r\n  \
+        \    }\r\n    ],\r\n    \"dnsSettings\": {\r\n      \"dnsServers\": [],\r\n\
+        \      \"appliedDnsServers\": [],\r\n      \"internalDomainNameSuffix\": \"\
+        2saserxjgbsurhwznv3e1nqg3f.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}"}
+    headers:
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/c87272b8-e344-4a48-8242-1376ea754461?api-version=2018-02-01']
       cache-control: [no-cache]
-      content-length: ['1639']
+      content-length: ['1740']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:38:55 GMT']
+      date: ['Fri, 20 Jul 2018 18:49:36 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-subscription-writes: ['1199']
     status: {code: 201, message: Created}
 - request:
@@ -243,25 +271,24 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 networkmanagementclient/1.6.0 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      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]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/2bac248f-0206-4027-8e61-970ea4c83692?api-version=2017-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/c87272b8-e344-4a48-8242-1376ea754461?api-version=2018-02-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: ['Wed, 22 Nov 2017 17:39:26 GMT']
+      date: ['Fri, 20 Jul 2018 18:50:06 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]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -269,64 +296,64 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 networkmanagementclient/1.6.0 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      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]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Network/networkInterfaces/pyvmirnicc0f9130c?api-version=2017-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Network/networkInterfaces/pyvmirnicc0f9130c?api-version=2018-02-01
   response:
     body: {string: "{\r\n  \"name\": \"pyvmirnicc0f9130c\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Network/networkInterfaces/pyvmirnicc0f9130c\"\
-        ,\r\n  \"etag\": \"W/\\\"899a0002-0059-4152-abb5-82c4565044ee\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"f6e9811c-fa24-4b4d-8612-db7e3223b74d\\\"\",\r\n \
         \ \"location\": \"westus\",\r\n  \"properties\": {\r\n    \"provisioningState\"\
-        : \"Succeeded\",\r\n    \"resourceGuid\": \"04706c7a-f781-4f7c-adfb-84bdf3dc7cd3\"\
+        : \"Succeeded\",\r\n    \"resourceGuid\": \"139216f0-52b2-40a8-8db3-c9e5cc35f02d\"\
         ,\r\n    \"ipConfigurations\": [\r\n      {\r\n        \"name\": \"pyarmconfig\"\
         ,\r\n        \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Network/networkInterfaces/pyvmirnicc0f9130c/ipConfigurations/pyarmconfig\"\
-        ,\r\n        \"etag\": \"W/\\\"899a0002-0059-4152-abb5-82c4565044ee\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"f6e9811c-fa24-4b4d-8612-db7e3223b74d\\\"\"\
         ,\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_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Network/virtualNetworks/pyvmirnetc0f9130c/subnets/pyvmirsubc0f9130c\"\
         \r\n          },\r\n          \"primary\": true,\r\n          \"privateIPAddressVersion\"\
-        : \"IPv4\"\r\n        }\r\n      }\r\n    ],\r\n    \"dnsSettings\": {\r\n\
-        \      \"dnsServers\": [],\r\n      \"appliedDnsServers\": [],\r\n      \"\
-        internalDomainNameSuffix\": \"dduwrz1vhahubdjah1dyyfwytg.dx.internal.cloudapp.net\"\
-        \r\n    },\r\n    \"enableAcceleratedNetworking\": false,\r\n    \"enableIPForwarding\"\
-        : false\r\n  },\r\n  \"type\": \"Microsoft.Network/networkInterfaces\"\r\n\
-        }"}
+        : \"IPv4\",\r\n          \"isInUseWithService\": false\r\n        }\r\n  \
+        \    }\r\n    ],\r\n    \"dnsSettings\": {\r\n      \"dnsServers\": [],\r\n\
+        \      \"appliedDnsServers\": [],\r\n      \"internalDomainNameSuffix\": \"\
+        2saserxjgbsurhwznv3e1nqg3f.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}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['1639']
+      content-length: ['1740']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:39:27 GMT']
-      etag: [W/"899a0002-0059-4152-abb5-82c4565044ee"]
+      date: ['Fri, 20 Jul 2018 18:50:07 GMT']
+      etag: [W/"f6e9811c-fa24-4b4d-8612-db7e3223b74d"]
       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]
     status: {code: 200, message: OK}
 - request:
-    body: 'b''b\''b\\\''{"location": "westus", "properties": {"hardwareProfile": {"vmSize":
-      "Standard_A0"}, "storageProfile": {"imageReference": {"publisher": "Canonical",
-      "offer": "UbuntuServer", "sku": "16.04.0-LTS", "version": "latest"}, "osDisk":
-      {"name": "test", "vhd": {"uri": "https://pyvmirstorc0f9130c.blob.core.windows.net/vhds/osdisk.vhd"},
+    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": {"name": "test", "vhd": {"uri": "https://pyvmirstorc0f9130c.blob.core.windows.net/vhds/osdisk.vhd"},
       "caching": "None", "createOption": "FromImage"}}, "osProfile": {"computerName":
       "test", "adminUsername": "Foo12", "adminPassword": "BaR@123test_mgmt_compute_test_virtual_machine_capturec0f9130c"},
-      "networkProfile": {"networkInterfaces": [{"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Network/networkInterfaces/pyvmirnicc0f9130c"}]}}}\\\''\'''''
+      "networkProfile": {"networkInterfaces": [{"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Network/networkInterfaces/pyvmirnicc0f9130c"}]}}}\\\\\\\''\\\''\'''''
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['765']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      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]
       accept-language: [en-US]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Compute/virtualMachines/pyvmirvmc0f9130c?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Compute/virtualMachines/pyvmirvmc0f9130c?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"6cdd833c-7e1d-472b-8804-914ac4726840\"\
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"f535aa5f-ee8e-41b3-9cc5-36da2b6b00e1\"\
         ,\r\n    \"hardwareProfile\": {\r\n      \"vmSize\": \"Standard_A0\"\r\n \
         \   },\r\n    \"storageProfile\": {\r\n      \"imageReference\": {\r\n   \
         \     \"publisher\": \"Canonical\",\r\n        \"offer\": \"UbuntuServer\"\
@@ -337,25 +364,27 @@ interactions:
         \r\n        },\r\n        \"caching\": \"None\"\r\n      },\r\n      \"dataDisks\"\
         : []\r\n    },\r\n    \"osProfile\": {\r\n      \"computerName\": \"test\"\
         ,\r\n      \"adminUsername\": \"Foo12\",\r\n      \"linuxConfiguration\":\
-        \ {\r\n        \"disablePasswordAuthentication\": false\r\n      },\r\n  \
-        \    \"secrets\": []\r\n    },\r\n    \"networkProfile\": {\"networkInterfaces\"\
-        :[{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Network/networkInterfaces/pyvmirnicc0f9130c\"\
+        \ {\r\n        \"disablePasswordAuthentication\": false,\r\n        \"provisionVMAgent\"\
+        : true\r\n      },\r\n      \"secrets\": [],\r\n      \"allowExtensionOperations\"\
+        : true\r\n    },\r\n    \"networkProfile\": {\"networkInterfaces\":[{\"id\"\
+        :\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Network/networkInterfaces/pyvmirnicc0f9130c\"\
         }]},\r\n    \"provisioningState\": \"Creating\"\r\n  },\r\n  \"type\": \"\
         Microsoft.Compute/virtualMachines\",\r\n  \"location\": \"westus\",\r\n  \"\
         id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Compute/virtualMachines/pyvmirvmc0f9130c\"\
         ,\r\n  \"name\": \"pyvmirvmc0f9130c\"\r\n}"}
     headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/d757635d-e5a1-460b-a974-be26440b46a4?api-version=2017-12-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/af5bacc7-9ccb-4639-b8da-e7a3fb96a380?api-version=2018-06-01']
       cache-control: [no-cache]
-      content-length: ['1411']
+      content-length: ['1487']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:39:29 GMT']
+      date: ['Fri, 20 Jul 2018 18:50:09 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateUpdateVM3Min;298,Microsoft.Compute/CreateUpdateVM30Min;1498']
-      x-ms-ratelimit-remaining-subscription-writes: ['1197']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/PutVM3Min;239,Microsoft.Compute/PutVM30Min;1199']
+      x-ms-ratelimit-remaining-subscription-writes: ['1199']
     status: {code: 201, message: Created}
 - request:
     body: null
@@ -363,57 +392,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
-    method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/d757635d-e5a1-460b-a974-be26440b46a4?api-version=2017-12-01
-  response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:39:30.2198701+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"d757635d-e5a1-460b-a974-be26440b46a4\"\
-        \r\n}"}
-    headers:
-      cache-control: [no-cache]
-      content-length: ['134']
-      content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:39:59 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2158,Microsoft.Compute/GetOperation30Min;17998']
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      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/d757635d-e5a1-460b-a974-be26440b46a4?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/af5bacc7-9ccb-4639-b8da-e7a3fb96a380?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:39:30.2198701+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"d757635d-e5a1-460b-a974-be26440b46a4\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:50:09.8167243+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"af5bacc7-9ccb-4639-b8da-e7a3fb96a380\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:40:29 GMT']
+      date: ['Fri, 20 Jul 2018 18:50:20 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2155,Microsoft.Compute/GetOperation30Min;17995']
+      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
@@ -421,28 +420,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      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/d757635d-e5a1-460b-a974-be26440b46a4?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/af5bacc7-9ccb-4639-b8da-e7a3fb96a380?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:39:30.2198701+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"d757635d-e5a1-460b-a974-be26440b46a4\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:50:09.8167243+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"af5bacc7-9ccb-4639-b8da-e7a3fb96a380\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:41:01 GMT']
+      date: ['Fri, 20 Jul 2018 18:50:51 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2152,Microsoft.Compute/GetOperation30Min;17992']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14996,Microsoft.Compute/GetOperation30Min;29993']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -450,28 +448,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      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/d757635d-e5a1-460b-a974-be26440b46a4?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/af5bacc7-9ccb-4639-b8da-e7a3fb96a380?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:39:30.2198701+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"d757635d-e5a1-460b-a974-be26440b46a4\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:50:09.8167243+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"af5bacc7-9ccb-4639-b8da-e7a3fb96a380\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:41:32 GMT']
+      date: ['Fri, 20 Jul 2018 18:51:23 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2149,Microsoft.Compute/GetOperation30Min;17989']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14993,Microsoft.Compute/GetOperation30Min;29990']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -479,28 +476,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      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/d757635d-e5a1-460b-a974-be26440b46a4?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/af5bacc7-9ccb-4639-b8da-e7a3fb96a380?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:39:30.2198701+00:00\",\r\
-        \n  \"endTime\": \"2017-11-22T17:41:46.7934559+00:00\",\r\n  \"status\": \"\
-        Succeeded\",\r\n  \"name\": \"d757635d-e5a1-460b-a974-be26440b46a4\"\r\n}"}
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:50:09.8167243+00:00\",\r\
+        \n  \"endTime\": \"2018-07-20T18:51:50.7911626+00:00\",\r\n  \"status\": \"\
+        Succeeded\",\r\n  \"name\": \"af5bacc7-9ccb-4639-b8da-e7a3fb96a380\"\r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['184']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:42:03 GMT']
+      date: ['Fri, 20 Jul 2018 18:51:54 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2146,Microsoft.Compute/GetOperation30Min;17986']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14990,Microsoft.Compute/GetOperation30Min;29987']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -508,14 +504,12 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      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/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Compute/virtualMachines/pyvmirvmc0f9130c?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Compute/virtualMachines/pyvmirvmc0f9130c?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"6cdd833c-7e1d-472b-8804-914ac4726840\"\
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"f535aa5f-ee8e-41b3-9cc5-36da2b6b00e1\"\
         ,\r\n    \"hardwareProfile\": {\r\n      \"vmSize\": \"Standard_A0\"\r\n \
         \   },\r\n    \"storageProfile\": {\r\n      \"imageReference\": {\r\n   \
         \     \"publisher\": \"Canonical\",\r\n        \"offer\": \"UbuntuServer\"\
@@ -524,10 +518,11 @@ interactions:
         \      \"name\": \"test\",\r\n        \"createOption\": \"FromImage\",\r\n\
         \        \"vhd\": {\r\n          \"uri\": \"https://pyvmirstorc0f9130c.blob.core.windows.net/vhds/osdisk.vhd\"\
         \r\n        },\r\n        \"caching\": \"None\",\r\n        \"diskSizeGB\"\
-        : 29\r\n      },\r\n      \"dataDisks\": []\r\n    },\r\n    \"osProfile\"\
+        : 30\r\n      },\r\n      \"dataDisks\": []\r\n    },\r\n    \"osProfile\"\
         : {\r\n      \"computerName\": \"test\",\r\n      \"adminUsername\": \"Foo12\"\
         ,\r\n      \"linuxConfiguration\": {\r\n        \"disablePasswordAuthentication\"\
-        : false\r\n      },\r\n      \"secrets\": []\r\n    },\r\n    \"networkProfile\"\
+        : false,\r\n        \"provisionVMAgent\": true\r\n      },\r\n      \"secrets\"\
+        : [],\r\n      \"allowExtensionOperations\": true\r\n    },\r\n    \"networkProfile\"\
         : {\"networkInterfaces\":[{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Network/networkInterfaces/pyvmirnicc0f9130c\"\
         }]},\r\n    \"provisioningState\": \"Succeeded\"\r\n  },\r\n  \"type\": \"\
         Microsoft.Compute/virtualMachines\",\r\n  \"location\": \"westus\",\r\n  \"\
@@ -535,16 +530,17 @@ interactions:
         ,\r\n  \"name\": \"pyvmirvmc0f9130c\"\r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['1439']
+      content-length: ['1515']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:42:03 GMT']
+      date: ['Fri, 20 Jul 2018 18:51:55 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4993,Microsoft.Compute/LowCostGet30Min;39894']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4198,Microsoft.Compute/LowCostGet30Min;33589']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -553,25 +549,25 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['0']
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      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]
       accept-language: [en-US]
     method: POST
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Compute/virtualMachines/pyvmirvmc0f9130c/deallocate?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Compute/virtualMachines/pyvmirvmc0f9130c/deallocate?api-version=2018-06-01
   response:
     body: {string: ''}
     headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/27cfbe10-f02e-4b60-9e9b-311d896461b6?api-version=2017-12-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/6c01c1fb-fadf-4c06-87e3-2c8cf2113919?api-version=2018-06-01']
       cache-control: [no-cache]
       content-length: ['0']
-      date: ['Wed, 22 Nov 2017 17:42:04 GMT']
+      date: ['Fri, 20 Jul 2018 18:51:56 GMT']
       expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/27cfbe10-f02e-4b60-9e9b-311d896461b6?monitor=true&api-version=2017-12-01']
+      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/6c01c1fb-fadf-4c06-87e3-2c8cf2113919?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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/DeleteVM3Min;299,Microsoft.Compute/DeleteVM30Min;1498']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/DeleteVM3Min;239,Microsoft.Compute/DeleteVM30Min;1199']
       x-ms-ratelimit-remaining-subscription-writes: ['1199']
     status: {code: 202, message: Accepted}
 - request:
@@ -580,28 +576,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      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/27cfbe10-f02e-4b60-9e9b-311d896461b6?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/6c01c1fb-fadf-4c06-87e3-2c8cf2113919?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:42:05.8261332+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"27cfbe10-f02e-4b60-9e9b-311d896461b6\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:51:56.7421307+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"6c01c1fb-fadf-4c06-87e3-2c8cf2113919\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:42:34 GMT']
+      date: ['Fri, 20 Jul 2018 18:52:13 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2145,Microsoft.Compute/GetOperation30Min;17984']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14987,Microsoft.Compute/GetOperation30Min;29984']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -609,28 +604,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      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/27cfbe10-f02e-4b60-9e9b-311d896461b6?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/6c01c1fb-fadf-4c06-87e3-2c8cf2113919?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:42:05.8261332+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"27cfbe10-f02e-4b60-9e9b-311d896461b6\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:51:56.7421307+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"6c01c1fb-fadf-4c06-87e3-2c8cf2113919\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:43:05 GMT']
+      date: ['Fri, 20 Jul 2018 18:52:51 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2145,Microsoft.Compute/GetOperation30Min;17981']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14985,Microsoft.Compute/GetOperation30Min;29982']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -638,28 +632,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      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/27cfbe10-f02e-4b60-9e9b-311d896461b6?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/6c01c1fb-fadf-4c06-87e3-2c8cf2113919?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:42:05.8261332+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"27cfbe10-f02e-4b60-9e9b-311d896461b6\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:51:56.7421307+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"6c01c1fb-fadf-4c06-87e3-2c8cf2113919\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:43:36 GMT']
+      date: ['Fri, 20 Jul 2018 18:53:22 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2145,Microsoft.Compute/GetOperation30Min;17978']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14984,Microsoft.Compute/GetOperation30Min;29979']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -667,28 +660,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      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/27cfbe10-f02e-4b60-9e9b-311d896461b6?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/6c01c1fb-fadf-4c06-87e3-2c8cf2113919?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:42:05.8261332+00:00\",\r\
-        \n  \"endTime\": \"2017-11-22T17:43:57.3723594+00:00\",\r\n  \"status\": \"\
-        Succeeded\",\r\n  \"name\": \"27cfbe10-f02e-4b60-9e9b-311d896461b6\"\r\n}"}
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:51:56.7421307+00:00\",\r\
+        \n  \"endTime\": \"2018-07-20T18:53:31.3347779+00:00\",\r\n  \"status\": \"\
+        Succeeded\",\r\n  \"name\": \"6c01c1fb-fadf-4c06-87e3-2c8cf2113919\"\r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['184']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:44:06 GMT']
+      date: ['Fri, 20 Jul 2018 18:53:52 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2145,Microsoft.Compute/GetOperation30Min;17975']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14985,Microsoft.Compute/GetOperation30Min;29977']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -697,23 +689,23 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['0']
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      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]
       accept-language: [en-US]
     method: POST
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Compute/virtualMachines/pyvmirvmc0f9130c/generalize?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Compute/virtualMachines/pyvmirvmc0f9130c/generalize?api-version=2018-06-01
   response:
     body: {string: ''}
     headers:
       cache-control: [no-cache]
       content-length: ['0']
-      date: ['Wed, 22 Nov 2017 17:44:06 GMT']
+      date: ['Fri, 20 Jul 2018 18:53:54 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/DeleteVM3Min;298,Microsoft.Compute/DeleteVM30Min;1497']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/UpdateVM3Min;239,Microsoft.Compute/UpdateVM30Min;1199']
       x-ms-ratelimit-remaining-subscription-writes: ['1199']
     status: {code: 200, message: OK}
 - request:
@@ -725,25 +717,26 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['81']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      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]
       accept-language: [en-US]
     method: POST
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Compute/virtualMachines/pyvmirvmc0f9130c/capture?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machine_capturec0f9130c/providers/Microsoft.Compute/virtualMachines/pyvmirvmc0f9130c/capture?api-version=2018-06-01
   response:
     body: {string: ''}
     headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/9babf6d7-f2e0-4d69-ad89-aeac19105ea8?api-version=2017-12-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/d62a11b5-9bf5-4704-8bba-9a5677541ce6?api-version=2018-06-01']
       cache-control: [no-cache]
       content-length: ['0']
-      date: ['Wed, 22 Nov 2017 17:44:08 GMT']
+      date: ['Fri, 20 Jul 2018 18:53:54 GMT']
       expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/9babf6d7-f2e0-4d69-ad89-aeac19105ea8?monitor=true&api-version=2017-12-01']
+      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/d62a11b5-9bf5-4704-8bba-9a5677541ce6?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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateUpdateVM3Min;299,Microsoft.Compute/CreateUpdateVM30Min;1497']
-      x-ms-ratelimit-remaining-subscription-writes: ['1199']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/UpdateVM3Min;238,Microsoft.Compute/UpdateVM30Min;1198']
+      x-ms-ratelimit-remaining-subscription-writes: ['1198']
     status: {code: 202, message: Accepted}
 - request:
     body: null
@@ -751,42 +744,67 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      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/9babf6d7-f2e0-4d69-ad89-aeac19105ea8?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/d62a11b5-9bf5-4704-8bba-9a5677541ce6?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:44:09.9200695+00:00\",\r\
-        \n  \"endTime\": \"2017-11-22T17:44:10.8732635+00:00\",\r\n  \"status\": \"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:53:54.8340477+00:00\",\r\
+        \n  \"endTime\": \"2018-07-20T18:53:55.2871588+00:00\",\r\n  \"status\": \"\
         Succeeded\",\r\n  \"properties\": {\r\n    \"output\": {\"$schema\":\"http://schema.management.azure.com/schemas/2014-04-01-preview/VM_IP.json\"\
         ,\"contentVersion\":\"1.0.0.0\",\"parameters\":{\"vmName\":{\"type\":\"string\"\
         },\"vmSize\":{\"type\":\"string\",\"defaultValue\":\"Standard_A0\"},\"adminUserName\"\
         :{\"type\":\"string\"},\"adminPassword\":{\"type\":\"securestring\"},\"networkInterfaceId\"\
-        :{\"type\":\"string\"}},\"resources\":[{\"apiVersion\":\"2017-12-01\",\"properties\"\
+        :{\"type\":\"string\"}},\"resources\":[{\"apiVersion\":\"2018-06-01\",\"properties\"\
         :{\"hardwareProfile\":{\"vmSize\":\"[parameters('vmSize')]\"},\"storageProfile\"\
-        :{\"osDisk\":{\"osType\":\"Linux\",\"name\":\"pslib-osDisk.6cdd833c-7e1d-472b-8804-914ac4726840.vhd\"\
-        ,\"createOption\":\"FromImage\",\"image\":{\"uri\":\"https://pyvmirstorc0f9130c.blob.core.windows.net/system/Microsoft.Compute/Images/dest/pslib-osDisk.6cdd833c-7e1d-472b-8804-914ac4726840.vhd\"\
-        },\"vhd\":{\"uri\":\"https://pyvmirstorc0f9130c.blob.core.windows.net/vmcontainer53e976f3-9883-4248-bac6-3715750c1512/osDisk.53e976f3-9883-4248-bac6-3715750c1512.vhd\"\
+        :{\"osDisk\":{\"osType\":\"Linux\",\"name\":\"pslib-osDisk.f535aa5f-ee8e-41b3-9cc5-36da2b6b00e1.vhd\"\
+        ,\"createOption\":\"FromImage\",\"image\":{\"uri\":\"https://pyvmirstorc0f9130c.blob.core.windows.net/system/Microsoft.Compute/Images/dest/pslib-osDisk.f535aa5f-ee8e-41b3-9cc5-36da2b6b00e1.vhd\"\
+        },\"vhd\":{\"uri\":\"https://pyvmirstorc0f9130c.blob.core.windows.net/vmcontainer00d4e2b3-bfbf-4926-b2ab-1be840aa5904/osDisk.00d4e2b3-bfbf-4926-b2ab-1be840aa5904.vhd\"\
         },\"caching\":\"None\"}},\"osProfile\":{\"computerName\":\"[parameters('vmName')]\"\
         ,\"adminUsername\":\"[parameters('adminUsername')]\",\"adminPassword\":\"\
         [parameters('adminPassword')]\"},\"networkProfile\":{\"networkInterfaces\"\
         :[{\"id\":\"[parameters('networkInterfaceId')]\"}]},\"provisioningState\"\
         :0},\"type\":\"Microsoft.Compute/virtualMachines\",\"location\":\"westus\"\
-        ,\"name\":\"[parameters('vmName')]\"}]}\r\n  },\r\n  \"name\": \"9babf6d7-f2e0-4d69-ad89-aeac19105ea8\"\
+        ,\"name\":\"[parameters('vmName')]\"}]}\r\n  },\r\n  \"name\": \"d62a11b5-9bf5-4704-8bba-9a5677541ce6\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['1485']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:44:39 GMT']
+      date: ['Fri, 20 Jul 2018 18:54:24 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;14985,Microsoft.Compute/GetOperation30Min;29975']
+    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/d62a11b5-9bf5-4704-8bba-9a5677541ce6?monitor=true&api-version=2018-06-01
+  response:
+    body: {string: '{"$schema":"http://schema.management.azure.com/schemas/2014-04-01-preview/VM_IP.json","contentVersion":"1.0.0.0","parameters":{"vmName":{"type":"string"},"vmSize":{"type":"string","defaultValue":"Standard_A0"},"adminUserName":{"type":"string"},"adminPassword":{"type":"securestring"},"networkInterfaceId":{"type":"string"}},"resources":[{"apiVersion":"2018-06-01","properties":{"hardwareProfile":{"vmSize":"[parameters(''vmSize'')]"},"storageProfile":{"osDisk":{"osType":"Linux","name":"pslib-osDisk.f535aa5f-ee8e-41b3-9cc5-36da2b6b00e1.vhd","createOption":"FromImage","image":{"uri":"https://pyvmirstorc0f9130c.blob.core.windows.net/system/Microsoft.Compute/Images/dest/pslib-osDisk.f535aa5f-ee8e-41b3-9cc5-36da2b6b00e1.vhd"},"vhd":{"uri":"https://pyvmirstorc0f9130c.blob.core.windows.net/vmcontainer00d4e2b3-bfbf-4926-b2ab-1be840aa5904/osDisk.00d4e2b3-bfbf-4926-b2ab-1be840aa5904.vhd"},"caching":"None"}},"osProfile":{"computerName":"[parameters(''vmName'')]","adminUsername":"[parameters(''adminUsername'')]","adminPassword":"[parameters(''adminPassword'')]"},"networkProfile":{"networkInterfaces":[{"id":"[parameters(''networkInterfaceId'')]"}]},"provisioningState":0},"type":"Microsoft.Compute/virtualMachines","location":"westus","name":"[parameters(''vmName'')]"}]}'}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['1260']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:54:25 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2145,Microsoft.Compute/GetOperation30Min;17973']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14984,Microsoft.Compute/GetOperation30Min;29974']
     status: {code: 200, message: OK}
 version: 1
diff --git a/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_virtual_machines_operations.yaml b/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_virtual_machines_operations.yaml
index b7a03d54dcda..897adbf26db1 100644
--- a/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_virtual_machines_operations.yaml
+++ b/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_virtual_machines_operations.yaml
@@ -1,29 +1,32 @@
 interactions:
 - request:
     body: '{"sku": {"name": "Standard_LRS"}, "kind": "Storage", "location": "westus",
-      "properties": {"supportsHttpsTrafficOnly": false}}'
+      "properties": {"supportsHttpsTrafficOnly": false, "isHnsEnabled": false}}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Length: ['125']
+      Content-Length: ['148']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 storagemanagementclient/1.4.0 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Storage/storageAccounts/pyvmirstor122014cf?api-version=2017-06-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Storage/storageAccounts/pyvmirstor122014cf?api-version=2018-02-01
   response:
     body: {string: ''}
     headers:
       cache-control: [no-cache]
       content-length: ['0']
-      date: ['Wed, 22 Nov 2017 17:44:47 GMT']
+      content-type: [text/plain; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 17:18:55 GMT']
       expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/locations/westus/asyncoperations/43718945-bd49-4387-88b4-3a0608591367?monitor=true&api-version=2017-06-01']
+      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/locations/westus/asyncoperations/94e9dfb8-8172-4afc-a5cb-98dcac70de22?monitor=true&api-version=2018-02-01']
       pragma: [no-cache]
-      server: [Microsoft-Azure-Storage-Resource-Provider/1.0, Microsoft-HTTPAPI/2.0]
+      server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0
+          Microsoft-HTTPAPI/2.0']
       strict-transport-security: [max-age=31536000; includeSubDomains]
+      x-content-type-options: [nosniff]
       x-ms-ratelimit-remaining-subscription-writes: ['1199']
     status: {code: 202, message: Accepted}
 - request:
@@ -32,27 +35,25 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 storagemanagementclient/1.4.0 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/locations/westus/asyncoperations/43718945-bd49-4387-88b4-3a0608591367?monitor=true&api-version=2017-06-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/locations/westus/asyncoperations/94e9dfb8-8172-4afc-a5cb-98dcac70de22?monitor=true&api-version=2018-02-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Storage/storageAccounts/pyvmirstor122014cf","kind":"Storage","location":"westus","name":"pyvmirstor122014cf","properties":{"creationTime":"2017-11-22T17:44:48.1604095Z","encryption":{"keySource":"Microsoft.Storage","services":{"blob":{"enabled":true,"lastEnabledTime":"2017-11-22T17:44:48.1624100Z"},"file":{"enabled":true,"lastEnabledTime":"2017-11-22T17:44:48.1624100Z"}}},"networkAcls":{"bypass":"AzureServices","defaultAction":"Allow","ipRules":[],"virtualNetworkRules":[]},"primaryEndpoints":{"blob":"https://pyvmirstor122014cf.blob.core.windows.net/","file":"https://pyvmirstor122014cf.file.core.windows.net/","queue":"https://pyvmirstor122014cf.queue.core.windows.net/","table":"https://pyvmirstor122014cf.table.core.windows.net/"},"primaryLocation":"westus","provisioningState":"Succeeded","statusOfPrimary":"available","supportsHttpsTrafficOnly":false},"sku":{"name":"Standard_LRS","tier":"Standard"},"tags":{},"type":"Microsoft.Storage/storageAccounts"}
-
-        '}
+    body: {string: '{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Storage/storageAccounts/pyvmirstor122014cf","name":"pyvmirstor122014cf","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"isHnsEnabled":false,"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-07-20T17:18:56.5349505Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-07-20T17:18:56.5349505Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-07-20T17:18:56.4099368Z","primaryEndpoints":{"blob":"https://pyvmirstor122014cf.blob.core.windows.net/","queue":"https://pyvmirstor122014cf.queue.core.windows.net/","table":"https://pyvmirstor122014cf.table.core.windows.net/","file":"https://pyvmirstor122014cf.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available"}}'}
     headers:
       cache-control: [no-cache]
-      content-length: ['1117']
+      content-length: ['1199']
       content-type: [application/json]
-      date: ['Wed, 22 Nov 2017 17:45:05 GMT']
+      date: ['Fri, 20 Jul 2018 17:19:14 GMT']
       expires: ['-1']
       pragma: [no-cache]
-      server: [Microsoft-Azure-Storage-Resource-Provider/1.0, Microsoft-HTTPAPI/2.0]
+      server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,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]
     status: {code: 200, message: OK}
 - request:
     body: '{"location": "westus", "properties": {"addressSpace": {"addressPrefixes":
@@ -64,35 +65,36 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['184']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 networkmanagementclient/1.6.0 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/virtualNetworks/pyvmirnet122014cf?api-version=2017-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/virtualNetworks/pyvmirnet122014cf?api-version=2018-02-01
   response:
     body: {string: "{\r\n  \"name\": \"pyvmirnet122014cf\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/virtualNetworks/pyvmirnet122014cf\"\
-        ,\r\n  \"etag\": \"W/\\\"31aff6a3-d711-4e12-8a61-196d45f5dfe9\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"cb70995e-b4d0-4be9-8f5a-088ee1c562a8\\\"\",\r\n \
         \ \"type\": \"Microsoft.Network/virtualNetworks\",\r\n  \"location\": \"westus\"\
         ,\r\n  \"properties\": {\r\n    \"provisioningState\": \"Updating\",\r\n \
-        \   \"resourceGuid\": \"6f35323f-613f-4cf6-86ee-57bf9d51f035\",\r\n    \"\
+        \   \"resourceGuid\": \"adef1d9d-fe92-446e-b24f-18feef70ec76\",\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\"\
         : \"pyvmirsub122014cf\",\r\n        \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/virtualNetworks/pyvmirnet122014cf/subnets/pyvmirsub122014cf\"\
-        ,\r\n        \"etag\": \"W/\\\"31aff6a3-d711-4e12-8a61-196d45f5dfe9\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"cb70995e-b4d0-4be9-8f5a-088ee1c562a8\\\"\"\
         ,\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\"\
         : 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/f46ffb9f-12c6-4dfe-b9a0-053f1243ec28?api-version=2017-09-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/8679ee1a-b700-409b-9247-e7e1696596b4?api-version=2018-02-01']
       cache-control: [no-cache]
       content-length: ['1183']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:45:07 GMT']
+      date: ['Fri, 20 Jul 2018 17:19:15 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-subscription-writes: ['1199']
     status: {code: 201, message: Created}
 - request:
@@ -101,25 +103,49 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 networkmanagementclient/1.6.0 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/f46ffb9f-12c6-4dfe-b9a0-053f1243ec28?api-version=2017-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/8679ee1a-b700-409b-9247-e7e1696596b4?api-version=2018-02-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 17:19:20 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]
+    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.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
+    method: GET
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/8679ee1a-b700-409b-9247-e7e1696596b4?api-version=2018-02-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: ['Wed, 22 Nov 2017 17:45:10 GMT']
+      date: ['Fri, 20 Jul 2018 17:19:30 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]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -127,22 +153,20 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 networkmanagementclient/1.6.0 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/virtualNetworks/pyvmirnet122014cf?api-version=2017-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/virtualNetworks/pyvmirnet122014cf?api-version=2018-02-01
   response:
     body: {string: "{\r\n  \"name\": \"pyvmirnet122014cf\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/virtualNetworks/pyvmirnet122014cf\"\
-        ,\r\n  \"etag\": \"W/\\\"8ad33876-35b6-475d-b7dd-b7b51465fa8a\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"933ab87c-0ad2-4338-a2e5-9cf9502fa456\\\"\",\r\n \
         \ \"type\": \"Microsoft.Network/virtualNetworks\",\r\n  \"location\": \"westus\"\
         ,\r\n  \"properties\": {\r\n    \"provisioningState\": \"Succeeded\",\r\n\
-        \    \"resourceGuid\": \"6f35323f-613f-4cf6-86ee-57bf9d51f035\",\r\n    \"\
+        \    \"resourceGuid\": \"adef1d9d-fe92-446e-b24f-18feef70ec76\",\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\"\
         : \"pyvmirsub122014cf\",\r\n        \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/virtualNetworks/pyvmirnet122014cf/subnets/pyvmirsub122014cf\"\
-        ,\r\n        \"etag\": \"W/\\\"8ad33876-35b6-475d-b7dd-b7b51465fa8a\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"933ab87c-0ad2-4338-a2e5-9cf9502fa456\\\"\"\
         ,\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\"\
@@ -151,14 +175,15 @@ interactions:
       cache-control: [no-cache]
       content-length: ['1185']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:45:11 GMT']
-      etag: [W/"8ad33876-35b6-475d-b7dd-b7b51465fa8a"]
+      date: ['Fri, 20 Jul 2018 17:19:32 GMT']
+      etag: [W/"933ab87c-0ad2-4338-a2e5-9cf9502fa456"]
       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]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -167,75 +192,78 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 networkmanagementclient/1.6.0 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/virtualNetworks/pyvmirnet122014cf/subnets/pyvmirsub122014cf?api-version=2017-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/virtualNetworks/pyvmirnet122014cf/subnets/pyvmirsub122014cf?api-version=2018-02-01
   response:
     body: {string: "{\r\n  \"name\": \"pyvmirsub122014cf\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/virtualNetworks/pyvmirnet122014cf/subnets/pyvmirsub122014cf\"\
-        ,\r\n  \"etag\": \"W/\\\"8ad33876-35b6-475d-b7dd-b7b51465fa8a\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"933ab87c-0ad2-4338-a2e5-9cf9502fa456\\\"\",\r\n \
         \ \"properties\": {\r\n    \"provisioningState\": \"Succeeded\",\r\n    \"\
         addressPrefix\": \"10.0.0.0/24\"\r\n  }\r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['418']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:45:12 GMT']
-      etag: [W/"8ad33876-35b6-475d-b7dd-b7b51465fa8a"]
+      date: ['Fri, 20 Jul 2018 17:19:33 GMT']
+      etag: [W/"933ab87c-0ad2-4338-a2e5-9cf9502fa456"]
       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]
     status: {code: 200, message: OK}
 - request:
-    body: 'b''b\''b\\\''{"location": "westus", "properties": {"ipConfigurations":
+    body: 'b''b\''b\\\''b\\\\\\\''{"location": "westus", "properties": {"ipConfigurations":
       [{"properties": {"privateIPAllocationMethod": "Dynamic", "subnet": {"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/virtualNetworks/pyvmirnet122014cf/subnets/pyvmirsub122014cf",
       "properties": {"addressPrefix": "10.0.0.0/24", "provisioningState": "Succeeded"},
-      "name": "pyvmirsub122014cf", "etag": "W/\\\\\\\\"8ad33876-35b6-475d-b7dd-b7b51465fa8a\\\\\\\\""}},
-      "name": "pyarmconfig"}]}}\\\''\'''''
+      "name": "pyvmirsub122014cf", "etag": "W/\\\\\\\\\\\\\\\\"933ab87c-0ad2-4338-a2e5-9cf9502fa456\\\\\\\\\\\\\\\\""}},
+      "name": "pyarmconfig"}]}}\\\\\\\''\\\''\'''''
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['541']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 networkmanagementclient/1.6.0 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/networkInterfaces/pyvmirnic122014cf?api-version=2017-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/networkInterfaces/pyvmirnic122014cf?api-version=2018-02-01
   response:
     body: {string: "{\r\n  \"name\": \"pyvmirnic122014cf\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/networkInterfaces/pyvmirnic122014cf\"\
-        ,\r\n  \"etag\": \"W/\\\"c02861a4-69c2-433c-9287-597642a0fdeb\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"e9ca4f7e-42c9-445c-809a-38894517a80a\\\"\",\r\n \
         \ \"location\": \"westus\",\r\n  \"properties\": {\r\n    \"provisioningState\"\
-        : \"Succeeded\",\r\n    \"resourceGuid\": \"a609237e-ed20-480a-b0d9-eb8588e76b56\"\
+        : \"Succeeded\",\r\n    \"resourceGuid\": \"d37cf6bc-f38c-4732-bdd1-8b888bab8d19\"\
         ,\r\n    \"ipConfigurations\": [\r\n      {\r\n        \"name\": \"pyarmconfig\"\
         ,\r\n        \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/networkInterfaces/pyvmirnic122014cf/ipConfigurations/pyarmconfig\"\
-        ,\r\n        \"etag\": \"W/\\\"c02861a4-69c2-433c-9287-597642a0fdeb\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"e9ca4f7e-42c9-445c-809a-38894517a80a\\\"\"\
         ,\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_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/virtualNetworks/pyvmirnet122014cf/subnets/pyvmirsub122014cf\"\
         \r\n          },\r\n          \"primary\": true,\r\n          \"privateIPAddressVersion\"\
-        : \"IPv4\"\r\n        }\r\n      }\r\n    ],\r\n    \"dnsSettings\": {\r\n\
-        \      \"dnsServers\": [],\r\n      \"appliedDnsServers\": [],\r\n      \"\
-        internalDomainNameSuffix\": \"h2zdk1z5mh1ezbxok45z0upqgf.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/adbcb1ec-6f85-4549-8af9-92bc1682add9?api-version=2017-09-01']
+        : \"IPv4\",\r\n          \"isInUseWithService\": false\r\n        }\r\n  \
+        \    }\r\n    ],\r\n    \"dnsSettings\": {\r\n      \"dnsServers\": [],\r\n\
+        \      \"appliedDnsServers\": [],\r\n      \"internalDomainNameSuffix\": \"\
+        tuo45lms5zxejmspdd5o42hmog.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}"}
+    headers:
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/c7e61fa3-4f98-4f78-bab1-f2a04ae2f3c0?api-version=2018-02-01']
       cache-control: [no-cache]
-      content-length: ['1651']
+      content-length: ['1752']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:45:14 GMT']
+      date: ['Fri, 20 Jul 2018 17:19:35 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-subscription-writes: ['1198']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-subscription-writes: ['1199']
     status: {code: 201, message: Created}
 - request:
     body: null
@@ -243,25 +271,24 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 networkmanagementclient/1.6.0 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/adbcb1ec-6f85-4549-8af9-92bc1682add9?api-version=2017-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/c7e61fa3-4f98-4f78-bab1-f2a04ae2f3c0?api-version=2018-02-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: ['Wed, 22 Nov 2017 17:45:45 GMT']
+      date: ['Fri, 20 Jul 2018 17:20: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]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -269,64 +296,64 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 networkmanagementclient/1.6.0 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/networkInterfaces/pyvmirnic122014cf?api-version=2017-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/networkInterfaces/pyvmirnic122014cf?api-version=2018-02-01
   response:
     body: {string: "{\r\n  \"name\": \"pyvmirnic122014cf\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/networkInterfaces/pyvmirnic122014cf\"\
-        ,\r\n  \"etag\": \"W/\\\"c02861a4-69c2-433c-9287-597642a0fdeb\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"e9ca4f7e-42c9-445c-809a-38894517a80a\\\"\",\r\n \
         \ \"location\": \"westus\",\r\n  \"properties\": {\r\n    \"provisioningState\"\
-        : \"Succeeded\",\r\n    \"resourceGuid\": \"a609237e-ed20-480a-b0d9-eb8588e76b56\"\
+        : \"Succeeded\",\r\n    \"resourceGuid\": \"d37cf6bc-f38c-4732-bdd1-8b888bab8d19\"\
         ,\r\n    \"ipConfigurations\": [\r\n      {\r\n        \"name\": \"pyarmconfig\"\
         ,\r\n        \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/networkInterfaces/pyvmirnic122014cf/ipConfigurations/pyarmconfig\"\
-        ,\r\n        \"etag\": \"W/\\\"c02861a4-69c2-433c-9287-597642a0fdeb\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"e9ca4f7e-42c9-445c-809a-38894517a80a\\\"\"\
         ,\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_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/virtualNetworks/pyvmirnet122014cf/subnets/pyvmirsub122014cf\"\
         \r\n          },\r\n          \"primary\": true,\r\n          \"privateIPAddressVersion\"\
-        : \"IPv4\"\r\n        }\r\n      }\r\n    ],\r\n    \"dnsSettings\": {\r\n\
-        \      \"dnsServers\": [],\r\n      \"appliedDnsServers\": [],\r\n      \"\
-        internalDomainNameSuffix\": \"h2zdk1z5mh1ezbxok45z0upqgf.dx.internal.cloudapp.net\"\
-        \r\n    },\r\n    \"enableAcceleratedNetworking\": false,\r\n    \"enableIPForwarding\"\
-        : false\r\n  },\r\n  \"type\": \"Microsoft.Network/networkInterfaces\"\r\n\
-        }"}
+        : \"IPv4\",\r\n          \"isInUseWithService\": false\r\n        }\r\n  \
+        \    }\r\n    ],\r\n    \"dnsSettings\": {\r\n      \"dnsServers\": [],\r\n\
+        \      \"appliedDnsServers\": [],\r\n      \"internalDomainNameSuffix\": \"\
+        tuo45lms5zxejmspdd5o42hmog.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}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['1651']
+      content-length: ['1752']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:45:45 GMT']
-      etag: [W/"c02861a4-69c2-433c-9287-597642a0fdeb"]
+      date: ['Fri, 20 Jul 2018 17:20:07 GMT']
+      etag: [W/"e9ca4f7e-42c9-445c-809a-38894517a80a"]
       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]
     status: {code: 200, message: OK}
 - request:
-    body: 'b''b\''b\\\''{"location": "westus", "properties": {"hardwareProfile": {"vmSize":
-      "Standard_A0"}, "storageProfile": {"imageReference": {"publisher": "Canonical",
-      "offer": "UbuntuServer", "sku": "16.04.0-LTS", "version": "latest"}, "osDisk":
-      {"name": "test", "vhd": {"uri": "https://pyvmirstor122014cf.blob.core.windows.net/vhds/osdisk.vhd"},
+    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": {"name": "test", "vhd": {"uri": "https://pyvmirstor122014cf.blob.core.windows.net/vhds/osdisk.vhd"},
       "caching": "None", "createOption": "FromImage"}}, "osProfile": {"computerName":
       "test", "adminUsername": "Foo12", "adminPassword": "BaR@123test_mgmt_compute_test_virtual_machines_operations122014cf"},
-      "networkProfile": {"networkInterfaces": [{"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/networkInterfaces/pyvmirnic122014cf"}]}}}\\\''\'''''
+      "networkProfile": {"networkInterfaces": [{"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/networkInterfaces/pyvmirnic122014cf"}]}}}\\\\\\\''\\\''\'''''
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['773']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Compute/virtualMachines/pyvmirvm122014cf?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Compute/virtualMachines/pyvmirvm122014cf?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"22337a83-a13f-4bff-a8fc-00da1359e560\"\
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"fc6910bc-0d0a-49ae-b8f7-498a48d88cc3\"\
         ,\r\n    \"hardwareProfile\": {\r\n      \"vmSize\": \"Standard_A0\"\r\n \
         \   },\r\n    \"storageProfile\": {\r\n      \"imageReference\": {\r\n   \
         \     \"publisher\": \"Canonical\",\r\n        \"offer\": \"UbuntuServer\"\
@@ -337,24 +364,26 @@ interactions:
         \r\n        },\r\n        \"caching\": \"None\"\r\n      },\r\n      \"dataDisks\"\
         : []\r\n    },\r\n    \"osProfile\": {\r\n      \"computerName\": \"test\"\
         ,\r\n      \"adminUsername\": \"Foo12\",\r\n      \"linuxConfiguration\":\
-        \ {\r\n        \"disablePasswordAuthentication\": false\r\n      },\r\n  \
-        \    \"secrets\": []\r\n    },\r\n    \"networkProfile\": {\"networkInterfaces\"\
-        :[{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/networkInterfaces/pyvmirnic122014cf\"\
+        \ {\r\n        \"disablePasswordAuthentication\": false,\r\n        \"provisionVMAgent\"\
+        : true\r\n      },\r\n      \"secrets\": [],\r\n      \"allowExtensionOperations\"\
+        : true\r\n    },\r\n    \"networkProfile\": {\"networkInterfaces\":[{\"id\"\
+        :\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/networkInterfaces/pyvmirnic122014cf\"\
         }]},\r\n    \"provisioningState\": \"Creating\"\r\n  },\r\n  \"type\": \"\
         Microsoft.Compute/virtualMachines\",\r\n  \"location\": \"westus\",\r\n  \"\
         id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Compute/virtualMachines/pyvmirvm122014cf\"\
         ,\r\n  \"name\": \"pyvmirvm122014cf\"\r\n}"}
     headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/1fd0efd6-52b2-4b86-829b-82e6ecfa9299?api-version=2017-12-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/e8985191-071e-473f-9e14-abb9a8262031?api-version=2018-06-01']
       cache-control: [no-cache]
-      content-length: ['1419']
+      content-length: ['1495']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:45:47 GMT']
+      date: ['Fri, 20 Jul 2018 17:20:09 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateUpdateVM3Min;298,Microsoft.Compute/CreateUpdateVM30Min;1496']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/PutVM3Min;239,Microsoft.Compute/PutVM30Min;1196']
       x-ms-ratelimit-remaining-subscription-writes: ['1199']
     status: {code: 201, message: Created}
 - request:
@@ -363,28 +392,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/1fd0efd6-52b2-4b86-829b-82e6ecfa9299?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/e8985191-071e-473f-9e14-abb9a8262031?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:45:49.0691311+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"1fd0efd6-52b2-4b86-829b-82e6ecfa9299\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:20:09.0776386+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"e8985191-071e-473f-9e14-abb9a8262031\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:46:18 GMT']
+      date: ['Fri, 20 Jul 2018 17:20:25 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2151,Microsoft.Compute/GetOperation30Min;17970']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14990,Microsoft.Compute/GetOperation30Min;29972']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -392,28 +420,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/1fd0efd6-52b2-4b86-829b-82e6ecfa9299?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/e8985191-071e-473f-9e14-abb9a8262031?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:45:49.0691311+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"1fd0efd6-52b2-4b86-829b-82e6ecfa9299\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:20:09.0776386+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"e8985191-071e-473f-9e14-abb9a8262031\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:46:48 GMT']
+      date: ['Fri, 20 Jul 2018 17:20:57 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2151,Microsoft.Compute/GetOperation30Min;17967']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14991,Microsoft.Compute/GetOperation30Min;29970']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -421,28 +448,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/1fd0efd6-52b2-4b86-829b-82e6ecfa9299?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/e8985191-071e-473f-9e14-abb9a8262031?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:45:49.0691311+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"1fd0efd6-52b2-4b86-829b-82e6ecfa9299\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:20:09.0776386+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"e8985191-071e-473f-9e14-abb9a8262031\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:47:19 GMT']
+      date: ['Fri, 20 Jul 2018 17:21:29 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2150,Microsoft.Compute/GetOperation30Min;17964']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14989,Microsoft.Compute/GetOperation30Min;29967']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -450,28 +476,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/1fd0efd6-52b2-4b86-829b-82e6ecfa9299?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/e8985191-071e-473f-9e14-abb9a8262031?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:45:49.0691311+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"1fd0efd6-52b2-4b86-829b-82e6ecfa9299\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:20:09.0776386+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"e8985191-071e-473f-9e14-abb9a8262031\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:47:50 GMT']
+      date: ['Fri, 20 Jul 2018 17:22:00 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2148,Microsoft.Compute/GetOperation30Min;17961']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14988,Microsoft.Compute/GetOperation30Min;29964']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -479,28 +504,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/1fd0efd6-52b2-4b86-829b-82e6ecfa9299?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/e8985191-071e-473f-9e14-abb9a8262031?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:45:49.0691311+00:00\",\r\
-        \n  \"endTime\": \"2017-11-22T17:47:52.1632609+00:00\",\r\n  \"status\": \"\
-        Succeeded\",\r\n  \"name\": \"1fd0efd6-52b2-4b86-829b-82e6ecfa9299\"\r\n}"}
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:20:09.0776386+00:00\",\r\
+        \n  \"endTime\": \"2018-07-20T17:22:11.2329319+00:00\",\r\n  \"status\": \"\
+        Succeeded\",\r\n  \"name\": \"e8985191-071e-473f-9e14-abb9a8262031\"\r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['184']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:48:20 GMT']
+      date: ['Fri, 20 Jul 2018 17:22:31 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2146,Microsoft.Compute/GetOperation30Min;17959']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14986,Microsoft.Compute/GetOperation30Min;29961']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -508,14 +532,12 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Compute/virtualMachines/pyvmirvm122014cf?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Compute/virtualMachines/pyvmirvm122014cf?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"22337a83-a13f-4bff-a8fc-00da1359e560\"\
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"fc6910bc-0d0a-49ae-b8f7-498a48d88cc3\"\
         ,\r\n    \"hardwareProfile\": {\r\n      \"vmSize\": \"Standard_A0\"\r\n \
         \   },\r\n    \"storageProfile\": {\r\n      \"imageReference\": {\r\n   \
         \     \"publisher\": \"Canonical\",\r\n        \"offer\": \"UbuntuServer\"\
@@ -524,10 +546,11 @@ interactions:
         \      \"name\": \"test\",\r\n        \"createOption\": \"FromImage\",\r\n\
         \        \"vhd\": {\r\n          \"uri\": \"https://pyvmirstor122014cf.blob.core.windows.net/vhds/osdisk.vhd\"\
         \r\n        },\r\n        \"caching\": \"None\",\r\n        \"diskSizeGB\"\
-        : 29\r\n      },\r\n      \"dataDisks\": []\r\n    },\r\n    \"osProfile\"\
+        : 30\r\n      },\r\n      \"dataDisks\": []\r\n    },\r\n    \"osProfile\"\
         : {\r\n      \"computerName\": \"test\",\r\n      \"adminUsername\": \"Foo12\"\
         ,\r\n      \"linuxConfiguration\": {\r\n        \"disablePasswordAuthentication\"\
-        : false\r\n      },\r\n      \"secrets\": []\r\n    },\r\n    \"networkProfile\"\
+        : false,\r\n        \"provisionVMAgent\": true\r\n      },\r\n      \"secrets\"\
+        : [],\r\n      \"allowExtensionOperations\": true\r\n    },\r\n    \"networkProfile\"\
         : {\"networkInterfaces\":[{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/networkInterfaces/pyvmirnic122014cf\"\
         }]},\r\n    \"provisioningState\": \"Succeeded\"\r\n  },\r\n  \"type\": \"\
         Microsoft.Compute/virtualMachines\",\r\n  \"location\": \"westus\",\r\n  \"\
@@ -535,16 +558,17 @@ interactions:
         ,\r\n  \"name\": \"pyvmirvm122014cf\"\r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['1447']
+      content-length: ['1523']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:48:21 GMT']
+      date: ['Fri, 20 Jul 2018 17:22:32 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4978,Microsoft.Compute/LowCostGet30Min;39873']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4193,Microsoft.Compute/LowCostGet30Min;33578']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -553,13 +577,13 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Compute/virtualMachines/pyvmirvm122014cf?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Compute/virtualMachines/pyvmirvm122014cf?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"22337a83-a13f-4bff-a8fc-00da1359e560\"\
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"fc6910bc-0d0a-49ae-b8f7-498a48d88cc3\"\
         ,\r\n    \"hardwareProfile\": {\r\n      \"vmSize\": \"Standard_A0\"\r\n \
         \   },\r\n    \"storageProfile\": {\r\n      \"imageReference\": {\r\n   \
         \     \"publisher\": \"Canonical\",\r\n        \"offer\": \"UbuntuServer\"\
@@ -568,10 +592,11 @@ interactions:
         \      \"name\": \"test\",\r\n        \"createOption\": \"FromImage\",\r\n\
         \        \"vhd\": {\r\n          \"uri\": \"https://pyvmirstor122014cf.blob.core.windows.net/vhds/osdisk.vhd\"\
         \r\n        },\r\n        \"caching\": \"None\",\r\n        \"diskSizeGB\"\
-        : 29\r\n      },\r\n      \"dataDisks\": []\r\n    },\r\n    \"osProfile\"\
+        : 30\r\n      },\r\n      \"dataDisks\": []\r\n    },\r\n    \"osProfile\"\
         : {\r\n      \"computerName\": \"test\",\r\n      \"adminUsername\": \"Foo12\"\
         ,\r\n      \"linuxConfiguration\": {\r\n        \"disablePasswordAuthentication\"\
-        : false\r\n      },\r\n      \"secrets\": []\r\n    },\r\n    \"networkProfile\"\
+        : false,\r\n        \"provisionVMAgent\": true\r\n      },\r\n      \"secrets\"\
+        : [],\r\n      \"allowExtensionOperations\": true\r\n    },\r\n    \"networkProfile\"\
         : {\"networkInterfaces\":[{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/networkInterfaces/pyvmirnic122014cf\"\
         }]},\r\n    \"provisioningState\": \"Succeeded\"\r\n  },\r\n  \"type\": \"\
         Microsoft.Compute/virtualMachines\",\r\n  \"location\": \"westus\",\r\n  \"\
@@ -579,16 +604,17 @@ interactions:
         ,\r\n  \"name\": \"pyvmirvm122014cf\"\r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['1447']
+      content-length: ['1523']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:48:21 GMT']
+      date: ['Fri, 20 Jul 2018 17:22:32 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4977,Microsoft.Compute/LowCostGet30Min;39872']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4192,Microsoft.Compute/LowCostGet30Min;33577']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -597,13 +623,13 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Compute/virtualMachines/pyvmirvm122014cf?$expand=instanceView&api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Compute/virtualMachines/pyvmirvm122014cf?$expand=instanceView&api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"22337a83-a13f-4bff-a8fc-00da1359e560\"\
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"fc6910bc-0d0a-49ae-b8f7-498a48d88cc3\"\
         ,\r\n    \"hardwareProfile\": {\r\n      \"vmSize\": \"Standard_A0\"\r\n \
         \   },\r\n    \"storageProfile\": {\r\n      \"imageReference\": {\r\n   \
         \     \"publisher\": \"Canonical\",\r\n        \"offer\": \"UbuntuServer\"\
@@ -612,43 +638,47 @@ interactions:
         \      \"name\": \"test\",\r\n        \"createOption\": \"FromImage\",\r\n\
         \        \"vhd\": {\r\n          \"uri\": \"https://pyvmirstor122014cf.blob.core.windows.net/vhds/osdisk.vhd\"\
         \r\n        },\r\n        \"caching\": \"None\",\r\n        \"diskSizeGB\"\
-        : 29\r\n      },\r\n      \"dataDisks\": []\r\n    },\r\n    \"osProfile\"\
+        : 30\r\n      },\r\n      \"dataDisks\": []\r\n    },\r\n    \"osProfile\"\
         : {\r\n      \"computerName\": \"test\",\r\n      \"adminUsername\": \"Foo12\"\
         ,\r\n      \"linuxConfiguration\": {\r\n        \"disablePasswordAuthentication\"\
-        : false\r\n      },\r\n      \"secrets\": []\r\n    },\r\n    \"networkProfile\"\
+        : false,\r\n        \"provisionVMAgent\": true\r\n      },\r\n      \"secrets\"\
+        : [],\r\n      \"allowExtensionOperations\": true\r\n    },\r\n    \"networkProfile\"\
         : {\"networkInterfaces\":[{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/networkInterfaces/pyvmirnic122014cf\"\
         }]},\r\n    \"provisioningState\": \"Succeeded\",\r\n    \"instanceView\"\
-        : {\r\n      \"vmAgent\": {\r\n        \"vmAgentVersion\": \"2.1.3\",\r\n\
-        \        \"statuses\": [\r\n          {\r\n            \"code\": \"ProvisioningState/succeeded\"\
-        ,\r\n            \"level\": \"Info\",\r\n            \"displayStatus\": \"\
-        Ready\",\r\n            \"message\": \"Guest Agent is running\",\r\n     \
-        \       \"time\": \"2017-11-22T17:48:15+00:00\"\r\n          }\r\n       \
-        \ ],\r\n        \"extensionHandlers\": []\r\n      },\r\n      \"disks\":\
-        \ [\r\n        {\r\n          \"name\": \"test\",\r\n          \"statuses\"\
-        : [\r\n            {\r\n              \"code\": \"ProvisioningState/succeeded\"\
-        ,\r\n              \"level\": \"Info\",\r\n              \"displayStatus\"\
-        : \"Provisioning succeeded\",\r\n              \"time\": \"2017-11-22T17:45:49.569135+00:00\"\
-        \r\n            }\r\n          ]\r\n        }\r\n      ],\r\n      \"statuses\"\
-        : [\r\n        {\r\n          \"code\": \"ProvisioningState/succeeded\",\r\
-        \n          \"level\": \"Info\",\r\n          \"displayStatus\": \"Provisioning\
-        \ succeeded\",\r\n          \"time\": \"2017-11-22T17:47:52.1476278+00:00\"\
-        \r\n        },\r\n        {\r\n          \"code\": \"PowerState/running\"\
-        ,\r\n          \"level\": \"Info\",\r\n          \"displayStatus\": \"VM running\"\
-        \r\n        }\r\n      ]\r\n    }\r\n  },\r\n  \"type\": \"Microsoft.Compute/virtualMachines\"\
+        : {\r\n      \"computerName\": \"test\",\r\n      \"osName\": \"ubuntu\",\r\
+        \n      \"osVersion\": \"16.04\",\r\n      \"vmAgent\": {\r\n        \"vmAgentVersion\"\
+        : \"2.2.26\",\r\n        \"statuses\": [\r\n          {\r\n            \"\
+        code\": \"ProvisioningState/succeeded\",\r\n            \"level\": \"Info\"\
+        ,\r\n            \"displayStatus\": \"Ready\",\r\n            \"message\"\
+        : \"Guest Agent is running\",\r\n            \"time\": \"2018-07-20T17:22:30+00:00\"\
+        \r\n          }\r\n        ],\r\n        \"extensionHandlers\": []\r\n   \
+        \   },\r\n      \"disks\": [\r\n        {\r\n          \"name\": \"test\"\
+        ,\r\n          \"statuses\": [\r\n            {\r\n              \"code\"\
+        : \"ProvisioningState/succeeded\",\r\n              \"level\": \"Info\",\r\
+        \n              \"displayStatus\": \"Provisioning succeeded\",\r\n       \
+        \       \"time\": \"2018-07-20T17:20:10.1088837+00:00\"\r\n            }\r\
+        \n          ]\r\n        }\r\n      ],\r\n      \"statuses\": [\r\n      \
+        \  {\r\n          \"code\": \"ProvisioningState/succeeded\",\r\n         \
+        \ \"level\": \"Info\",\r\n          \"displayStatus\": \"Provisioning succeeded\"\
+        ,\r\n          \"time\": \"2018-07-20T17:22:11.2173139+00:00\"\r\n       \
+        \ },\r\n        {\r\n          \"code\": \"PowerState/running\",\r\n     \
+        \     \"level\": \"Info\",\r\n          \"displayStatus\": \"VM running\"\r\
+        \n        }\r\n      ]\r\n    }\r\n  },\r\n  \"type\": \"Microsoft.Compute/virtualMachines\"\
         ,\r\n  \"location\": \"westus\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Compute/virtualMachines/pyvmirvm122014cf\"\
         ,\r\n  \"name\": \"pyvmirvm122014cf\"\r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['2577']
+      content-length: ['2742']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:48:22 GMT']
+      date: ['Fri, 20 Jul 2018 17:22:43 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4976,Microsoft.Compute/LowCostGet30Min;39871']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4191,Microsoft.Compute/LowCostGet30Min;33576']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -658,25 +688,26 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['0']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: POST
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Compute/virtualMachines/pyvmirvm122014cf/deallocate?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Compute/virtualMachines/pyvmirvm122014cf/deallocate?api-version=2018-06-01
   response:
     body: {string: ''}
     headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/b60403c6-a890-406a-acff-689bdc37c80a?api-version=2017-12-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/77ced980-e3a7-49b2-80b5-504b82c8695a?api-version=2018-06-01']
       cache-control: [no-cache]
       content-length: ['0']
-      date: ['Wed, 22 Nov 2017 17:48:23 GMT']
+      date: ['Fri, 20 Jul 2018 17:22:45 GMT']
       expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/b60403c6-a890-406a-acff-689bdc37c80a?monitor=true&api-version=2017-12-01']
+      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/77ced980-e3a7-49b2-80b5-504b82c8695a?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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/DeleteVM3Min;299,Microsoft.Compute/DeleteVM30Min;1495']
-      x-ms-ratelimit-remaining-subscription-writes: ['1198']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/DeleteVM3Min;239,Microsoft.Compute/DeleteVM30Min;1195']
+      x-ms-ratelimit-remaining-subscription-writes: ['1199']
     status: {code: 202, message: Accepted}
 - request:
     body: null
@@ -684,28 +715,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/b60403c6-a890-406a-acff-689bdc37c80a?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/77ced980-e3a7-49b2-80b5-504b82c8695a?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:48:25.0874366+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"b60403c6-a890-406a-acff-689bdc37c80a\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:22:45.3671512+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"77ced980-e3a7-49b2-80b5-504b82c8695a\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:48:53 GMT']
+      date: ['Fri, 20 Jul 2018 17:23:03 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2145,Microsoft.Compute/GetOperation30Min;17957']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14984,Microsoft.Compute/GetOperation30Min;29959']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -713,28 +743,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/b60403c6-a890-406a-acff-689bdc37c80a?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/77ced980-e3a7-49b2-80b5-504b82c8695a?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:48:25.0874366+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"b60403c6-a890-406a-acff-689bdc37c80a\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:22:45.3671512+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"77ced980-e3a7-49b2-80b5-504b82c8695a\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:49:24 GMT']
+      date: ['Fri, 20 Jul 2018 17:23:39 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2145,Microsoft.Compute/GetOperation30Min;17954']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14987,Microsoft.Compute/GetOperation30Min;29957']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -742,28 +771,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/b60403c6-a890-406a-acff-689bdc37c80a?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/77ced980-e3a7-49b2-80b5-504b82c8695a?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:48:25.0874366+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"b60403c6-a890-406a-acff-689bdc37c80a\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:22:45.3671512+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"77ced980-e3a7-49b2-80b5-504b82c8695a\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:49:55 GMT']
+      date: ['Fri, 20 Jul 2018 17:24: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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2145,Microsoft.Compute/GetOperation30Min;17951']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14987,Microsoft.Compute/GetOperation30Min;29954']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -771,28 +799,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/b60403c6-a890-406a-acff-689bdc37c80a?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/77ced980-e3a7-49b2-80b5-504b82c8695a?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:48:25.0874366+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"b60403c6-a890-406a-acff-689bdc37c80a\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:22:45.3671512+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"77ced980-e3a7-49b2-80b5-504b82c8695a\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:50:25 GMT']
+      date: ['Fri, 20 Jul 2018 17:24:43 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2144,Microsoft.Compute/GetOperation30Min;17948']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14986,Microsoft.Compute/GetOperation30Min;29951']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -800,28 +827,55 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/b60403c6-a890-406a-acff-689bdc37c80a?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/77ced980-e3a7-49b2-80b5-504b82c8695a?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:48:25.0874366+00:00\",\r\
-        \n  \"endTime\": \"2017-11-22T17:50:35.9884168+00:00\",\r\n  \"status\": \"\
-        Succeeded\",\r\n  \"name\": \"b60403c6-a890-406a-acff-689bdc37c80a\"\r\n}"}
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:22:45.3671512+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"77ced980-e3a7-49b2-80b5-504b82c8695a\"\
+        \r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['184']
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 17:25:14 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;14986,Microsoft.Compute/GetOperation30Min;29948']
+    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.18.4 msrest/0.4.28
+          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/77ced980-e3a7-49b2-80b5-504b82c8695a?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:22:45.3671512+00:00\",\r\
+        \n  \"endTime\": \"2018-07-20T17:25:15.270999+00:00\",\r\n  \"status\": \"\
+        Succeeded\",\r\n  \"name\": \"77ced980-e3a7-49b2-80b5-504b82c8695a\"\r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['183']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:50:56 GMT']
+      date: ['Fri, 20 Jul 2018 17:25:44 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2144,Microsoft.Compute/GetOperation30Min;17945']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14987,Microsoft.Compute/GetOperation30Min;29946']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -831,24 +885,25 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['0']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: POST
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Compute/virtualMachines/pyvmirvm122014cf/start?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Compute/virtualMachines/pyvmirvm122014cf/start?api-version=2018-06-01
   response:
     body: {string: ''}
     headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/e5d513db-23c5-4b11-be87-171eb39636b8?api-version=2017-12-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/baad4985-37de-4a83-99b9-7a0ed12862f7?api-version=2018-06-01']
       cache-control: [no-cache]
       content-length: ['0']
-      date: ['Wed, 22 Nov 2017 17:50:57 GMT']
+      date: ['Fri, 20 Jul 2018 17:25:45 GMT']
       expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/e5d513db-23c5-4b11-be87-171eb39636b8?monitor=true&api-version=2017-12-01']
+      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/baad4985-37de-4a83-99b9-7a0ed12862f7?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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateUpdateVM3Min;299,Microsoft.Compute/CreateUpdateVM30Min;1495']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/UpdateVM3Min;239,Microsoft.Compute/UpdateVM30Min;1197']
       x-ms-ratelimit-remaining-subscription-writes: ['1199']
     status: {code: 202, message: Accepted}
 - request:
@@ -857,28 +912,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/e5d513db-23c5-4b11-be87-171eb39636b8?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/baad4985-37de-4a83-99b9-7a0ed12862f7?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:50:58.8338007+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"e5d513db-23c5-4b11-be87-171eb39636b8\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:25:46.7146914+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"baad4985-37de-4a83-99b9-7a0ed12862f7\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:51:27 GMT']
+      date: ['Fri, 20 Jul 2018 17:25:57 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2143,Microsoft.Compute/GetOperation30Min;17942']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14986,Microsoft.Compute/GetOperation30Min;29945']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -886,28 +940,55 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/e5d513db-23c5-4b11-be87-171eb39636b8?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/baad4985-37de-4a83-99b9-7a0ed12862f7?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:50:58.8338007+00:00\",\r\
-        \n  \"endTime\": \"2017-11-22T17:51:37.8678232+00:00\",\r\n  \"status\": \"\
-        Succeeded\",\r\n  \"name\": \"e5d513db-23c5-4b11-be87-171eb39636b8\"\r\n}"}
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:25:46.7146914+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"baad4985-37de-4a83-99b9-7a0ed12862f7\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 17:26: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;14984,Microsoft.Compute/GetOperation30Min;29943']
+    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.18.4 msrest/0.4.28
+          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/baad4985-37de-4a83-99b9-7a0ed12862f7?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:25:46.7146914+00:00\",\r\
+        \n  \"endTime\": \"2018-07-20T17:26:22.1825315+00:00\",\r\n  \"status\": \"\
+        Succeeded\",\r\n  \"name\": \"baad4985-37de-4a83-99b9-7a0ed12862f7\"\r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['184']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:51:58 GMT']
+      date: ['Fri, 20 Jul 2018 17:26: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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2144,Microsoft.Compute/GetOperation30Min;17940']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14984,Microsoft.Compute/GetOperation30Min;29940']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -917,24 +998,25 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['0']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: POST
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Compute/virtualMachines/pyvmirvm122014cf/restart?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Compute/virtualMachines/pyvmirvm122014cf/restart?api-version=2018-06-01
   response:
     body: {string: ''}
     headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/6ce860e6-7db4-44f6-84e8-4ac214d60b8a?api-version=2017-12-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/5ec9e9c9-b3c2-422f-a9a4-629ed7bb6763?api-version=2018-06-01']
       cache-control: [no-cache]
       content-length: ['0']
-      date: ['Wed, 22 Nov 2017 17:51:58 GMT']
+      date: ['Fri, 20 Jul 2018 17:26:43 GMT']
       expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/6ce860e6-7db4-44f6-84e8-4ac214d60b8a?monitor=true&api-version=2017-12-01']
+      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/5ec9e9c9-b3c2-422f-a9a4-629ed7bb6763?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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateUpdateVM3Min;298,Microsoft.Compute/CreateUpdateVM30Min;1494']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/UpdateVM3Min;238,Microsoft.Compute/UpdateVM30Min;1196']
       x-ms-ratelimit-remaining-subscription-writes: ['1199']
     status: {code: 202, message: Accepted}
 - request:
@@ -943,28 +1025,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/6ce860e6-7db4-44f6-84e8-4ac214d60b8a?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/5ec9e9c9-b3c2-422f-a9a4-629ed7bb6763?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:52:00.294163+00:00\",\r\n\
-        \  \"endTime\": \"2017-11-22T17:52:15.6546489+00:00\",\r\n  \"status\": \"\
-        Succeeded\",\r\n  \"name\": \"6ce860e6-7db4-44f6-84e8-4ac214d60b8a\"\r\n}"}
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:26:43.5622787+00:00\",\r\
+        \n  \"endTime\": \"2018-07-20T17:26:57.7995825+00:00\",\r\n  \"status\": \"\
+        Succeeded\",\r\n  \"name\": \"5ec9e9c9-b3c2-422f-a9a4-629ed7bb6763\"\r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['183']
+      content-length: ['184']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:52:29 GMT']
+      date: ['Fri, 20 Jul 2018 17:27:13 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2147,Microsoft.Compute/GetOperation30Min;17938']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14985,Microsoft.Compute/GetOperation30Min;29938']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -974,25 +1055,26 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['0']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: POST
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Compute/virtualMachines/pyvmirvm122014cf/powerOff?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Compute/virtualMachines/pyvmirvm122014cf/powerOff?api-version=2018-06-01
   response:
     body: {string: ''}
     headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/9e1a9b7a-a829-4b7a-8f77-cb888dad12d6?api-version=2017-12-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/7d91a1eb-f0eb-4975-9bfc-6f8e0f84dee5?api-version=2018-06-01']
       cache-control: [no-cache]
       content-length: ['0']
-      date: ['Wed, 22 Nov 2017 17:52:31 GMT']
+      date: ['Fri, 20 Jul 2018 17:27:14 GMT']
       expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/9e1a9b7a-a829-4b7a-8f77-cb888dad12d6?monitor=true&api-version=2017-12-01']
+      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/7d91a1eb-f0eb-4975-9bfc-6f8e0f84dee5?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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/DeleteVM3Min;299,Microsoft.Compute/DeleteVM30Min;1494']
-      x-ms-ratelimit-remaining-subscription-writes: ['1198']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/UpdateVM3Min;237,Microsoft.Compute/UpdateVM30Min;1195']
+      x-ms-ratelimit-remaining-subscription-writes: ['1199']
     status: {code: 202, message: Accepted}
 - request:
     body: null
@@ -1000,57 +1082,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
-    method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/9e1a9b7a-a829-4b7a-8f77-cb888dad12d6?api-version=2017-12-01
-  response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:52:33.3596756+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"9e1a9b7a-a829-4b7a-8f77-cb888dad12d6\"\
-        \r\n}"}
-    headers:
-      cache-control: [no-cache]
-      content-length: ['134']
-      content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:53:02 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2147,Microsoft.Compute/GetOperation30Min;17935']
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/9e1a9b7a-a829-4b7a-8f77-cb888dad12d6?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/7d91a1eb-f0eb-4975-9bfc-6f8e0f84dee5?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:52:33.3596756+00:00\",\r\
-        \n  \"endTime\": \"2017-11-22T17:53:05.8776129+00:00\",\r\n  \"status\": \"\
-        Succeeded\",\r\n  \"name\": \"9e1a9b7a-a829-4b7a-8f77-cb888dad12d6\"\r\n}"}
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:27:15.2679315+00:00\",\r\
+        \n  \"endTime\": \"2018-07-20T17:27:28.142498+00:00\",\r\n  \"status\": \"\
+        Succeeded\",\r\n  \"name\": \"7d91a1eb-f0eb-4975-9bfc-6f8e0f84dee5\"\r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['184']
+      content-length: ['183']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:53:32 GMT']
+      date: ['Fri, 20 Jul 2018 17:27:44 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2147,Microsoft.Compute/GetOperation30Min;17932']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14986,Microsoft.Compute/GetOperation30Min;29936']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1059,14 +1111,14 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Compute/virtualMachines?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Compute/virtualMachines?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"value\": [\r\n    {\r\n      \"properties\": {\r\n  \
-        \      \"vmId\": \"22337a83-a13f-4bff-a8fc-00da1359e560\",\r\n        \"hardwareProfile\"\
+        \      \"vmId\": \"fc6910bc-0d0a-49ae-b8f7-498a48d88cc3\",\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\"\
@@ -1075,28 +1127,30 @@ interactions:
         ,\r\n            \"createOption\": \"FromImage\",\r\n            \"vhd\":\
         \ {\r\n              \"uri\": \"https://pyvmirstor122014cf.blob.core.windows.net/vhds/osdisk.vhd\"\
         \r\n            },\r\n            \"caching\": \"None\",\r\n            \"\
-        diskSizeGB\": 29\r\n          },\r\n          \"dataDisks\": []\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\"\
-        : {\r\n            \"disablePasswordAuthentication\": false\r\n          },\r\
-        \n          \"secrets\": []\r\n        },\r\n        \"networkProfile\": {\"\
-        networkInterfaces\":[{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/networkInterfaces/pyvmirnic122014cf\"\
+        : {\r\n            \"disablePasswordAuthentication\": false,\r\n         \
+        \   \"provisionVMAgent\": true\r\n          },\r\n          \"secrets\": [],\r\
+        \n          \"allowExtensionOperations\": true\r\n        },\r\n        \"\
+        networkProfile\": {\"networkInterfaces\":[{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Network/networkInterfaces/pyvmirnic122014cf\"\
         }]},\r\n        \"provisioningState\": \"Succeeded\"\r\n      },\r\n     \
         \ \"type\": \"Microsoft.Compute/virtualMachines\",\r\n      \"location\":\
         \ \"westus\",\r\n      \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Compute/virtualMachines/pyvmirvm122014cf\"\
         ,\r\n      \"name\": \"pyvmirvm122014cf\"\r\n    }\r\n  ]\r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['1636']
+      content-length: ['1720']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:53:33 GMT']
+      date: ['Fri, 20 Jul 2018 17:27:45 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/HighCostGet3Min;179,Microsoft.Compute/HighCostGet30Min;899']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/HighCostGet3Min;159,Microsoft.Compute/HighCostGet30Min;799']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1106,25 +1160,26 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['0']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: DELETE
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Compute/virtualMachines/pyvmirvm122014cf?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_virtual_machines_operations122014cf/providers/Microsoft.Compute/virtualMachines/pyvmirvm122014cf?api-version=2018-06-01
   response:
     body: {string: ''}
     headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/1e741e6a-6c0f-48f6-afa3-fdb6b02b49a6?api-version=2017-12-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/119df04a-2d48-4517-b551-fc1957d99d3a?api-version=2018-06-01']
       cache-control: [no-cache]
       content-length: ['0']
-      date: ['Wed, 22 Nov 2017 17:53:35 GMT']
+      date: ['Fri, 20 Jul 2018 17:27:46 GMT']
       expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/1e741e6a-6c0f-48f6-afa3-fdb6b02b49a6?monitor=true&api-version=2017-12-01']
+      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/119df04a-2d48-4517-b551-fc1957d99d3a?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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/DeleteVM3Min;298,Microsoft.Compute/DeleteVM30Min;1493']
-      x-ms-ratelimit-remaining-subscription-writes: ['1199']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/DeleteVM3Min;239,Microsoft.Compute/DeleteVM30Min;1194']
+      x-ms-ratelimit-remaining-subscription-deletes: ['14999']
     status: {code: 202, message: Accepted}
 - request:
     body: null
@@ -1132,28 +1187,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/1e741e6a-6c0f-48f6-afa3-fdb6b02b49a6?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/119df04a-2d48-4517-b551-fc1957d99d3a?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:53:37.4118117+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"1e741e6a-6c0f-48f6-afa3-fdb6b02b49a6\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:27:47.1625797+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"119df04a-2d48-4517-b551-fc1957d99d3a\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:54:05 GMT']
+      date: ['Fri, 20 Jul 2018 17:28:04 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2148,Microsoft.Compute/GetOperation30Min;17930']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14984,Microsoft.Compute/GetOperation30Min;29934']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1161,28 +1215,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/1e741e6a-6c0f-48f6-afa3-fdb6b02b49a6?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/119df04a-2d48-4517-b551-fc1957d99d3a?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:53:37.4118117+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"1e741e6a-6c0f-48f6-afa3-fdb6b02b49a6\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:27:47.1625797+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"119df04a-2d48-4517-b551-fc1957d99d3a\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:54:36 GMT']
+      date: ['Fri, 20 Jul 2018 17:28:35 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2147,Microsoft.Compute/GetOperation30Min;17927']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14988,Microsoft.Compute/GetOperation30Min;29932']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1190,28 +1243,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/1e741e6a-6c0f-48f6-afa3-fdb6b02b49a6?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/119df04a-2d48-4517-b551-fc1957d99d3a?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:53:37.4118117+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"1e741e6a-6c0f-48f6-afa3-fdb6b02b49a6\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:27:47.1625797+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"119df04a-2d48-4517-b551-fc1957d99d3a\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:55:07 GMT']
+      date: ['Fri, 20 Jul 2018 17:29:07 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2145,Microsoft.Compute/GetOperation30Min;17924']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14987,Microsoft.Compute/GetOperation30Min;29929']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1219,27 +1271,26 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/1e741e6a-6c0f-48f6-afa3-fdb6b02b49a6?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/119df04a-2d48-4517-b551-fc1957d99d3a?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:53:37.4118117+00:00\",\r\
-        \n  \"endTime\": \"2017-11-22T17:55:29.7974494+00:00\",\r\n  \"status\": \"\
-        Succeeded\",\r\n  \"name\": \"1e741e6a-6c0f-48f6-afa3-fdb6b02b49a6\"\r\n}"}
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:27:47.1625797+00:00\",\r\
+        \n  \"endTime\": \"2018-07-20T17:29:12.4528217+00:00\",\r\n  \"status\": \"\
+        Succeeded\",\r\n  \"name\": \"119df04a-2d48-4517-b551-fc1957d99d3a\"\r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['184']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:55:37 GMT']
+      date: ['Fri, 20 Jul 2018 17:29:38 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2145,Microsoft.Compute/GetOperation30Min;17921']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14988,Microsoft.Compute/GetOperation30Min;29927']
     status: {code: 200, message: OK}
 version: 1
diff --git a/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_vm_extension_images.yaml b/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_vm_extension_images.yaml
index 865dad6824bc..297128cfd09b 100644
--- a/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_vm_extension_images.yaml
+++ b/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_vm_extension_images.yaml
@@ -6,11 +6,11 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers?api-version=2018-06-01
   response:
     body: {string: "[\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"\
         1e\",\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/1e\"\
@@ -26,20 +26,22 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/abiquo\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"accellion\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/accellion\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"accessdata-group\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/accessdata-group\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"accops\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/accops\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Acronis\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Acronis\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Acronis.Backup\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Acronis.Backup\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"actian-corp\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/actian-corp\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"actian_matrix\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/actian_matrix\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"actifio\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/actifio\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"activeeon\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/activeeon\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"adatao\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/adatao\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"adobe_test\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/adobe_test\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"advantech\"\
@@ -50,28 +52,36 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/aerospike\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"aerospike-database\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/aerospike-database\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"affinio\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/affinio\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"aiscaler-cache-control-ddos-and-url-rewriting-\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/aiscaler-cache-control-ddos-and-url-rewriting-\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"akamai-technologies\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/akamai-technologies\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"akumina\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/akumina\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"alachisoft\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/alachisoft\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"alces-flight-limited\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/alces-flight-limited\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"alertlogic\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/alertlogic\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"AlertLogic.Extension\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/AlertLogic.Extension\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"algebraix-data\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/algebraix-data\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"alienvault\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/alienvault\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"alldigital-brevity\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/alldigital-brevity\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"altair-engineering-inc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/altair-engineering-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"altamira-corporation\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/altamira-corporation\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"alteryx\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/alteryx\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"altova\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/altova\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"aod\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/aod\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"apigee\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/apigee\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"appcelerator\"\
@@ -82,10 +92,16 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/appistry\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"appscale-marketplace\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/appscale-marketplace\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"appspace\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/appspace\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"aptean-inc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/aptean-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"aqua-security\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/aqua-security\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"aquaforest\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/aquaforest\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"arabesque-group\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/arabesque-group\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"arangodb\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/arangodb\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"aras\"\
@@ -94,8 +110,10 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/arista-networks\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"array_networks\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/array_networks\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"aspex\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/aspex\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"artificial-intelligence-techniques-sl\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/artificial-intelligence-techniques-sl\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"asigra\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/asigra\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"aspex-managed-cloud\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/aspex-managed-cloud\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"atlassian\"\
@@ -108,10 +126,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/auraportal\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"auriq-systems\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/auriq-systems\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"avds\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/avds\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"averesystems\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/averesystems\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"avepoint\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/avepoint\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"avi-networks\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/avi-networks\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"aviatrix-systems\"\
@@ -122,6 +138,10 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/axway\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"azul\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/azul\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"AzureChinaMarketplace\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/AzureChinaMarketplace\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"AzureDatabricks\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/AzureDatabricks\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"AzureRT.Test\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/AzureRT.Test\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"azuresyncfusion\"\
@@ -134,6 +154,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/azuretesting3\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"AzureTools1type\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/AzureTools1type\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"baas-techbureau\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/baas-techbureau\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"baffle-io\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/baffle-io\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"balabit\"\
@@ -146,14 +168,18 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/batch\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"bdy\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/bdy\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"betterdish\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/betterdish\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"beyondtrust\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/beyondtrust\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"bi-builders-as\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/bi-builders-as\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Bitnami\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Bitnami\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"bizagi\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/bizagi\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"biztalk360\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/biztalk360\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"black-duck-software\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/black-duck-software\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"blackberry\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/blackberry\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"blk-technologies\"\
@@ -164,6 +190,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/blockchain-foundry\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"blockstack\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/blockstack\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"bloombase\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/bloombase\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"bluecat\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/bluecat\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"bluetalon\"\
@@ -172,10 +200,10 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/bmc.ctm\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"bmcctm.test\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/bmcctm.test\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"boxless\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/boxless\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"brainshare-it\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/brainshare-it\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"bravura-software-llc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/bravura-software-llc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"brocade_communications\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/brocade_communications\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"bssw\"\
@@ -184,8 +212,6 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/buddhalabs\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Canonical\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Canonical\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"caringo\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/caringo\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"carto\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/carto\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cask\"\
@@ -196,12 +222,12 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cautelalabs\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cavirin\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cavirin\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cbrdashboard\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cbrdashboard\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cbreplicator\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cbreplicator\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cds\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cds\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"celum-gmbh\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/celum-gmbh\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"center-for-internet-security-inc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/center-for-internet-security-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"certivox\"\
@@ -230,8 +256,12 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/clear-linux-project\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"clouber\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/clouber\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cloud-checkr\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cloud-checkr\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cloud-cruiser\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cloud-cruiser\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cloud-infrastructure-services\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cloud-infrastructure-services\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cloudbees\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cloudbees\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cloudbees-enterprise-jenkins\"\
@@ -240,10 +270,6 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cloudbolt-software\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cloudboost\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cloudboost\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cloudcoreo\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cloudcoreo\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cloudcruiser\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cloudcruiser\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cloudenablers-inc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cloudenablers-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cloudera\"\
@@ -264,6 +290,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/CloudLinkEMC.SecureVM\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cloudneeti\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cloudneeti\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cloudplan-gmbh\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cloudplan-gmbh\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cloudsecurity\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cloudsecurity\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cloudsoft\"\
@@ -282,8 +310,6 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cohesive\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"commvault\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/commvault\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"companyname-short\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/companyname-short\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"composable\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/composable\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"comunity\"\
@@ -294,28 +320,28 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/confluentinc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"connecting-software\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/connecting-software\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"consensys\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/consensys\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"convertigo\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/convertigo\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"corda\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/corda\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"CoreOS\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/CoreOS\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cortex-ag\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cortex-ag\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"couchbase\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/couchbase\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"crate-io\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/crate-io\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"credativ\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/credativ\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cree\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cree\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cryptzone\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cryptzone\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"csstest\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/csstest\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"ctm.bmc.com\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/ctm.bmc.com\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cybernetica-as\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cybernetica-as\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cyxtera\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cyxtera\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"danielsol.AzureTools1\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/danielsol.AzureTools1\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Dans.Windows.App\"\
@@ -340,8 +366,6 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/datasunrise\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"datometry\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/datometry\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"dell-software\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/dell-software\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"dellemc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/dellemc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"dell_software\"\
@@ -360,24 +384,36 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/diagramics\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"digitaloffice\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/digitaloffice\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"diladele\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/diladele\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"dimensionalmechanics-inc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/dimensionalmechanics-inc\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"diqa\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/diqa\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"docker\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/docker\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"docscorp-us\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/docscorp-us\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"dome9\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/dome9\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"drizti\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/drizti\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"drone\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/drone\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"dsi\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/dsi\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"dundas\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/dundas\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"dyadic_security\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/dyadic_security\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"dynatrace\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/dynatrace\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"dynatrace.ruxit\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/dynatrace.ruxit\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"eastbanctech\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/eastbanctech\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"eastwind-networks-inc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/eastwind-networks-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"edevtech\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/edevtech\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"egnyte\"\
@@ -386,8 +422,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/eip\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"eip-eipower\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/eip-eipower\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"elasticbeam\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/elasticbeam\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"ekran-system-inc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/ekran-system-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"elasticbox\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/elasticbox\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"elecard\"\
@@ -406,12 +442,10 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/enterprise-ethereum-alliance\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"enterprisedb-corp\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/enterprisedb-corp\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"enterpriseworx-it\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/enterpriseworx-it\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"eperi\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/eperi\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"equalum\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/equalum\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"equilibrium\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/equilibrium\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"esdenera\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/esdenera\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"ESET\"\
@@ -426,22 +460,26 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/evostream-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"exasol\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/exasol\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"expertime\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/expertime\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"f5-networks\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/f5-networks\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"falconstorsoftware\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/falconstorsoftware\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"feezmodo-consulting-pte-ltd\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/feezmodo-consulting-pte-ltd\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"fidesys\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/fidesys\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"filecatalyst\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/filecatalyst\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"firehost\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/firehost\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"flashgrid-inc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/flashgrid-inc\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"flexify-io\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/flexify-io\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"flynet\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/flynet\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"foghorn-systems\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/foghorn-systems\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"forcepoint-llc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/forcepoint-llc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"forscene\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/forscene\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"fortinet\"\
@@ -458,6 +496,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Gemalto.SafeNet.ProtectV\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"genesys-source\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/genesys-source\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"gigamon-inc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/gigamon-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"GitHub\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/GitHub\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"gitlab\"\
@@ -468,12 +508,12 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/gordic\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"graphitegtc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/graphitegtc\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"great-software-laboratory-private-limited\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/great-software-laboratory-private-limited\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"greathorn\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/greathorn\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"greensql\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/greensql\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"grid\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/grid\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"gridgain\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/gridgain\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"guardicore\"\
@@ -482,14 +522,18 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/h2o-ai\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"haivision\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/haivision\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"halobicloud\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/halobicloud\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"hanu\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/hanu\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"haproxy-technologies\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/haproxy-technologies\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"harpaitalia\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/harpaitalia\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"HDInsight\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/HDInsight\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"hcl-technologies\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/hcl-technologies\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"heimdall-data\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/heimdall-data\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"help-systems\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/help-systems\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"hewlett-packard\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/hewlett-packard\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"hillstone-networks\"\
@@ -520,14 +564,18 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/iaansys\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"ibabs-eu\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/ibabs-eu\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"ibm\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/ibm\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"iboss\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/iboss\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"ikan\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/ikan\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"image-technologies\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/image-technologies\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"imaginecommunications\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/imaginecommunications\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"imperva\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/imperva\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"incredibuild\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/incredibuild\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"infoblox\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/infoblox\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"infolibrarian\"\
@@ -536,10 +584,18 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/informatica\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"informationbuilders\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/informationbuilders\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"infront-consulting-group-ltd\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/infront-consulting-group-ltd\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"ingrammicro\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/ingrammicro\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"integration-objects\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/integration-objects\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"intel\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/intel\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"intel-bigdl\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/intel-bigdl\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"intel-fpga\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/intel-fpga\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"intellicus-technologies-pvt-ltd\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/intellicus-technologies-pvt-ltd\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"intelligent-plant-ltd\"\
@@ -552,10 +608,10 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/iquest\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"ishlangu-load-balancer-adc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/ishlangu-load-balancer-adc\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"issp-corporation\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/issp-corporation\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"itelios\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/itelios\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"iw\",\r\
-        \n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/iw\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"jamcracker\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/jamcracker\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"jedox\"\
@@ -564,6 +620,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/jelastic\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"jetnexus\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/jetnexus\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"jetware-srl\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/jetware-srl\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"jfrog\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/jfrog\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"jitterbit_integration\"\
@@ -578,8 +636,6 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/kali-linux\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Kaspersky.Lab\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Kaspersky.Lab\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"KasperskyLab\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/KasperskyLab\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"KasperskyLab.SecurityAgent\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/KasperskyLab.SecurityAgent\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"kaspersky_lab\"\
@@ -596,22 +652,22 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/knime\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"kobalt\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/kobalt\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"krypc-technologies-pvt-ltd\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/krypc-technologies-pvt-ltd\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"lansa\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/lansa\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"learningtechnolgy\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/learningtechnolgy\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"leostream-corporation\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/leostream-corporation\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"liebsoft\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/liebsoft\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"liquid-files\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/liquid-files\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"liquidware\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/liquidware\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"literatu\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/literatu\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"loadbalancer\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/loadbalancer\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"loginpeople\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/loginpeople\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"logmein\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/logmein\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"logsign\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/logsign\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"logtrust\"\
@@ -620,10 +676,12 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/looker\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"lti-lt-infotech\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/lti-lt-infotech\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"luxoft\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/luxoft\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"luminate-security\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/luminate-security\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mactores_inc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/mactores_inc\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"maketv\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/maketv\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"manageengine\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/manageengine\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mapr-technologies\"\
@@ -636,6 +694,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/massiveanalytic-\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mathworks-deployment\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/mathworks-deployment\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mathworks-inc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/mathworks-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mavinglobal\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/mavinglobal\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"McAfee.EndpointSecurity\"\
@@ -650,22 +710,34 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/memsql\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mendix\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/mendix\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mesosphere\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/mesosphere\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mfe_azure\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/mfe_azure\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mfiles\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/mfiles\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mico\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/mico\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"micro-focus\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/micro-focus\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"microsec-zrt\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/microsec-zrt\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"microsoft-ads\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/microsoft-ads\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"microsoft-avere\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/microsoft-avere\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"microsoft-azure-batch\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/microsoft-azure-batch\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"microsoft-azure-compute\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/microsoft-azure-compute\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"microsoft-dsvm\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/microsoft-dsvm\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"microsoft-hyperv\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/microsoft-hyperv\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.AKS\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.AKS\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.ActiveDirectory\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.ActiveDirectory\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.ActiveDirectory.LinuxSSH\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.ActiveDirectory.LinuxSSH\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.Applications\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.Applications\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.Backup.Test\"\
@@ -678,6 +750,10 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.Diagnostics.Build.Test\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.Extensions\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.Extensions\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.KeyVault\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.KeyVault\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.KeyVault.Edp\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.KeyVault.Edp\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.Monitoring.DependencyAgent\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.Monitoring.DependencyAgent\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.Networking.SDN\"\
@@ -688,14 +764,14 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.Performance.Diagnostics\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.RecoveryServices\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.RecoveryServices\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.RecoveryServices.Edp\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.RecoveryServices.Edp\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.RecoveryServices.SiteRecovery\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.RecoveryServices.SiteRecovery\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.RecoveryServices.SiteRecovery2\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.RecoveryServices.SiteRecovery2\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.RecoveryServices.WorkloadBackup\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.RecoveryServices.WorkloadBackup\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.RecoveryServices.WorkloadBackup.Edp\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.RecoveryServices.WorkloadBackup.Edp\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.Security\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.Security\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.Security.Edp\"\
@@ -722,20 +798,30 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.CloudBackup.Workload.Extension.Edp\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Compute\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Compute\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.CPlat.Core\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.CPlat.Core\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.CPlat.Core.Edp\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.CPlat.Core.Edp\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.DscPolicy2.Test\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.DscPolicy2.Test\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.EnterpriseCloud.Monitoring\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.EnterpriseCloud.Monitoring\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.EnterpriseCloud.Monitoring.Test\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.EnterpriseCloud.Monitoring.Test\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Golive.Extensions\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Golive.Extensions\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.HDInsight.Current\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.HDInsight.Current\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.GuestConfig.Test\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.GuestConfig.Test\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.GuestConfiguration.Test\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.GuestConfiguration.Test\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.HpcCompute\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.HpcCompute\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.HpcPack\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.HpcPack\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.ManagedIdentity\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.ManagedIdentity\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.ManagedServices\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.ManagedServices\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.OSTCExtensions\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.OSTCExtensions\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.OSTCExtensions.Edp\"\
@@ -744,18 +830,16 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.OSTCExtensions.Test\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Powershell\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Powershell\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Powershell.Reboot\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Powershell.Reboot\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Powershell.Test\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Powershell.Test\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Powershell.Test01\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Powershell.Test01\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.SqlServer.Managability.IaaS.Test\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.SqlServer.Managability.IaaS.Test\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.SqlServer.Management\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.SqlServer.Management\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.SystemCenter\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.SystemCenter\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.TestSqlServer\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.TestSqlServer\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.TestSqlServer.Edp\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.TestSqlServer.Edp\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.VisualStudio.Azure.ETWTraceListenerService\"\
@@ -802,12 +886,12 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/MicrosoftWindowsDesktop\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"MicrosoftWindowsServer\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/MicrosoftWindowsServer\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"MicrosoftWindowsServerEssentials\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/MicrosoftWindowsServerEssentials\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"MicrosoftWindowsServerHPCPack\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/MicrosoftWindowsServerHPCPack\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"MicrosoftWindowsServerRemoteDesktop\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/MicrosoftWindowsServerRemoteDesktop\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"microstrategy\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/microstrategy\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"midfin\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/midfin\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"midvision\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/midvision\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mindcti\"\
@@ -816,8 +900,12 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/miraclelinux\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"miracl_linux\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/miracl_linux\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"miri-infotech-pvt-ltd\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/miri-infotech-pvt-ltd\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mobilab\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/mobilab\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"moogsoft\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/moogsoft\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"moviemasher\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/moviemasher\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"msopentech\"\
@@ -826,18 +914,18 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/msrazuresapservices\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mtnfog\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/mtnfog\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"multisoft-ab\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/multisoft-ab\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mvp-systems\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/mvp-systems\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mxhero\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/mxhero\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"my-com\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/my-com\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"naaraaadvertising\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/naaraaadvertising\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"namirial\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/namirial\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"narrativescience\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/narrativescience\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"nasuni\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/nasuni\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"ncbi\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/ncbi\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"ndl\"\
@@ -858,6 +946,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/netmail\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"netsil\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/netsil\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"netsweeper\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/netsweeper\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"netwrix\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/netwrix\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"neusoft-neteye\"\
@@ -870,34 +960,42 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/nicepeopleatwork\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"nodejsapi\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/nodejsapi\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"nodesource\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/nodesource\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"noobaa\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/noobaa\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"norsync\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/norsync\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"northbridge-secure\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/northbridge-secure\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"nri\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/nri\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"ntt-data-intellilink-corporation\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/ntt-data-intellilink-corporation\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"nubeva-inc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/nubeva-inc\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"nuco-networks\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/nuco-networks\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"nuxeo\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/nuxeo\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"nvidia\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/nvidia\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"o2mc-real-time-data-platform\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/o2mc-real-time-data-platform\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"oceanblue-cloud\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/oceanblue-cloud\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"OctopusDeploy.Tentacle\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/OctopusDeploy.Tentacle\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"omega-software\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/omega-software\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"ooyala\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/ooyala\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"onapsis\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/onapsis\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"onyx-point-inc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/onyx-point-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"op5\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/op5\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"opencell\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/opencell\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"OpenLogic\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/OpenLogic\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"opennebulasystems\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/opennebulasystems\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"opentext\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/opentext\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"openvpn\"\
@@ -908,6 +1006,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/opsview-limited\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Oracle\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Oracle\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"oriana\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/oriana\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"orientdb\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/orientdb\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"osirium-ltd\"\
@@ -916,8 +1016,6 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/osisoft\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"osnexus\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/osnexus\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"outsystems\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/outsystems\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"paloaltonetworks\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/paloaltonetworks\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"panorama-necto\"\
@@ -932,8 +1030,12 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/passlogy\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"paxata\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/paxata\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"peer-software-inc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/peer-software-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"penta-security-systems-inc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/penta-security-systems-inc\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"percona\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/percona\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"pivotal\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/pivotal\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"plesk\"\
@@ -942,10 +1044,6 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/portalarchitects\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"postgres-pro\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/postgres-pro\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"predictionio\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/predictionio\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"predixion\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/predixion\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"prestashop\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/prestashop\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"prime-strategy\"\
@@ -974,8 +1072,12 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/pyramidanalytics\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"qlik\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/qlik\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"qore-technologies\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/qore-technologies\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Qualys\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Qualys\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Qualys.Test\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Qualys.Test\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"qualysguard\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/qualysguard\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"quasardb\"\
@@ -984,10 +1086,12 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/qubole\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"qubole-inc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/qubole-inc\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"racemi-incorporated\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/racemi-incorporated\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"quest\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/quest\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"racknap\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/racknap\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"radiant-logic\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/radiant-logic\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"radware\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/radware\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"rancher\"\
@@ -998,8 +1102,12 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Rapid7.InsightPlatform\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"rapidminer\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/rapidminer\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"rds\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/rds\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"realm\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/realm\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"reblaze\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/reblaze\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"RedHat\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/RedHat\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"redpoint-global\"\
@@ -1012,6 +1120,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/res\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"resco\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/resco\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"responder-corp\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/responder-corp\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"revolution-analytics\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/revolution-analytics\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"RightScaleLinux\"\
@@ -1024,8 +1134,6 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/RiverbedTechnology\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"rocketsoftware\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/rocketsoftware\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"rocket_software\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/rocket_software\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"roktech\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/roktech\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"rsa-security-llc\"\
@@ -1034,6 +1142,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/rsk-labs\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"rtts\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/rtts\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"rubrik-inc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/rubrik-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"saama\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/saama\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"saasame-limited\"\
@@ -1048,16 +1158,14 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/sap\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"scalearc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/scalearc\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"scalebase\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/scalebase\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"scalegrid\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/scalegrid\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"scality\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/scality\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"scsk\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/scsk\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"sensorberg\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/sensorberg\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"secureworks\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/secureworks\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"sentryone\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/sentryone\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"service-control-inc\"\
@@ -1092,8 +1200,6 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Site24x7\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"skyarc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/skyarc\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"slamby\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/slamby\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"smartmessage-autoflow\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/smartmessage-autoflow\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"snaplogic\"\
@@ -1106,26 +1212,28 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/soha\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"solanolabs\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/solanolabs\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"solar-security\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/solar-security\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"solarwinds\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/solarwinds\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"solid-stack\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/solid-stack\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"sonicwall-inc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/sonicwall-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"sophos\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/sophos\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"south-river-technologies\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/south-river-technologies\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"spacecurve\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/spacecurve\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"spagobi\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/spagobi\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"sparklinglogic\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/sparklinglogic\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"sphere3d\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/sphere3d\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"splunk\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/splunk\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"sqlstream\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/sqlstream\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"sqream\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/sqream\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"src-solution\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/src-solution\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"stackato-platform-as-a-service\"\
@@ -1154,8 +1262,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/stratalux\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"stratis-group-ltd\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/stratis-group-ltd\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"stratus-id\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/stratus-id\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"stratumn\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/stratumn\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"streamsets\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/streamsets\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"striim\"\
@@ -1170,6 +1278,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Symantec.CloudWorkloadProtection\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Symantec.CloudWorkloadProtection.Test\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Symantec.CloudWorkloadProtection.Test\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Symantec.CloudWorkloadProtection.TestOnStage\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Symantec.CloudWorkloadProtection.TestOnStage\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Symantec.QA\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Symantec.QA\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Symantec.staging\"\
@@ -1188,10 +1298,14 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/syncfusiondashboard\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"synechron-technologies\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/synechron-technologies\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"syte\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/syte\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"tableau\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/tableau\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"tactic\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/tactic\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"talari-networks\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/talari-networks\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"talena-inc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/talena-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"talon\"\
@@ -1204,6 +1318,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/te-systems\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"techdivision\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/techdivision\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"techlatest\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/techlatest\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"telepat\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/telepat\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"tenable\"\
@@ -1228,16 +1344,24 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Test3.Microsoft.VisualStudio.Services\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"thales-vormetric\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/thales-vormetric\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"thoughtspot-inc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/thoughtspot-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"tibco-software\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/tibco-software\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"tig\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/tig\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"timextender\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/timextender\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"tmaxsoft\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/tmaxsoft\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"tokyosystemhouse\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/tokyosystemhouse\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"topdesk\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/topdesk\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"torusware\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/torusware\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"totemo\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/totemo\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"townsend-security\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/townsend-security\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"transvault\"\
@@ -1250,6 +1374,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/TrendMicro.PortalProtect\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"tresorit\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/tresorit\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"truestack\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/truestack\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"tsa-public-service\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/tsa-public-service\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"tunnelbiz\"\
@@ -1268,12 +1394,10 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/unidesk\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"unidesk-corp\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/unidesk-corp\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"unify-cloud-llc\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/unify-cloud-llc\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"unifi-software\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/unifi-software\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"uniprint-net\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/uniprint-net\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"unisys-azuremp-stealth\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/unisys-azuremp-stealth\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"unitrends\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/unitrends\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"usp\"\
@@ -1286,24 +1410,24 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/vbot\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"veeam\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/veeam\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"velocitydb-inc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/velocitydb-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"velocloud\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/velocloud\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"velostrata\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/velostrata\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"velostrata-inc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/velostrata-inc\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"ventify\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/ventify\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"veritas\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/veritas\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"versasec\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/versasec\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"vertabelo\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/vertabelo\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"vidispine\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/vidispine\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"vidizmo\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/vidizmo\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"vigyanlabs-innovations-pvt-ltd\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/vigyanlabs-innovations-pvt-ltd\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"vintegris\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/vintegris\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"viptela\"\
@@ -1334,6 +1458,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/wardy-it-solutions\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"warewolf-esb\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/warewolf-esb\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"watchguard-technologies\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/watchguard-technologies\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"waves\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/waves\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"websense-apmailpe\"\
@@ -1348,20 +1474,22 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/workspot\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"wowza\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/wowza\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"xendata-inc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/xendata-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"xfinityinc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/xfinityinc\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"xrm\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/xrm\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"xtremedata\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/xtremedata\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"xyzrd-group-ou\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/xyzrd-group-ou\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"yellowfin\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/yellowfin\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"your-shop-online\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/your-shop-online\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"z1\",\r\
         \n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/z1\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"zementis\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/zementis\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"z4it-aps\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/z4it-aps\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"zend\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/zend\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"zerodown_software\"\
@@ -1375,15 +1503,16 @@ interactions:
         \r\n  }\r\n]"}
     headers:
       cache-control: [no-cache]
-      content-length: ['138101']
+      content-length: ['151625']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:55:43 GMT']
+      date: ['Fri, 20 Jul 2018 17:29:46 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]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1392,24 +1521,25 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/1e/artifacttypes/vmextension/types?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/1e/artifacttypes/vmextension/types?api-version=2018-06-01
   response:
     body: {string: '[]'}
     headers:
       cache-control: [no-cache]
       content-length: ['2']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:55:43 GMT']
+      date: ['Fri, 20 Jul 2018 17:29:47 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]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1418,24 +1548,25 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/4psa/artifacttypes/vmextension/types?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/4psa/artifacttypes/vmextension/types?api-version=2018-06-01
   response:
     body: {string: '[]'}
     headers:
       cache-control: [no-cache]
       content-length: ['2']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:55:45 GMT']
+      date: ['Fri, 20 Jul 2018 17:29:48 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]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1444,24 +1575,25 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/5nine-software-inc/artifacttypes/vmextension/types?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/5nine-software-inc/artifacttypes/vmextension/types?api-version=2018-06-01
   response:
     body: {string: '[]'}
     headers:
       cache-control: [no-cache]
       content-length: ['2']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:55:45 GMT']
+      date: ['Fri, 20 Jul 2018 17:29:49 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]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1470,24 +1602,25 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/7isolutions/artifacttypes/vmextension/types?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/7isolutions/artifacttypes/vmextension/types?api-version=2018-06-01
   response:
     body: {string: '[]'}
     headers:
       cache-control: [no-cache]
       content-length: ['2']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:55:46 GMT']
+      date: ['Fri, 20 Jul 2018 17:29:49 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]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1496,24 +1629,25 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/a10networks/artifacttypes/vmextension/types?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/a10networks/artifacttypes/vmextension/types?api-version=2018-06-01
   response:
     body: {string: '[]'}
     headers:
       cache-control: [no-cache]
       content-length: ['2']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:55:46 GMT']
+      date: ['Fri, 20 Jul 2018 17:29:50 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]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1522,24 +1656,25 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/abiquo/artifacttypes/vmextension/types?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/abiquo/artifacttypes/vmextension/types?api-version=2018-06-01
   response:
     body: {string: '[]'}
     headers:
       cache-control: [no-cache]
       content-length: ['2']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:55:47 GMT']
+      date: ['Fri, 20 Jul 2018 17:29:51 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]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1548,24 +1683,25 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/accellion/artifacttypes/vmextension/types?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/accellion/artifacttypes/vmextension/types?api-version=2018-06-01
   response:
     body: {string: '[]'}
     headers:
       cache-control: [no-cache]
       content-length: ['2']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:55:48 GMT']
+      date: ['Fri, 20 Jul 2018 17:29:52 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]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1574,24 +1710,25 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/accops/artifacttypes/vmextension/types?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/accessdata-group/artifacttypes/vmextension/types?api-version=2018-06-01
   response:
     body: {string: '[]'}
     headers:
       cache-control: [no-cache]
       content-length: ['2']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:55:48 GMT']
+      date: ['Fri, 20 Jul 2018 17:29:52 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]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1600,24 +1737,25 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/Acronis/artifacttypes/vmextension/types?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/accops/artifacttypes/vmextension/types?api-version=2018-06-01
   response:
     body: {string: '[]'}
     headers:
       cache-control: [no-cache]
       content-length: ['2']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:55:49 GMT']
+      date: ['Fri, 20 Jul 2018 17:29:52 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]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1626,11 +1764,38 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/Acronis.Backup/artifacttypes/vmextension/types?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/Acronis/artifacttypes/vmextension/types?api-version=2018-06-01
+  response:
+    body: {string: '[]'}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['2']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 17:29:54 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]
+    status: {code: 200, message: OK}
+- request:
+    body: null
+    headers:
+      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.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
+      accept-language: [en-US]
+    method: GET
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/Acronis.Backup/artifacttypes/vmextension/types?api-version=2018-06-01
   response:
     body: {string: "[\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"\
         AcronisBackup\",\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Acronis.Backup/ArtifactTypes/VMExtension/Types/AcronisBackup\"\
@@ -1641,13 +1806,14 @@ interactions:
       cache-control: [no-cache]
       content-length: ['513']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:55:50 GMT']
+      date: ['Fri, 20 Jul 2018 17:29:54 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]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1656,11 +1822,11 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/Acronis.Backup/artifacttypes/vmextension/types/AcronisBackup/versions?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/Acronis.Backup/artifacttypes/vmextension/types/AcronisBackup/versions?api-version=2018-06-01
   response:
     body: {string: "[\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"\
         1.0.33\",\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Acronis.Backup/ArtifactTypes/VMExtension/Types/AcronisBackup/Versions/1.0.33\"\
@@ -1669,13 +1835,14 @@ interactions:
       cache-control: [no-cache]
       content-length: ['262']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:55:50 GMT']
+      date: ['Fri, 20 Jul 2018 17:29:55 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]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1684,11 +1851,11 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/Acronis.Backup/artifacttypes/vmextension/types/AcronisBackup/versions/1.0.33?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/Acronis.Backup/artifacttypes/vmextension/types/AcronisBackup/versions/1.0.33?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"properties\": {\r\n    \"operatingSystem\": \"Windows\"\
         ,\r\n    \"computeRole\": \"IaaS\",\r\n    \"vmScaleSetEnabled\": false,\r\
@@ -1699,12 +1866,13 @@ interactions:
       cache-control: [no-cache]
       content-length: ['408']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:55:51 GMT']
+      date: ['Fri, 20 Jul 2018 17:29:56 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]
     status: {code: 200, message: OK}
 version: 1
diff --git a/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_vm_extensions.yaml b/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_vm_extensions.yaml
index 5f90ad6f08b3..755d5ec9b949 100644
--- a/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_vm_extensions.yaml
+++ b/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_vm_extensions.yaml
@@ -1,29 +1,32 @@
 interactions:
 - request:
     body: '{"sku": {"name": "Standard_LRS"}, "kind": "Storage", "location": "westus",
-      "properties": {"supportsHttpsTrafficOnly": false}}'
+      "properties": {"supportsHttpsTrafficOnly": false, "isHnsEnabled": false}}'
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Length: ['125']
+      Content-Length: ['148']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 storagemanagementclient/1.4.0 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Storage/storageAccounts/pyvmextstor15a60f10?api-version=2017-06-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Storage/storageAccounts/pyvmextstor15a60f10?api-version=2018-02-01
   response:
     body: {string: ''}
     headers:
       cache-control: [no-cache]
       content-length: ['0']
-      date: ['Wed, 22 Nov 2017 17:55:58 GMT']
+      content-type: [text/plain; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 17:30:06 GMT']
       expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/locations/westus/asyncoperations/e59bd86d-d257-4b7f-ad49-e969b55ae3ac?monitor=true&api-version=2017-06-01']
+      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/locations/westus/asyncoperations/0ef4b146-d69c-42c3-9754-44168567c443?monitor=true&api-version=2018-02-01']
       pragma: [no-cache]
-      server: [Microsoft-Azure-Storage-Resource-Provider/1.0, Microsoft-HTTPAPI/2.0]
+      server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,Microsoft-HTTPAPI/2.0
+          Microsoft-HTTPAPI/2.0']
       strict-transport-security: [max-age=31536000; includeSubDomains]
+      x-content-type-options: [nosniff]
       x-ms-ratelimit-remaining-subscription-writes: ['1199']
     status: {code: 202, message: Accepted}
 - request:
@@ -32,27 +35,25 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 storagemanagementclient/1.4.0 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 azure-mgmt-storage/2.0.0rc4 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/locations/westus/asyncoperations/e59bd86d-d257-4b7f-ad49-e969b55ae3ac?monitor=true&api-version=2017-06-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Storage/locations/westus/asyncoperations/0ef4b146-d69c-42c3-9754-44168567c443?monitor=true&api-version=2018-02-01
   response:
-    body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Storage/storageAccounts/pyvmextstor15a60f10","kind":"Storage","location":"westus","name":"pyvmextstor15a60f10","properties":{"creationTime":"2017-11-22T17:55:59.6920128Z","encryption":{"keySource":"Microsoft.Storage","services":{"blob":{"enabled":true,"lastEnabledTime":"2017-11-22T17:55:59.6940128Z"},"file":{"enabled":true,"lastEnabledTime":"2017-11-22T17:55:59.6940128Z"}}},"networkAcls":{"bypass":"AzureServices","defaultAction":"Allow","ipRules":[],"virtualNetworkRules":[]},"primaryEndpoints":{"blob":"https://pyvmextstor15a60f10.blob.core.windows.net/","file":"https://pyvmextstor15a60f10.file.core.windows.net/","queue":"https://pyvmextstor15a60f10.queue.core.windows.net/","table":"https://pyvmextstor15a60f10.table.core.windows.net/"},"primaryLocation":"westus","provisioningState":"Succeeded","statusOfPrimary":"available","supportsHttpsTrafficOnly":false},"sku":{"name":"Standard_LRS","tier":"Standard"},"tags":{},"type":"Microsoft.Storage/storageAccounts"}
-
-        '}
+    body: {string: '{"sku":{"name":"Standard_LRS","tier":"Standard"},"kind":"Storage","id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Storage/storageAccounts/pyvmextstor15a60f10","name":"pyvmextstor15a60f10","type":"Microsoft.Storage/storageAccounts","location":"westus","tags":{},"properties":{"isHnsEnabled":false,"networkAcls":{"bypass":"AzureServices","virtualNetworkRules":[],"ipRules":[],"defaultAction":"Allow"},"trustedDirectories":["72f988bf-86f1-41af-91ab-2d7cd011db47"],"supportsHttpsTrafficOnly":false,"encryption":{"services":{"file":{"enabled":true,"lastEnabledTime":"2018-07-20T17:30:06.8465041Z"},"blob":{"enabled":true,"lastEnabledTime":"2018-07-20T17:30:06.8465041Z"}},"keySource":"Microsoft.Storage"},"provisioningState":"Succeeded","creationTime":"2018-07-20T17:30:06.7214742Z","primaryEndpoints":{"blob":"https://pyvmextstor15a60f10.blob.core.windows.net/","queue":"https://pyvmextstor15a60f10.queue.core.windows.net/","table":"https://pyvmextstor15a60f10.table.core.windows.net/","file":"https://pyvmextstor15a60f10.file.core.windows.net/"},"primaryLocation":"westus","statusOfPrimary":"available"}}'}
     headers:
       cache-control: [no-cache]
-      content-length: ['1109']
+      content-length: ['1191']
       content-type: [application/json]
-      date: ['Wed, 22 Nov 2017 17:56:15 GMT']
+      date: ['Fri, 20 Jul 2018 17:30:24 GMT']
       expires: ['-1']
       pragma: [no-cache]
-      server: [Microsoft-Azure-Storage-Resource-Provider/1.0, Microsoft-HTTPAPI/2.0]
+      server: ['Microsoft-Azure-Storage-Resource-Provider/1.0,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]
     status: {code: 200, message: OK}
 - request:
     body: '{"location": "westus", "properties": {"addressSpace": {"addressPrefixes":
@@ -64,36 +65,37 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['185']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 networkmanagementclient/1.6.0 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Network/virtualNetworks/pyvmextnet15a60f10?api-version=2017-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Network/virtualNetworks/pyvmextnet15a60f10?api-version=2018-02-01
   response:
     body: {string: "{\r\n  \"name\": \"pyvmextnet15a60f10\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Network/virtualNetworks/pyvmextnet15a60f10\"\
-        ,\r\n  \"etag\": \"W/\\\"d7076446-d4f3-41a1-8112-f0e4bad02646\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"b1609b16-1f14-4299-96e3-b38cb695da4e\\\"\",\r\n \
         \ \"type\": \"Microsoft.Network/virtualNetworks\",\r\n  \"location\": \"westus\"\
         ,\r\n  \"properties\": {\r\n    \"provisioningState\": \"Updating\",\r\n \
-        \   \"resourceGuid\": \"f73c063e-e57b-42e7-b394-9abd1390c71c\",\r\n    \"\
+        \   \"resourceGuid\": \"f8da2361-edfa-4961-b7d7-b98e60a993bc\",\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\"\
         : \"pyvmextsub15a60f10\",\r\n        \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Network/virtualNetworks/pyvmextnet15a60f10/subnets/pyvmextsub15a60f10\"\
-        ,\r\n        \"etag\": \"W/\\\"d7076446-d4f3-41a1-8112-f0e4bad02646\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"b1609b16-1f14-4299-96e3-b38cb695da4e\\\"\"\
         ,\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\"\
         : 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/fd6463cc-ccb9-4217-a104-dd0164b5089c?api-version=2017-09-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/b531d4e3-3d1d-4449-bd31-6150afd0805b?api-version=2018-02-01']
       cache-control: [no-cache]
       content-length: ['1160']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:56:18 GMT']
+      date: ['Fri, 20 Jul 2018 17:30:25 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-subscription-writes: ['1198']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-subscription-writes: ['1199']
     status: {code: 201, message: Created}
 - request:
     body: null
@@ -101,25 +103,49 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 networkmanagementclient/1.6.0 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
+    method: GET
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/b531d4e3-3d1d-4449-bd31-6150afd0805b?api-version=2018-02-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 17:30:29 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]
+    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.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/fd6463cc-ccb9-4217-a104-dd0164b5089c?api-version=2017-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/b531d4e3-3d1d-4449-bd31-6150afd0805b?api-version=2018-02-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: ['Wed, 22 Nov 2017 17:56:21 GMT']
+      date: ['Fri, 20 Jul 2018 17:30:40 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]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -127,22 +153,20 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 networkmanagementclient/1.6.0 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Network/virtualNetworks/pyvmextnet15a60f10?api-version=2017-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Network/virtualNetworks/pyvmextnet15a60f10?api-version=2018-02-01
   response:
     body: {string: "{\r\n  \"name\": \"pyvmextnet15a60f10\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Network/virtualNetworks/pyvmextnet15a60f10\"\
-        ,\r\n  \"etag\": \"W/\\\"0a335caa-b5b1-4d04-83a6-1acaefba0ce1\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"8e38299e-d685-4def-88b4-5c0c191c9427\\\"\",\r\n \
         \ \"type\": \"Microsoft.Network/virtualNetworks\",\r\n  \"location\": \"westus\"\
         ,\r\n  \"properties\": {\r\n    \"provisioningState\": \"Succeeded\",\r\n\
-        \    \"resourceGuid\": \"f73c063e-e57b-42e7-b394-9abd1390c71c\",\r\n    \"\
+        \    \"resourceGuid\": \"f8da2361-edfa-4961-b7d7-b98e60a993bc\",\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\"\
         : \"pyvmextsub15a60f10\",\r\n        \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Network/virtualNetworks/pyvmextnet15a60f10/subnets/pyvmextsub15a60f10\"\
-        ,\r\n        \"etag\": \"W/\\\"0a335caa-b5b1-4d04-83a6-1acaefba0ce1\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"8e38299e-d685-4def-88b4-5c0c191c9427\\\"\"\
         ,\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\"\
@@ -151,14 +175,15 @@ interactions:
       cache-control: [no-cache]
       content-length: ['1162']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:56:22 GMT']
-      etag: [W/"0a335caa-b5b1-4d04-83a6-1acaefba0ce1"]
+      date: ['Fri, 20 Jul 2018 17:30:41 GMT']
+      etag: [W/"8e38299e-d685-4def-88b4-5c0c191c9427"]
       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]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -167,74 +192,77 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 networkmanagementclient/1.6.0 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Network/virtualNetworks/pyvmextnet15a60f10/subnets/pyvmextsub15a60f10?api-version=2017-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Network/virtualNetworks/pyvmextnet15a60f10/subnets/pyvmextsub15a60f10?api-version=2018-02-01
   response:
     body: {string: "{\r\n  \"name\": \"pyvmextsub15a60f10\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Network/virtualNetworks/pyvmextnet15a60f10/subnets/pyvmextsub15a60f10\"\
-        ,\r\n  \"etag\": \"W/\\\"0a335caa-b5b1-4d04-83a6-1acaefba0ce1\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"8e38299e-d685-4def-88b4-5c0c191c9427\\\"\",\r\n \
         \ \"properties\": {\r\n    \"provisioningState\": \"Succeeded\",\r\n    \"\
         addressPrefix\": \"10.0.0.0/24\"\r\n  }\r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['407']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:56:23 GMT']
-      etag: [W/"0a335caa-b5b1-4d04-83a6-1acaefba0ce1"]
+      date: ['Fri, 20 Jul 2018 17:30:43 GMT']
+      etag: [W/"8e38299e-d685-4def-88b4-5c0c191c9427"]
       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]
     status: {code: 200, message: OK}
 - request:
-    body: 'b''b\''b\\\''{"location": "westus", "properties": {"ipConfigurations":
+    body: 'b''b\''b\\\''b\\\\\\\''{"location": "westus", "properties": {"ipConfigurations":
       [{"properties": {"privateIPAllocationMethod": "Dynamic", "subnet": {"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Network/virtualNetworks/pyvmextnet15a60f10/subnets/pyvmextsub15a60f10",
       "properties": {"addressPrefix": "10.0.0.0/24", "provisioningState": "Succeeded"},
-      "name": "pyvmextsub15a60f10", "etag": "W/\\\\\\\\"0a335caa-b5b1-4d04-83a6-1acaefba0ce1\\\\\\\\""}},
-      "name": "pyarmconfig"}]}}\\\''\'''''
+      "name": "pyvmextsub15a60f10", "etag": "W/\\\\\\\\\\\\\\\\"8e38299e-d685-4def-88b4-5c0c191c9427\\\\\\\\\\\\\\\\""}},
+      "name": "pyarmconfig"}]}}\\\\\\\''\\\''\'''''
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['530']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 networkmanagementclient/1.6.0 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Network/networkInterfaces/pyvmextnic15a60f10?api-version=2017-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Network/networkInterfaces/pyvmextnic15a60f10?api-version=2018-02-01
   response:
     body: {string: "{\r\n  \"name\": \"pyvmextnic15a60f10\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Network/networkInterfaces/pyvmextnic15a60f10\"\
-        ,\r\n  \"etag\": \"W/\\\"38f610e7-71ec-4370-9044-af9e8a51b388\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"88daaa8d-8ec4-41b4-b1db-a411bbc5d9e7\\\"\",\r\n \
         \ \"location\": \"westus\",\r\n  \"properties\": {\r\n    \"provisioningState\"\
-        : \"Succeeded\",\r\n    \"resourceGuid\": \"9dcbcc81-62da-4fdc-9777-bf173da851a1\"\
+        : \"Succeeded\",\r\n    \"resourceGuid\": \"ce036b1a-5ffd-4891-84b0-61f2dd90b2ca\"\
         ,\r\n    \"ipConfigurations\": [\r\n      {\r\n        \"name\": \"pyarmconfig\"\
         ,\r\n        \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Network/networkInterfaces/pyvmextnic15a60f10/ipConfigurations/pyarmconfig\"\
-        ,\r\n        \"etag\": \"W/\\\"38f610e7-71ec-4370-9044-af9e8a51b388\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"88daaa8d-8ec4-41b4-b1db-a411bbc5d9e7\\\"\"\
         ,\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_compute_test_vm_extensions15a60f10/providers/Microsoft.Network/virtualNetworks/pyvmextnet15a60f10/subnets/pyvmextsub15a60f10\"\
         \r\n          },\r\n          \"primary\": true,\r\n          \"privateIPAddressVersion\"\
-        : \"IPv4\"\r\n        }\r\n      }\r\n    ],\r\n    \"dnsSettings\": {\r\n\
-        \      \"dnsServers\": [],\r\n      \"appliedDnsServers\": [],\r\n      \"\
-        internalDomainNameSuffix\": \"hyddz3112xtufm2utk4rheghde.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/67b18f34-76c1-473b-a454-5b625caa90fc?api-version=2017-09-01']
+        : \"IPv4\",\r\n          \"isInUseWithService\": false\r\n        }\r\n  \
+        \    }\r\n    ],\r\n    \"dnsSettings\": {\r\n      \"dnsServers\": [],\r\n\
+        \      \"appliedDnsServers\": [],\r\n      \"internalDomainNameSuffix\": \"\
+        mer3v4h03vqutn4xxghgbkmtxe.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}"}
+    headers:
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/df99cf16-90f7-4690-b90f-843f9465dc58?api-version=2018-02-01']
       cache-control: [no-cache]
-      content-length: ['1614']
+      content-length: ['1715']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:56:24 GMT']
+      date: ['Fri, 20 Jul 2018 17:30:44 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-subscription-writes: ['1199']
     status: {code: 201, message: Created}
 - request:
@@ -243,25 +271,24 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 networkmanagementclient/1.6.0 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/67b18f34-76c1-473b-a454-5b625caa90fc?api-version=2017-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/df99cf16-90f7-4690-b90f-843f9465dc58?api-version=2018-02-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: ['Wed, 22 Nov 2017 17:56:55 GMT']
+      date: ['Fri, 20 Jul 2018 17:31:15 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]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -269,64 +296,64 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 networkmanagementclient/1.6.0 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Network/networkInterfaces/pyvmextnic15a60f10?api-version=2017-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Network/networkInterfaces/pyvmextnic15a60f10?api-version=2018-02-01
   response:
     body: {string: "{\r\n  \"name\": \"pyvmextnic15a60f10\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Network/networkInterfaces/pyvmextnic15a60f10\"\
-        ,\r\n  \"etag\": \"W/\\\"38f610e7-71ec-4370-9044-af9e8a51b388\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"88daaa8d-8ec4-41b4-b1db-a411bbc5d9e7\\\"\",\r\n \
         \ \"location\": \"westus\",\r\n  \"properties\": {\r\n    \"provisioningState\"\
-        : \"Succeeded\",\r\n    \"resourceGuid\": \"9dcbcc81-62da-4fdc-9777-bf173da851a1\"\
+        : \"Succeeded\",\r\n    \"resourceGuid\": \"ce036b1a-5ffd-4891-84b0-61f2dd90b2ca\"\
         ,\r\n    \"ipConfigurations\": [\r\n      {\r\n        \"name\": \"pyarmconfig\"\
         ,\r\n        \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Network/networkInterfaces/pyvmextnic15a60f10/ipConfigurations/pyarmconfig\"\
-        ,\r\n        \"etag\": \"W/\\\"38f610e7-71ec-4370-9044-af9e8a51b388\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"88daaa8d-8ec4-41b4-b1db-a411bbc5d9e7\\\"\"\
         ,\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_compute_test_vm_extensions15a60f10/providers/Microsoft.Network/virtualNetworks/pyvmextnet15a60f10/subnets/pyvmextsub15a60f10\"\
         \r\n          },\r\n          \"primary\": true,\r\n          \"privateIPAddressVersion\"\
-        : \"IPv4\"\r\n        }\r\n      }\r\n    ],\r\n    \"dnsSettings\": {\r\n\
-        \      \"dnsServers\": [],\r\n      \"appliedDnsServers\": [],\r\n      \"\
-        internalDomainNameSuffix\": \"hyddz3112xtufm2utk4rheghde.dx.internal.cloudapp.net\"\
-        \r\n    },\r\n    \"enableAcceleratedNetworking\": false,\r\n    \"enableIPForwarding\"\
-        : false\r\n  },\r\n  \"type\": \"Microsoft.Network/networkInterfaces\"\r\n\
-        }"}
+        : \"IPv4\",\r\n          \"isInUseWithService\": false\r\n        }\r\n  \
+        \    }\r\n    ],\r\n    \"dnsSettings\": {\r\n      \"dnsServers\": [],\r\n\
+        \      \"appliedDnsServers\": [],\r\n      \"internalDomainNameSuffix\": \"\
+        mer3v4h03vqutn4xxghgbkmtxe.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}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['1614']
+      content-length: ['1715']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:56:56 GMT']
-      etag: [W/"38f610e7-71ec-4370-9044-af9e8a51b388"]
+      date: ['Fri, 20 Jul 2018 17:31:15 GMT']
+      etag: [W/"88daaa8d-8ec4-41b4-b1db-a411bbc5d9e7"]
       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]
     status: {code: 200, message: OK}
 - request:
-    body: 'b''b\''b\\\''{"location": "westus", "properties": {"hardwareProfile": {"vmSize":
-      "Standard_A0"}, "storageProfile": {"imageReference": {"publisher": "MicrosoftWindowsServer",
-      "offer": "WindowsServer", "sku": "2016-Datacenter", "version": "latest"}, "osDisk":
-      {"name": "test", "vhd": {"uri": "https://pyvmextstor15a60f10.blob.core.windows.net/vhds/osdisk.vhd"},
+    body: 'b''b\''b\\\''b\\\\\\\''{"location": "westus", "properties": {"hardwareProfile":
+      {"vmSize": "Standard_A0"}, "storageProfile": {"imageReference": {"publisher":
+      "MicrosoftWindowsServer", "offer": "WindowsServer", "sku": "2016-Datacenter",
+      "version": "latest"}, "osDisk": {"name": "test", "vhd": {"uri": "https://pyvmextstor15a60f10.blob.core.windows.net/vhds/osdisk.vhd"},
       "caching": "None", "createOption": "FromImage"}}, "osProfile": {"computerName":
       "test", "adminUsername": "Foo12", "adminPassword": "BaR@123test_mgmt_compute_test_vm_extensions15a60f10"},
-      "networkProfile": {"networkInterfaces": [{"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Network/networkInterfaces/pyvmextnic15a60f10"}]}}}\\\''\'''''
+      "networkProfile": {"networkInterfaces": [{"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Network/networkInterfaces/pyvmextnic15a60f10"}]}}}\\\\\\\''\\\''\'''''
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['765']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Compute/virtualMachines/pyvmextvm15a60f10?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Compute/virtualMachines/pyvmextvm15a60f10?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"889ae501-1aef-484b-b5ea-5f3f733af144\"\
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"78de114e-3de9-4250-8725-8a9c2a68386a\"\
         ,\r\n    \"hardwareProfile\": {\r\n      \"vmSize\": \"Standard_A0\"\r\n \
         \   },\r\n    \"storageProfile\": {\r\n      \"imageReference\": {\r\n   \
         \     \"publisher\": \"MicrosoftWindowsServer\",\r\n        \"offer\": \"\
@@ -338,23 +365,25 @@ interactions:
         : []\r\n    },\r\n    \"osProfile\": {\r\n      \"computerName\": \"test\"\
         ,\r\n      \"adminUsername\": \"Foo12\",\r\n      \"windowsConfiguration\"\
         : {\r\n        \"provisionVMAgent\": true,\r\n        \"enableAutomaticUpdates\"\
-        : true\r\n      },\r\n      \"secrets\": []\r\n    },\r\n    \"networkProfile\"\
-        : {\"networkInterfaces\":[{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Network/networkInterfaces/pyvmextnic15a60f10\"\
+        : true\r\n      },\r\n      \"secrets\": [],\r\n      \"allowExtensionOperations\"\
+        : true\r\n    },\r\n    \"networkProfile\": {\"networkInterfaces\":[{\"id\"\
+        :\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Network/networkInterfaces/pyvmextnic15a60f10\"\
         }]},\r\n    \"provisioningState\": \"Creating\"\r\n  },\r\n  \"type\": \"\
         Microsoft.Compute/virtualMachines\",\r\n  \"location\": \"westus\",\r\n  \"\
         id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Compute/virtualMachines/pyvmextvm15a60f10\"\
         ,\r\n  \"name\": \"pyvmextvm15a60f10\"\r\n}"}
     headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/32866454-f150-44c4-96e2-b4c1eb6969b0?api-version=2017-12-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01']
       cache-control: [no-cache]
-      content-length: ['1444']
+      content-length: ['1485']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:56:58 GMT']
+      date: ['Fri, 20 Jul 2018 17:31:17 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateUpdateVM3Min;299,Microsoft.Compute/CreateUpdateVM30Min;1493']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/PutVM3Min;239,Microsoft.Compute/PutVM30Min;1195']
       x-ms-ratelimit-remaining-subscription-writes: ['1199']
     status: {code: 201, message: Created}
 - request:
@@ -363,28 +392,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/32866454-f150-44c4-96e2-b4c1eb6969b0?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:56:59.9913245+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"32866454-f150-44c4-96e2-b4c1eb6969b0\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:57:28 GMT']
+      date: ['Fri, 20 Jul 2018 17:31:28 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2154,Microsoft.Compute/GetOperation30Min;17919']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14993,Microsoft.Compute/GetOperation30Min;29926']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -392,28 +420,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/32866454-f150-44c4-96e2-b4c1eb6969b0?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:56:59.9913245+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"32866454-f150-44c4-96e2-b4c1eb6969b0\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:58:00 GMT']
+      date: ['Fri, 20 Jul 2018 17:32:45 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2154,Microsoft.Compute/GetOperation30Min;17916']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14993,Microsoft.Compute/GetOperation30Min;29920']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -421,28 +448,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/32866454-f150-44c4-96e2-b4c1eb6969b0?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:56:59.9913245+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"32866454-f150-44c4-96e2-b4c1eb6969b0\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:58:30 GMT']
+      date: ['Fri, 20 Jul 2018 17:33:18 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2152,Microsoft.Compute/GetOperation30Min;17913']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14990,Microsoft.Compute/GetOperation30Min;29917']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -450,28 +476,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/32866454-f150-44c4-96e2-b4c1eb6969b0?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:56:59.9913245+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"32866454-f150-44c4-96e2-b4c1eb6969b0\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:59:02 GMT']
+      date: ['Fri, 20 Jul 2018 17:33:50 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2149,Microsoft.Compute/GetOperation30Min;17910']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14987,Microsoft.Compute/GetOperation30Min;29914']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -479,28 +504,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/32866454-f150-44c4-96e2-b4c1eb6969b0?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:56:59.9913245+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"32866454-f150-44c4-96e2-b4c1eb6969b0\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:59:33 GMT']
+      date: ['Fri, 20 Jul 2018 17:34:22 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2146,Microsoft.Compute/GetOperation30Min;17907']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14985,Microsoft.Compute/GetOperation30Min;29911']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -508,28 +532,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/32866454-f150-44c4-96e2-b4c1eb6969b0?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:56:59.9913245+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"32866454-f150-44c4-96e2-b4c1eb6969b0\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:00:03 GMT']
+      date: ['Fri, 20 Jul 2018 17:34:52 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2144,Microsoft.Compute/GetOperation30Min;17904']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14984,Microsoft.Compute/GetOperation30Min;29908']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -537,28 +560,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/32866454-f150-44c4-96e2-b4c1eb6969b0?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:56:59.9913245+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"32866454-f150-44c4-96e2-b4c1eb6969b0\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:00:33 GMT']
+      date: ['Fri, 20 Jul 2018 17:35:24 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2144,Microsoft.Compute/GetOperation30Min;17901']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14983,Microsoft.Compute/GetOperation30Min;29905']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -566,28 +588,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/32866454-f150-44c4-96e2-b4c1eb6969b0?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:56:59.9913245+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"32866454-f150-44c4-96e2-b4c1eb6969b0\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:01:05 GMT']
+      date: ['Fri, 20 Jul 2018 17:35:55 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2144,Microsoft.Compute/GetOperation30Min;17898']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14983,Microsoft.Compute/GetOperation30Min;29902']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -595,28 +616,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/32866454-f150-44c4-96e2-b4c1eb6969b0?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:56:59.9913245+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"32866454-f150-44c4-96e2-b4c1eb6969b0\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:01:35 GMT']
+      date: ['Fri, 20 Jul 2018 17:36:29 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2144,Microsoft.Compute/GetOperation30Min;17895']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14983,Microsoft.Compute/GetOperation30Min;29899']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -624,28 +644,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/32866454-f150-44c4-96e2-b4c1eb6969b0?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:56:59.9913245+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"32866454-f150-44c4-96e2-b4c1eb6969b0\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:02:06 GMT']
+      date: ['Fri, 20 Jul 2018 17:37:00 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2144,Microsoft.Compute/GetOperation30Min;17892']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14985,Microsoft.Compute/GetOperation30Min;29896']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -653,28 +672,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/32866454-f150-44c4-96e2-b4c1eb6969b0?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:56:59.9913245+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"32866454-f150-44c4-96e2-b4c1eb6969b0\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:02:37 GMT']
+      date: ['Fri, 20 Jul 2018 17:37:32 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2144,Microsoft.Compute/GetOperation30Min;17889']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14985,Microsoft.Compute/GetOperation30Min;29893']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -682,28 +700,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/32866454-f150-44c4-96e2-b4c1eb6969b0?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:56:59.9913245+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"32866454-f150-44c4-96e2-b4c1eb6969b0\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:03:08 GMT']
+      date: ['Fri, 20 Jul 2018 17:38:03 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2144,Microsoft.Compute/GetOperation30Min;17886']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14985,Microsoft.Compute/GetOperation30Min;29890']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -711,28 +728,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/32866454-f150-44c4-96e2-b4c1eb6969b0?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:56:59.9913245+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"32866454-f150-44c4-96e2-b4c1eb6969b0\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:03:38 GMT']
+      date: ['Fri, 20 Jul 2018 17:38:35 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2144,Microsoft.Compute/GetOperation30Min;17884']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14985,Microsoft.Compute/GetOperation30Min;29887']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -740,28 +756,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/32866454-f150-44c4-96e2-b4c1eb6969b0?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:56:59.9913245+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"32866454-f150-44c4-96e2-b4c1eb6969b0\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:04:09 GMT']
+      date: ['Fri, 20 Jul 2018 17:39:06 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2144,Microsoft.Compute/GetOperation30Min;17881']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14985,Microsoft.Compute/GetOperation30Min;29884']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -769,28 +784,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/32866454-f150-44c4-96e2-b4c1eb6969b0?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:56:59.9913245+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"32866454-f150-44c4-96e2-b4c1eb6969b0\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:04:40 GMT']
+      date: ['Fri, 20 Jul 2018 17:39:38 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2144,Microsoft.Compute/GetOperation30Min;17878']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14984,Microsoft.Compute/GetOperation30Min;29881']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -798,28 +812,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/32866454-f150-44c4-96e2-b4c1eb6969b0?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:56:59.9913245+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"32866454-f150-44c4-96e2-b4c1eb6969b0\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:05:10 GMT']
+      date: ['Fri, 20 Jul 2018 17:40: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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2144,Microsoft.Compute/GetOperation30Min;17876']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14984,Microsoft.Compute/GetOperation30Min;29883']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -827,28 +840,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/32866454-f150-44c4-96e2-b4c1eb6969b0?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:56:59.9913245+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"32866454-f150-44c4-96e2-b4c1eb6969b0\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:05:40 GMT']
+      date: ['Fri, 20 Jul 2018 17:40:42 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2144,Microsoft.Compute/GetOperation30Min;17873']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14984,Microsoft.Compute/GetOperation30Min;29880']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -856,28 +868,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/32866454-f150-44c4-96e2-b4c1eb6969b0?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:56:59.9913245+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"32866454-f150-44c4-96e2-b4c1eb6969b0\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:06:11 GMT']
+      date: ['Fri, 20 Jul 2018 17:41:14 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2144,Microsoft.Compute/GetOperation30Min;17870']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14984,Microsoft.Compute/GetOperation30Min;29877']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -885,28 +896,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/32866454-f150-44c4-96e2-b4c1eb6969b0?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:56:59.9913245+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"32866454-f150-44c4-96e2-b4c1eb6969b0\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:06:42 GMT']
+      date: ['Fri, 20 Jul 2018 17:41:46 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2144,Microsoft.Compute/GetOperation30Min;17867']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14984,Microsoft.Compute/GetOperation30Min;29874']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -914,28 +924,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/32866454-f150-44c4-96e2-b4c1eb6969b0?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:56:59.9913245+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"32866454-f150-44c4-96e2-b4c1eb6969b0\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:07:12 GMT']
+      date: ['Fri, 20 Jul 2018 17:42:17 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2144,Microsoft.Compute/GetOperation30Min;17864']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14983,Microsoft.Compute/GetOperation30Min;29871']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -943,28 +952,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/32866454-f150-44c4-96e2-b4c1eb6969b0?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:56:59.9913245+00:00\",\r\
-        \n  \"endTime\": \"2017-11-22T18:07:21.2100835+00:00\",\r\n  \"status\": \"\
-        Succeeded\",\r\n  \"name\": \"32866454-f150-44c4-96e2-b4c1eb6969b0\"\r\n}"}
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['184']
+      content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:07:43 GMT']
+      date: ['Fri, 20 Jul 2018 17:42:49 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2144,Microsoft.Compute/GetOperation30Min;17862']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14983,Microsoft.Compute/GetOperation30Min;29868']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -972,108 +980,83 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Compute/virtualMachines/pyvmextvm15a60f10?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"889ae501-1aef-484b-b5ea-5f3f733af144\"\
-        ,\r\n    \"hardwareProfile\": {\r\n      \"vmSize\": \"Standard_A0\"\r\n \
-        \   },\r\n    \"storageProfile\": {\r\n      \"imageReference\": {\r\n   \
-        \     \"publisher\": \"MicrosoftWindowsServer\",\r\n        \"offer\": \"\
-        WindowsServer\",\r\n        \"sku\": \"2016-Datacenter\",\r\n        \"version\"\
-        : \"latest\"\r\n      },\r\n      \"osDisk\": {\r\n        \"osType\": \"\
-        Windows\",\r\n        \"name\": \"test\",\r\n        \"createOption\": \"\
-        FromImage\",\r\n        \"vhd\": {\r\n          \"uri\": \"https://pyvmextstor15a60f10.blob.core.windows.net/vhds/osdisk.vhd\"\
-        \r\n        },\r\n        \"caching\": \"None\",\r\n        \"diskSizeGB\"\
-        : 127\r\n      },\r\n      \"dataDisks\": []\r\n    },\r\n    \"osProfile\"\
-        : {\r\n      \"computerName\": \"test\",\r\n      \"adminUsername\": \"Foo12\"\
-        ,\r\n      \"windowsConfiguration\": {\r\n        \"provisionVMAgent\": true,\r\
-        \n        \"enableAutomaticUpdates\": true\r\n      },\r\n      \"secrets\"\
-        : []\r\n    },\r\n    \"networkProfile\": {\"networkInterfaces\":[{\"id\"\
-        :\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Network/networkInterfaces/pyvmextnic15a60f10\"\
-        }]},\r\n    \"provisioningState\": \"Succeeded\"\r\n  },\r\n  \"type\": \"\
-        Microsoft.Compute/virtualMachines\",\r\n  \"location\": \"westus\",\r\n  \"\
-        id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Compute/virtualMachines/pyvmextvm15a60f10\"\
-        ,\r\n  \"name\": \"pyvmextvm15a60f10\"\r\n}"}
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['1473']
+      content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:07:43 GMT']
+      date: ['Fri, 20 Jul 2018 17:43:20 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4991,Microsoft.Compute/LowCostGet30Min;39877']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14983,Microsoft.Compute/GetOperation30Min;29865']
     status: {code: 200, message: OK}
 - request:
-    body: '{"location": "westus", "properties": {"publisher": "Microsoft.Compute",
-      "type": "VMAccessAgent", "typeHandlerVersion": "2.0", "autoUpgradeMinorVersion":
-      true, "settings": {}, "protectedSettings": {}}}'
+    body: null
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Length: ['200']
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
-    method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Compute/virtualMachines/pyvmextvm15a60f10/extensions/pyvmextvm15a60f10AccessAgent?api-version=2017-12-01
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"publisher\": \"Microsoft.Compute\"\
-        ,\r\n    \"type\": \"VMAccessAgent\",\r\n    \"typeHandlerVersion\": \"2.0\"\
-        ,\r\n    \"autoUpgradeMinorVersion\": true,\r\n    \"settings\": {},\r\n \
-        \   \"provisioningState\": \"Creating\"\r\n  },\r\n  \"type\": \"Microsoft.Compute/virtualMachines/extensions\"\
-        ,\r\n  \"location\": \"westus\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Compute/virtualMachines/pyvmextvm15a60f10/extensions/pyvmextvm15a60f10AccessAgent\"\
-        ,\r\n  \"name\": \"pyvmextvm15a60f10AccessAgent\"\r\n}"}
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
     headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/847df48b-9ae3-44a9-ba0e-4880c9aafecf?api-version=2017-12-01']
       cache-control: [no-cache]
-      content-length: ['580']
+      content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:07:45 GMT']
+      date: ['Fri, 20 Jul 2018 17:43:52 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateUpdateVM3Min;299,Microsoft.Compute/CreateUpdateVM30Min;1494']
-      x-ms-ratelimit-remaining-subscription-writes: ['1199']
-    status: {code: 201, message: Created}
+      transfer-encoding: [chunked]
+      vary: [Accept-Encoding]
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14983,Microsoft.Compute/GetOperation30Min;29862']
+    status: {code: 200, message: OK}
 - request:
     body: null
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/847df48b-9ae3-44a9-ba0e-4880c9aafecf?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T18:07:47.2456661+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"847df48b-9ae3-44a9-ba0e-4880c9aafecf\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:08:16 GMT']
+      date: ['Fri, 20 Jul 2018 17:44:25 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2145,Microsoft.Compute/GetOperation30Min;17860']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14983,Microsoft.Compute/GetOperation30Min;29859']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1081,28 +1064,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/847df48b-9ae3-44a9-ba0e-4880c9aafecf?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T18:07:47.2456661+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"847df48b-9ae3-44a9-ba0e-4880c9aafecf\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:08:47 GMT']
+      date: ['Fri, 20 Jul 2018 17:44:56 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2145,Microsoft.Compute/GetOperation30Min;17857']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14983,Microsoft.Compute/GetOperation30Min;29856']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1110,28 +1092,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/847df48b-9ae3-44a9-ba0e-4880c9aafecf?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T18:07:47.2456661+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"847df48b-9ae3-44a9-ba0e-4880c9aafecf\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:09:17 GMT']
+      date: ['Fri, 20 Jul 2018 17:45:30 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2145,Microsoft.Compute/GetOperation30Min;17854']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14983,Microsoft.Compute/GetOperation30Min;29873']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1139,28 +1120,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/847df48b-9ae3-44a9-ba0e-4880c9aafecf?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T18:07:47.2456661+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"847df48b-9ae3-44a9-ba0e-4880c9aafecf\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:09:47 GMT']
+      date: ['Fri, 20 Jul 2018 17:46:01 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2145,Microsoft.Compute/GetOperation30Min;17851']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14986,Microsoft.Compute/GetOperation30Min;29870']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1168,28 +1148,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/847df48b-9ae3-44a9-ba0e-4880c9aafecf?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T18:07:47.2456661+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"847df48b-9ae3-44a9-ba0e-4880c9aafecf\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:10:17 GMT']
+      date: ['Fri, 20 Jul 2018 17:46:32 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2145,Microsoft.Compute/GetOperation30Min;17874']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14985,Microsoft.Compute/GetOperation30Min;29867']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1197,28 +1176,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/847df48b-9ae3-44a9-ba0e-4880c9aafecf?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T18:07:47.2456661+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"847df48b-9ae3-44a9-ba0e-4880c9aafecf\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:10:49 GMT']
+      date: ['Fri, 20 Jul 2018 17:47:02 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2143,Microsoft.Compute/GetOperation30Min;17871']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14985,Microsoft.Compute/GetOperation30Min;29864']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1226,28 +1204,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/847df48b-9ae3-44a9-ba0e-4880c9aafecf?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T18:07:47.2456661+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"847df48b-9ae3-44a9-ba0e-4880c9aafecf\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:11:19 GMT']
+      date: ['Fri, 20 Jul 2018 17:47:33 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2143,Microsoft.Compute/GetOperation30Min;17868']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14985,Microsoft.Compute/GetOperation30Min;29861']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1255,28 +1232,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/847df48b-9ae3-44a9-ba0e-4880c9aafecf?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T18:07:47.2456661+00:00\",\r\
-        \n  \"endTime\": \"2017-11-22T18:11:49.5473071+00:00\",\r\n  \"status\": \"\
-        Succeeded\",\r\n  \"name\": \"847df48b-9ae3-44a9-ba0e-4880c9aafecf\"\r\n}"}
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['184']
+      content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:11:49 GMT']
+      date: ['Fri, 20 Jul 2018 17:48:06 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2143,Microsoft.Compute/GetOperation30Min;17865']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14985,Microsoft.Compute/GetOperation30Min;29858']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1284,31 +1260,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Compute/virtualMachines/pyvmextvm15a60f10/extensions/pyvmextvm15a60f10AccessAgent?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"publisher\": \"Microsoft.Compute\"\
-        ,\r\n    \"type\": \"VMAccessAgent\",\r\n    \"typeHandlerVersion\": \"2.0\"\
-        ,\r\n    \"autoUpgradeMinorVersion\": true,\r\n    \"settings\": {},\r\n \
-        \   \"provisioningState\": \"Succeeded\"\r\n  },\r\n  \"type\": \"Microsoft.Compute/virtualMachines/extensions\"\
-        ,\r\n  \"location\": \"westus\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Compute/virtualMachines/pyvmextvm15a60f10/extensions/pyvmextvm15a60f10AccessAgent\"\
-        ,\r\n  \"name\": \"pyvmextvm15a60f10AccessAgent\"\r\n}"}
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['581']
+      content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:11:50 GMT']
+      date: ['Fri, 20 Jul 2018 17:48:38 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4981,Microsoft.Compute/LowCostGet30Min;39876']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14984,Microsoft.Compute/GetOperation30Min;29855']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1316,31 +1288,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Compute/virtualMachines/pyvmextvm15a60f10/extensions/pyvmextvm15a60f10AccessAgent?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"publisher\": \"Microsoft.Compute\"\
-        ,\r\n    \"type\": \"VMAccessAgent\",\r\n    \"typeHandlerVersion\": \"2.0\"\
-        ,\r\n    \"autoUpgradeMinorVersion\": true,\r\n    \"settings\": {},\r\n \
-        \   \"provisioningState\": \"Succeeded\"\r\n  },\r\n  \"type\": \"Microsoft.Compute/virtualMachines/extensions\"\
-        ,\r\n  \"location\": \"westus\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Compute/virtualMachines/pyvmextvm15a60f10/extensions/pyvmextvm15a60f10AccessAgent\"\
-        ,\r\n  \"name\": \"pyvmextvm15a60f10AccessAgent\"\r\n}"}
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['581']
+      content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:11:52 GMT']
+      date: ['Fri, 20 Jul 2018 17:49:09 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4980,Microsoft.Compute/LowCostGet30Min;39875']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14984,Microsoft.Compute/GetOperation30Min;29852']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1348,56 +1316,55 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Length: ['0']
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
-    method: DELETE
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Compute/virtualMachines/pyvmextvm15a60f10/extensions/pyvmextvm15a60f10AccessAgent?api-version=2017-12-01
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: ''}
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
     headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/8782f212-a364-4073-8604-5da3c5637035?api-version=2017-12-01']
       cache-control: [no-cache]
-      content-length: ['0']
-      date: ['Wed, 22 Nov 2017 18:11:53 GMT']
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 17:49:41 GMT']
       expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/8782f212-a364-4073-8604-5da3c5637035?monitor=true&api-version=2017-12-01']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateUpdateVM3Min;299,Microsoft.Compute/CreateUpdateVM30Min;1494']
-      x-ms-ratelimit-remaining-subscription-writes: ['1199']
-    status: {code: 202, message: Accepted}
+      transfer-encoding: [chunked]
+      vary: [Accept-Encoding]
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14984,Microsoft.Compute/GetOperation30Min;29849']
+    status: {code: 200, message: OK}
 - request:
     body: null
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/8782f212-a364-4073-8604-5da3c5637035?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T18:11:55.0945537+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"8782f212-a364-4073-8604-5da3c5637035\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:12:23 GMT']
+      date: ['Fri, 20 Jul 2018 17:50:12 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2143,Microsoft.Compute/GetOperation30Min;17862']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14984,Microsoft.Compute/GetOperation30Min;29871']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1405,27 +1372,1907 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 17:50:43 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;14983,Microsoft.Compute/GetOperation30Min;29868']
+    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.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 17:51:14 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;14983,Microsoft.Compute/GetOperation30Min;29865']
+    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.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 17:51:46 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;14983,Microsoft.Compute/GetOperation30Min;29862']
+    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.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 17:52:17 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;14983,Microsoft.Compute/GetOperation30Min;29859']
+    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.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 17:52:50 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;14983,Microsoft.Compute/GetOperation30Min;29856']
+    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.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 17:53:21 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;14983,Microsoft.Compute/GetOperation30Min;29853']
+    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.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 17:53:52 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;14983,Microsoft.Compute/GetOperation30Min;29850']
+    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.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 17:54:23 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;14983,Microsoft.Compute/GetOperation30Min;29847']
+    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.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 17:54:56 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;14983,Microsoft.Compute/GetOperation30Min;29844']
+    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.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 17:55:28 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;14983,Microsoft.Compute/GetOperation30Min;29864']
+    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.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 17:56:01 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;14983,Microsoft.Compute/GetOperation30Min;29861']
+    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.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 17:56:31 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;14985,Microsoft.Compute/GetOperation30Min;29858']
+    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.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 17:57:04 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;14985,Microsoft.Compute/GetOperation30Min;29855']
+    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.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 17:57:35 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;14985,Microsoft.Compute/GetOperation30Min;29852']
+    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.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 17:58:06 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;14985,Microsoft.Compute/GetOperation30Min;29849']
+    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.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 17:58:38 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;14985,Microsoft.Compute/GetOperation30Min;29846']
+    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.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 17:59:10 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;14984,Microsoft.Compute/GetOperation30Min;29843']
+    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.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 17:59: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;14984,Microsoft.Compute/GetOperation30Min;29840']
+    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.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:00:12 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;14984,Microsoft.Compute/GetOperation30Min;29856']
+    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.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:00:43 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;14983,Microsoft.Compute/GetOperation30Min;29853']
+    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.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:01:14 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;14983,Microsoft.Compute/GetOperation30Min;29850']
+    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.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:01:47 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;14983,Microsoft.Compute/GetOperation30Min;29847']
+    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.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:02:17 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;14983,Microsoft.Compute/GetOperation30Min;29844']
+    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.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:02:50 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;14983,Microsoft.Compute/GetOperation30Min;29841']
+    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.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:03:22 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;14983,Microsoft.Compute/GetOperation30Min;29838']
+    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.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:03:53 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;14983,Microsoft.Compute/GetOperation30Min;29835']
+    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.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:04:25 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;14983,Microsoft.Compute/GetOperation30Min;29832']
+    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.18.4 msrest/0.4.28
+          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/28338fc3-8d17-442d-922b-4500ae422420?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T17:31:17.5726582+00:00\",\r\
+        \n  \"endTime\": \"2018-07-20T18:04:56.2602103+00:00\",\r\n  \"status\": \"\
+        Succeeded\",\r\n  \"name\": \"28338fc3-8d17-442d-922b-4500ae422420\"\r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['184']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:04:57 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;14983,Microsoft.Compute/GetOperation30Min;29829']
+    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.18.4 msrest/0.4.28
+          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/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Compute/virtualMachines/pyvmextvm15a60f10?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"78de114e-3de9-4250-8725-8a9c2a68386a\"\
+        ,\r\n    \"hardwareProfile\": {\r\n      \"vmSize\": \"Standard_A0\"\r\n \
+        \   },\r\n    \"storageProfile\": {\r\n      \"imageReference\": {\r\n   \
+        \     \"publisher\": \"MicrosoftWindowsServer\",\r\n        \"offer\": \"\
+        WindowsServer\",\r\n        \"sku\": \"2016-Datacenter\",\r\n        \"version\"\
+        : \"latest\"\r\n      },\r\n      \"osDisk\": {\r\n        \"osType\": \"\
+        Windows\",\r\n        \"name\": \"test\",\r\n        \"createOption\": \"\
+        FromImage\",\r\n        \"vhd\": {\r\n          \"uri\": \"https://pyvmextstor15a60f10.blob.core.windows.net/vhds/osdisk.vhd\"\
+        \r\n        },\r\n        \"caching\": \"None\",\r\n        \"diskSizeGB\"\
+        : 127\r\n      },\r\n      \"dataDisks\": []\r\n    },\r\n    \"osProfile\"\
+        : {\r\n      \"computerName\": \"test\",\r\n      \"adminUsername\": \"Foo12\"\
+        ,\r\n      \"windowsConfiguration\": {\r\n        \"provisionVMAgent\": true,\r\
+        \n        \"enableAutomaticUpdates\": true\r\n      },\r\n      \"secrets\"\
+        : [],\r\n      \"allowExtensionOperations\": true\r\n    },\r\n    \"networkProfile\"\
+        : {\"networkInterfaces\":[{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Network/networkInterfaces/pyvmextnic15a60f10\"\
+        }]},\r\n    \"provisioningState\": \"Succeeded\"\r\n  },\r\n  \"type\": \"\
+        Microsoft.Compute/virtualMachines\",\r\n  \"location\": \"westus\",\r\n  \"\
+        id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Compute/virtualMachines/pyvmextvm15a60f10\"\
+        ,\r\n  \"name\": \"pyvmextvm15a60f10\"\r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['1514']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:04:58 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/LowCostGet3Min;4198,Microsoft.Compute/LowCostGet30Min;33590']
+    status: {code: 200, message: OK}
+- request:
+    body: '{"location": "westus", "properties": {"publisher": "Microsoft.Compute",
+      "type": "VMAccessAgent", "typeHandlerVersion": "2.0", "autoUpgradeMinorVersion":
+      true, "settings": {}, "protectedSettings": {}}}'
+    headers:
+      Accept: [application/json]
+      Accept-Encoding: ['gzip, deflate']
+      Connection: [keep-alive]
+      Content-Length: ['200']
+      Content-Type: [application/json; charset=utf-8]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
+      accept-language: [en-US]
+    method: PUT
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Compute/virtualMachines/pyvmextvm15a60f10/extensions/pyvmextvm15a60f10AccessAgent?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"properties\": {\r\n    \"autoUpgradeMinorVersion\": true,\r\
+        \n    \"settings\": {},\r\n    \"provisioningState\": \"Creating\",\r\n  \
+        \  \"publisher\": \"Microsoft.Compute\",\r\n    \"type\": \"VMAccessAgent\"\
+        ,\r\n    \"typeHandlerVersion\": \"2.0\"\r\n  },\r\n  \"type\": \"Microsoft.Compute/virtualMachines/extensions\"\
+        ,\r\n  \"location\": \"westus\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Compute/virtualMachines/pyvmextvm15a60f10/extensions/pyvmextvm15a60f10AccessAgent\"\
+        ,\r\n  \"name\": \"pyvmextvm15a60f10AccessAgent\"\r\n}"}
+    headers:
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01']
+      cache-control: [no-cache]
+      content-length: ['580']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:04:59 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/UpdateVM3Min;239,Microsoft.Compute/UpdateVM30Min;1199']
+      x-ms-ratelimit-remaining-subscription-writes: ['1199']
+    status: {code: 201, message: Created}
+- 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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:05:30 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;14985,Microsoft.Compute/GetOperation30Min;29854']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:06:01 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;14985,Microsoft.Compute/GetOperation30Min;29851']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:06:33 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;14985,Microsoft.Compute/GetOperation30Min;29848']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:07: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;14985,Microsoft.Compute/GetOperation30Min;29845']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:07:37 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;14985,Microsoft.Compute/GetOperation30Min;29842']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:08:09 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;14984,Microsoft.Compute/GetOperation30Min;29839']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:08: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;14984,Microsoft.Compute/GetOperation30Min;29836']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:09:19 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;14984,Microsoft.Compute/GetOperation30Min;29833']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:09:49 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;14984,Microsoft.Compute/GetOperation30Min;29830']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:10:21 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;14983,Microsoft.Compute/GetOperation30Min;29856']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:10:54 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;14983,Microsoft.Compute/GetOperation30Min;29853']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:11:27 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;14983,Microsoft.Compute/GetOperation30Min;29850']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:11:58 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;14983,Microsoft.Compute/GetOperation30Min;29847']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:12:29 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;14983,Microsoft.Compute/GetOperation30Min;29844']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:13:01 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;14985,Microsoft.Compute/GetOperation30Min;29841']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:13:33 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;14985,Microsoft.Compute/GetOperation30Min;29838']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:14:06 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;14985,Microsoft.Compute/GetOperation30Min;29835']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:14:39 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;14985,Microsoft.Compute/GetOperation30Min;29832']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:15:10 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;14985,Microsoft.Compute/GetOperation30Min;29857']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:15:42 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;14984,Microsoft.Compute/GetOperation30Min;29854']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:16:14 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;14984,Microsoft.Compute/GetOperation30Min;29851']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:16:47 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;14983,Microsoft.Compute/GetOperation30Min;29848']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:17:19 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;14983,Microsoft.Compute/GetOperation30Min;29845']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:17:51 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;14983,Microsoft.Compute/GetOperation30Min;29842']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:18:23 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;14983,Microsoft.Compute/GetOperation30Min;29839']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:18:55 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;14983,Microsoft.Compute/GetOperation30Min;29836']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:19:28 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;14983,Microsoft.Compute/GetOperation30Min;29833']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:19:59 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;14983,Microsoft.Compute/GetOperation30Min;29830']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:20:32 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;14985,Microsoft.Compute/GetOperation30Min;29856']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:21: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;14985,Microsoft.Compute/GetOperation30Min;29853']
+    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.18.4 msrest/0.4.28
+          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/5e60a368-21f3-495b-adef-a45dcafe91b1?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:05:00.2442984+00:00\",\r\
+        \n  \"endTime\": \"2018-07-20T18:21:33.4039973+00:00\",\r\n  \"status\": \"\
+        Succeeded\",\r\n  \"name\": \"5e60a368-21f3-495b-adef-a45dcafe91b1\"\r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['184']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:21:36 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;14985,Microsoft.Compute/GetOperation30Min;29850']
+    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.18.4 msrest/0.4.28
+          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/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Compute/virtualMachines/pyvmextvm15a60f10/extensions/pyvmextvm15a60f10AccessAgent?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"properties\": {\r\n    \"autoUpgradeMinorVersion\": true,\r\
+        \n    \"settings\": {},\r\n    \"provisioningState\": \"Succeeded\",\r\n \
+        \   \"publisher\": \"Microsoft.Compute\",\r\n    \"type\": \"VMAccessAgent\"\
+        ,\r\n    \"typeHandlerVersion\": \"2.0\"\r\n  },\r\n  \"type\": \"Microsoft.Compute/virtualMachines/extensions\"\
+        ,\r\n  \"location\": \"westus\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Compute/virtualMachines/pyvmextvm15a60f10/extensions/pyvmextvm15a60f10AccessAgent\"\
+        ,\r\n  \"name\": \"pyvmextvm15a60f10AccessAgent\"\r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['581']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:21:36 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/LowCostGet3Min;4198,Microsoft.Compute/LowCostGet30Min;33583']
+    status: {code: 200, message: OK}
+- request:
+    body: null
+    headers:
+      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.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
+      accept-language: [en-US]
+    method: GET
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Compute/virtualMachines/pyvmextvm15a60f10/extensions/pyvmextvm15a60f10AccessAgent?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"properties\": {\r\n    \"autoUpgradeMinorVersion\": true,\r\
+        \n    \"settings\": {},\r\n    \"provisioningState\": \"Succeeded\",\r\n \
+        \   \"publisher\": \"Microsoft.Compute\",\r\n    \"type\": \"VMAccessAgent\"\
+        ,\r\n    \"typeHandlerVersion\": \"2.0\"\r\n  },\r\n  \"type\": \"Microsoft.Compute/virtualMachines/extensions\"\
+        ,\r\n  \"location\": \"westus\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Compute/virtualMachines/pyvmextvm15a60f10/extensions/pyvmextvm15a60f10AccessAgent\"\
+        ,\r\n  \"name\": \"pyvmextvm15a60f10AccessAgent\"\r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['581']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:21:37 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/LowCostGet3Min;4197,Microsoft.Compute/LowCostGet30Min;33582']
+    status: {code: 200, message: OK}
+- request:
+    body: null
+    headers:
+      Accept: [application/json]
+      Accept-Encoding: ['gzip, deflate']
+      Connection: [keep-alive]
+      Content-Length: ['0']
+      Content-Type: [application/json; charset=utf-8]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
+      accept-language: [en-US]
+    method: DELETE
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_compute_test_vm_extensions15a60f10/providers/Microsoft.Compute/virtualMachines/pyvmextvm15a60f10/extensions/pyvmextvm15a60f10AccessAgent?api-version=2018-06-01
+  response:
+    body: {string: ''}
+    headers:
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/7fadabcb-72df-40a3-b008-2aafa9d070a9?api-version=2018-06-01']
+      cache-control: [no-cache]
+      content-length: ['0']
+      date: ['Fri, 20 Jul 2018 18:21:38 GMT']
+      expires: ['-1']
+      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/7fadabcb-72df-40a3-b008-2aafa9d070a9?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/UpdateVM3Min;239,Microsoft.Compute/UpdateVM30Min;1198']
+      x-ms-ratelimit-remaining-subscription-deletes: ['14999']
+    status: {code: 202, message: Accepted}
+- 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.18.4 msrest/0.4.28
+          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/7fadabcb-72df-40a3-b008-2aafa9d070a9?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:21:38.8569511+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"7fadabcb-72df-40a3-b008-2aafa9d070a9\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:22:09 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;14985,Microsoft.Compute/GetOperation30Min;29847']
+    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.18.4 msrest/0.4.28
+          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/7fadabcb-72df-40a3-b008-2aafa9d070a9?api-version=2018-06-01
+  response:
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:21:38.8569511+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"7fadabcb-72df-40a3-b008-2aafa9d070a9\"\
+        \r\n}"}
+    headers:
+      cache-control: [no-cache]
+      content-length: ['134']
+      content-type: [application/json; charset=utf-8]
+      date: ['Fri, 20 Jul 2018 18:22:40 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;14985,Microsoft.Compute/GetOperation30Min;29844']
+    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.18.4 msrest/0.4.28
+          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/8782f212-a364-4073-8604-5da3c5637035?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/7fadabcb-72df-40a3-b008-2aafa9d070a9?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T18:11:55.0945537+00:00\",\r\
-        \n  \"endTime\": \"2017-11-22T18:12:38.0715457+00:00\",\r\n  \"status\": \"\
-        Succeeded\",\r\n  \"name\": \"8782f212-a364-4073-8604-5da3c5637035\"\r\n}"}
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T18:21:38.8569511+00:00\",\r\
+        \n  \"endTime\": \"2018-07-20T18:22:50.5011745+00:00\",\r\n  \"status\": \"\
+        Succeeded\",\r\n  \"name\": \"7fadabcb-72df-40a3-b008-2aafa9d070a9\"\r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['184']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:12:56 GMT']
+      date: ['Fri, 20 Jul 2018 18:23: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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2143,Microsoft.Compute/GetOperation30Min;17859']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14984,Microsoft.Compute/GetOperation30Min;29841']
     status: {code: 200, message: OK}
 version: 1
diff --git a/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_vm_images.yaml b/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_vm_images.yaml
index d5c9eff4c6e3..102d86e6faef 100644
--- a/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_vm_images.yaml
+++ b/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_vm_images.yaml
@@ -6,11 +6,11 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers?api-version=2018-06-01
   response:
     body: {string: "[\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"\
         1e\",\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/1e\"\
@@ -26,20 +26,22 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/abiquo\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"accellion\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/accellion\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"accessdata-group\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/accessdata-group\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"accops\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/accops\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Acronis\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Acronis\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Acronis.Backup\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Acronis.Backup\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"actian-corp\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/actian-corp\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"actian_matrix\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/actian_matrix\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"actifio\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/actifio\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"activeeon\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/activeeon\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"adatao\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/adatao\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"adobe_test\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/adobe_test\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"advantech\"\
@@ -50,28 +52,36 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/aerospike\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"aerospike-database\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/aerospike-database\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"affinio\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/affinio\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"aiscaler-cache-control-ddos-and-url-rewriting-\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/aiscaler-cache-control-ddos-and-url-rewriting-\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"akamai-technologies\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/akamai-technologies\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"akumina\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/akumina\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"alachisoft\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/alachisoft\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"alces-flight-limited\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/alces-flight-limited\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"alertlogic\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/alertlogic\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"AlertLogic.Extension\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/AlertLogic.Extension\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"algebraix-data\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/algebraix-data\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"alienvault\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/alienvault\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"alldigital-brevity\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/alldigital-brevity\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"altair-engineering-inc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/altair-engineering-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"altamira-corporation\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/altamira-corporation\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"alteryx\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/alteryx\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"altova\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/altova\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"aod\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/aod\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"apigee\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/apigee\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"appcelerator\"\
@@ -82,10 +92,16 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/appistry\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"appscale-marketplace\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/appscale-marketplace\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"appspace\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/appspace\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"aptean-inc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/aptean-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"aqua-security\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/aqua-security\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"aquaforest\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/aquaforest\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"arabesque-group\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/arabesque-group\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"arangodb\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/arangodb\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"aras\"\
@@ -94,8 +110,10 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/arista-networks\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"array_networks\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/array_networks\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"aspex\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/aspex\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"artificial-intelligence-techniques-sl\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/artificial-intelligence-techniques-sl\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"asigra\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/asigra\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"aspex-managed-cloud\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/aspex-managed-cloud\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"atlassian\"\
@@ -108,10 +126,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/auraportal\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"auriq-systems\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/auriq-systems\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"avds\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/avds\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"averesystems\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/averesystems\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"avepoint\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/avepoint\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"avi-networks\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/avi-networks\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"aviatrix-systems\"\
@@ -122,6 +138,10 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/axway\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"azul\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/azul\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"AzureChinaMarketplace\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/AzureChinaMarketplace\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"AzureDatabricks\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/AzureDatabricks\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"AzureRT.Test\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/AzureRT.Test\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"azuresyncfusion\"\
@@ -134,6 +154,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/azuretesting3\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"AzureTools1type\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/AzureTools1type\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"baas-techbureau\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/baas-techbureau\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"baffle-io\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/baffle-io\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"balabit\"\
@@ -146,14 +168,18 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/batch\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"bdy\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/bdy\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"betterdish\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/betterdish\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"beyondtrust\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/beyondtrust\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"bi-builders-as\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/bi-builders-as\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Bitnami\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Bitnami\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"bizagi\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/bizagi\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"biztalk360\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/biztalk360\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"black-duck-software\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/black-duck-software\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"blackberry\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/blackberry\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"blk-technologies\"\
@@ -164,6 +190,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/blockchain-foundry\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"blockstack\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/blockstack\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"bloombase\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/bloombase\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"bluecat\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/bluecat\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"bluetalon\"\
@@ -172,10 +200,10 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/bmc.ctm\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"bmcctm.test\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/bmcctm.test\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"boxless\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/boxless\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"brainshare-it\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/brainshare-it\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"bravura-software-llc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/bravura-software-llc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"brocade_communications\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/brocade_communications\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"bssw\"\
@@ -184,8 +212,6 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/buddhalabs\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Canonical\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Canonical\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"caringo\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/caringo\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"carto\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/carto\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cask\"\
@@ -196,12 +222,12 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cautelalabs\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cavirin\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cavirin\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cbrdashboard\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cbrdashboard\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cbreplicator\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cbreplicator\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cds\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cds\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"celum-gmbh\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/celum-gmbh\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"center-for-internet-security-inc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/center-for-internet-security-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"certivox\"\
@@ -230,8 +256,12 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/clear-linux-project\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"clouber\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/clouber\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cloud-checkr\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cloud-checkr\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cloud-cruiser\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cloud-cruiser\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cloud-infrastructure-services\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cloud-infrastructure-services\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cloudbees\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cloudbees\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cloudbees-enterprise-jenkins\"\
@@ -240,10 +270,6 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cloudbolt-software\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cloudboost\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cloudboost\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cloudcoreo\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cloudcoreo\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cloudcruiser\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cloudcruiser\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cloudenablers-inc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cloudenablers-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cloudera\"\
@@ -264,6 +290,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/CloudLinkEMC.SecureVM\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cloudneeti\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cloudneeti\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cloudplan-gmbh\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cloudplan-gmbh\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cloudsecurity\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cloudsecurity\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cloudsoft\"\
@@ -282,8 +310,6 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cohesive\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"commvault\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/commvault\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"companyname-short\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/companyname-short\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"composable\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/composable\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"comunity\"\
@@ -294,28 +320,28 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/confluentinc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"connecting-software\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/connecting-software\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"consensys\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/consensys\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"convertigo\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/convertigo\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"corda\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/corda\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"CoreOS\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/CoreOS\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cortex-ag\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cortex-ag\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"couchbase\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/couchbase\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"crate-io\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/crate-io\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"credativ\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/credativ\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cree\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cree\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cryptzone\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cryptzone\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"csstest\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/csstest\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"ctm.bmc.com\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/ctm.bmc.com\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cybernetica-as\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cybernetica-as\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"cyxtera\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/cyxtera\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"danielsol.AzureTools1\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/danielsol.AzureTools1\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Dans.Windows.App\"\
@@ -340,8 +366,6 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/datasunrise\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"datometry\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/datometry\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"dell-software\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/dell-software\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"dellemc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/dellemc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"dell_software\"\
@@ -360,24 +384,36 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/diagramics\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"digitaloffice\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/digitaloffice\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"diladele\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/diladele\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"dimensionalmechanics-inc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/dimensionalmechanics-inc\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"diqa\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/diqa\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"docker\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/docker\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"docscorp-us\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/docscorp-us\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"dome9\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/dome9\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"drizti\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/drizti\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"drone\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/drone\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"dsi\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/dsi\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"dundas\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/dundas\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"dyadic_security\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/dyadic_security\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"dynatrace\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/dynatrace\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"dynatrace.ruxit\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/dynatrace.ruxit\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"eastbanctech\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/eastbanctech\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"eastwind-networks-inc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/eastwind-networks-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"edevtech\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/edevtech\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"egnyte\"\
@@ -386,8 +422,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/eip\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"eip-eipower\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/eip-eipower\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"elasticbeam\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/elasticbeam\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"ekran-system-inc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/ekran-system-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"elasticbox\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/elasticbox\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"elecard\"\
@@ -406,12 +442,10 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/enterprise-ethereum-alliance\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"enterprisedb-corp\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/enterprisedb-corp\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"enterpriseworx-it\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/enterpriseworx-it\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"eperi\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/eperi\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"equalum\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/equalum\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"equilibrium\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/equilibrium\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"esdenera\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/esdenera\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"ESET\"\
@@ -426,22 +460,26 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/evostream-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"exasol\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/exasol\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"expertime\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/expertime\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"f5-networks\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/f5-networks\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"falconstorsoftware\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/falconstorsoftware\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"feezmodo-consulting-pte-ltd\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/feezmodo-consulting-pte-ltd\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"fidesys\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/fidesys\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"filecatalyst\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/filecatalyst\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"firehost\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/firehost\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"flashgrid-inc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/flashgrid-inc\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"flexify-io\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/flexify-io\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"flynet\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/flynet\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"foghorn-systems\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/foghorn-systems\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"forcepoint-llc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/forcepoint-llc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"forscene\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/forscene\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"fortinet\"\
@@ -458,6 +496,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Gemalto.SafeNet.ProtectV\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"genesys-source\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/genesys-source\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"gigamon-inc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/gigamon-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"GitHub\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/GitHub\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"gitlab\"\
@@ -468,12 +508,12 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/gordic\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"graphitegtc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/graphitegtc\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"great-software-laboratory-private-limited\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/great-software-laboratory-private-limited\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"greathorn\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/greathorn\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"greensql\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/greensql\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"grid\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/grid\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"gridgain\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/gridgain\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"guardicore\"\
@@ -482,14 +522,18 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/h2o-ai\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"haivision\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/haivision\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"halobicloud\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/halobicloud\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"hanu\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/hanu\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"haproxy-technologies\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/haproxy-technologies\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"harpaitalia\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/harpaitalia\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"HDInsight\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/HDInsight\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"hcl-technologies\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/hcl-technologies\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"heimdall-data\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/heimdall-data\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"help-systems\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/help-systems\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"hewlett-packard\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/hewlett-packard\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"hillstone-networks\"\
@@ -520,14 +564,18 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/iaansys\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"ibabs-eu\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/ibabs-eu\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"ibm\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/ibm\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"iboss\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/iboss\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"ikan\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/ikan\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"image-technologies\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/image-technologies\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"imaginecommunications\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/imaginecommunications\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"imperva\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/imperva\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"incredibuild\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/incredibuild\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"infoblox\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/infoblox\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"infolibrarian\"\
@@ -536,10 +584,18 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/informatica\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"informationbuilders\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/informationbuilders\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"infront-consulting-group-ltd\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/infront-consulting-group-ltd\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"ingrammicro\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/ingrammicro\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"integration-objects\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/integration-objects\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"intel\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/intel\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"intel-bigdl\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/intel-bigdl\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"intel-fpga\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/intel-fpga\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"intellicus-technologies-pvt-ltd\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/intellicus-technologies-pvt-ltd\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"intelligent-plant-ltd\"\
@@ -552,10 +608,10 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/iquest\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"ishlangu-load-balancer-adc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/ishlangu-load-balancer-adc\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"issp-corporation\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/issp-corporation\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"itelios\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/itelios\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"iw\",\r\
-        \n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/iw\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"jamcracker\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/jamcracker\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"jedox\"\
@@ -564,6 +620,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/jelastic\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"jetnexus\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/jetnexus\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"jetware-srl\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/jetware-srl\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"jfrog\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/jfrog\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"jitterbit_integration\"\
@@ -578,8 +636,6 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/kali-linux\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Kaspersky.Lab\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Kaspersky.Lab\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"KasperskyLab\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/KasperskyLab\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"KasperskyLab.SecurityAgent\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/KasperskyLab.SecurityAgent\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"kaspersky_lab\"\
@@ -596,22 +652,22 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/knime\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"kobalt\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/kobalt\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"krypc-technologies-pvt-ltd\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/krypc-technologies-pvt-ltd\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"lansa\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/lansa\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"learningtechnolgy\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/learningtechnolgy\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"leostream-corporation\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/leostream-corporation\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"liebsoft\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/liebsoft\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"liquid-files\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/liquid-files\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"liquidware\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/liquidware\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"literatu\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/literatu\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"loadbalancer\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/loadbalancer\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"loginpeople\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/loginpeople\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"logmein\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/logmein\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"logsign\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/logsign\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"logtrust\"\
@@ -620,10 +676,12 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/looker\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"lti-lt-infotech\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/lti-lt-infotech\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"luxoft\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/luxoft\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"luminate-security\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/luminate-security\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mactores_inc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/mactores_inc\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"maketv\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/maketv\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"manageengine\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/manageengine\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mapr-technologies\"\
@@ -636,6 +694,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/massiveanalytic-\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mathworks-deployment\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/mathworks-deployment\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mathworks-inc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/mathworks-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mavinglobal\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/mavinglobal\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"McAfee.EndpointSecurity\"\
@@ -650,22 +710,34 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/memsql\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mendix\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/mendix\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mesosphere\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/mesosphere\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mfe_azure\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/mfe_azure\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mfiles\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/mfiles\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mico\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/mico\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"micro-focus\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/micro-focus\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"microsec-zrt\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/microsec-zrt\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"microsoft-ads\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/microsoft-ads\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"microsoft-avere\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/microsoft-avere\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"microsoft-azure-batch\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/microsoft-azure-batch\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"microsoft-azure-compute\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/microsoft-azure-compute\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"microsoft-dsvm\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/microsoft-dsvm\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"microsoft-hyperv\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/microsoft-hyperv\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.AKS\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.AKS\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.ActiveDirectory\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.ActiveDirectory\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.ActiveDirectory.LinuxSSH\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.ActiveDirectory.LinuxSSH\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.Applications\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.Applications\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.Backup.Test\"\
@@ -678,6 +750,10 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.Diagnostics.Build.Test\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.Extensions\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.Extensions\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.KeyVault\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.KeyVault\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.KeyVault.Edp\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.KeyVault.Edp\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.Monitoring.DependencyAgent\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.Monitoring.DependencyAgent\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.Networking.SDN\"\
@@ -688,14 +764,14 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.Performance.Diagnostics\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.RecoveryServices\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.RecoveryServices\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.RecoveryServices.Edp\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.RecoveryServices.Edp\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.RecoveryServices.SiteRecovery\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.RecoveryServices.SiteRecovery\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.RecoveryServices.SiteRecovery2\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.RecoveryServices.SiteRecovery2\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.RecoveryServices.WorkloadBackup\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.RecoveryServices.WorkloadBackup\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.RecoveryServices.WorkloadBackup.Edp\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.RecoveryServices.WorkloadBackup.Edp\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.Security\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Azure.Security\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Azure.Security.Edp\"\
@@ -722,20 +798,30 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.CloudBackup.Workload.Extension.Edp\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Compute\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Compute\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.CPlat.Core\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.CPlat.Core\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.CPlat.Core.Edp\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.CPlat.Core.Edp\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.DscPolicy2.Test\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.DscPolicy2.Test\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.EnterpriseCloud.Monitoring\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.EnterpriseCloud.Monitoring\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.EnterpriseCloud.Monitoring.Test\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.EnterpriseCloud.Monitoring.Test\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Golive.Extensions\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Golive.Extensions\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.HDInsight.Current\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.HDInsight.Current\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.GuestConfig.Test\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.GuestConfig.Test\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.GuestConfiguration.Test\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.GuestConfiguration.Test\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.HpcCompute\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.HpcCompute\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.HpcPack\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.HpcPack\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.ManagedIdentity\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.ManagedIdentity\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.ManagedServices\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.ManagedServices\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.OSTCExtensions\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.OSTCExtensions\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.OSTCExtensions.Edp\"\
@@ -744,18 +830,16 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.OSTCExtensions.Test\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Powershell\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Powershell\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Powershell.Reboot\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Powershell.Reboot\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Powershell.Test\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Powershell.Test\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.Powershell.Test01\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.Powershell.Test01\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.SqlServer.Managability.IaaS.Test\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.SqlServer.Managability.IaaS.Test\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.SqlServer.Management\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.SqlServer.Management\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.SystemCenter\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.SystemCenter\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.TestSqlServer\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.TestSqlServer\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.TestSqlServer.Edp\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Microsoft.TestSqlServer.Edp\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Microsoft.VisualStudio.Azure.ETWTraceListenerService\"\
@@ -802,12 +886,12 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/MicrosoftWindowsDesktop\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"MicrosoftWindowsServer\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/MicrosoftWindowsServer\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"MicrosoftWindowsServerEssentials\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/MicrosoftWindowsServerEssentials\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"MicrosoftWindowsServerHPCPack\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/MicrosoftWindowsServerHPCPack\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"MicrosoftWindowsServerRemoteDesktop\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/MicrosoftWindowsServerRemoteDesktop\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"microstrategy\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/microstrategy\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"midfin\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/midfin\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"midvision\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/midvision\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mindcti\"\
@@ -816,8 +900,12 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/miraclelinux\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"miracl_linux\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/miracl_linux\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"miri-infotech-pvt-ltd\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/miri-infotech-pvt-ltd\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mobilab\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/mobilab\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"moogsoft\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/moogsoft\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"moviemasher\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/moviemasher\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"msopentech\"\
@@ -826,18 +914,18 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/msrazuresapservices\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mtnfog\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/mtnfog\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"multisoft-ab\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/multisoft-ab\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mvp-systems\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/mvp-systems\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"mxhero\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/mxhero\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"my-com\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/my-com\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"naaraaadvertising\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/naaraaadvertising\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"namirial\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/namirial\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"narrativescience\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/narrativescience\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"nasuni\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/nasuni\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"ncbi\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/ncbi\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"ndl\"\
@@ -858,6 +946,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/netmail\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"netsil\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/netsil\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"netsweeper\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/netsweeper\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"netwrix\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/netwrix\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"neusoft-neteye\"\
@@ -870,34 +960,42 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/nicepeopleatwork\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"nodejsapi\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/nodejsapi\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"nodesource\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/nodesource\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"noobaa\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/noobaa\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"norsync\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/norsync\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"northbridge-secure\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/northbridge-secure\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"nri\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/nri\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"ntt-data-intellilink-corporation\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/ntt-data-intellilink-corporation\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"nubeva-inc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/nubeva-inc\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"nuco-networks\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/nuco-networks\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"nuxeo\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/nuxeo\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"nvidia\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/nvidia\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"o2mc-real-time-data-platform\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/o2mc-real-time-data-platform\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"oceanblue-cloud\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/oceanblue-cloud\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"OctopusDeploy.Tentacle\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/OctopusDeploy.Tentacle\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"omega-software\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/omega-software\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"ooyala\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/ooyala\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"onapsis\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/onapsis\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"onyx-point-inc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/onyx-point-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"op5\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/op5\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"opencell\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/opencell\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"OpenLogic\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/OpenLogic\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"opennebulasystems\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/opennebulasystems\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"opentext\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/opentext\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"openvpn\"\
@@ -908,6 +1006,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/opsview-limited\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Oracle\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Oracle\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"oriana\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/oriana\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"orientdb\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/orientdb\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"osirium-ltd\"\
@@ -916,8 +1016,6 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/osisoft\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"osnexus\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/osnexus\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"outsystems\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/outsystems\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"paloaltonetworks\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/paloaltonetworks\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"panorama-necto\"\
@@ -932,8 +1030,12 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/passlogy\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"paxata\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/paxata\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"peer-software-inc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/peer-software-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"penta-security-systems-inc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/penta-security-systems-inc\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"percona\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/percona\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"pivotal\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/pivotal\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"plesk\"\
@@ -942,10 +1044,6 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/portalarchitects\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"postgres-pro\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/postgres-pro\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"predictionio\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/predictionio\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"predixion\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/predixion\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"prestashop\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/prestashop\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"prime-strategy\"\
@@ -974,8 +1072,12 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/pyramidanalytics\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"qlik\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/qlik\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"qore-technologies\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/qore-technologies\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Qualys\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Qualys\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Qualys.Test\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Qualys.Test\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"qualysguard\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/qualysguard\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"quasardb\"\
@@ -984,10 +1086,12 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/qubole\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"qubole-inc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/qubole-inc\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"racemi-incorporated\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/racemi-incorporated\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"quest\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/quest\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"racknap\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/racknap\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"radiant-logic\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/radiant-logic\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"radware\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/radware\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"rancher\"\
@@ -998,8 +1102,12 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Rapid7.InsightPlatform\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"rapidminer\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/rapidminer\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"rds\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/rds\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"realm\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/realm\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"reblaze\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/reblaze\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"RedHat\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/RedHat\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"redpoint-global\"\
@@ -1012,6 +1120,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/res\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"resco\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/resco\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"responder-corp\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/responder-corp\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"revolution-analytics\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/revolution-analytics\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"RightScaleLinux\"\
@@ -1024,8 +1134,6 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/RiverbedTechnology\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"rocketsoftware\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/rocketsoftware\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"rocket_software\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/rocket_software\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"roktech\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/roktech\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"rsa-security-llc\"\
@@ -1034,6 +1142,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/rsk-labs\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"rtts\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/rtts\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"rubrik-inc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/rubrik-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"saama\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/saama\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"saasame-limited\"\
@@ -1048,16 +1158,14 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/sap\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"scalearc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/scalearc\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"scalebase\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/scalebase\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"scalegrid\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/scalegrid\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"scality\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/scality\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"scsk\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/scsk\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"sensorberg\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/sensorberg\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"secureworks\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/secureworks\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"sentryone\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/sentryone\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"service-control-inc\"\
@@ -1092,8 +1200,6 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Site24x7\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"skyarc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/skyarc\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"slamby\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/slamby\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"smartmessage-autoflow\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/smartmessage-autoflow\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"snaplogic\"\
@@ -1106,26 +1212,28 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/soha\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"solanolabs\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/solanolabs\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"solar-security\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/solar-security\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"solarwinds\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/solarwinds\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"solid-stack\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/solid-stack\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"sonicwall-inc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/sonicwall-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"sophos\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/sophos\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"south-river-technologies\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/south-river-technologies\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"spacecurve\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/spacecurve\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"spagobi\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/spagobi\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"sparklinglogic\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/sparklinglogic\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"sphere3d\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/sphere3d\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"splunk\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/splunk\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"sqlstream\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/sqlstream\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"sqream\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/sqream\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"src-solution\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/src-solution\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"stackato-platform-as-a-service\"\
@@ -1154,8 +1262,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/stratalux\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"stratis-group-ltd\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/stratis-group-ltd\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"stratus-id\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/stratus-id\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"stratumn\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/stratumn\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"streamsets\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/streamsets\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"striim\"\
@@ -1170,6 +1278,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Symantec.CloudWorkloadProtection\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Symantec.CloudWorkloadProtection.Test\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Symantec.CloudWorkloadProtection.Test\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Symantec.CloudWorkloadProtection.TestOnStage\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Symantec.CloudWorkloadProtection.TestOnStage\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Symantec.QA\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Symantec.QA\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"Symantec.staging\"\
@@ -1188,10 +1298,14 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/syncfusiondashboard\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"synechron-technologies\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/synechron-technologies\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"syte\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/syte\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"tableau\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/tableau\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"tactic\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/tactic\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"talari-networks\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/talari-networks\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"talena-inc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/talena-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"talon\"\
@@ -1204,6 +1318,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/te-systems\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"techdivision\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/techdivision\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"techlatest\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/techlatest\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"telepat\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/telepat\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"tenable\"\
@@ -1228,16 +1344,24 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/Test3.Microsoft.VisualStudio.Services\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"thales-vormetric\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/thales-vormetric\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"thoughtspot-inc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/thoughtspot-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"tibco-software\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/tibco-software\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"tig\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/tig\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"timextender\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/timextender\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"tmaxsoft\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/tmaxsoft\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"tokyosystemhouse\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/tokyosystemhouse\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"topdesk\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/topdesk\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"torusware\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/torusware\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"totemo\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/totemo\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"townsend-security\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/townsend-security\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"transvault\"\
@@ -1250,6 +1374,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/TrendMicro.PortalProtect\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"tresorit\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/tresorit\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"truestack\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/truestack\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"tsa-public-service\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/tsa-public-service\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"tunnelbiz\"\
@@ -1268,12 +1394,10 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/unidesk\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"unidesk-corp\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/unidesk-corp\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"unify-cloud-llc\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/unify-cloud-llc\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"unifi-software\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/unifi-software\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"uniprint-net\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/uniprint-net\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"unisys-azuremp-stealth\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/unisys-azuremp-stealth\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"unitrends\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/unitrends\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"usp\"\
@@ -1286,24 +1410,24 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/vbot\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"veeam\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/veeam\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"velocitydb-inc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/velocitydb-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"velocloud\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/velocloud\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"velostrata\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/velostrata\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"velostrata-inc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/velostrata-inc\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"ventify\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/ventify\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"veritas\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/veritas\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"versasec\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/versasec\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"vertabelo\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/vertabelo\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"vidispine\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/vidispine\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"vidizmo\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/vidizmo\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"vigyanlabs-innovations-pvt-ltd\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/vigyanlabs-innovations-pvt-ltd\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"vintegris\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/vintegris\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"viptela\"\
@@ -1334,6 +1458,8 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/wardy-it-solutions\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"warewolf-esb\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/warewolf-esb\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"watchguard-technologies\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/watchguard-technologies\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"waves\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/waves\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"websense-apmailpe\"\
@@ -1348,20 +1474,22 @@ interactions:
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/workspot\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"wowza\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/wowza\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"xendata-inc\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/xendata-inc\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"xfinityinc\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/xfinityinc\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"xrm\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/xrm\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"xtremedata\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/xtremedata\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"xyzrd-group-ou\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/xyzrd-group-ou\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"yellowfin\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/yellowfin\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"your-shop-online\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/your-shop-online\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"z1\",\r\
         \n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/z1\"\
-        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"zementis\"\
-        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/zementis\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"z4it-aps\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/z4it-aps\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"zend\"\
         ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/zend\"\
         \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"zerodown_software\"\
@@ -1375,15 +1503,16 @@ interactions:
         \r\n  }\r\n]"}
     headers:
       cache-control: [no-cache]
-      content-length: ['138101']
+      content-length: ['151625']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:13:01 GMT']
+      date: ['Fri, 20 Jul 2018 18:23:19 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]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1392,11 +1521,11 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/1e/artifacttypes/vmimage/offers?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/1e/artifacttypes/vmimage/offers?api-version=2018-06-01
   response:
     body: {string: "[\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"\
         tachyonv30-0-100\",\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/1e/ArtifactTypes/VMImage/Offers/tachyonv30-0-100\"\
@@ -1405,13 +1534,14 @@ interactions:
       cache-control: [no-cache]
       content-length: ['244']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:13:03 GMT']
+      date: ['Fri, 20 Jul 2018 18:23:21 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]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1420,26 +1550,29 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/1e/artifacttypes/vmimage/offers/tachyonv30-0-100/skus?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/1e/artifacttypes/vmimage/offers/tachyonv30-0-100/skus?api-version=2018-06-01
   response:
     body: {string: "[\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"\
         tachyonv3-1\",\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/1e/ArtifactTypes/VMImage/Offers/tachyonv30-0-100/Skus/tachyonv3-1\"\
+        \r\n  },\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"tachyonv3-2\"\
+        ,\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/1e/ArtifactTypes/VMImage/Offers/tachyonv30-0-100/Skus/tachyonv3-2\"\
         \r\n  }\r\n]"}
     headers:
       cache-control: [no-cache]
-      content-length: ['256']
+      content-length: ['509']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:13:03 GMT']
+      date: ['Fri, 20 Jul 2018 18:23:22 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]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1448,11 +1581,11 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/1e/artifacttypes/vmimage/offers/tachyonv30-0-100/skus/tachyonv3-1/versions?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/1e/artifacttypes/vmimage/offers/tachyonv30-0-100/skus/tachyonv3-1/versions?api-version=2018-06-01
   response:
     body: {string: "[\r\n  {\r\n    \"location\": \"westus\",\r\n    \"name\": \"\
         3.1.2\",\r\n    \"id\": \"/Subscriptions/00000000-0000-0000-0000-000000000000/Providers/Microsoft.Compute/Locations/westus/Publishers/1e/ArtifactTypes/VMImage/Offers/tachyonv30-0-100/Skus/tachyonv3-1/Versions/3.1.2\"\
@@ -1461,13 +1594,14 @@ interactions:
       cache-control: [no-cache]
       content-length: ['265']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:13:04 GMT']
+      date: ['Fri, 20 Jul 2018 18:23:27 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]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -1476,11 +1610,11 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/1e/artifacttypes/vmimage/offers/tachyonv30-0-100/skus/tachyonv3-1/versions/3.1.2?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/publishers/1e/artifacttypes/vmimage/offers/tachyonv30-0-100/skus/tachyonv3-1/versions/3.1.2?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"properties\": {\r\n    \"plan\": {\r\n      \"publisher\"\
         : \"1e\",\r\n      \"name\": \"tachyonv3-1\",\r\n      \"product\": \"tachyonv30-0-100\"\
@@ -1492,12 +1626,13 @@ interactions:
       cache-control: [no-cache]
       content-length: ['482']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:13:05 GMT']
+      date: ['Fri, 20 Jul 2018 18:23:39 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]
     status: {code: 200, message: OK}
 version: 1
diff --git a/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_vm_sizes.yaml b/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_vm_sizes.yaml
index 343cd6903154..0f2f404b4d7f 100644
--- a/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_vm_sizes.yaml
+++ b/azure-mgmt-compute/tests/recordings/test_mgmt_compute.test_vm_sizes.yaml
@@ -6,13 +6,31 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      User-Agent: [python/3.6.4 (Windows-10-10.0.17134-SP0) requests/2.18.4 msrest/0.4.28
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/vmSizes?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/vmSizes?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"value\": [\r\n    {\r\n      \"name\": \"Standard_DS1_v2\"\
+    body: {string: "{\r\n  \"value\": [\r\n    {\r\n      \"name\": \"Standard_B1ms\"\
+        ,\r\n      \"numberOfCores\": 1,\r\n      \"osDiskSizeInMB\": 1047552,\r\n\
+        \      \"resourceDiskSizeInMB\": 4096,\r\n      \"memoryInMB\": 2048,\r\n\
+        \      \"maxDataDiskCount\": 2\r\n    },\r\n    {\r\n      \"name\": \"Standard_B1s\"\
+        ,\r\n      \"numberOfCores\": 1,\r\n      \"osDiskSizeInMB\": 1047552,\r\n\
+        \      \"resourceDiskSizeInMB\": 2048,\r\n      \"memoryInMB\": 1024,\r\n\
+        \      \"maxDataDiskCount\": 2\r\n    },\r\n    {\r\n      \"name\": \"Standard_B2ms\"\
+        ,\r\n      \"numberOfCores\": 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n\
+        \      \"resourceDiskSizeInMB\": 16384,\r\n      \"memoryInMB\": 8192,\r\n\
+        \      \"maxDataDiskCount\": 4\r\n    },\r\n    {\r\n      \"name\": \"Standard_B2s\"\
+        ,\r\n      \"numberOfCores\": 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n\
+        \      \"resourceDiskSizeInMB\": 8192,\r\n      \"memoryInMB\": 4096,\r\n\
+        \      \"maxDataDiskCount\": 4\r\n    },\r\n    {\r\n      \"name\": \"Standard_B4ms\"\
+        ,\r\n      \"numberOfCores\": 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n\
+        \      \"resourceDiskSizeInMB\": 32768,\r\n      \"memoryInMB\": 16384,\r\n\
+        \      \"maxDataDiskCount\": 8\r\n    },\r\n    {\r\n      \"name\": \"Standard_B8ms\"\
+        ,\r\n      \"numberOfCores\": 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n\
+        \      \"resourceDiskSizeInMB\": 65536,\r\n      \"memoryInMB\": 32768,\r\n\
+        \      \"maxDataDiskCount\": 16\r\n    },\r\n    {\r\n      \"name\": \"Standard_DS1_v2\"\
         ,\r\n      \"numberOfCores\": 1,\r\n      \"osDiskSizeInMB\": 1047552,\r\n\
         \      \"resourceDiskSizeInMB\": 7168,\r\n      \"memoryInMB\": 3584,\r\n\
         \      \"maxDataDiskCount\": 4\r\n    },\r\n    {\r\n      \"name\": \"Standard_DS2_v2\"\
@@ -28,16 +46,25 @@ interactions:
         ,\r\n      \"numberOfCores\": 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n\
         \      \"resourceDiskSizeInMB\": 114688,\r\n      \"memoryInMB\": 57344,\r\
         \n      \"maxDataDiskCount\": 64\r\n    },\r\n    {\r\n      \"name\": \"\
-        Standard_DS11_v2\",\r\n      \"numberOfCores\": 2,\r\n      \"osDiskSizeInMB\"\
+        Standard_DS11-1_v2\",\r\n      \"numberOfCores\": 2,\r\n      \"osDiskSizeInMB\"\
+        : 1047552,\r\n      \"resourceDiskSizeInMB\": 28672,\r\n      \"memoryInMB\"\
+        : 14336,\r\n      \"maxDataDiskCount\": 8\r\n    },\r\n    {\r\n      \"name\"\
+        : \"Standard_DS11_v2\",\r\n      \"numberOfCores\": 2,\r\n      \"osDiskSizeInMB\"\
         : 1047552,\r\n      \"resourceDiskSizeInMB\": 28672,\r\n      \"memoryInMB\"\
         : 14336,\r\n      \"maxDataDiskCount\": 8\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Standard_DS12_v2\",\r\n      \"numberOfCores\": 4,\r\n      \"osDiskSizeInMB\"\
+        : \"Standard_DS12-1_v2\",\r\n      \"numberOfCores\": 4,\r\n      \"osDiskSizeInMB\"\
         : 1047552,\r\n      \"resourceDiskSizeInMB\": 57344,\r\n      \"memoryInMB\"\
         : 28672,\r\n      \"maxDataDiskCount\": 16\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_DS13-2_v2\",\r\n      \"numberOfCores\": 8,\r\n      \"\
-        osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 114688,\r\n\
-        \      \"memoryInMB\": 57344,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\
-        \n    {\r\n      \"name\": \"Standard_DS13-4_v2\",\r\n      \"numberOfCores\"\
+        name\": \"Standard_DS12-2_v2\",\r\n      \"numberOfCores\": 4,\r\n      \"\
+        osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 57344,\r\n \
+        \     \"memoryInMB\": 28672,\r\n      \"maxDataDiskCount\": 16\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_DS12_v2\",\r\n      \"numberOfCores\"\
+        : 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 57344,\r\n      \"memoryInMB\": 28672,\r\n      \"maxDataDiskCount\": 16\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_DS13-2_v2\",\r\n      \"numberOfCores\"\
+        : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 114688,\r\n      \"memoryInMB\": 57344,\r\n      \"maxDataDiskCount\": 32\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_DS13-4_v2\",\r\n      \"numberOfCores\"\
         : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
         : 114688,\r\n      \"memoryInMB\": 57344,\r\n      \"maxDataDiskCount\": 32\r\
         \n    },\r\n    {\r\n      \"name\": \"Standard_DS13_v2\",\r\n      \"numberOfCores\"\
@@ -96,89 +123,105 @@ interactions:
         name\": \"Standard_F16s\",\r\n      \"numberOfCores\": 16,\r\n      \"osDiskSizeInMB\"\
         : 1047552,\r\n      \"resourceDiskSizeInMB\": 65536,\r\n      \"memoryInMB\"\
         : 32768,\r\n      \"maxDataDiskCount\": 64\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_A0\",\r\n      \"numberOfCores\": 1,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 20480,\r\n      \"memoryInMB\"\
-        : 768,\r\n      \"maxDataDiskCount\": 1\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Standard_A1\",\r\n      \"numberOfCores\": 1,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 71680,\r\n      \"memoryInMB\"\
-        : 1792,\r\n      \"maxDataDiskCount\": 2\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Standard_A2\",\r\n      \"numberOfCores\": 2,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 138240,\r\n      \"memoryInMB\"\
-        : 3584,\r\n      \"maxDataDiskCount\": 4\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Standard_A3\",\r\n      \"numberOfCores\": 4,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 291840,\r\n      \"memoryInMB\"\
-        : 7168,\r\n      \"maxDataDiskCount\": 8\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Standard_A5\",\r\n      \"numberOfCores\": 2,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 138240,\r\n      \"memoryInMB\"\
-        : 14336,\r\n      \"maxDataDiskCount\": 4\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Standard_A4\",\r\n      \"numberOfCores\": 8,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 619520,\r\n      \"memoryInMB\"\
-        : 14336,\r\n      \"maxDataDiskCount\": 16\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_A6\",\r\n      \"numberOfCores\": 4,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 291840,\r\n      \"memoryInMB\"\
-        : 28672,\r\n      \"maxDataDiskCount\": 8\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Standard_A7\",\r\n      \"numberOfCores\": 8,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 619520,\r\n      \"memoryInMB\"\
-        : 57344,\r\n      \"maxDataDiskCount\": 16\r\n    },\r\n    {\r\n      \"\
-        name\": \"Basic_A0\",\r\n      \"numberOfCores\": 1,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 20480,\r\n      \"memoryInMB\"\
-        : 768,\r\n      \"maxDataDiskCount\": 1\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Basic_A1\",\r\n      \"numberOfCores\": 1,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 40960,\r\n      \"memoryInMB\"\
-        : 1792,\r\n      \"maxDataDiskCount\": 2\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Basic_A2\",\r\n      \"numberOfCores\": 2,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 61440,\r\n      \"memoryInMB\"\
-        : 3584,\r\n      \"maxDataDiskCount\": 4\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Basic_A3\",\r\n      \"numberOfCores\": 4,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 122880,\r\n      \"memoryInMB\"\
-        : 7168,\r\n      \"maxDataDiskCount\": 8\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Basic_A4\",\r\n      \"numberOfCores\": 8,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 245760,\r\n      \"memoryInMB\"\
-        : 14336,\r\n      \"maxDataDiskCount\": 16\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_D1_v2\",\r\n      \"numberOfCores\": 1,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 51200,\r\n      \"memoryInMB\"\
-        : 3584,\r\n      \"maxDataDiskCount\": 4\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Standard_D2_v2\",\r\n      \"numberOfCores\": 2,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 102400,\r\n      \"memoryInMB\"\
-        : 7168,\r\n      \"maxDataDiskCount\": 8\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Standard_D3_v2\",\r\n      \"numberOfCores\": 4,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 204800,\r\n      \"memoryInMB\"\
-        : 14336,\r\n      \"maxDataDiskCount\": 16\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_D4_v2\",\r\n      \"numberOfCores\": 8,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 409600,\r\n      \"memoryInMB\"\
-        : 28672,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_D5_v2\",\r\n      \"numberOfCores\": 16,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 819200,\r\n      \"memoryInMB\"\
-        : 57344,\r\n      \"maxDataDiskCount\": 64\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_D11_v2\",\r\n      \"numberOfCores\": 2,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 102400,\r\n      \"memoryInMB\"\
-        : 14336,\r\n      \"maxDataDiskCount\": 8\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Standard_D12_v2\",\r\n      \"numberOfCores\": 4,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 204800,\r\n      \"memoryInMB\"\
-        : 28672,\r\n      \"maxDataDiskCount\": 16\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_D13_v2\",\r\n      \"numberOfCores\": 8,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 409600,\r\n      \"memoryInMB\"\
-        : 57344,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_D14_v2\",\r\n      \"numberOfCores\": 16,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 819200,\r\n      \"memoryInMB\"\
-        : 114688,\r\n      \"maxDataDiskCount\": 64\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_D15_v2\",\r\n      \"numberOfCores\": 20,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 286720,\r\n      \"memoryInMB\"\
-        : 143360,\r\n      \"maxDataDiskCount\": 64\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_D2_v2_Promo\",\r\n      \"numberOfCores\": 2,\r\n     \
-        \ \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 102400,\r\
-        \n      \"memoryInMB\": 7168,\r\n      \"maxDataDiskCount\": 8\r\n    },\r\
-        \n    {\r\n      \"name\": \"Standard_D3_v2_Promo\",\r\n      \"numberOfCores\"\
+        name\": \"Standard_D2s_v3\",\r\n      \"numberOfCores\": 2,\r\n      \"osDiskSizeInMB\"\
+        : 1047552,\r\n      \"resourceDiskSizeInMB\": 16384,\r\n      \"memoryInMB\"\
+        : 8192,\r\n      \"maxDataDiskCount\": 4\r\n    },\r\n    {\r\n      \"name\"\
+        : \"Standard_D4s_v3\",\r\n      \"numberOfCores\": 4,\r\n      \"osDiskSizeInMB\"\
+        : 1047552,\r\n      \"resourceDiskSizeInMB\": 32768,\r\n      \"memoryInMB\"\
+        : 16384,\r\n      \"maxDataDiskCount\": 8\r\n    },\r\n    {\r\n      \"name\"\
+        : \"Standard_D8s_v3\",\r\n      \"numberOfCores\": 8,\r\n      \"osDiskSizeInMB\"\
+        : 1047552,\r\n      \"resourceDiskSizeInMB\": 65536,\r\n      \"memoryInMB\"\
+        : 32768,\r\n      \"maxDataDiskCount\": 16\r\n    },\r\n    {\r\n      \"\
+        name\": \"Standard_D16s_v3\",\r\n      \"numberOfCores\": 16,\r\n      \"\
+        osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 131072,\r\n\
+        \      \"memoryInMB\": 65536,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_D32s_v3\",\r\n      \"numberOfCores\"\
+        : 32,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 262144,\r\n      \"memoryInMB\": 131072,\r\n      \"maxDataDiskCount\":\
+        \ 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_A0\",\r\n      \"numberOfCores\"\
+        : 1,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 20480,\r\n      \"memoryInMB\": 768,\r\n      \"maxDataDiskCount\": 1\r\n\
+        \    },\r\n    {\r\n      \"name\": \"Standard_A1\",\r\n      \"numberOfCores\"\
+        : 1,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 71680,\r\n      \"memoryInMB\": 1792,\r\n      \"maxDataDiskCount\": 2\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_A2\",\r\n      \"numberOfCores\"\
+        : 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 138240,\r\n      \"memoryInMB\": 3584,\r\n      \"maxDataDiskCount\": 4\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_A3\",\r\n      \"numberOfCores\"\
+        : 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 291840,\r\n      \"memoryInMB\": 7168,\r\n      \"maxDataDiskCount\": 8\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_A5\",\r\n      \"numberOfCores\"\
+        : 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 138240,\r\n      \"memoryInMB\": 14336,\r\n      \"maxDataDiskCount\": 4\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_A4\",\r\n      \"numberOfCores\"\
+        : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 619520,\r\n      \"memoryInMB\": 14336,\r\n      \"maxDataDiskCount\": 16\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_A6\",\r\n      \"numberOfCores\"\
+        : 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 291840,\r\n      \"memoryInMB\": 28672,\r\n      \"maxDataDiskCount\": 8\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_A7\",\r\n      \"numberOfCores\"\
+        : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 619520,\r\n      \"memoryInMB\": 57344,\r\n      \"maxDataDiskCount\": 16\r\
+        \n    },\r\n    {\r\n      \"name\": \"Basic_A0\",\r\n      \"numberOfCores\"\
+        : 1,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 20480,\r\n      \"memoryInMB\": 768,\r\n      \"maxDataDiskCount\": 1\r\n\
+        \    },\r\n    {\r\n      \"name\": \"Basic_A1\",\r\n      \"numberOfCores\"\
+        : 1,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 40960,\r\n      \"memoryInMB\": 1792,\r\n      \"maxDataDiskCount\": 2\r\
+        \n    },\r\n    {\r\n      \"name\": \"Basic_A2\",\r\n      \"numberOfCores\"\
+        : 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 61440,\r\n      \"memoryInMB\": 3584,\r\n      \"maxDataDiskCount\": 4\r\
+        \n    },\r\n    {\r\n      \"name\": \"Basic_A3\",\r\n      \"numberOfCores\"\
+        : 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 122880,\r\n      \"memoryInMB\": 7168,\r\n      \"maxDataDiskCount\": 8\r\
+        \n    },\r\n    {\r\n      \"name\": \"Basic_A4\",\r\n      \"numberOfCores\"\
+        : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 245760,\r\n      \"memoryInMB\": 14336,\r\n      \"maxDataDiskCount\": 16\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_D1_v2\",\r\n      \"numberOfCores\"\
+        : 1,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 51200,\r\n      \"memoryInMB\": 3584,\r\n      \"maxDataDiskCount\": 4\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_D2_v2\",\r\n      \"numberOfCores\"\
+        : 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 102400,\r\n      \"memoryInMB\": 7168,\r\n      \"maxDataDiskCount\": 8\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_D3_v2\",\r\n      \"numberOfCores\"\
         : 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
         : 204800,\r\n      \"memoryInMB\": 14336,\r\n      \"maxDataDiskCount\": 16\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_D4_v2_Promo\",\r\n      \"\
-        numberOfCores\": 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_D4_v2\",\r\n      \"numberOfCores\"\
+        : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
         : 409600,\r\n      \"memoryInMB\": 28672,\r\n      \"maxDataDiskCount\": 32\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_D5_v2_Promo\",\r\n      \"\
-        numberOfCores\": 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_D5_v2\",\r\n      \"numberOfCores\"\
+        : 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
         : 819200,\r\n      \"memoryInMB\": 57344,\r\n      \"maxDataDiskCount\": 64\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_D11_v2_Promo\",\r\n      \"\
-        numberOfCores\": 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_D11_v2\",\r\n      \"numberOfCores\"\
+        : 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 102400,\r\n      \"memoryInMB\": 14336,\r\n      \"maxDataDiskCount\": 8\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_D12_v2\",\r\n      \"numberOfCores\"\
+        : 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 204800,\r\n      \"memoryInMB\": 28672,\r\n      \"maxDataDiskCount\": 16\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_D13_v2\",\r\n      \"numberOfCores\"\
+        : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 409600,\r\n      \"memoryInMB\": 57344,\r\n      \"maxDataDiskCount\": 32\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_D14_v2\",\r\n      \"numberOfCores\"\
+        : 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 819200,\r\n      \"memoryInMB\": 114688,\r\n      \"maxDataDiskCount\":\
+        \ 64\r\n    },\r\n    {\r\n      \"name\": \"Standard_D15_v2\",\r\n      \"\
+        numberOfCores\": 20,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 286720,\r\n      \"memoryInMB\": 143360,\r\n      \"maxDataDiskCount\":\
+        \ 64\r\n    },\r\n    {\r\n      \"name\": \"Standard_D2_v2_Promo\",\r\n \
+        \     \"numberOfCores\": 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n    \
+        \  \"resourceDiskSizeInMB\": 102400,\r\n      \"memoryInMB\": 7168,\r\n  \
+        \    \"maxDataDiskCount\": 8\r\n    },\r\n    {\r\n      \"name\": \"Standard_D3_v2_Promo\"\
+        ,\r\n      \"numberOfCores\": 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n\
+        \      \"resourceDiskSizeInMB\": 204800,\r\n      \"memoryInMB\": 14336,\r\
+        \n      \"maxDataDiskCount\": 16\r\n    },\r\n    {\r\n      \"name\": \"\
+        Standard_D4_v2_Promo\",\r\n      \"numberOfCores\": 8,\r\n      \"osDiskSizeInMB\"\
+        : 1047552,\r\n      \"resourceDiskSizeInMB\": 409600,\r\n      \"memoryInMB\"\
+        : 28672,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"\
+        name\": \"Standard_D5_v2_Promo\",\r\n      \"numberOfCores\": 16,\r\n    \
+        \  \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 819200,\r\
+        \n      \"memoryInMB\": 57344,\r\n      \"maxDataDiskCount\": 64\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_D11_v2_Promo\",\r\n      \"numberOfCores\"\
+        : 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
         : 102400,\r\n      \"memoryInMB\": 14336,\r\n      \"maxDataDiskCount\": 8\r\
         \n    },\r\n    {\r\n      \"name\": \"Standard_D12_v2_Promo\",\r\n      \"\
         numberOfCores\": 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
@@ -225,7 +268,22 @@ interactions:
         \n    },\r\n    {\r\n      \"name\": \"Standard_A8_v2\",\r\n      \"numberOfCores\"\
         : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
         : 81920,\r\n      \"memoryInMB\": 16384,\r\n      \"maxDataDiskCount\": 16\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_D1\",\r\n      \"numberOfCores\"\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_D2_v3\",\r\n      \"numberOfCores\"\
+        : 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 51200,\r\n      \"memoryInMB\": 8192,\r\n      \"maxDataDiskCount\": 4\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_D4_v3\",\r\n      \"numberOfCores\"\
+        : 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 102400,\r\n      \"memoryInMB\": 16384,\r\n      \"maxDataDiskCount\": 8\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_D8_v3\",\r\n      \"numberOfCores\"\
+        : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 204800,\r\n      \"memoryInMB\": 32768,\r\n      \"maxDataDiskCount\": 16\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_D16_v3\",\r\n      \"numberOfCores\"\
+        : 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 409600,\r\n      \"memoryInMB\": 65636,\r\n      \"maxDataDiskCount\": 32\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_D32_v3\",\r\n      \"numberOfCores\"\
+        : 32,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 819200,\r\n      \"memoryInMB\": 131072,\r\n      \"maxDataDiskCount\":\
+        \ 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_D1\",\r\n      \"numberOfCores\"\
         : 1,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
         : 51200,\r\n      \"memoryInMB\": 3584,\r\n      \"maxDataDiskCount\": 4\r\
         \n    },\r\n    {\r\n      \"name\": \"Standard_D2\",\r\n      \"numberOfCores\"\
@@ -273,58 +331,10 @@ interactions:
         \n    },\r\n    {\r\n      \"name\": \"Standard_DS14\",\r\n      \"numberOfCores\"\
         : 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
         : 229376,\r\n      \"memoryInMB\": 114688,\r\n      \"maxDataDiskCount\":\
-        \ 64\r\n    },\r\n    {\r\n      \"name\": \"Standard_B1ms\",\r\n      \"\
-        numberOfCores\": 1,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 4096,\r\n      \"memoryInMB\": 2048,\r\n      \"maxDataDiskCount\": 2\r\n\
-        \    },\r\n    {\r\n      \"name\": \"Standard_B1s\",\r\n      \"numberOfCores\"\
-        : 1,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 2048,\r\n      \"memoryInMB\": 1024,\r\n      \"maxDataDiskCount\": 2\r\n\
-        \    },\r\n    {\r\n      \"name\": \"Standard_B2ms\",\r\n      \"numberOfCores\"\
-        : 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 16384,\r\n      \"memoryInMB\": 8192,\r\n      \"maxDataDiskCount\": 4\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_B2s\",\r\n      \"numberOfCores\"\
-        : 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 8192,\r\n      \"memoryInMB\": 4096,\r\n      \"maxDataDiskCount\": 4\r\n\
-        \    },\r\n    {\r\n      \"name\": \"Standard_B4ms\",\r\n      \"numberOfCores\"\
-        : 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 32768,\r\n      \"memoryInMB\": 16384,\r\n      \"maxDataDiskCount\": 8\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_B8ms\",\r\n      \"numberOfCores\"\
-        : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 65536,\r\n      \"memoryInMB\": 32768,\r\n      \"maxDataDiskCount\": 16\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_D2_v3\",\r\n      \"numberOfCores\"\
-        : 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 51200,\r\n      \"memoryInMB\": 8192,\r\n      \"maxDataDiskCount\": 4\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_D4_v3\",\r\n      \"numberOfCores\"\
-        : 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 102400,\r\n      \"memoryInMB\": 16384,\r\n      \"maxDataDiskCount\": 8\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_D8_v3\",\r\n      \"numberOfCores\"\
-        : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 204800,\r\n      \"memoryInMB\": 32768,\r\n      \"maxDataDiskCount\": 16\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_D16_v3\",\r\n      \"numberOfCores\"\
-        : 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 409600,\r\n      \"memoryInMB\": 65636,\r\n      \"maxDataDiskCount\": 32\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_D32_v3\",\r\n      \"numberOfCores\"\
-        : 32,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 819200,\r\n      \"memoryInMB\": 131072,\r\n      \"maxDataDiskCount\":\
-        \ 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_D64_v3\",\r\n      \"\
+        \ 64\r\n    },\r\n    {\r\n      \"name\": \"Standard_D64_v3\",\r\n      \"\
         numberOfCores\": 64,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
         : 1638400,\r\n      \"memoryInMB\": 262144,\r\n      \"maxDataDiskCount\"\
-        : 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_D2s_v3\",\r\n      \"\
-        numberOfCores\": 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 16384,\r\n      \"memoryInMB\": 8192,\r\n      \"maxDataDiskCount\": 4\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_D4s_v3\",\r\n      \"numberOfCores\"\
-        : 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 32768,\r\n      \"memoryInMB\": 16384,\r\n      \"maxDataDiskCount\": 8\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_D8s_v3\",\r\n      \"numberOfCores\"\
-        : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 65536,\r\n      \"memoryInMB\": 32768,\r\n      \"maxDataDiskCount\": 16\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_D16s_v3\",\r\n      \"numberOfCores\"\
-        : 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 131072,\r\n      \"memoryInMB\": 65536,\r\n      \"maxDataDiskCount\": 32\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_D32s_v3\",\r\n      \"numberOfCores\"\
-        : 32,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 262144,\r\n      \"memoryInMB\": 131072,\r\n      \"maxDataDiskCount\":\
-        \ 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_D64s_v3\",\r\n     \
+        : 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_D64s_v3\",\r\n     \
         \ \"numberOfCores\": 64,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"\
         resourceDiskSizeInMB\": 524288,\r\n      \"memoryInMB\": 262144,\r\n     \
         \ \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_E2_v3\"\
@@ -343,70 +353,92 @@ interactions:
         name\": \"Standard_E32_v3\",\r\n      \"numberOfCores\": 32,\r\n      \"osDiskSizeInMB\"\
         : 1047552,\r\n      \"resourceDiskSizeInMB\": 819200,\r\n      \"memoryInMB\"\
         : 262144,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_E64_v3\",\r\n      \"numberOfCores\": 64,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 1638400,\r\n      \"memoryInMB\"\
-        : 442368,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_E2s_v3\",\r\n      \"numberOfCores\": 2,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 32768,\r\n      \"memoryInMB\"\
-        : 16384,\r\n      \"maxDataDiskCount\": 4\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Standard_E4s_v3\",\r\n      \"numberOfCores\": 4,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 65536,\r\n      \"memoryInMB\"\
-        : 32768,\r\n      \"maxDataDiskCount\": 8\r\n    },\r\n    {\r\n      \"name\"\
-        : \"Standard_E8s_v3\",\r\n      \"numberOfCores\": 8,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 131072,\r\n      \"memoryInMB\"\
-        : 65536,\r\n      \"maxDataDiskCount\": 16\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_E16s_v3\",\r\n      \"numberOfCores\": 16,\r\n      \"\
-        osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 262144,\r\n\
-        \      \"memoryInMB\": 131072,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\
-        \n    {\r\n      \"name\": \"Standard_E32-8s_v3\",\r\n      \"numberOfCores\"\
-        : 32,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 524288,\r\n      \"memoryInMB\": 262144,\r\n      \"maxDataDiskCount\":\
-        \ 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_E32-16s_v3\",\r\n  \
-        \    \"numberOfCores\": 32,\r\n      \"osDiskSizeInMB\": 1047552,\r\n    \
-        \  \"resourceDiskSizeInMB\": 524288,\r\n      \"memoryInMB\": 262144,\r\n\
-        \      \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_E32s_v3\"\
-        ,\r\n      \"numberOfCores\": 32,\r\n      \"osDiskSizeInMB\": 1047552,\r\n\
-        \      \"resourceDiskSizeInMB\": 524288,\r\n      \"memoryInMB\": 262144,\r\
-        \n      \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"name\": \"\
-        Standard_E64-16s_v3\",\r\n      \"numberOfCores\": 64,\r\n      \"osDiskSizeInMB\"\
-        : 1047552,\r\n      \"resourceDiskSizeInMB\": 884736,\r\n      \"memoryInMB\"\
-        : 442368,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"\
-        name\": \"Standard_E64-32s_v3\",\r\n      \"numberOfCores\": 64,\r\n     \
-        \ \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 884736,\r\
-        \n      \"memoryInMB\": 442368,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\
-        \n    {\r\n      \"name\": \"Standard_E64s_v3\",\r\n      \"numberOfCores\"\
+        name\": \"Standard_E64i_v3\",\r\n      \"numberOfCores\": 64,\r\n      \"\
+        osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 1638400,\r\n\
+        \      \"memoryInMB\": 442368,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_E64_v3\",\r\n      \"numberOfCores\"\
         : 64,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 884736,\r\n      \"memoryInMB\": 442368,\r\n      \"maxDataDiskCount\":\
-        \ 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_G1\",\r\n      \"numberOfCores\"\
-        : 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 393216,\r\n      \"memoryInMB\": 28672,\r\n      \"maxDataDiskCount\": 8\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_G2\",\r\n      \"numberOfCores\"\
+        : 1638400,\r\n      \"memoryInMB\": 442368,\r\n      \"maxDataDiskCount\"\
+        : 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_E2s_v3\",\r\n      \"\
+        numberOfCores\": 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 32768,\r\n      \"memoryInMB\": 16384,\r\n      \"maxDataDiskCount\": 4\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_E4-2s_v3\",\r\n      \"numberOfCores\"\
+        : 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 65536,\r\n      \"memoryInMB\": 32768,\r\n      \"maxDataDiskCount\": 8\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_E4s_v3\",\r\n      \"numberOfCores\"\
         : 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 786432,\r\n      \"memoryInMB\": 57344,\r\n      \"maxDataDiskCount\": 16\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_G3\",\r\n      \"numberOfCores\"\
+        : 65536,\r\n      \"memoryInMB\": 32768,\r\n      \"maxDataDiskCount\": 8\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_E8-2s_v3\",\r\n      \"numberOfCores\"\
+        : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 131072,\r\n      \"memoryInMB\": 65536,\r\n      \"maxDataDiskCount\": 16\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_E8-4s_v3\",\r\n      \"numberOfCores\"\
+        : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 131072,\r\n      \"memoryInMB\": 65536,\r\n      \"maxDataDiskCount\": 16\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_E8s_v3\",\r\n      \"numberOfCores\"\
         : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 1572864,\r\n      \"memoryInMB\": 114688,\r\n      \"maxDataDiskCount\"\
-        : 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_G4\",\r\n      \"numberOfCores\"\
+        : 131072,\r\n      \"memoryInMB\": 65536,\r\n      \"maxDataDiskCount\": 16\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_E16-4s_v3\",\r\n      \"numberOfCores\"\
         : 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 3145728,\r\n      \"memoryInMB\": 229376,\r\n      \"maxDataDiskCount\"\
-        : 64\r\n    },\r\n    {\r\n      \"name\": \"Standard_G5\",\r\n      \"numberOfCores\"\
+        : 262144,\r\n      \"memoryInMB\": 131072,\r\n      \"maxDataDiskCount\":\
+        \ 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_E16-8s_v3\",\r\n   \
+        \   \"numberOfCores\": 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n     \
+        \ \"resourceDiskSizeInMB\": 262144,\r\n      \"memoryInMB\": 131072,\r\n \
+        \     \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_E16s_v3\"\
+        ,\r\n      \"numberOfCores\": 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n\
+        \      \"resourceDiskSizeInMB\": 262144,\r\n      \"memoryInMB\": 131072,\r\
+        \n      \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"name\": \"\
+        Standard_E32-8s_v3\",\r\n      \"numberOfCores\": 32,\r\n      \"osDiskSizeInMB\"\
+        : 1047552,\r\n      \"resourceDiskSizeInMB\": 524288,\r\n      \"memoryInMB\"\
+        : 262144,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"\
+        name\": \"Standard_E32-16s_v3\",\r\n      \"numberOfCores\": 32,\r\n     \
+        \ \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 524288,\r\
+        \n      \"memoryInMB\": 262144,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_E32s_v3\",\r\n      \"numberOfCores\"\
         : 32,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 6291456,\r\n      \"memoryInMB\": 458752,\r\n      \"maxDataDiskCount\"\
-        : 64\r\n    },\r\n    {\r\n      \"name\": \"Standard_GS1\",\r\n      \"numberOfCores\"\
-        : 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 57344,\r\n      \"memoryInMB\": 28672,\r\n      \"maxDataDiskCount\": 8\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_GS2\",\r\n      \"numberOfCores\"\
-        : 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 114688,\r\n      \"memoryInMB\": 57344,\r\n      \"maxDataDiskCount\": 16\r\
-        \n    },\r\n    {\r\n      \"name\": \"Standard_GS3\",\r\n      \"numberOfCores\"\
-        : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 229376,\r\n      \"memoryInMB\": 114688,\r\n      \"maxDataDiskCount\":\
-        \ 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_GS4\",\r\n      \"numberOfCores\"\
+        : 524288,\r\n      \"memoryInMB\": 262144,\r\n      \"maxDataDiskCount\":\
+        \ 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_E64-16s_v3\",\r\n  \
+        \    \"numberOfCores\": 64,\r\n      \"osDiskSizeInMB\": 1047552,\r\n    \
+        \  \"resourceDiskSizeInMB\": 884736,\r\n      \"memoryInMB\": 442368,\r\n\
+        \      \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_E64-32s_v3\"\
+        ,\r\n      \"numberOfCores\": 64,\r\n      \"osDiskSizeInMB\": 1047552,\r\n\
+        \      \"resourceDiskSizeInMB\": 884736,\r\n      \"memoryInMB\": 442368,\r\
+        \n      \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"name\": \"\
+        Standard_E64is_v3\",\r\n      \"numberOfCores\": 64,\r\n      \"osDiskSizeInMB\"\
+        : 1047552,\r\n      \"resourceDiskSizeInMB\": 884736,\r\n      \"memoryInMB\"\
+        : 442368,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\n    {\r\n      \"\
+        name\": \"Standard_E64s_v3\",\r\n      \"numberOfCores\": 64,\r\n      \"\
+        osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 884736,\r\n\
+        \      \"memoryInMB\": 442368,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_G1\",\r\n      \"numberOfCores\": 2,\r\
+        \n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 393216,\r\
+        \n      \"memoryInMB\": 28672,\r\n      \"maxDataDiskCount\": 8\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_G2\",\r\n      \"numberOfCores\": 4,\r\
+        \n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 786432,\r\
+        \n      \"memoryInMB\": 57344,\r\n      \"maxDataDiskCount\": 16\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_G3\",\r\n      \"numberOfCores\": 8,\r\
+        \n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 1572864,\r\
+        \n      \"memoryInMB\": 114688,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_G4\",\r\n      \"numberOfCores\": 16,\r\
+        \n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 3145728,\r\
+        \n      \"memoryInMB\": 229376,\r\n      \"maxDataDiskCount\": 64\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_G5\",\r\n      \"numberOfCores\": 32,\r\
+        \n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 6291456,\r\
+        \n      \"memoryInMB\": 458752,\r\n      \"maxDataDiskCount\": 64\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_GS1\",\r\n      \"numberOfCores\": 2,\r\
+        \n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 57344,\r\
+        \n      \"memoryInMB\": 28672,\r\n      \"maxDataDiskCount\": 8\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_GS2\",\r\n      \"numberOfCores\": 4,\r\
+        \n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 114688,\r\
+        \n      \"memoryInMB\": 57344,\r\n      \"maxDataDiskCount\": 16\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_GS3\",\r\n      \"numberOfCores\": 8,\r\
+        \n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 229376,\r\
+        \n      \"memoryInMB\": 114688,\r\n      \"maxDataDiskCount\": 32\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_GS4\",\r\n      \"numberOfCores\": 16,\r\
+        \n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\": 458752,\r\
+        \n      \"memoryInMB\": 229376,\r\n      \"maxDataDiskCount\": 64\r\n    },\r\
+        \n    {\r\n      \"name\": \"Standard_GS4-4\",\r\n      \"numberOfCores\"\
         : 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
         : 458752,\r\n      \"memoryInMB\": 229376,\r\n      \"maxDataDiskCount\":\
-        \ 64\r\n    },\r\n    {\r\n      \"name\": \"Standard_GS4-4\",\r\n      \"\
-        numberOfCores\": 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
-        : 458752,\r\n      \"memoryInMB\": 229376,\r\n      \"maxDataDiskCount\":\
         \ 64\r\n    },\r\n    {\r\n      \"name\": \"Standard_GS4-8\",\r\n      \"\
         numberOfCores\": 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
         : 458752,\r\n      \"memoryInMB\": 229376,\r\n      \"maxDataDiskCount\":\
@@ -461,18 +493,40 @@ interactions:
         : 64\r\n    },\r\n    {\r\n      \"name\": \"Standard_H16mr\",\r\n      \"\
         numberOfCores\": 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
         : 2048000,\r\n      \"memoryInMB\": 229376,\r\n      \"maxDataDiskCount\"\
-        : 64\r\n    }\r\n  ]\r\n}"}
+        : 64\r\n    },\r\n    {\r\n      \"name\": \"Standard_F2s_v2\",\r\n      \"\
+        numberOfCores\": 2,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 16384,\r\n      \"memoryInMB\": 4096,\r\n      \"maxDataDiskCount\": 4\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_F4s_v2\",\r\n      \"numberOfCores\"\
+        : 4,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 32768,\r\n      \"memoryInMB\": 8192,\r\n      \"maxDataDiskCount\": 8\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_F8s_v2\",\r\n      \"numberOfCores\"\
+        : 8,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 65536,\r\n      \"memoryInMB\": 16384,\r\n      \"maxDataDiskCount\": 16\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_F16s_v2\",\r\n      \"numberOfCores\"\
+        : 16,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 131072,\r\n      \"memoryInMB\": 32768,\r\n      \"maxDataDiskCount\": 32\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_F32s_v2\",\r\n      \"numberOfCores\"\
+        : 32,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 262144,\r\n      \"memoryInMB\": 65536,\r\n      \"maxDataDiskCount\": 32\r\
+        \n    },\r\n    {\r\n      \"name\": \"Standard_F64s_v2\",\r\n      \"numberOfCores\"\
+        : 64,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"resourceDiskSizeInMB\"\
+        : 524288,\r\n      \"memoryInMB\": 131072,\r\n      \"maxDataDiskCount\":\
+        \ 32\r\n    },\r\n    {\r\n      \"name\": \"Standard_F72s_v2\",\r\n     \
+        \ \"numberOfCores\": 72,\r\n      \"osDiskSizeInMB\": 1047552,\r\n      \"\
+        resourceDiskSizeInMB\": 589824,\r\n      \"memoryInMB\": 147456,\r\n     \
+        \ \"maxDataDiskCount\": 32\r\n    }\r\n  ]\r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['30498']
+      content-length: ['34047']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 18:13:09 GMT']
+      date: ['Fri, 20 Jul 2018 18:23:45 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4989,Microsoft.Compute/LowCostGet30Min;39869']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: [Microsoft.Compute/GetSubscriptionInfo3Min;479]
     status: {code: 200, message: OK}
 version: 1
diff --git a/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_create_image_from_blob.yaml b/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_create_image_from_blob.yaml
index c385def6ec63..e8d38fb35748 100644
--- a/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_create_image_from_blob.yaml
+++ b/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_create_image_from_blob.yaml
@@ -14,7 +14,7 @@ interactions:
       accept-language: [en-US]
       x-ms-client-request-id: [aaefdaec-5d36-11e7-af9e-ecb1d756380e]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_image_from_blob1cfb14b2/providers/Microsoft.Compute/images/myImage?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_image_from_blob1cfb14b2/providers/Microsoft.Compute/images/myImage?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"properties\": {\r\n    \"storageProfile\": {\r\n      \"osDisk\":
         {\r\n        \"osType\": \"Linux\",\r\n        \"osState\": \"Generalized\",\r\n
@@ -24,7 +24,7 @@ interactions:
         \ \"location\": \"westus\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_image_from_blob1cfb14b2/providers/Microsoft.Compute/images/myImage\",\r\n
         \ \"name\": \"myImage\"\r\n}"}
     headers:
-      Azure-AsyncOperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/53c76029-51ee-40c5-843a-3ab96eba05f4?api-version=2017-12-01']
+      Azure-AsyncOperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/53c76029-51ee-40c5-843a-3ab96eba05f4?api-version=2018-06-01']
       Cache-Control: [no-cache]
       Content-Length: ['622']
       Content-Type: [application/json; charset=utf-8]
@@ -51,7 +51,7 @@ interactions:
       accept-language: [en-US]
       x-ms-client-request-id: [aaefdaec-5d36-11e7-af9e-ecb1d756380e]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/53c76029-51ee-40c5-843a-3ab96eba05f4?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/53c76029-51ee-40c5-843a-3ab96eba05f4?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"startTime\": \"2017-06-30T01:51:43.9432726+00:00\",\r\n
         \ \"endTime\": \"2017-06-30T01:52:04.5545491+00:00\",\r\n  \"status\": \"Succeeded\",\r\n
@@ -85,7 +85,7 @@ interactions:
       accept-language: [en-US]
       x-ms-client-request-id: [aaefdaec-5d36-11e7-af9e-ecb1d756380e]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_image_from_blob1cfb14b2/providers/Microsoft.Compute/images/myImage?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_image_from_blob1cfb14b2/providers/Microsoft.Compute/images/myImage?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"properties\": {\r\n    \"storageProfile\": {\r\n      \"osDisk\":
         {\r\n        \"osType\": \"Linux\",\r\n        \"osState\": \"Generalized\",\r\n
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 c28ec4666097..ddbbaba273a0 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
@@ -9,31 +9,31 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['183']
       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 networkmanagementclient/2.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.4
+          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 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=2017-11-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-02-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/\\\"9553c743-9fdb-4205-bd0f-028f2977494c\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"7c227f05-36cc-41b9-9c1e-24abcdcd74fc\\\"\",\r\n \
         \ \"type\": \"Microsoft.Network/virtualNetworks\",\r\n  \"location\": \"westus\"\
         ,\r\n  \"properties\": {\r\n    \"provisioningState\": \"Updating\",\r\n \
-        \   \"resourceGuid\": \"c8348c82-b60a-4280-8f04-e77fe75371ca\",\r\n    \"\
+        \   \"resourceGuid\": \"5bb4a7a8-2bff-4f31-ba6c-71451e40cdc3\",\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/\\\"9553c743-9fdb-4205-bd0f-028f2977494c\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"7c227f05-36cc-41b9-9c1e-24abcdcd74fc\\\"\"\
         ,\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\"\
         : 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/7ec1374f-127d-4872-9cce-55b6da1a011e?api-version=2017-11-01']
+      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']
       cache-control: [no-cache]
       content-length: ['1198']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:22:58 GMT']
+      date: ['Fri, 20 Jul 2018 19:37:05 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -47,17 +47,17 @@ 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 networkmanagementclient/2.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.4
+          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/7ec1374f-127d-4872-9cce-55b6da1a011e?api-version=2017-11-01
+    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
   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: ['Wed, 21 Mar 2018 21:23:03 GMT']
+      date: ['Fri, 20 Jul 2018 19:37:09 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -72,17 +72,17 @@ 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 networkmanagementclient/2.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.4
+          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/7ec1374f-127d-4872-9cce-55b6da1a011e?api-version=2017-11-01
+    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
   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: ['Wed, 21 Mar 2018 21:23:13 GMT']
+      date: ['Fri, 20 Jul 2018 19:37:20 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -97,20 +97,20 @@ 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 networkmanagementclient/2.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.4
+          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 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=2017-11-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-02-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/\\\"12cf6389-de57-43c9-9a9e-aa913105cb3b\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"b9f1d43d-22e4-43c8-8317-850fa2f0b96e\\\"\",\r\n \
         \ \"type\": \"Microsoft.Network/virtualNetworks\",\r\n  \"location\": \"westus\"\
         ,\r\n  \"properties\": {\r\n    \"provisioningState\": \"Succeeded\",\r\n\
-        \    \"resourceGuid\": \"c8348c82-b60a-4280-8f04-e77fe75371ca\",\r\n    \"\
+        \    \"resourceGuid\": \"5bb4a7a8-2bff-4f31-ba6c-71451e40cdc3\",\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/\\\"12cf6389-de57-43c9-9a9e-aa913105cb3b\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"b9f1d43d-22e4-43c8-8317-850fa2f0b96e\\\"\"\
         ,\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\"\
@@ -119,8 +119,8 @@ interactions:
       cache-control: [no-cache]
       content-length: ['1200']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:23:14 GMT']
-      etag: [W/"12cf6389-de57-43c9-9a9e-aa913105cb3b"]
+      date: ['Fri, 20 Jul 2018 19:37:20 GMT']
+      etag: [W/"b9f1d43d-22e4-43c8-8317-850fa2f0b96e"]
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -136,22 +136,22 @@ interactions:
       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 networkmanagementclient/2.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.4
+          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 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=2017-11-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-02-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/\\\"12cf6389-de57-43c9-9a9e-aa913105cb3b\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"b9f1d43d-22e4-43c8-8317-850fa2f0b96e\\\"\",\r\n \
         \ \"properties\": {\r\n    \"provisioningState\": \"Succeeded\",\r\n    \"\
         addressPrefix\": \"10.0.0.0/24\"\r\n  }\r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['425']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:23:14 GMT']
-      etag: [W/"12cf6389-de57-43c9-9a9e-aa913105cb3b"]
+      date: ['Fri, 20 Jul 2018 19:37:22 GMT']
+      etag: [W/"b9f1d43d-22e4-43c8-8317-850fa2f0b96e"]
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -161,26 +161,26 @@ interactions:
       x-content-type-options: [nosniff]
     status: {code: 200, message: OK}
 - request:
-    body: 'b''b\''b\\\''{"location": "westus", "sku": {"name": "Standard_A1", "tier":
-      "Standard", "capacity": 5}, "properties": {"upgradePolicy": {"mode": "Manual"},
-      "virtualMachineProfile": {"osProfile": {"computerNamePrefix": "PyTestInfix",
+    body: 'b''b\''b\\\''b\\\\\\\''{"location": "westus", "sku": {"name": "Standard_A1",
+      "tier": "Standard", "capacity": 5}, "properties": {"upgradePolicy": {"mode":
+      "Manual"}, "virtualMachineProfile": {"osProfile": {"computerNamePrefix": "PyTestInfix",
       "adminUsername": "Foo12", "adminPassword": "BaR@123!!!!"}, "storageProfile":
       {"imageReference": {"publisher": "Canonical", "offer": "UbuntuServer", "sku":
       "16.04.0-LTS", "version": "latest"}}, "networkProfile": {"networkInterfaceConfigurations":
       [{"name": "PyTestInfixnic", "properties": {"primary": true, "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"}}}]}}]}},
-      "overprovision": true}}\\\''\'''''
+      "overprovision": true}}\\\\\\\''\\\''\'''''
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['867']
       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.4
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 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=2017-12-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.Compute/virtualMachineScaleSets/pyvmirvm5cc18eb?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"sku\": {\r\n    \"name\": \"Standard_A1\",\r\n    \"\
         tier\": \"Standard\",\r\n    \"capacity\": 5\r\n  },\r\n  \"properties\":\
@@ -189,29 +189,30 @@ interactions:
         \  },\r\n    \"virtualMachineProfile\": {\r\n      \"osProfile\": {\r\n  \
         \      \"computerNamePrefix\": \"PyTestInfix\",\r\n        \"adminUsername\"\
         : \"Foo12\",\r\n        \"linuxConfiguration\": {\r\n          \"disablePasswordAuthentication\"\
-        : false\r\n        },\r\n        \"secrets\": []\r\n      },\r\n      \"storageProfile\"\
-        : {\r\n        \"osDisk\": {\r\n          \"createOption\": \"FromImage\"\
-        ,\r\n          \"caching\": \"None\",\r\n          \"managedDisk\": {\r\n\
-        \            \"storageAccountType\": \"Standard_LRS\"\r\n          }\r\n \
-        \       },\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 \
-        \     },\r\n      \"networkProfile\": {\"networkInterfaceConfigurations\"\
+        : false,\r\n          \"provisionVMAgent\": true\r\n        },\r\n       \
+        \ \"secrets\": [],\r\n        \"allowExtensionOperations\": true\r\n     \
+        \ },\r\n      \"storageProfile\": {\r\n        \"osDisk\": {\r\n         \
+        \ \"createOption\": \"FromImage\",\r\n          \"caching\": \"None\",\r\n\
+        \          \"managedDisk\": {\r\n            \"storageAccountType\": \"Standard_LRS\"\
+        \r\n          }\r\n        },\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      },\r\n      \"networkProfile\": {\"networkInterfaceConfigurations\"\
         :[{\"name\":\"PyTestInfixnic\",\"properties\":{\"primary\":true,\"enableAcceleratedNetworking\"\
         :false,\"dnsSettings\":{\"dnsServers\":[]},\"enableIPForwarding\":false,\"\
         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\": \"99f64c31-94c4-4439-9a46-e72f275a6b94\"\
+        : \"Creating\",\r\n    \"overprovision\": true,\r\n    \"uniqueId\": \"1bfeb98c-4800-46ed-a794-0ede0003daf9\"\
         \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/d26b2f56-d553-4d9c-9cb1-a8816f379e8f?api-version=2017-12-01']
+      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']
       cache-control: [no-cache]
-      content-length: ['1926']
+      content-length: ['2006']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:23:17 GMT']
+      date: ['Fri, 20 Jul 2018 19:37:24 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -227,19 +228,19 @@ 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.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/d26b2f56-d553-4d9c-9cb1-a8816f379e8f?api-version=2017-12-01
+    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-03-21T21:23:16.7295202+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"d26b2f56-d553-4d9c-9cb1-a8816f379e8f\"\
+    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: ['Wed, 21 Mar 2018 21:23:54 GMT']
+      date: ['Fri, 20 Jul 2018 19:37:41 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -247,7 +248,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;11997,Microsoft.Compute/GetOperation30Min;23997']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14994,Microsoft.Compute/GetOperation30Min;29982']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -255,19 +256,19 @@ 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.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/d26b2f56-d553-4d9c-9cb1-a8816f379e8f?api-version=2017-12-01
+    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-03-21T21:23:16.7295202+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"d26b2f56-d553-4d9c-9cb1-a8816f379e8f\"\
+    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: ['Wed, 21 Mar 2018 21:24:28 GMT']
+      date: ['Fri, 20 Jul 2018 19:38:11 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -275,7 +276,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;11994,Microsoft.Compute/GetOperation30Min;23994']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14994,Microsoft.Compute/GetOperation30Min;29980']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -283,19 +284,19 @@ 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.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/d26b2f56-d553-4d9c-9cb1-a8816f379e8f?api-version=2017-12-01
+    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-03-21T21:23:16.7295202+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"d26b2f56-d553-4d9c-9cb1-a8816f379e8f\"\
+    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: ['Wed, 21 Mar 2018 21:25:00 GMT']
+      date: ['Fri, 20 Jul 2018 19:38:42 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -303,7 +304,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;11991,Microsoft.Compute/GetOperation30Min;23991']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14991,Microsoft.Compute/GetOperation30Min;29977']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -311,19 +312,47 @@ 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.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/d26b2f56-d553-4d9c-9cb1-a8816f379e8f?api-version=2017-12-01
+    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-03-21T21:23:16.7295202+00:00\",\r\
-        \n  \"endTime\": \"2018-03-21T21:25:25.2924465+00:00\",\r\n  \"status\": \"\
-        Succeeded\",\r\n  \"name\": \"d26b2f56-d553-4d9c-9cb1-a8816f379e8f\"\r\n}"}
+    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:39:15 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;14989,Microsoft.Compute/GetOperation30Min;29974']
+    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  \"endTime\": \"2018-07-20T19:39:18.955664+00:00\",\r\n  \"status\": \"\
+        Succeeded\",\r\n  \"name\": \"87aab33f-2ddd-434c-a646-098d5e9b4995\"\r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['184']
+      content-length: ['183']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:25:31 GMT']
+      date: ['Fri, 20 Jul 2018 19:39:46 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -331,7 +360,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;11988,Microsoft.Compute/GetOperation30Min;23988']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14988,Microsoft.Compute/GetOperation30Min;29972']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -339,10 +368,10 @@ 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.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/resourceGroups/test_mgmt_managed_disks_test_create_virtual_machine_scale_set5cc18eb/providers/Microsoft.Compute/virtualMachineScaleSets/pyvmirvm5cc18eb?api-version=2017-12-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.Compute/virtualMachineScaleSets/pyvmirvm5cc18eb?api-version=2018-06-01
   response:
     body: {string: "{\r\n  \"sku\": {\r\n    \"name\": \"Standard_A1\",\r\n    \"\
         tier\": \"Standard\",\r\n    \"capacity\": 5\r\n  },\r\n  \"properties\":\
@@ -351,28 +380,29 @@ interactions:
         \  },\r\n    \"virtualMachineProfile\": {\r\n      \"osProfile\": {\r\n  \
         \      \"computerNamePrefix\": \"PyTestInfix\",\r\n        \"adminUsername\"\
         : \"Foo12\",\r\n        \"linuxConfiguration\": {\r\n          \"disablePasswordAuthentication\"\
-        : false\r\n        },\r\n        \"secrets\": []\r\n      },\r\n      \"storageProfile\"\
-        : {\r\n        \"osDisk\": {\r\n          \"createOption\": \"FromImage\"\
-        ,\r\n          \"caching\": \"None\",\r\n          \"managedDisk\": {\r\n\
-        \            \"storageAccountType\": \"Standard_LRS\"\r\n          }\r\n \
-        \       },\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 \
-        \     },\r\n      \"networkProfile\": {\"networkInterfaceConfigurations\"\
+        : false,\r\n          \"provisionVMAgent\": true\r\n        },\r\n       \
+        \ \"secrets\": [],\r\n        \"allowExtensionOperations\": true\r\n     \
+        \ },\r\n      \"storageProfile\": {\r\n        \"osDisk\": {\r\n         \
+        \ \"createOption\": \"FromImage\",\r\n          \"caching\": \"None\",\r\n\
+        \          \"managedDisk\": {\r\n            \"storageAccountType\": \"Standard_LRS\"\
+        \r\n          }\r\n        },\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      },\r\n      \"networkProfile\": {\"networkInterfaceConfigurations\"\
         :[{\"name\":\"PyTestInfixnic\",\"properties\":{\"primary\":true,\"enableAcceleratedNetworking\"\
         :false,\"dnsSettings\":{\"dnsServers\":[]},\"enableIPForwarding\":false,\"\
         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\": \"99f64c31-94c4-4439-9a46-e72f275a6b94\"\
+        : \"Succeeded\",\r\n    \"overprovision\": true,\r\n    \"uniqueId\": \"1bfeb98c-4800-46ed-a794-0ede0003daf9\"\
         \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:
       cache-control: [no-cache]
-      content-length: ['1927']
+      content-length: ['2007']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:25:32 GMT']
+      date: ['Fri, 20 Jul 2018 19:39:47 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -380,6 +410,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;1490']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetVMScaleSet3Min;194,Microsoft.Compute/GetVMScaleSet30Min;1494']
     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 6b2ccd00b537..be86c18808b9 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
@@ -9,31 +9,31 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['183']
       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 networkmanagementclient/2.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.4
+          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 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=2017-11-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-02-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/\\\"cd48b2c7-db52-4e2a-a3b1-c9b9a41818a4\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"64c083b9-3eb4-4c40-9de7-279cc2a038a1\\\"\",\r\n \
         \ \"type\": \"Microsoft.Network/virtualNetworks\",\r\n  \"location\": \"westus\"\
         ,\r\n  \"properties\": {\r\n    \"provisioningState\": \"Updating\",\r\n \
-        \   \"resourceGuid\": \"721e8a4f-fa1a-4df6-b067-ff820fa80094\",\r\n    \"\
+        \   \"resourceGuid\": \"036c7e38-bec3-4e4b-86b0-635c5ab9f043\",\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/\\\"cd48b2c7-db52-4e2a-a3b1-c9b9a41818a4\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"64c083b9-3eb4-4c40-9de7-279cc2a038a1\\\"\"\
         ,\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\"\
         : 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/8b83e3c1-6c2e-4362-a615-195f8678872b?api-version=2017-11-01']
+      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']
       cache-control: [no-cache]
       content-length: ['1176']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:25:39 GMT']
+      date: ['Fri, 20 Jul 2018 19:31:00 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -47,17 +47,17 @@ 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 networkmanagementclient/2.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.4
+          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/8b83e3c1-6c2e-4362-a615-195f8678872b?api-version=2017-11-01
+    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
   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: ['Wed, 21 Mar 2018 21:25:42 GMT']
+      date: ['Fri, 20 Jul 2018 19:31:05 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -72,17 +72,17 @@ 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 networkmanagementclient/2.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.4
+          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/8b83e3c1-6c2e-4362-a615-195f8678872b?api-version=2017-11-01
+    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
   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: ['Wed, 21 Mar 2018 21:25:53 GMT']
+      date: ['Fri, 20 Jul 2018 19:31:16 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -97,20 +97,20 @@ 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 networkmanagementclient/2.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.4
+          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 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=2017-11-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-02-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/\\\"7a52a48a-c497-4504-89c5-ae8d4322f00c\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"4719cad4-b57f-41cb-b500-f6bf88d2a39d\\\"\",\r\n \
         \ \"type\": \"Microsoft.Network/virtualNetworks\",\r\n  \"location\": \"westus\"\
         ,\r\n  \"properties\": {\r\n    \"provisioningState\": \"Succeeded\",\r\n\
-        \    \"resourceGuid\": \"721e8a4f-fa1a-4df6-b067-ff820fa80094\",\r\n    \"\
+        \    \"resourceGuid\": \"036c7e38-bec3-4e4b-86b0-635c5ab9f043\",\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/\\\"7a52a48a-c497-4504-89c5-ae8d4322f00c\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"4719cad4-b57f-41cb-b500-f6bf88d2a39d\\\"\"\
         ,\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\"\
@@ -119,8 +119,8 @@ interactions:
       cache-control: [no-cache]
       content-length: ['1178']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:25:54 GMT']
-      etag: [W/"7a52a48a-c497-4504-89c5-ae8d4322f00c"]
+      date: ['Fri, 20 Jul 2018 19:31:17 GMT']
+      etag: [W/"4719cad4-b57f-41cb-b500-f6bf88d2a39d"]
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -136,22 +136,22 @@ interactions:
       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 networkmanagementclient/2.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.4
+          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 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=2017-11-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-02-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/\\\"7a52a48a-c497-4504-89c5-ae8d4322f00c\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"4719cad4-b57f-41cb-b500-f6bf88d2a39d\\\"\",\r\n \
         \ \"properties\": {\r\n    \"provisioningState\": \"Succeeded\",\r\n    \"\
         addressPrefix\": \"10.0.0.0/24\"\r\n  }\r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['414']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:25:54 GMT']
-      etag: [W/"7a52a48a-c497-4504-89c5-ae8d4322f00c"]
+      date: ['Fri, 20 Jul 2018 19:31:17 GMT']
+      etag: [W/"4719cad4-b57f-41cb-b500-f6bf88d2a39d"]
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -161,46 +161,47 @@ interactions:
       x-content-type-options: [nosniff]
     status: {code: 200, message: OK}
 - request:
-    body: 'b''b\''b\\\''{"location": "westus", "properties": {"ipConfigurations":
+    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/\\\\\\\\"7a52a48a-c497-4504-89c5-ae8d4322f00c\\\\\\\\""}},
-      "name": "pyarmconfig"}]}}\\\''\'''''
+      "name": "pyvmirsub9bd146b", "etag": "W/\\\\\\\\\\\\\\\\"4719cad4-b57f-41cb-b500-f6bf88d2a39d\\\\\\\\\\\\\\\\""}},
+      "name": "pyarmconfig"}]}}\\\\\\\''\\\''\'''''
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['537']
       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 networkmanagementclient/2.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.4
+          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 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=2017-11-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-02-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/\\\"44f68a36-a34f-4277-b8ed-8b35fe70cede\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"8cfa9197-f4e2-4789-abdd-1d71c60abbd8\\\"\",\r\n \
         \ \"location\": \"westus\",\r\n  \"properties\": {\r\n    \"provisioningState\"\
-        : \"Succeeded\",\r\n    \"resourceGuid\": \"4425d357-8ee6-4b76-9529-af00523230eb\"\
+        : \"Succeeded\",\r\n    \"resourceGuid\": \"1771de10-75f8-4a87-a1cf-5076fdd3fe5b\"\
         ,\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/\\\"44f68a36-a34f-4277-b8ed-8b35fe70cede\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"8cfa9197-f4e2-4789-abdd-1d71c60abbd8\\\"\"\
         ,\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\"\
         \r\n          },\r\n          \"primary\": true,\r\n          \"privateIPAddressVersion\"\
-        : \"IPv4\"\r\n        }\r\n      }\r\n    ],\r\n    \"dnsSettings\": {\r\n\
-        \      \"dnsServers\": [],\r\n      \"appliedDnsServers\": [],\r\n      \"\
-        internalDomainNameSuffix\": \"j4fb22q05l1e1mdh54ba5kaase.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}"}
-    headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/5c21cc45-f78d-424c-97ec-87dfbb1b0afa?api-version=2017-11-01']
+        : \"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}"}
+    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']
       cache-control: [no-cache]
-      content-length: ['1704']
+      content-length: ['1744']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:25:56 GMT']
+      date: ['Fri, 20 Jul 2018 19:31:20 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -214,17 +215,17 @@ 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 networkmanagementclient/2.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.4
+          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 Azure-SDK-For-Python]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/5c21cc45-f78d-424c-97ec-87dfbb1b0afa?api-version=2017-11-01
+    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
   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: ['Wed, 21 Mar 2018 21:26:26 GMT']
+      date: ['Fri, 20 Jul 2018 19:31:51 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -239,34 +240,35 @@ 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 networkmanagementclient/2.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.4
+          msrest_azure/0.4.34 networkmanagementclient/2.0.0rc3 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=2017-11-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-02-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/\\\"44f68a36-a34f-4277-b8ed-8b35fe70cede\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"8cfa9197-f4e2-4789-abdd-1d71c60abbd8\\\"\",\r\n \
         \ \"location\": \"westus\",\r\n  \"properties\": {\r\n    \"provisioningState\"\
-        : \"Succeeded\",\r\n    \"resourceGuid\": \"4425d357-8ee6-4b76-9529-af00523230eb\"\
+        : \"Succeeded\",\r\n    \"resourceGuid\": \"1771de10-75f8-4a87-a1cf-5076fdd3fe5b\"\
         ,\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/\\\"44f68a36-a34f-4277-b8ed-8b35fe70cede\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"8cfa9197-f4e2-4789-abdd-1d71c60abbd8\\\"\"\
         ,\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\"\
         \r\n          },\r\n          \"primary\": true,\r\n          \"privateIPAddressVersion\"\
-        : \"IPv4\"\r\n        }\r\n      }\r\n    ],\r\n    \"dnsSettings\": {\r\n\
-        \      \"dnsServers\": [],\r\n      \"appliedDnsServers\": [],\r\n      \"\
-        internalDomainNameSuffix\": \"j4fb22q05l1e1mdh54ba5kaase.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}"}
+        : \"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}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['1704']
+      content-length: ['1744']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:26:27 GMT']
-      etag: [W/"44f68a36-a34f-4277-b8ed-8b35fe70cede"]
+      date: ['Fri, 20 Jul 2018 19:31:52 GMT']
+      etag: [W/"8cfa9197-f4e2-4789-abdd-1d71c60abbd8"]
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -276,24 +278,25 @@ interactions:
       x-content-type-options: [nosniff]
     status: {code: 200, message: OK}
 - request:
-    body: 'b''b\''b\\\''{"location": "westus", "properties": {"hardwareProfile": {"vmSize":
-      "Standard_A0"}, "storageProfile": {"imageReference": {"publisher": "Canonical",
-      "offer": "UbuntuServer", "sku": "16.04.0-LTS", "version": "latest"}}, "osProfile":
-      {"computerName": "test", "adminUsername": "Foo12", "adminPassword": "BaR@123test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b"},
-      "networkProfile": {"networkInterfaces": [{"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/networkInterfaces/pyvmirnic9bd146b"}]}}}\\\''\'''''
+    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"}},
+      "osProfile": {"computerName": "test", "adminUsername": "Foo12", "adminPassword":
+      "BaR@123test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b"}, "networkProfile":
+      {"networkInterfaces": [{"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/networkInterfaces/pyvmirnic9bd146b"}]}}}\\\\\\\''\\\''\'''''
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['610']
       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.4
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 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=2017-12-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/virtualMachines/pyvmirvm9bd146b?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"5ce62867-146c-4f5d-8558-f5b42bcec93e\"\
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"6da6cba8-137b-4c4e-88a8-7cab9d83e457\"\
         ,\r\n    \"hardwareProfile\": {\r\n      \"vmSize\": \"Standard_A0\"\r\n \
         \   },\r\n    \"storageProfile\": {\r\n      \"imageReference\": {\r\n   \
         \     \"publisher\": \"Canonical\",\r\n        \"offer\": \"UbuntuServer\"\
@@ -304,18 +307,19 @@ interactions:
         \r\n        }\r\n      },\r\n      \"dataDisks\": []\r\n    },\r\n    \"osProfile\"\
         : {\r\n      \"computerName\": \"test\",\r\n      \"adminUsername\": \"Foo12\"\
         ,\r\n      \"linuxConfiguration\": {\r\n        \"disablePasswordAuthentication\"\
-        : false\r\n      },\r\n      \"secrets\": []\r\n    },\r\n    \"networkProfile\"\
+        : false,\r\n        \"provisionVMAgent\": true\r\n      },\r\n      \"secrets\"\
+        : [],\r\n      \"allowExtensionOperations\": true\r\n    },\r\n    \"networkProfile\"\
         : {\"networkInterfaces\":[{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/networkInterfaces/pyvmirnic9bd146b\"\
         }]},\r\n    \"provisioningState\": \"Creating\"\r\n  },\r\n  \"type\": \"\
         Microsoft.Compute/virtualMachines\",\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/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/d5847ed1-0136-4c26-8089-7d8cf783159e?api-version=2017-12-01']
+      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']
       cache-control: [no-cache]
-      content-length: ['1365']
+      content-length: ['1441']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:26:29 GMT']
+      date: ['Fri, 20 Jul 2018 19:31:55 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -330,19 +334,19 @@ 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.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/d5847ed1-0136-4c26-8089-7d8cf783159e?api-version=2017-12-01
+    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-03-21T21:26:29.5622701+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"d5847ed1-0136-4c26-8089-7d8cf783159e\"\
+    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: ['Wed, 21 Mar 2018 21:26:46 GMT']
+      date: ['Fri, 20 Jul 2018 19:32:05 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -350,7 +354,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;11988,Microsoft.Compute/GetOperation30Min;23985']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14999,Microsoft.Compute/GetOperation30Min;29996']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -358,19 +362,19 @@ 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.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/d5847ed1-0136-4c26-8089-7d8cf783159e?api-version=2017-12-01
+    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-03-21T21:26:29.5622701+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"d5847ed1-0136-4c26-8089-7d8cf783159e\"\
+    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: ['Wed, 21 Mar 2018 21:27:16 GMT']
+      date: ['Fri, 20 Jul 2018 19:32:36 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -378,7 +382,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;11989,Microsoft.Compute/GetOperation30Min;23983']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14996,Microsoft.Compute/GetOperation30Min;29993']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -386,19 +390,19 @@ 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.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/d5847ed1-0136-4c26-8089-7d8cf783159e?api-version=2017-12-01
+    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-03-21T21:26:29.5622701+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"d5847ed1-0136-4c26-8089-7d8cf783159e\"\
+    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: ['Wed, 21 Mar 2018 21:27:47 GMT']
+      date: ['Fri, 20 Jul 2018 19:33:08 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -406,7 +410,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;11988,Microsoft.Compute/GetOperation30Min;23979']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14993,Microsoft.Compute/GetOperation30Min;29990']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -414,19 +418,19 @@ 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.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/d5847ed1-0136-4c26-8089-7d8cf783159e?api-version=2017-12-01
+    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-03-21T21:26:29.5622701+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"d5847ed1-0136-4c26-8089-7d8cf783159e\"\
+    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: ['Wed, 21 Mar 2018 21:28:19 GMT']
+      date: ['Fri, 20 Jul 2018 19:33:42 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -434,7 +438,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;11987,Microsoft.Compute/GetOperation30Min;23976']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14990,Microsoft.Compute/GetOperation30Min;29987']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -442,19 +446,19 @@ 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.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/d5847ed1-0136-4c26-8089-7d8cf783159e?api-version=2017-12-01
+    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-03-21T21:26:29.5622701+00:00\",\r\
-        \n  \"endTime\": \"2018-03-21T21:28:25.4692465+00:00\",\r\n  \"status\": \"\
-        Succeeded\",\r\n  \"name\": \"d5847ed1-0136-4c26-8089-7d8cf783159e\"\r\n}"}
+    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}"}
     headers:
       cache-control: [no-cache]
       content-length: ['184']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:28:49 GMT']
+      date: ['Fri, 20 Jul 2018 19:34:12 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -462,7 +466,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;11986,Microsoft.Compute/GetOperation30Min;23974']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14988,Microsoft.Compute/GetOperation30Min;29985']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -470,36 +474,37 @@ 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.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/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Compute/virtualMachines/pyvmirvm9bd146b?api-version=2017-12-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/virtualMachines/pyvmirvm9bd146b?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"5ce62867-146c-4f5d-8558-f5b42bcec93e\"\
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"6da6cba8-137b-4c4e-88a8-7cab9d83e457\"\
         ,\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_3b3324871ff040749a0ae88c34f31d3c\"\
+        \      \"name\": \"pyvmirvm9bd146b_OsDisk_1_b5b630048cb34ce9b48f7ce25f52b837\"\
         ,\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_3b3324871ff040749a0ae88c34f31d3c\"\
+        ,\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        },\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\":\
-        \ {\r\n        \"disablePasswordAuthentication\": false\r\n      },\r\n  \
-        \    \"secrets\": []\r\n    },\r\n    \"networkProfile\": {\"networkInterfaces\"\
-        :[{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/networkInterfaces/pyvmirnic9bd146b\"\
+        \ {\r\n        \"disablePasswordAuthentication\": false,\r\n        \"provisionVMAgent\"\
+        : true\r\n      },\r\n      \"secrets\": [],\r\n      \"allowExtensionOperations\"\
+        : true\r\n    },\r\n    \"networkProfile\": {\"networkInterfaces\":[{\"id\"\
+        :\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/networkInterfaces/pyvmirnic9bd146b\"\
         }]},\r\n    \"provisioningState\": \"Succeeded\"\r\n  },\r\n  \"type\": \"\
         Microsoft.Compute/virtualMachines\",\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/virtualMachines/pyvmirvm9bd146b\"\
         ,\r\n  \"name\": \"pyvmirvm9bd146b\"\r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['1708']
+      content-length: ['1784']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:28:50 GMT']
+      date: ['Fri, 20 Jul 2018 19:34:13 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -507,7 +512,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4796,Microsoft.Compute/LowCostGet30Min;38356']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4196,Microsoft.Compute/LowCostGet30Min;33584']
     status: {code: 200, message: OK}
 - request:
     body: '{"location": "westus", "properties": {"creationData": {"createOption":
@@ -518,8 +523,8 @@ 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.4
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 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
@@ -529,19 +534,19 @@ interactions:
         : \"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/3c8b20e3-95c7-471c-9ddf-e0163b353a8a?api-version=2018-04-01']
+      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']
       cache-control: [no-cache]
       content-length: ['230']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:28:52 GMT']
+      date: ['Fri, 20 Jul 2018 19:34:14 GMT']
       expires: ['-1']
-      location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/DiskOperations/3c8b20e3-95c7-471c-9ddf-e0163b353a8a?monitor=true&api-version=2018-04-01']
+      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']
       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;3995']
-      x-ms-ratelimit-remaining-subscription-writes: ['1199']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateUpdateDisks3Min;998,Microsoft.Compute/CreateUpdateDisks30Min;3998']
+      x-ms-ratelimit-remaining-subscription-writes: ['1198']
     status: {code: 202, message: Accepted}
 - request:
     body: null
@@ -549,25 +554,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.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/DiskOperations/3c8b20e3-95c7-471c-9ddf-e0163b353a8a?api-version=2018-04-01
+    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
   response:
-    body: {string: "{\r\n  \"startTime\": \"2018-03-21T21:28:52.4669731+00:00\",\r\
-        \n  \"endTime\": \"2018-03-21T21:28:52.5919892+00:00\",\r\n  \"status\": \"\
+    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\": \"\
         Succeeded\",\r\n  \"properties\": {\r\n    \"output\": {\"sku\":{\"name\"\
         :\"Standard_LRS\",\"tier\":\"Standard\"},\"properties\":{\"creationData\"\
-        :{\"createOption\":\"Empty\"},\"diskSizeGB\":20,\"timeCreated\":\"2018-03-21T21:28:52.4669731+00:00\"\
+        :{\"createOption\":\"Empty\"},\"diskSizeGB\":20,\"timeCreated\":\"2018-07-20T19:34:15.0985166+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\": \"3c8b20e3-95c7-471c-9ddf-e0163b353a8a\"\
+        ,\"name\":\"mySecondDisk\"}\r\n  },\r\n  \"name\": \"138dc38a-a6be-4be9-abc1-cf8e7afe6dbd\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['706']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:29:22 GMT']
+      date: ['Fri, 20 Jul 2018 19:34:45 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -575,7 +580,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;249978']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;49996,Microsoft.Compute/GetOperation30Min;249994']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -583,15 +588,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.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/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Compute/disks/mySecondDisk?api-version=2018-04-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:28:52.4669731+00:00\",\r\n \
+        \ 20,\r\n    \"timeCreated\": \"2018-07-20T19:34:15.0985166+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\"\
@@ -600,7 +605,7 @@ interactions:
       cache-control: [no-cache]
       content-length: ['585']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:29:23 GMT']
+      date: ['Fri, 20 Jul 2018 19:34:46 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -608,42 +613,43 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4998,Microsoft.Compute/LowCostGet30Min;19988']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4997,Microsoft.Compute/LowCostGet30Min;19996']
     status: {code: 200, message: OK}
 - request:
-    body: '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_3b3324871ff040749a0ae88c34f31d3c",
+    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",
       "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_3b3324871ff040749a0ae88c34f31d3c",
+      {"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",
       "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":
-      {"disablePasswordAuthentication": false}, "secrets": []}, "networkProfile":
-      {"networkInterfaces": [{"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/networkInterfaces/pyvmirnic9bd146b"}]}}}\\\''\'''''
+      {"disablePasswordAuthentication": false, "provisionVMAgent": true}, "secrets":
+      [], "allowExtensionOperations": true}, "networkProfile": {"networkInterfaces":
+      [{"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/networkInterfaces/pyvmirnic9bd146b"}]}}}\\\\\\\''\\\''\'''''
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Length: ['1332']
+      Content-Length: ['1392']
       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.4
+          msrest_azure/0.4.34 computemanagementclient/4.0.0rc3 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=2017-12-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/virtualMachines/pyvmirvm9bd146b?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"5ce62867-146c-4f5d-8558-f5b42bcec93e\"\
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"6da6cba8-137b-4c4e-88a8-7cab9d83e457\"\
         ,\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_3b3324871ff040749a0ae88c34f31d3c\"\
+        \      \"name\": \"pyvmirvm9bd146b_OsDisk_1_b5b630048cb34ce9b48f7ce25f52b837\"\
         ,\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_3b3324871ff040749a0ae88c34f31d3c\"\
+        ,\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        },\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\": \"\
@@ -652,19 +658,20 @@ interactions:
         \r\n          },\r\n          \"diskSizeGB\": 20\r\n        }\r\n      ]\r\
         \n    },\r\n    \"osProfile\": {\r\n      \"computerName\": \"test\",\r\n\
         \      \"adminUsername\": \"Foo12\",\r\n      \"linuxConfiguration\": {\r\n\
-        \        \"disablePasswordAuthentication\": false\r\n      },\r\n      \"\
-        secrets\": []\r\n    },\r\n    \"networkProfile\": {\"networkInterfaces\"\
-        :[{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/networkInterfaces/pyvmirnic9bd146b\"\
+        \        \"disablePasswordAuthentication\": false,\r\n        \"provisionVMAgent\"\
+        : true\r\n      },\r\n      \"secrets\": [],\r\n      \"allowExtensionOperations\"\
+        : true\r\n    },\r\n    \"networkProfile\": {\"networkInterfaces\":[{\"id\"\
+        :\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/networkInterfaces/pyvmirnic9bd146b\"\
         }]},\r\n    \"provisioningState\": \"Updating\"\r\n  },\r\n  \"type\": \"\
         Microsoft.Compute/virtualMachines\",\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/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/c42aedf4-1614-47dc-81f3-37696396bda2?api-version=2017-12-01']
+      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']
       cache-control: [no-cache]
-      content-length: ['2175']
+      content-length: ['2251']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:29:25 GMT']
+      date: ['Fri, 20 Jul 2018 19:34:48 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -681,19 +688,19 @@ 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.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/c42aedf4-1614-47dc-81f3-37696396bda2?api-version=2017-12-01
+    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
   response:
-    body: {string: "{\r\n  \"startTime\": \"2018-03-21T21:29:25.1285754+00:00\",\r\
-        \n  \"endTime\": \"2018-03-21T21:29:32.6769305+00:00\",\r\n  \"status\": \"\
-        Succeeded\",\r\n  \"name\": \"c42aedf4-1614-47dc-81f3-37696396bda2\"\r\n}"}
+    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}"}
     headers:
       cache-control: [no-cache]
       content-length: ['184']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:29:55 GMT']
+      date: ['Fri, 20 Jul 2018 19:35:19 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -701,7 +708,7 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;11985,Microsoft.Compute/GetOperation30Min;23970']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14989,Microsoft.Compute/GetOperation30Min;29986']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -709,21 +716,21 @@ 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.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/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Compute/virtualMachines/pyvmirvm9bd146b?api-version=2017-12-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/virtualMachines/pyvmirvm9bd146b?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"5ce62867-146c-4f5d-8558-f5b42bcec93e\"\
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"6da6cba8-137b-4c4e-88a8-7cab9d83e457\"\
         ,\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_3b3324871ff040749a0ae88c34f31d3c\"\
+        \      \"name\": \"pyvmirvm9bd146b_OsDisk_1_b5b630048cb34ce9b48f7ce25f52b837\"\
         ,\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_3b3324871ff040749a0ae88c34f31d3c\"\
+        ,\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        },\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\": \"\
@@ -732,18 +739,19 @@ interactions:
         \r\n          },\r\n          \"diskSizeGB\": 20\r\n        }\r\n      ]\r\
         \n    },\r\n    \"osProfile\": {\r\n      \"computerName\": \"test\",\r\n\
         \      \"adminUsername\": \"Foo12\",\r\n      \"linuxConfiguration\": {\r\n\
-        \        \"disablePasswordAuthentication\": false\r\n      },\r\n      \"\
-        secrets\": []\r\n    },\r\n    \"networkProfile\": {\"networkInterfaces\"\
-        :[{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/networkInterfaces/pyvmirnic9bd146b\"\
+        \        \"disablePasswordAuthentication\": false,\r\n        \"provisionVMAgent\"\
+        : true\r\n      },\r\n      \"secrets\": [],\r\n      \"allowExtensionOperations\"\
+        : true\r\n    },\r\n    \"networkProfile\": {\"networkInterfaces\":[{\"id\"\
+        :\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_vm_implicit_md9bd146b/providers/Microsoft.Network/networkInterfaces/pyvmirnic9bd146b\"\
         }]},\r\n    \"provisioningState\": \"Succeeded\"\r\n  },\r\n  \"type\": \"\
         Microsoft.Compute/virtualMachines\",\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/virtualMachines/pyvmirvm9bd146b\"\
         ,\r\n  \"name\": \"pyvmirvm9bd146b\"\r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['2176']
+      content-length: ['2252']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 21 Mar 2018 21:29:55 GMT']
+      date: ['Fri, 20 Jul 2018 19:35:20 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
@@ -751,6 +759,6 @@ interactions:
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
       x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4792,Microsoft.Compute/LowCostGet30Min;38352']
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4191,Microsoft.Compute/LowCostGet30Min;33582']
     status: {code: 200, message: OK}
 version: 1
diff --git a/azure-mgmt-compute/tests/recordings/test_mgmt_msi.test_create_msi_enabled_vm.yaml b/azure-mgmt-compute/tests/recordings/test_mgmt_msi.test_create_msi_enabled_vm.yaml
index bfb17eb18529..44b1f0fe4d8f 100644
--- a/azure-mgmt-compute/tests/recordings/test_mgmt_msi.test_create_msi_enabled_vm.yaml
+++ b/azure-mgmt-compute/tests/recordings/test_mgmt_msi.test_create_msi_enabled_vm.yaml
@@ -9,62 +9,66 @@ interactions:
       Connection: [keep-alive]
       Content-Length: ['184']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 networkmanagementclient/1.6.0 Azure-SDK-For-Python]
+      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]
       accept-language: [en-US]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Network/virtualNetworks/pyvmirnet507d1052?api-version=2017-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Network/virtualNetworks/pyvmirnet507d1052?api-version=2018-02-01
   response:
     body: {string: "{\r\n  \"name\": \"pyvmirnet507d1052\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Network/virtualNetworks/pyvmirnet507d1052\"\
-        ,\r\n  \"etag\": \"W/\\\"bb7c270c-5910-4a68-bbe1-99737f15bcaa\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"b822003c-a09f-48d8-b434-9febc9161d8d\\\"\",\r\n \
         \ \"type\": \"Microsoft.Network/virtualNetworks\",\r\n  \"location\": \"westus\"\
-        ,\r\n  \"properties\": {\r\n    \"provisioningState\": \"Updating\",\r\n \
-        \   \"resourceGuid\": \"0e928848-8c6a-47ce-8cf1-bb9f9496d169\",\r\n    \"\
+        ,\r\n  \"properties\": {\r\n    \"provisioningState\": \"Succeeded\",\r\n\
+        \    \"resourceGuid\": \"c45f6b49-dc06-49b9-8e21-ae6f9812c0dd\",\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\"\
         : \"pyvmirsub507d1052\",\r\n        \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Network/virtualNetworks/pyvmirnet507d1052/subnets/pyvmirsub507d1052\"\
-        ,\r\n        \"etag\": \"W/\\\"bb7c270c-5910-4a68-bbe1-99737f15bcaa\\\"\"\
-        ,\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\"\
-        : false,\r\n    \"enableVmProtection\": false\r\n  }\r\n}"}
+        ,\r\n        \"etag\": \"W/\\\"b822003c-a09f-48d8-b434-9febc9161d8d\\\"\"\
+        ,\r\n        \"properties\": {\r\n          \"provisioningState\": \"Succeeded\"\
+        ,\r\n          \"addressPrefix\": \"10.0.0.0/24\",\r\n          \"ipConfigurations\"\
+        : [\r\n            {\r\n              \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Network/networkInterfaces/pyvmirnic507d1052/ipConfigurations/pyarmconfig\"\
+        \r\n            }\r\n          ]\r\n        }\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/df5b0da3-d0e8-4e20-8bd1-ba8fa8f8cfbc?api-version=2017-09-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/c85715f6-0991-4296-94c9-f62688952687?api-version=2018-02-01']
       cache-control: [no-cache]
-      content-length: ['1163']
+      content-length: ['1474']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:12:30 GMT']
+      date: ['Fri, 20 Jul 2018 18:59:44 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-subscription-writes: ['1199']
-    status: {code: 201, message: Created}
+      transfer-encoding: [chunked]
+      vary: [Accept-Encoding]
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-subscription-writes: ['1198']
+    status: {code: 200, message: OK}
 - request:
     body: null
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 networkmanagementclient/1.6.0 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      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]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/df5b0da3-d0e8-4e20-8bd1-ba8fa8f8cfbc?api-version=2017-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/c85715f6-0991-4296-94c9-f62688952687?api-version=2018-02-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: ['Wed, 22 Nov 2017 17:12:35 GMT']
+      date: ['Fri, 20 Jul 2018 19:00:14 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]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -72,38 +76,39 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 networkmanagementclient/1.6.0 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      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]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Network/virtualNetworks/pyvmirnet507d1052?api-version=2017-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Network/virtualNetworks/pyvmirnet507d1052?api-version=2018-02-01
   response:
     body: {string: "{\r\n  \"name\": \"pyvmirnet507d1052\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Network/virtualNetworks/pyvmirnet507d1052\"\
-        ,\r\n  \"etag\": \"W/\\\"c4f72218-692a-473b-959f-6f36939d57b5\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"b822003c-a09f-48d8-b434-9febc9161d8d\\\"\",\r\n \
         \ \"type\": \"Microsoft.Network/virtualNetworks\",\r\n  \"location\": \"westus\"\
         ,\r\n  \"properties\": {\r\n    \"provisioningState\": \"Succeeded\",\r\n\
-        \    \"resourceGuid\": \"0e928848-8c6a-47ce-8cf1-bb9f9496d169\",\r\n    \"\
+        \    \"resourceGuid\": \"c45f6b49-dc06-49b9-8e21-ae6f9812c0dd\",\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\"\
         : \"pyvmirsub507d1052\",\r\n        \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Network/virtualNetworks/pyvmirnet507d1052/subnets/pyvmirsub507d1052\"\
-        ,\r\n        \"etag\": \"W/\\\"c4f72218-692a-473b-959f-6f36939d57b5\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"b822003c-a09f-48d8-b434-9febc9161d8d\\\"\"\
         ,\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\"\
-        : false,\r\n    \"enableVmProtection\": false\r\n  }\r\n}"}
+        ,\r\n          \"addressPrefix\": \"10.0.0.0/24\",\r\n          \"ipConfigurations\"\
+        : [\r\n            {\r\n              \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Network/networkInterfaces/pyvmirnic507d1052/ipConfigurations/pyarmconfig\"\
+        \r\n            }\r\n          ]\r\n        }\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: ['1165']
+      content-length: ['1474']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:12:35 GMT']
-      etag: [W/"c4f72218-692a-473b-959f-6f36939d57b5"]
+      date: ['Fri, 20 Jul 2018 19:00:15 GMT']
+      etag: [W/"b822003c-a09f-48d8-b434-9febc9161d8d"]
       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]
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -112,165 +117,103 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 networkmanagementclient/1.6.0 Azure-SDK-For-Python]
+      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]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Network/virtualNetworks/pyvmirnet507d1052/subnets/pyvmirsub507d1052?api-version=2017-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Network/virtualNetworks/pyvmirnet507d1052/subnets/pyvmirsub507d1052?api-version=2018-02-01
   response:
     body: {string: "{\r\n  \"name\": \"pyvmirsub507d1052\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Network/virtualNetworks/pyvmirnet507d1052/subnets/pyvmirsub507d1052\"\
-        ,\r\n  \"etag\": \"W/\\\"c4f72218-692a-473b-959f-6f36939d57b5\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"b822003c-a09f-48d8-b434-9febc9161d8d\\\"\",\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    \"ipConfigurations\": [\r\n     \
+        \ {\r\n        \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Network/networkInterfaces/pyvmirnic507d1052/ipConfigurations/pyarmconfig\"\
+        \r\n      }\r\n    ]\r\n  }\r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['408']
+      content-length: ['687']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:12:36 GMT']
-      etag: [W/"c4f72218-692a-473b-959f-6f36939d57b5"]
+      date: ['Fri, 20 Jul 2018 19:00:16 GMT']
+      etag: [W/"b822003c-a09f-48d8-b434-9febc9161d8d"]
       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]
     status: {code: 200, message: OK}
 - request:
-    body: 'b''b\''b\\\''{"location": "westus", "properties": {"ipConfigurations":
+    body: 'b''b\''b\\\''b\\\\\\\''{"location": "westus", "properties": {"ipConfigurations":
       [{"properties": {"privateIPAllocationMethod": "Dynamic", "subnet": {"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Network/virtualNetworks/pyvmirnet507d1052/subnets/pyvmirsub507d1052",
       "properties": {"addressPrefix": "10.0.0.0/24", "provisioningState": "Succeeded"},
-      "name": "pyvmirsub507d1052", "etag": "W/\\\\\\\\"c4f72218-692a-473b-959f-6f36939d57b5\\\\\\\\""}},
-      "name": "pyarmconfig"}]}}\\\''\'''''
+      "name": "pyvmirsub507d1052", "etag": "W/\\\\\\\\\\\\\\\\"b822003c-a09f-48d8-b434-9febc9161d8d\\\\\\\\\\\\\\\\""}},
+      "name": "pyarmconfig"}]}}\\\\\\\''\\\''\'''''
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['531']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 networkmanagementclient/1.6.0 Azure-SDK-For-Python]
+      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]
       accept-language: [en-US]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Network/networkInterfaces/pyvmirnic507d1052?api-version=2017-09-01
-  response:
-    body: {string: "{\r\n  \"name\": \"pyvmirnic507d1052\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Network/networkInterfaces/pyvmirnic507d1052\"\
-        ,\r\n  \"etag\": \"W/\\\"9a36d932-234f-4b6d-93b8-84f36f69b7a2\\\"\",\r\n \
-        \ \"location\": \"westus\",\r\n  \"properties\": {\r\n    \"provisioningState\"\
-        : \"Succeeded\",\r\n    \"resourceGuid\": \"889a3e3e-6468-4825-bcb7-5c830ab09960\"\
-        ,\r\n    \"ipConfigurations\": [\r\n      {\r\n        \"name\": \"pyarmconfig\"\
-        ,\r\n        \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Network/networkInterfaces/pyvmirnic507d1052/ipConfigurations/pyarmconfig\"\
-        ,\r\n        \"etag\": \"W/\\\"9a36d932-234f-4b6d-93b8-84f36f69b7a2\\\"\"\
-        ,\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_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Network/virtualNetworks/pyvmirnet507d1052/subnets/pyvmirsub507d1052\"\
-        \r\n          },\r\n          \"primary\": true,\r\n          \"privateIPAddressVersion\"\
-        : \"IPv4\"\r\n        }\r\n      }\r\n    ],\r\n    \"dnsSettings\": {\r\n\
-        \      \"dnsServers\": [],\r\n      \"appliedDnsServers\": [],\r\n      \"\
-        internalDomainNameSuffix\": \"jcejedtkrthepdhrxopzjfwrnb.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/015ea421-4ca0-49d6-a35f-5d43a40bf232?api-version=2017-09-01']
-      cache-control: [no-cache]
-      content-length: ['1621']
-      content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:12:38 GMT']
-      expires: ['-1']
-      pragma: [no-cache]
-      server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
-      strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-subscription-writes: ['1199']
-    status: {code: 201, message: Created}
-- request:
-    body: null
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 networkmanagementclient/1.6.0 Azure-SDK-For-Python]
-      accept-language: [en-US]
-    method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Network/locations/westus/operations/015ea421-4ca0-49d6-a35f-5d43a40bf232?api-version=2017-09-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: ['Wed, 22 Nov 2017 17:13:08 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]
-    status: {code: 200, message: OK}
-- request:
-    body: null
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 networkmanagementclient/1.6.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_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Network/networkInterfaces/pyvmirnic507d1052?api-version=2017-09-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Network/networkInterfaces/pyvmirnic507d1052?api-version=2018-02-01
   response:
     body: {string: "{\r\n  \"name\": \"pyvmirnic507d1052\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Network/networkInterfaces/pyvmirnic507d1052\"\
-        ,\r\n  \"etag\": \"W/\\\"9a36d932-234f-4b6d-93b8-84f36f69b7a2\\\"\",\r\n \
+        ,\r\n  \"etag\": \"W/\\\"8840b2d2-472d-4e84-9d44-044f63bdb36a\\\"\",\r\n \
         \ \"location\": \"westus\",\r\n  \"properties\": {\r\n    \"provisioningState\"\
-        : \"Succeeded\",\r\n    \"resourceGuid\": \"889a3e3e-6468-4825-bcb7-5c830ab09960\"\
+        : \"Succeeded\",\r\n    \"resourceGuid\": \"ffb2913e-a892-497e-8797-156e42e33e52\"\
         ,\r\n    \"ipConfigurations\": [\r\n      {\r\n        \"name\": \"pyarmconfig\"\
         ,\r\n        \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Network/networkInterfaces/pyvmirnic507d1052/ipConfigurations/pyarmconfig\"\
-        ,\r\n        \"etag\": \"W/\\\"9a36d932-234f-4b6d-93b8-84f36f69b7a2\\\"\"\
+        ,\r\n        \"etag\": \"W/\\\"8840b2d2-472d-4e84-9d44-044f63bdb36a\\\"\"\
         ,\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_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Network/virtualNetworks/pyvmirnet507d1052/subnets/pyvmirsub507d1052\"\
         \r\n          },\r\n          \"primary\": true,\r\n          \"privateIPAddressVersion\"\
-        : \"IPv4\"\r\n        }\r\n      }\r\n    ],\r\n    \"dnsSettings\": {\r\n\
-        \      \"dnsServers\": [],\r\n      \"appliedDnsServers\": [],\r\n      \"\
-        internalDomainNameSuffix\": \"jcejedtkrthepdhrxopzjfwrnb.dx.internal.cloudapp.net\"\
-        \r\n    },\r\n    \"enableAcceleratedNetworking\": false,\r\n    \"enableIPForwarding\"\
-        : false\r\n  },\r\n  \"type\": \"Microsoft.Network/networkInterfaces\"\r\n\
-        }"}
+        : \"IPv4\",\r\n          \"isInUseWithService\": false\r\n        }\r\n  \
+        \    }\r\n    ],\r\n    \"dnsSettings\": {\r\n      \"dnsServers\": [],\r\n\
+        \      \"appliedDnsServers\": [],\r\n      \"internalDomainNameSuffix\": \"\
+        jfvv5rag1s2utdrbvzxzqewa1f.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}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['1621']
+      content-length: ['1722']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:13:08 GMT']
-      etag: [W/"9a36d932-234f-4b6d-93b8-84f36f69b7a2"]
+      date: ['Fri, 20 Jul 2018 19:00:17 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-subscription-writes: ['1199']
     status: {code: 200, message: OK}
 - request:
-    body: 'b''b\''b\\\''{"location": "westus", "properties": {"hardwareProfile": {"vmSize":
-      "Standard_A0"}, "storageProfile": {"imageReference": {"publisher": "Canonical",
-      "offer": "UbuntuServer", "sku": "16.04.0-LTS", "version": "latest"}}, "osProfile":
-      {"computerName": "test", "adminUsername": "Foo12", "adminPassword": "BaR@123test_mgmt_msi_test_create_msi_enabled_vm507d1052"},
-      "networkProfile": {"networkInterfaces": [{"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Network/networkInterfaces/pyvmirnic507d1052"}]}},
-      "identity": {"type": "SystemAssigned"}}\\\''\'''''
+    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"}},
+      "osProfile": {"computerName": "test", "adminUsername": "Foo12", "adminPassword":
+      "BaR@123test_mgmt_msi_test_create_msi_enabled_vm507d1052"}, "networkProfile":
+      {"networkInterfaces": [{"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Network/networkInterfaces/pyvmirnic507d1052"}]}},
+      "identity": {"type": "SystemAssigned"}}\\\\\\\''\\\''\'''''
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Length: ['633']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      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]
       accept-language: [en-US]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Compute/virtualMachines/pyvmirvm507d1052?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Compute/virtualMachines/pyvmirvm507d1052?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"c48b41b9-1a29-4dbc-b692-808bba25f2e6\"\
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"48b5e051-e721-4592-933d-d8508c270672\"\
         ,\r\n    \"hardwareProfile\": {\r\n      \"vmSize\": \"Standard_A0\"\r\n \
         \   },\r\n    \"storageProfile\": {\r\n      \"imageReference\": {\r\n   \
         \     \"publisher\": \"Canonical\",\r\n        \"offer\": \"UbuntuServer\"\
@@ -281,25 +224,27 @@ interactions:
         \r\n        }\r\n      },\r\n      \"dataDisks\": []\r\n    },\r\n    \"osProfile\"\
         : {\r\n      \"computerName\": \"test\",\r\n      \"adminUsername\": \"Foo12\"\
         ,\r\n      \"linuxConfiguration\": {\r\n        \"disablePasswordAuthentication\"\
-        : false\r\n      },\r\n      \"secrets\": []\r\n    },\r\n    \"networkProfile\"\
+        : false,\r\n        \"provisionVMAgent\": true\r\n      },\r\n      \"secrets\"\
+        : [],\r\n      \"allowExtensionOperations\": true\r\n    },\r\n    \"networkProfile\"\
         : {\"networkInterfaces\":[{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Network/networkInterfaces/pyvmirnic507d1052\"\
         }]},\r\n    \"provisioningState\": \"Creating\"\r\n  },\r\n  \"type\": \"\
         Microsoft.Compute/virtualMachines\",\r\n  \"location\": \"westus\",\r\n  \"\
         identity\": {\r\n    \"type\": \"SystemAssigned\",\r\n    \"principalId\"\
-        : \"76e7a747-fd23-4a21-a22d-4ecca09fe705\",\r\n    \"tenantId\": \"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a\"\
+        : \"3b8badd3-bb4c-464c-9d0e-0211aed49274\",\r\n    \"tenantId\": \"72f988bf-86f1-41af-91ab-2d7cd011db47\"\
         \r\n  },\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Compute/virtualMachines/pyvmirvm507d1052\"\
         ,\r\n  \"name\": \"pyvmirvm507d1052\"\r\n}"}
     headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/376a08a0-ac15-4e3f-93b7-e6b27b3c98b5?api-version=2017-12-01']
+      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/4f476e68-18ea-4134-a026-1643484ef773?api-version=2018-06-01']
       cache-control: [no-cache]
-      content-length: ['1520']
+      content-length: ['1596']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:13:13 GMT']
+      date: ['Fri, 20 Jul 2018 19:00:23 GMT']
       expires: ['-1']
       pragma: [no-cache]
       server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
       strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateUpdateVM3Min;298,Microsoft.Compute/CreateUpdateVM30Min;1498']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/PutVM3Min;239,Microsoft.Compute/PutVM30Min;1198']
       x-ms-ratelimit-remaining-subscription-writes: ['1199']
     status: {code: 201, message: Created}
 - request:
@@ -308,28 +253,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      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/376a08a0-ac15-4e3f-93b7-e6b27b3c98b5?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/4f476e68-18ea-4134-a026-1643484ef773?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:13:12.1525597+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"376a08a0-ac15-4e3f-93b7-e6b27b3c98b5\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T19:00:23.7486557+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"4f476e68-18ea-4134-a026-1643484ef773\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:13:43 GMT']
+      date: ['Fri, 20 Jul 2018 19:00:40 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2147,Microsoft.Compute/GetOperation30Min;17987']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14998,Microsoft.Compute/GetOperation30Min;29973']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -337,28 +281,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      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/376a08a0-ac15-4e3f-93b7-e6b27b3c98b5?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/4f476e68-18ea-4134-a026-1643484ef773?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:13:12.1525597+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"376a08a0-ac15-4e3f-93b7-e6b27b3c98b5\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T19:00:23.7486557+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"4f476e68-18ea-4134-a026-1643484ef773\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:14:14 GMT']
+      date: ['Fri, 20 Jul 2018 19:01:13 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2141,Microsoft.Compute/GetOperation30Min;17981']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14996,Microsoft.Compute/GetOperation30Min;29971']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -366,28 +309,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      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/376a08a0-ac15-4e3f-93b7-e6b27b3c98b5?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/4f476e68-18ea-4134-a026-1643484ef773?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:13:12.1525597+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"376a08a0-ac15-4e3f-93b7-e6b27b3c98b5\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T19:00:23.7486557+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"4f476e68-18ea-4134-a026-1643484ef773\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:14:44 GMT']
+      date: ['Fri, 20 Jul 2018 19:01:45 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2136,Microsoft.Compute/GetOperation30Min;17976']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14993,Microsoft.Compute/GetOperation30Min;29968']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -395,28 +337,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      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/376a08a0-ac15-4e3f-93b7-e6b27b3c98b5?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/4f476e68-18ea-4134-a026-1643484ef773?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:13:12.1525597+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"376a08a0-ac15-4e3f-93b7-e6b27b3c98b5\"\
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T19:00:23.7486557+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"4f476e68-18ea-4134-a026-1643484ef773\"\
         \r\n}"}
     headers:
       cache-control: [no-cache]
       content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:15:14 GMT']
+      date: ['Fri, 20 Jul 2018 19:02:17 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2131,Microsoft.Compute/GetOperation30Min;17969']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14990,Microsoft.Compute/GetOperation30Min;29965']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -424,28 +365,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      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/376a08a0-ac15-4e3f-93b7-e6b27b3c98b5?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/4f476e68-18ea-4134-a026-1643484ef773?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:13:12.1525597+00:00\",\r\
-        \n  \"endTime\": \"2017-11-22T17:15:28.9658923+00:00\",\r\n  \"status\": \"\
-        Succeeded\",\r\n  \"name\": \"376a08a0-ac15-4e3f-93b7-e6b27b3c98b5\"\r\n}"}
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T19:00:23.7486557+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"4f476e68-18ea-4134-a026-1643484ef773\"\
+        \r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['184']
+      content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:15:45 GMT']
+      date: ['Fri, 20 Jul 2018 19:02:48 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2130,Microsoft.Compute/GetOperation30Min;17964']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14987,Microsoft.Compute/GetOperation30Min;29962']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -453,47 +393,27 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      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/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Compute/virtualMachines/pyvmirvm507d1052?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/4f476e68-18ea-4134-a026-1643484ef773?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"c48b41b9-1a29-4dbc-b692-808bba25f2e6\"\
-        ,\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\": \"pyvmirvm507d1052_OsDisk_1_438adbe8e4c94995a23a94104e10dab7\"\
-        ,\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_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Compute/disks/pyvmirvm507d1052_OsDisk_1_438adbe8e4c94995a23a94104e10dab7\"\
-        \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\":\
-        \ {\r\n        \"disablePasswordAuthentication\": false\r\n      },\r\n  \
-        \    \"secrets\": []\r\n    },\r\n    \"networkProfile\": {\"networkInterfaces\"\
-        :[{\"id\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Network/networkInterfaces/pyvmirnic507d1052\"\
-        }]},\r\n    \"provisioningState\": \"Succeeded\"\r\n  },\r\n  \"type\": \"\
-        Microsoft.Compute/virtualMachines\",\r\n  \"location\": \"westus\",\r\n  \"\
-        identity\": {\r\n    \"type\": \"SystemAssigned\",\r\n    \"principalId\"\
-        : \"76e7a747-fd23-4a21-a22d-4ecca09fe705\",\r\n    \"tenantId\": \"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a\"\
-        \r\n  },\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Compute/virtualMachines/pyvmirvm507d1052\"\
-        ,\r\n  \"name\": \"pyvmirvm507d1052\"\r\n}"}
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T19:00:23.7486557+00:00\",\r\
+        \n  \"status\": \"InProgress\",\r\n  \"name\": \"4f476e68-18ea-4134-a026-1643484ef773\"\
+        \r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['1856']
+      content-length: ['134']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:15:45 GMT']
+      date: ['Fri, 20 Jul 2018 19:03:19 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4990,Microsoft.Compute/LowCostGet30Min;39990']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14984,Microsoft.Compute/GetOperation30Min;29959']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -501,124 +421,75 @@ interactions:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 authorizationmanagementclient/0.30.0 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      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/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Authorization/roleDefinitions?$filter=roleName%20eq%20%27Contributor%27&api-version=2015-07-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/4f476e68-18ea-4134-a026-1643484ef773?api-version=2018-06-01
   response:
-    body: {string: '{"value":[{"properties":{"roleName":"Contributor","type":"BuiltInRole","description":"Lets
-        you manage everything except access to resources.","assignableScopes":["/"],"permissions":[{"actions":["*"],"notActions":["Microsoft.Authorization/*/Delete","Microsoft.Authorization/*/Write","Microsoft.Authorization/elevateAccess/Action"]}],"createdOn":"0001-01-01T08:00:00.0000000Z","updatedOn":"2016-12-14T02:04:45.1393855Z","createdBy":null,"updatedBy":null},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c","type":"Microsoft.Authorization/roleDefinitions","name":"b24988ac-6180-42a0-ab88-20f7382dd24c"}]}'}
+    body: {string: "{\r\n  \"startTime\": \"2018-07-20T19:00:23.7486557+00:00\",\r\
+        \n  \"endTime\": \"2018-07-20T19:03:41.3751026+00:00\",\r\n  \"status\": \"\
+        Succeeded\",\r\n  \"name\": \"4f476e68-18ea-4134-a026-1643484ef773\"\r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['696']
+      content-length: ['184']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:15:46 GMT']
+      date: ['Fri, 20 Jul 2018 19:03:50 GMT']
       expires: ['-1']
       pragma: [no-cache]
-      server: [Microsoft-IIS/8.5]
-      set-cookie: [x-ms-gateway-slice=productionb; path=/; secure; HttpOnly]
+      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-powered-by: [ASP.NET]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;14983,Microsoft.Compute/GetOperation30Min;29956']
     status: {code: 200, message: OK}
-- request:
-    body: 'b''b\''b\\\''{"properties": {"roleDefinitionId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c",
-      "principalId": "76e7a747-fd23-4a21-a22d-4ecca09fe705"}}\\\''\'''''
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      Connection: [keep-alive]
-      Content-Length: ['233']
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 authorizationmanagementclient/0.30.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_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Authorization/roleAssignments/193baada-5ac2-444b-b146-de622a45a95b?api-version=2015-07-01
-  response:
-    body: {string: '{"properties":{"roleDefinitionId":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c","principalId":"76e7a747-fd23-4a21-a22d-4ecca09fe705","scope":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052","createdOn":"2017-11-22T17:15:47.6986723Z","updatedOn":"2017-11-22T17:15:47.6986723Z","createdBy":null,"updatedBy":"5963f50c-7c43-405c-af7e-53294de76abd"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Authorization/roleAssignments/193baada-5ac2-444b-b146-de622a45a95b","type":"Microsoft.Authorization/roleAssignments","name":"193baada-5ac2-444b-b146-de622a45a95b"}'}
-    headers:
-      cache-control: [no-cache]
-      content-length: ['814']
-      content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:15:49 GMT']
-      expires: ['-1']
-      pragma: [no-cache]
-      server: [Microsoft-IIS/8.5]
-      set-cookie: [x-ms-gateway-slice=productionb; path=/; secure; HttpOnly]
-      strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-content-type-options: [nosniff]
-      x-ms-ratelimit-remaining-subscription-writes: ['1199']
-      x-powered-by: [ASP.NET]
-    status: {code: 201, message: Created}
-- request:
-    body: '{"location": "westus", "properties": {"publisher": "Microsoft.ManagedIdentity",
-      "type": "ManagedIdentityExtensionForLinux", "typeHandlerVersion": "1.0", "autoUpgradeMinorVersion":
-      true, "settings": {"port": 50342}, "protectedSettings": {}}}'
-    headers:
-      Accept: [application/json]
-      Accept-Encoding: ['gzip, deflate']
-      Connection: [keep-alive]
-      Content-Length: ['240']
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
-    method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Compute/virtualMachines/pyvmirvm507d1052/extensions/pyvmirvm507d1052ManagedIdentityExtensionForLinux?api-version=2017-12-01
-  response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"publisher\": \"Microsoft.ManagedIdentity\"\
-        ,\r\n    \"type\": \"ManagedIdentityExtensionForLinux\",\r\n    \"typeHandlerVersion\"\
-        : \"1.0\",\r\n    \"autoUpgradeMinorVersion\": true,\r\n    \"settings\":\
-        \ {\"port\":50342},\r\n    \"provisioningState\": \"Creating\"\r\n  },\r\n\
-        \  \"type\": \"Microsoft.Compute/virtualMachines/extensions\",\r\n  \"location\"\
-        : \"westus\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Compute/virtualMachines/pyvmirvm507d1052/extensions/pyvmirvm507d1052ManagedIdentityExtensionForLinux\"\
-        ,\r\n  \"name\": \"pyvmirvm507d1052ManagedIdentityExtensionForLinux\"\r\n}"}
-    headers:
-      azure-asyncoperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/be475f07-1dde-4a25-bb54-30381830a11b?api-version=2017-12-01']
-      cache-control: [no-cache]
-      content-length: ['662']
-      content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:15:51 GMT']
-      expires: ['-1']
-      pragma: [no-cache]
-      server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
-      strict-transport-security: [max-age=31536000; includeSubDomains]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/CreateUpdateVM3Min;297,Microsoft.Compute/CreateUpdateVM30Min;1496']
-      x-ms-ratelimit-remaining-subscription-writes: ['1199']
-    status: {code: 201, message: Created}
 - request:
     body: null
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
-      Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
-      accept-language: [en-US]
+      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/be475f07-1dde-4a25-bb54-30381830a11b?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Compute/virtualMachines/pyvmirvm507d1052?api-version=2018-06-01
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:15:50.7637272+00:00\",\r\
-        \n  \"status\": \"InProgress\",\r\n  \"name\": \"be475f07-1dde-4a25-bb54-30381830a11b\"\
-        \r\n}"}
+    body: {string: "{\r\n  \"properties\": {\r\n    \"vmId\": \"48b5e051-e721-4592-933d-d8508c270672\"\
+        ,\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\": \"pyvmirvm507d1052_OsDisk_1_f13e840da20b4053aaf8dad6800c2f64\"\
+        ,\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_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Compute/disks/pyvmirvm507d1052_OsDisk_1_f13e840da20b4053aaf8dad6800c2f64\"\
+        \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\":\
+        \ {\r\n        \"disablePasswordAuthentication\": false,\r\n        \"provisionVMAgent\"\
+        : true\r\n      },\r\n      \"secrets\": [],\r\n      \"allowExtensionOperations\"\
+        : true\r\n    },\r\n    \"networkProfile\": {\"networkInterfaces\":[{\"id\"\
+        :\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Network/networkInterfaces/pyvmirnic507d1052\"\
+        }]},\r\n    \"provisioningState\": \"Succeeded\"\r\n  },\r\n  \"type\": \"\
+        Microsoft.Compute/virtualMachines\",\r\n  \"location\": \"westus\",\r\n  \"\
+        identity\": {\r\n    \"type\": \"SystemAssigned\",\r\n    \"principalId\"\
+        : \"3b8badd3-bb4c-464c-9d0e-0211aed49274\",\r\n    \"tenantId\": \"72f988bf-86f1-41af-91ab-2d7cd011db47\"\
+        \r\n  },\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Compute/virtualMachines/pyvmirvm507d1052\"\
+        ,\r\n  \"name\": \"pyvmirvm507d1052\"\r\n}"}
     headers:
       cache-control: [no-cache]
-      content-length: ['134']
+      content-length: ['1932']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:16:22 GMT']
+      date: ['Fri, 20 Jul 2018 19:03:50 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-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2133,Microsoft.Compute/GetOperation30Min;17962']
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4196,Microsoft.Compute/LowCostGet30Min;33583']
     status: {code: 200, message: OK}
 - request:
     body: null
@@ -627,59 +498,59 @@ interactions:
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      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 azure-mgmt-authorization/0.50.0 Azure-SDK-For-Python]
       accept-language: [en-US]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/be475f07-1dde-4a25-bb54-30381830a11b?api-version=2017-12-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Authorization/roleDefinitions?$filter=roleName%20eq%20%27Contributor%27&api-version=2018-01-01-preview
   response:
-    body: {string: "{\r\n  \"startTime\": \"2017-11-22T17:15:50.7637272+00:00\",\r\
-        \n  \"endTime\": \"2017-11-22T17:16:38.5007821+00:00\",\r\n  \"status\": \"\
-        Succeeded\",\r\n  \"name\": \"be475f07-1dde-4a25-bb54-30381830a11b\"\r\n}"}
+    body: {string: '{"value":[{"properties":{"roleName":"Contributor","type":"BuiltInRole","description":"Lets
+        you manage everything except access to resources.","assignableScopes":["/"],"permissions":[{"actions":["*"],"notActions":["Microsoft.Authorization/*/Delete","Microsoft.Authorization/*/Write","Microsoft.Authorization/elevateAccess/Action","Microsoft.Blueprint/blueprintAssignments/write","Microsoft.Blueprint/blueprintAssignments/delete"],"dataActions":[],"notDataActions":[]}],"createdOn":"0001-01-01T08:00:00.0000000Z","updatedOn":"2018-05-30T19:22:32.4538167Z","createdBy":null,"updatedBy":null},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c","type":"Microsoft.Authorization/roleDefinitions","name":"b24988ac-6180-42a0-ab88-20f7382dd24c"}]}'}
     headers:
       cache-control: [no-cache]
-      content-length: ['184']
+      content-length: ['832']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:16:53 GMT']
+      date: ['Fri, 20 Jul 2018 19:03:50 GMT']
       expires: ['-1']
       pragma: [no-cache]
-      server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
+      server: [Microsoft-IIS/10.0]
+      set-cookie: [x-ms-gateway-slice=productionb; path=/; secure; HttpOnly]
       strict-transport-security: [max-age=31536000; includeSubDomains]
       transfer-encoding: [chunked]
       vary: [Accept-Encoding]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/GetOperation3Min;2131,Microsoft.Compute/GetOperation30Min;17955']
+      x-content-type-options: [nosniff]
+      x-ms-request-charge: ['1']
+      x-powered-by: [ASP.NET]
     status: {code: 200, message: OK}
 - request:
-    body: null
+    body: 'b''b\''b\\\''b\\\\\\\''{"properties": {"roleDefinitionId": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c",
+      "principalId": "3b8badd3-bb4c-464c-9d0e-0211aed49274"}}\\\\\\\''\\\''\'''''
     headers:
       Accept: [application/json]
       Accept-Encoding: ['gzip, deflate']
       Connection: [keep-alive]
+      Content-Length: ['233']
       Content-Type: [application/json; charset=utf-8]
-      User-Agent: [python/3.6.2 (Windows-10-10.0.16299-SP0) requests/2.18.4 msrest/0.4.14
-          msrest_azure/0.4.14 computemanagementclient/3.0.1 Azure-SDK-For-Python]
+      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 azure-mgmt-authorization/0.50.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_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Compute/virtualMachines/pyvmirvm507d1052/extensions/pyvmirvm507d1052ManagedIdentityExtensionForLinux?api-version=2017-12-01
+    method: PUT
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Authorization/roleAssignments/05cabf20-c143-4eb8-9e4e-84ef3bde66c3?api-version=2018-01-01-preview
   response:
-    body: {string: "{\r\n  \"properties\": {\r\n    \"publisher\": \"Microsoft.ManagedIdentity\"\
-        ,\r\n    \"type\": \"ManagedIdentityExtensionForLinux\",\r\n    \"typeHandlerVersion\"\
-        : \"1.0\",\r\n    \"autoUpgradeMinorVersion\": true,\r\n    \"settings\":\
-        \ {\"port\":50342},\r\n    \"provisioningState\": \"Succeeded\"\r\n  },\r\n\
-        \  \"type\": \"Microsoft.Compute/virtualMachines/extensions\",\r\n  \"location\"\
-        : \"westus\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Compute/virtualMachines/pyvmirvm507d1052/extensions/pyvmirvm507d1052ManagedIdentityExtensionForLinux\"\
-        ,\r\n  \"name\": \"pyvmirvm507d1052ManagedIdentityExtensionForLinux\"\r\n}"}
+    body: {string: '{"properties":{"roleDefinitionId":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c","principalId":"3b8badd3-bb4c-464c-9d0e-0211aed49274","principalType":"ServicePrincipal","scope":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052","createdOn":"2018-07-20T19:03:53.1958528Z","updatedOn":"2018-07-20T19:03:53.1958528Z","createdBy":null,"updatedBy":"e33fbfd4-bc19-47c6-be55-5f5a7f950b7a"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_msi_test_create_msi_enabled_vm507d1052/providers/Microsoft.Authorization/roleAssignments/05cabf20-c143-4eb8-9e4e-84ef3bde66c3","type":"Microsoft.Authorization/roleAssignments","name":"05cabf20-c143-4eb8-9e4e-84ef3bde66c3"}'}
     headers:
       cache-control: [no-cache]
-      content-length: ['663']
+      content-length: ['849']
       content-type: [application/json; charset=utf-8]
-      date: ['Wed, 22 Nov 2017 17:16:53 GMT']
+      date: ['Fri, 20 Jul 2018 19:03:54 GMT']
       expires: ['-1']
       pragma: [no-cache]
-      server: [Microsoft-HTTPAPI/2.0, Microsoft-HTTPAPI/2.0]
+      server: [Microsoft-IIS/10.0]
+      set-cookie: [x-ms-gateway-slice=productionb; path=/; secure; HttpOnly]
       strict-transport-security: [max-age=31536000; includeSubDomains]
-      transfer-encoding: [chunked]
-      vary: [Accept-Encoding]
-      x-ms-ratelimit-remaining-resource: ['Microsoft.Compute/LowCostGet3Min;4987,Microsoft.Compute/LowCostGet30Min;39987']
-    status: {code: 200, message: OK}
+      x-content-type-options: [nosniff]
+      x-ms-ratelimit-remaining-subscription-writes: ['1199']
+      x-ms-request-charge: ['2']
+      x-powered-by: [ASP.NET]
+    status: {code: 201, message: Created}
 version: 1
diff --git a/azure-mgmt-compute/tests/test_mgmt_compute.py b/azure-mgmt-compute/tests/test_mgmt_compute.py
index 4ba4a177d0a2..84a161f417a2 100644
--- a/azure-mgmt-compute/tests/test_mgmt_compute.py
+++ b/azure-mgmt-compute/tests/test_mgmt_compute.py
@@ -51,7 +51,7 @@ def get_resource_names(self, base):
 
     def create_storage_account(self, group_name, location, storage_name):
         params_create = azure.mgmt.storage.models.StorageAccountCreateParameters(
-            sku=azure.mgmt.storage.models.Sku(azure.mgmt.storage.models.SkuName.standard_lrs),
+            sku=azure.mgmt.storage.models.Sku(name=azure.mgmt.storage.models.SkuName.standard_lrs),
             kind=azure.mgmt.storage.models.Kind.storage,
             location=location
         )
@@ -199,7 +199,7 @@ def test_virtual_machines_operations(self, resource_group, location):
         )
         vm_result = result_create.result()
         self.assertEqual(vm_result.name, names.vm)
-    
+
         # Get by name
         result_get = self.compute_client.virtual_machines.get(
             resource_group.name,
@@ -298,7 +298,7 @@ def test_virtual_machine_capture(self, resource_group, location):
             }
         )
         capture_result = async_capture.result()
-        self.assertTrue(hasattr(capture_result, 'output'))
+        assert capture_result.content_version == "1.0.0.0"
 
     @ResourceGroupPreparer()
     def test_vm_extensions(self, resource_group, location):
diff --git a/azure-mgmt-compute/tests/test_mgmt_msi.py b/azure-mgmt-compute/tests/test_mgmt_msi.py
index 97e866184296..cf0c908d75a9 100644
--- a/azure-mgmt-compute/tests/test_mgmt_msi.py
+++ b/azure-mgmt-compute/tests/test_mgmt_msi.py
@@ -115,25 +115,26 @@ def test_create_msi_enabled_vm(self, resource_group, location):
             )
 
         # Adds the MSI extension
-        ext_type_name = 'ManagedIdentityExtensionForLinux'
-        ext_name = vm_result.name + ext_type_name
-        params_create = virtual_machines_models.VirtualMachineExtension(
-            location=location,
-            publisher='Microsoft.ManagedIdentity',
-            virtual_machine_extension_type=ext_type_name,
-            type_handler_version='1.0',
-            auto_upgrade_minor_version=True,
-            settings={'port': 50342}, # Default port that should be used
-            protected_settings={},
-        )
-        result_create = self.compute_client.virtual_machine_extensions.create_or_update(
-            resource_group.name,
-            names.vm,
-            ext_name,
-            params_create,
-        )
-        result_create.wait()
-        
+        # This is deprecated, no extension needed anymore. Keep the code as extension example still.
+        # ext_type_name = 'ManagedIdentityExtensionForLinux'
+        # ext_name = vm_result.name + ext_type_name
+        # params_create = virtual_machines_models.VirtualMachineExtension(
+        #     location=location,
+        #     publisher='Microsoft.ManagedIdentity',
+        #     virtual_machine_extension_type=ext_type_name,
+        #     type_handler_version='1.0',
+        #     auto_upgrade_minor_version=True,
+        #     settings={'port': 50342}, # Default port that should be used
+        #     protected_settings={},
+        # )
+        # result_create = self.compute_client.virtual_machine_extensions.create_or_update(
+        #     resource_group.name,
+        #     names.vm,
+        #     ext_name,
+        #     params_create,
+        # )
+        # result_create.wait()
+
 
     ############# Should be generalized
 
@@ -215,4 +216,3 @@ def get_network_profile(self, network_interface_id):
                 ),
             ],
         )
-    
\ No newline at end of file

From dfcc1a52f4160f181e7ad6bb28af4d94d7eefc49 Mon Sep 17 00:00:00 2001
From: Laurent Mazuel <laurent.mazuel@gmail.com>
Date: Fri, 20 Jul 2018 12:42:57 -0700
Subject: [PATCH 28/29] Make it stable

---
 azure-mgmt-compute/azure/mgmt/compute/version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-mgmt-compute/azure/mgmt/compute/version.py b/azure-mgmt-compute/azure/mgmt/compute/version.py
index 6b28d101df44..5a310ec590fb 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.0rc3"
+VERSION = "4.0.0"

From 1ccf250ceb348c42a00f97b1db325b0463f1636e Mon Sep 17 00:00:00 2001
From: Laurent Mazuel <laurent.mazuel@gmail.com>
Date: Fri, 20 Jul 2018 12:48:54 -0700
Subject: [PATCH 29/29] ChangeLog

---
 azure-mgmt-compute/HISTORY.rst | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/azure-mgmt-compute/HISTORY.rst b/azure-mgmt-compute/HISTORY.rst
index 5f3c6db3392c..269ade956ebc 100644
--- a/azure-mgmt-compute/HISTORY.rst
+++ b/azure-mgmt-compute/HISTORY.rst
@@ -3,6 +3,34 @@
 Release History
 ===============
 
+4.0.0 (2018-07-20)
+++++++++++++++++++
+
+**Features**
+
+- Model VirtualMachineScaleSetIdentity has a new parameter user_assigned_identities
+- Model VirtualMachineScaleSetIPConfiguration has a new parameter application_security_groups
+- Model VirtualMachineScaleSetUpdateIPConfiguration has a new parameter application_security_groups
+- Model VirtualMachineIdentity has a new parameter user_assigned_identities
+- Model LinuxConfiguration has a new parameter provision_vm_agent
+- Model OSProfile has a new parameter allow_extension_operations
+- Added operation group GalleryImagesOperations
+- Added operation group GalleryImageVersionsOperations
+- Added operation group GalleriesOperations
+- Model UpgradeOperationHistoricalStatusInfoProperties has a new parameter rollback_info
+- Model UpgradePolicy has a new parameter auto_os_upgrade_policy
+- Added operation AvailabilitySetsOperations.list_by_subscription
+
+**Breaking changes**
+
+- Model VirtualMachineScaleSetIdentity no longer has parameter identity_ids
+- Model VirtualMachineScaleSetOSDisk no longer has parameter disk_size_gb
+- Model VirtualMachineScaleSetVM no longer has parameter zones
+- Model VirtualMachineScaleSetUpdateOSDisk no longer has parameter disk_size_gb
+- Model VirtualMachineIdentity no longer has parameter identity_ids
+
+New default API Version is now 2018-06-01
+
 4.0.0rc2 (2018-04-17)
 +++++++++++++++++++++
 
@@ -40,7 +68,7 @@ This version uses a next-generation code generator that *might* introduce breaki
 
   - Return type changes from `msrestazure.azure_operation.AzureOperationPoller` to `msrest.polling.LROPoller`. External API is the same.
   - Return type is now **always** a `msrest.polling.LROPoller`, regardless of the optional parameters used.
-  - The behavior has changed when using `raw=True`. Instead of returning the initial call result as `ClientRawResponse`, 
+  - The behavior has changed when using `raw=True`. Instead of returning the initial call result as `ClientRawResponse`,
     without polling, now this returns an LROPoller. After polling, the final resource will be returned as a `ClientRawResponse`.
   - New `polling` parameter. The default behavior is `Polling=True` which will poll using ARM algorithm. When `Polling=False`,
     the response of the initial call will be returned without polling.
@@ -216,7 +244,7 @@ to use the new Managed Disk feature instead of Storage.
 
 New APIVersion for "container" 2016-09-30.
 
-* several parameters (e.g. "username") now dynamically check before REST calls validity 
+* several parameters (e.g. "username") now dynamically check before REST calls validity
   against a regexp. Exception will be TypeError and not CloudError anymore.
 
 0.31.0 (2016-11-01)