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.

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.

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.

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.

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'},