From 2302606d598b3d2b8b11dad92b8ef352f91fd4eb Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Wed, 24 Jul 2019 04:25:26 -0700 Subject: [PATCH 1/6] [AutoPR compute/resource-manager] removing non-ascii character (#6460) * Generated from 090b727225320af61034c7278c3ccf51dcbef8a2 removing non-ascii character * Generated from 56ccb1151588cff87c1c92eee0e6c56e42c7f2f4 corrected the description --- .../azure/mgmt/compute/v2019_03_01/models/_models.py | 4 ++-- .../azure/mgmt/compute/v2019_03_01/models/_models_py3.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models.py b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models.py index 96dc4655ae3..12291b05dde 100644 --- a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models.py +++ b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models.py @@ -801,7 +801,7 @@ class DedicatedHostGroup(Resource): host group. :vartype hosts: list[~azure.mgmt.compute.v2019_03_01.models.SubResourceReadOnly] - :param zones: Availability Zone to use for this host group � only single + :param zones: Availability Zone to use for this host group. Only single zone is supported. The zone can be assigned only during creation. If not provided, the group supports all zones in the region. If provided, enforces each host in the group to be in the same zone. @@ -853,7 +853,7 @@ class DedicatedHostGroupUpdate(UpdateResource): host group. :vartype hosts: list[~azure.mgmt.compute.v2019_03_01.models.SubResourceReadOnly] - :param zones: Availability Zone to use for this host group � only single + :param zones: Availability Zone to use for this host group. Only single zone is supported. The zone can be assigned only during creation. If not provided, the group supports all zones in the region. If provided, enforces each host in the group to be in the same zone. diff --git a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models_py3.py b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models_py3.py index 8a662511798..f7d01ae1d2d 100644 --- a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models_py3.py +++ b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models_py3.py @@ -801,7 +801,7 @@ class DedicatedHostGroup(Resource): host group. :vartype hosts: list[~azure.mgmt.compute.v2019_03_01.models.SubResourceReadOnly] - :param zones: Availability Zone to use for this host group � only single + :param zones: Availability Zone to use for this host group. Only single zone is supported. The zone can be assigned only during creation. If not provided, the group supports all zones in the region. If provided, enforces each host in the group to be in the same zone. @@ -853,7 +853,7 @@ class DedicatedHostGroupUpdate(UpdateResource): host group. :vartype hosts: list[~azure.mgmt.compute.v2019_03_01.models.SubResourceReadOnly] - :param zones: Availability Zone to use for this host group � only single + :param zones: Availability Zone to use for this host group. Only single zone is supported. The zone can be assigned only during creation. If not provided, the group supports all zones in the region. If provided, enforces each host in the group to be in the same zone. From 4331824e1f90da71de079b120141f11eeff4d794 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Fri, 2 Aug 2019 11:18:13 -0700 Subject: [PATCH 2/6] [AutoPR compute/resource-manager] Add missing Gallery Application API in 2019-07-01 version (#6512) * Generated from 01293ebd64fa96d11d30d9b0ef1391cbe8e62443 Add missing Gallery Application API in 2019-07-01 version * Generated from 6637309053b80e0b62b01f1c240d72749e30f1c2 Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs --- .../compute/v2019_03_01/models/__init__.py | 6 ++ .../compute/v2019_03_01/models/_models.py | 62 ++++++++++++++++- .../compute/v2019_03_01/models/_models_py3.py | 66 +++++++++++++++++-- ...irtual_machine_scale_set_vms_operations.py | 8 ++- 4 files changed, 133 insertions(+), 9 deletions(-) diff --git a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/__init__.py b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/__init__.py index f12266d5ba5..090f6dc0c18 100644 --- a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/__init__.py +++ b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/__init__.py @@ -97,6 +97,7 @@ from ._models_py3 import RunCommandInputParameter from ._models_py3 import RunCommandParameterDefinition from ._models_py3 import RunCommandResult + from ._models_py3 import ScheduledEventsProfile from ._models_py3 import Sku from ._models_py3 import SshConfiguration from ._models_py3 import SshPublicKey @@ -104,6 +105,7 @@ from ._models_py3 import SubResource from ._models_py3 import SubResourceReadOnly from ._models_py3 import TargetRegion + from ._models_py3 import TerminateNotificationProfile from ._models_py3 import ThrottledRequestsInput from ._models_py3 import UpdateResource from ._models_py3 import UpgradeOperationHistoricalStatusInfo @@ -268,6 +270,7 @@ from ._models import RunCommandInputParameter from ._models import RunCommandParameterDefinition from ._models import RunCommandResult + from ._models import ScheduledEventsProfile from ._models import Sku from ._models import SshConfiguration from ._models import SshPublicKey @@ -275,6 +278,7 @@ from ._models import SubResource from ._models import SubResourceReadOnly from ._models import TargetRegion + from ._models import TerminateNotificationProfile from ._models import ThrottledRequestsInput from ._models import UpdateResource from ._models import UpgradeOperationHistoricalStatusInfo @@ -497,6 +501,7 @@ 'RunCommandInputParameter', 'RunCommandParameterDefinition', 'RunCommandResult', + 'ScheduledEventsProfile', 'Sku', 'SshConfiguration', 'SshPublicKey', @@ -504,6 +509,7 @@ 'SubResource', 'SubResourceReadOnly', 'TargetRegion', + 'TerminateNotificationProfile', 'ThrottledRequestsInput', 'UpdateResource', 'UpgradeOperationHistoricalStatusInfo', diff --git a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models.py b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models.py index 12291b05dde..ed16b97166d 100644 --- a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models.py +++ b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models.py @@ -1561,8 +1561,9 @@ class GalleryImage(Resource): **Linux**. Possible values include: 'Windows', 'Linux' :type os_type: str or ~azure.mgmt.compute.v2019_03_01.models.OperatingSystemTypes - :param os_state: Required. The allowed values for OS State are - 'Generalized'. Possible values include: 'Generalized', 'Specialized' + :param os_state: Required. This property allows the user to specify + whether the virtual machines created under this image are 'Generalized' or + 'Specialized'. Possible values include: 'Generalized', 'Specialized' :type os_state: str or ~azure.mgmt.compute.v2019_03_01.models.OperatingSystemStateTypes :param end_of_life_date: The end of life date of the gallery Image @@ -1791,7 +1792,7 @@ def __init__(self, **kwargs): class GalleryImageVersionStorageProfile(Model): - """This is the storage profile of a gallery Image Version. + """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. @@ -3633,6 +3634,24 @@ def __init__(self, **kwargs): self.value = kwargs.get('value', None) +class ScheduledEventsProfile(Model): + """ScheduledEventsProfile. + + :param terminate_notification_profile: Specifies Terminate Scheduled Event + related configurations. + :type terminate_notification_profile: + ~azure.mgmt.compute.v2019_03_01.models.TerminateNotificationProfile + """ + + _attribute_map = { + 'terminate_notification_profile': {'key': 'terminateNotificationProfile', 'type': 'TerminateNotificationProfile'}, + } + + def __init__(self, **kwargs): + super(ScheduledEventsProfile, self).__init__(**kwargs) + self.terminate_notification_profile = kwargs.get('terminate_notification_profile', None) + + class Sku(Model): """Describes a virtual machine scale set sku. @@ -3796,6 +3815,31 @@ def __init__(self, **kwargs): self.storage_account_type = kwargs.get('storage_account_type', None) +class TerminateNotificationProfile(Model): + """TerminateNotificationProfile. + + :param not_before_timeout: Configurable length of time a Virtual Machine + being deleted will have to potentially approve the Terminate Scheduled + Event before the event is auto approved (timed out). The configuration + must be specified in ISO 8601 format, the default value is 5 minutes + (PT5M) + :type not_before_timeout: str + :param enable: Specifies whether the Terminate Scheduled event is enabled + or disabled. + :type enable: bool + """ + + _attribute_map = { + 'not_before_timeout': {'key': 'notBeforeTimeout', 'type': 'str'}, + 'enable': {'key': 'enable', 'type': 'bool'}, + } + + def __init__(self, **kwargs): + super(TerminateNotificationProfile, self).__init__(**kwargs) + self.not_before_timeout = kwargs.get('not_before_timeout', None) + self.enable = kwargs.get('enable', None) + + class ThrottledRequestsInput(LogAnalyticsInputBase): """Api request input for LogAnalytics getThrottledRequests Api. @@ -6336,6 +6380,10 @@ class VirtualMachineScaleSetUpdateVMProfile(Model): :param license_type: The license type, which is for bring your own license scenario. :type license_type: str + :param scheduled_events_profile: Specifies Scheduled Event related + configurations. + :type scheduled_events_profile: + ~azure.mgmt.compute.v2019_03_01.models.ScheduledEventsProfile """ _attribute_map = { @@ -6345,6 +6393,7 @@ class VirtualMachineScaleSetUpdateVMProfile(Model): 'diagnostics_profile': {'key': 'diagnosticsProfile', 'type': 'DiagnosticsProfile'}, 'extension_profile': {'key': 'extensionProfile', 'type': 'VirtualMachineScaleSetExtensionProfile'}, 'license_type': {'key': 'licenseType', 'type': 'str'}, + 'scheduled_events_profile': {'key': 'scheduledEventsProfile', 'type': 'ScheduledEventsProfile'}, } def __init__(self, **kwargs): @@ -6355,6 +6404,7 @@ def __init__(self, **kwargs): 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.scheduled_events_profile = kwargs.get('scheduled_events_profile', None) class VirtualMachineScaleSetVM(Resource): @@ -6736,6 +6786,10 @@ class VirtualMachineScaleSetVMProfile(Model): 2017-10-30-preview. Possible values include: 'Deallocate', 'Delete' :type eviction_policy: str or ~azure.mgmt.compute.v2019_03_01.models.VirtualMachineEvictionPolicyTypes + :param scheduled_events_profile: Specifies Scheduled Event related + configurations. + :type scheduled_events_profile: + ~azure.mgmt.compute.v2019_03_01.models.ScheduledEventsProfile """ _attribute_map = { @@ -6747,6 +6801,7 @@ class VirtualMachineScaleSetVMProfile(Model): 'license_type': {'key': 'licenseType', 'type': 'str'}, 'priority': {'key': 'priority', 'type': 'str'}, 'eviction_policy': {'key': 'evictionPolicy', 'type': 'str'}, + 'scheduled_events_profile': {'key': 'scheduledEventsProfile', 'type': 'ScheduledEventsProfile'}, } def __init__(self, **kwargs): @@ -6759,6 +6814,7 @@ def __init__(self, **kwargs): self.license_type = kwargs.get('license_type', None) self.priority = kwargs.get('priority', None) self.eviction_policy = kwargs.get('eviction_policy', None) + self.scheduled_events_profile = kwargs.get('scheduled_events_profile', None) class VirtualMachineScaleSetVMProtectionPolicy(Model): diff --git a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models_py3.py b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models_py3.py index f7d01ae1d2d..d1c4b4a7604 100644 --- a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models_py3.py +++ b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models_py3.py @@ -1561,8 +1561,9 @@ class GalleryImage(Resource): **Linux**. Possible values include: 'Windows', 'Linux' :type os_type: str or ~azure.mgmt.compute.v2019_03_01.models.OperatingSystemTypes - :param os_state: Required. The allowed values for OS State are - 'Generalized'. Possible values include: 'Generalized', 'Specialized' + :param os_state: Required. This property allows the user to specify + whether the virtual machines created under this image are 'Generalized' or + 'Specialized'. Possible values include: 'Generalized', 'Specialized' :type os_state: str or ~azure.mgmt.compute.v2019_03_01.models.OperatingSystemStateTypes :param end_of_life_date: The end of life date of the gallery Image @@ -1791,7 +1792,7 @@ def __init__(self, *, source, target_regions=None, replica_count: int=None, excl class GalleryImageVersionStorageProfile(Model): - """This is the storage profile of a gallery Image Version. + """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. @@ -3633,6 +3634,24 @@ def __init__(self, *, value=None, **kwargs) -> None: self.value = value +class ScheduledEventsProfile(Model): + """ScheduledEventsProfile. + + :param terminate_notification_profile: Specifies Terminate Scheduled Event + related configurations. + :type terminate_notification_profile: + ~azure.mgmt.compute.v2019_03_01.models.TerminateNotificationProfile + """ + + _attribute_map = { + 'terminate_notification_profile': {'key': 'terminateNotificationProfile', 'type': 'TerminateNotificationProfile'}, + } + + def __init__(self, *, terminate_notification_profile=None, **kwargs) -> None: + super(ScheduledEventsProfile, self).__init__(**kwargs) + self.terminate_notification_profile = terminate_notification_profile + + class Sku(Model): """Describes a virtual machine scale set sku. @@ -3796,6 +3815,31 @@ def __init__(self, *, name: str, regional_replica_count: int=None, storage_accou self.storage_account_type = storage_account_type +class TerminateNotificationProfile(Model): + """TerminateNotificationProfile. + + :param not_before_timeout: Configurable length of time a Virtual Machine + being deleted will have to potentially approve the Terminate Scheduled + Event before the event is auto approved (timed out). The configuration + must be specified in ISO 8601 format, the default value is 5 minutes + (PT5M) + :type not_before_timeout: str + :param enable: Specifies whether the Terminate Scheduled event is enabled + or disabled. + :type enable: bool + """ + + _attribute_map = { + 'not_before_timeout': {'key': 'notBeforeTimeout', 'type': 'str'}, + 'enable': {'key': 'enable', 'type': 'bool'}, + } + + def __init__(self, *, not_before_timeout: str=None, enable: bool=None, **kwargs) -> None: + super(TerminateNotificationProfile, self).__init__(**kwargs) + self.not_before_timeout = not_before_timeout + self.enable = enable + + class ThrottledRequestsInput(LogAnalyticsInputBase): """Api request input for LogAnalytics getThrottledRequests Api. @@ -6336,6 +6380,10 @@ class VirtualMachineScaleSetUpdateVMProfile(Model): :param license_type: The license type, which is for bring your own license scenario. :type license_type: str + :param scheduled_events_profile: Specifies Scheduled Event related + configurations. + :type scheduled_events_profile: + ~azure.mgmt.compute.v2019_03_01.models.ScheduledEventsProfile """ _attribute_map = { @@ -6345,9 +6393,10 @@ class VirtualMachineScaleSetUpdateVMProfile(Model): 'diagnostics_profile': {'key': 'diagnosticsProfile', 'type': 'DiagnosticsProfile'}, 'extension_profile': {'key': 'extensionProfile', 'type': 'VirtualMachineScaleSetExtensionProfile'}, 'license_type': {'key': 'licenseType', 'type': 'str'}, + 'scheduled_events_profile': {'key': 'scheduledEventsProfile', 'type': 'ScheduledEventsProfile'}, } - def __init__(self, *, os_profile=None, storage_profile=None, network_profile=None, diagnostics_profile=None, extension_profile=None, license_type: str=None, **kwargs) -> None: + def __init__(self, *, os_profile=None, storage_profile=None, network_profile=None, diagnostics_profile=None, extension_profile=None, license_type: str=None, scheduled_events_profile=None, **kwargs) -> None: super(VirtualMachineScaleSetUpdateVMProfile, self).__init__(**kwargs) self.os_profile = os_profile self.storage_profile = storage_profile @@ -6355,6 +6404,7 @@ def __init__(self, *, os_profile=None, storage_profile=None, network_profile=Non self.diagnostics_profile = diagnostics_profile self.extension_profile = extension_profile self.license_type = license_type + self.scheduled_events_profile = scheduled_events_profile class VirtualMachineScaleSetVM(Resource): @@ -6736,6 +6786,10 @@ class VirtualMachineScaleSetVMProfile(Model): 2017-10-30-preview. Possible values include: 'Deallocate', 'Delete' :type eviction_policy: str or ~azure.mgmt.compute.v2019_03_01.models.VirtualMachineEvictionPolicyTypes + :param scheduled_events_profile: Specifies Scheduled Event related + configurations. + :type scheduled_events_profile: + ~azure.mgmt.compute.v2019_03_01.models.ScheduledEventsProfile """ _attribute_map = { @@ -6747,9 +6801,10 @@ class VirtualMachineScaleSetVMProfile(Model): 'license_type': {'key': 'licenseType', 'type': 'str'}, 'priority': {'key': 'priority', 'type': 'str'}, 'eviction_policy': {'key': 'evictionPolicy', 'type': 'str'}, + 'scheduled_events_profile': {'key': 'scheduledEventsProfile', 'type': 'ScheduledEventsProfile'}, } - def __init__(self, *, os_profile=None, storage_profile=None, network_profile=None, diagnostics_profile=None, extension_profile=None, license_type: str=None, priority=None, eviction_policy=None, **kwargs) -> None: + def __init__(self, *, os_profile=None, storage_profile=None, network_profile=None, diagnostics_profile=None, extension_profile=None, license_type: str=None, priority=None, eviction_policy=None, scheduled_events_profile=None, **kwargs) -> None: super(VirtualMachineScaleSetVMProfile, self).__init__(**kwargs) self.os_profile = os_profile self.storage_profile = storage_profile @@ -6759,6 +6814,7 @@ def __init__(self, *, os_profile=None, storage_profile=None, network_profile=Non self.license_type = license_type self.priority = priority self.eviction_policy = eviction_policy + self.scheduled_events_profile = scheduled_events_profile class VirtualMachineScaleSetVMProtectionPolicy(Model): diff --git a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/operations/_virtual_machine_scale_set_vms_operations.py b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/operations/_virtual_machine_scale_set_vms_operations.py index f995fbbb042..51c834d9c10 100644 --- a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/operations/_virtual_machine_scale_set_vms_operations.py +++ b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/operations/_virtual_machine_scale_set_vms_operations.py @@ -506,7 +506,7 @@ def get_long_running_output(response): 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): + self, resource_group_name, vm_scale_set_name, instance_id, expand=None, 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. @@ -515,6 +515,10 @@ def get( :type vm_scale_set_name: str :param instance_id: The instance ID of the virtual machine. :type instance_id: str + :param expand: The expand expression to apply on the operation. + Possible values include: 'instanceView' + :type expand: str or + ~azure.mgmt.compute.v2019_03_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 @@ -538,6 +542,8 @@ def get( # 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 From 0102a2aa8194691eb5a64d4089e55dcb126b3857 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Sun, 4 Aug 2019 18:59:21 -0700 Subject: [PATCH 3/6] [AutoPR compute/resource-manager] add HyperVGeneation in GetVMImage (#6501) * Generated from 4b3b012a4c684afd2e931bb2ac4c01bbf894eec4 add HyperVGeneation in SharedVMImageVersion * Generated from c34793bd9910de785d31e7bf8e6da1fd7e30de8b reuse HyperVGenerationType * Generated from c34793bd9910de785d31e7bf8e6da1fd7e30de8b reuse HyperVGenerationType --- .../azure/mgmt/compute/v2019_03_01/models/_models.py | 5 +++++ .../azure/mgmt/compute/v2019_03_01/models/_models_py3.py | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models.py b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models.py index ed16b97166d..09677a516b9 100644 --- a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models.py +++ b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models.py @@ -4901,6 +4901,9 @@ class VirtualMachineImage(VirtualMachineImageResource): :param automatic_os_upgrade_properties: :type automatic_os_upgrade_properties: ~azure.mgmt.compute.v2019_03_01.models.AutomaticOSUpgradeProperties + :param hyper_vgeneration: Possible values include: 'V1', 'V2' + :type hyper_vgeneration: str or + ~azure.mgmt.compute.v2019_03_01.models.HyperVGenerationTypes """ _validation = { @@ -4917,6 +4920,7 @@ class VirtualMachineImage(VirtualMachineImageResource): 'os_disk_image': {'key': 'properties.osDiskImage', 'type': 'OSDiskImage'}, 'data_disk_images': {'key': 'properties.dataDiskImages', 'type': '[DataDiskImage]'}, 'automatic_os_upgrade_properties': {'key': 'properties.automaticOSUpgradeProperties', 'type': 'AutomaticOSUpgradeProperties'}, + 'hyper_vgeneration': {'key': 'properties.hyperVGeneration', 'type': 'str'}, } def __init__(self, **kwargs): @@ -4925,6 +4929,7 @@ def __init__(self, **kwargs): self.os_disk_image = kwargs.get('os_disk_image', None) self.data_disk_images = kwargs.get('data_disk_images', None) self.automatic_os_upgrade_properties = kwargs.get('automatic_os_upgrade_properties', None) + self.hyper_vgeneration = kwargs.get('hyper_vgeneration', None) class VirtualMachineInstanceView(Model): diff --git a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models_py3.py b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models_py3.py index d1c4b4a7604..20406a6af23 100644 --- a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models_py3.py +++ b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models_py3.py @@ -4901,6 +4901,9 @@ class VirtualMachineImage(VirtualMachineImageResource): :param automatic_os_upgrade_properties: :type automatic_os_upgrade_properties: ~azure.mgmt.compute.v2019_03_01.models.AutomaticOSUpgradeProperties + :param hyper_vgeneration: Possible values include: 'V1', 'V2' + :type hyper_vgeneration: str or + ~azure.mgmt.compute.v2019_03_01.models.HyperVGenerationTypes """ _validation = { @@ -4917,14 +4920,16 @@ class VirtualMachineImage(VirtualMachineImageResource): 'os_disk_image': {'key': 'properties.osDiskImage', 'type': 'OSDiskImage'}, 'data_disk_images': {'key': 'properties.dataDiskImages', 'type': '[DataDiskImage]'}, 'automatic_os_upgrade_properties': {'key': 'properties.automaticOSUpgradeProperties', 'type': 'AutomaticOSUpgradeProperties'}, + 'hyper_vgeneration': {'key': 'properties.hyperVGeneration', 'type': 'str'}, } - def __init__(self, *, name: str, location: str, id: str=None, tags=None, plan=None, os_disk_image=None, data_disk_images=None, automatic_os_upgrade_properties=None, **kwargs) -> None: + def __init__(self, *, name: str, location: str, id: str=None, tags=None, plan=None, os_disk_image=None, data_disk_images=None, automatic_os_upgrade_properties=None, hyper_vgeneration=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 self.automatic_os_upgrade_properties = automatic_os_upgrade_properties + self.hyper_vgeneration = hyper_vgeneration class VirtualMachineInstanceView(Model): From b07d4010f7683aec226be00ff2c803d06ded5a55 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Wed, 14 Aug 2019 15:12:49 -0700 Subject: [PATCH 4/6] [AutoPR compute/resource-manager] Swagger: Allowing for VMSS reference during VM creation (#6609) * Generated from 547a98bc34516d8788adff951ebd929d8d5125ae Swagger: Allowing for VMSS reference during VM creation * Generated from 2723517c6c29f1c6945bdf05b9c4e42f85159011 fixing typo --- .../compute/v2019_03_01/models/_models.py | 32 +++++++++++++++-- .../compute/v2019_03_01/models/_models_py3.py | 36 ++++++++++++++++--- 2 files changed, 62 insertions(+), 6 deletions(-) diff --git a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models.py b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models.py index 09677a516b9..7fc5e702423 100644 --- a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models.py +++ b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models.py @@ -4260,8 +4260,20 @@ class VirtualMachine(Resource): 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)

Currently, a VM can only be added to availability set at creation - time. An existing VM cannot be added to an availability set. + time. An existing VM cannot be added to an availability set.

This + property cannot exist along with a non-null + properties.virtualMachineScaleSet reference. :type availability_set: ~azure.mgmt.compute.v2019_03_01.models.SubResource + :param virtual_machine_scale_set: Specifies information about the virtual + machine scale set that the virtual machine should be assigned to. Virtual + machines specified in the same virtual machine scale set are allocated to + different nodes to maximize availability. Currently, a VM can only be + added to virtual machine scale set at creation time. An existing VM cannot + be added to a virtual machine scale set.

This property cannot + exist along with a non-null properties.availabilitySet reference. +

Minimum api‐version: 2019‐03‐01 + :type virtual_machine_scale_set: + ~azure.mgmt.compute.v2019_03_01.models.SubResource :param proximity_placement_group: Specifies information about the proximity placement group that the virtual machine should be assigned to.

Minimum api-version: 2018-04-01. @@ -4325,6 +4337,7 @@ class VirtualMachine(Resource): 'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'}, 'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'}, 'availability_set': {'key': 'properties.availabilitySet', 'type': 'SubResource'}, + 'virtual_machine_scale_set': {'key': 'properties.virtualMachineScaleSet', 'type': 'SubResource'}, 'proximity_placement_group': {'key': 'properties.proximityPlacementGroup', 'type': 'SubResource'}, 'host': {'key': 'properties.host', 'type': 'SubResource'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, @@ -4346,6 +4359,7 @@ def __init__(self, **kwargs): 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.virtual_machine_scale_set = kwargs.get('virtual_machine_scale_set', None) self.proximity_placement_group = kwargs.get('proximity_placement_group', None) self.host = kwargs.get('host', None) self.provisioning_state = None @@ -6964,8 +6978,20 @@ class VirtualMachineUpdate(UpdateResource): 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)

Currently, a VM can only be added to availability set at creation - time. An existing VM cannot be added to an availability set. + time. An existing VM cannot be added to an availability set.

This + property cannot exist along with a non-null + properties.virtualMachineScaleSet reference. :type availability_set: ~azure.mgmt.compute.v2019_03_01.models.SubResource + :param virtual_machine_scale_set: Specifies information about the virtual + machine scale set that the virtual machine should be assigned to. Virtual + machines specified in the same virtual machine scale set are allocated to + different nodes to maximize availability. Currently, a VM can only be + added to virtual machine scale set at creation time. An existing VM cannot + be added to a virtual machine scale set.

This property cannot + exist along with a non-null properties.availabilitySet reference. +

Minimum api‐version: 2019‐03‐01 + :type virtual_machine_scale_set: + ~azure.mgmt.compute.v2019_03_01.models.SubResource :param proximity_placement_group: Specifies information about the proximity placement group that the virtual machine should be assigned to.

Minimum api-version: 2018-04-01. @@ -7017,6 +7043,7 @@ class VirtualMachineUpdate(UpdateResource): 'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'}, 'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'}, 'availability_set': {'key': 'properties.availabilitySet', 'type': 'SubResource'}, + 'virtual_machine_scale_set': {'key': 'properties.virtualMachineScaleSet', 'type': 'SubResource'}, 'proximity_placement_group': {'key': 'properties.proximityPlacementGroup', 'type': 'SubResource'}, 'host': {'key': 'properties.host', 'type': 'SubResource'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, @@ -7037,6 +7064,7 @@ def __init__(self, **kwargs): 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.virtual_machine_scale_set = kwargs.get('virtual_machine_scale_set', None) self.proximity_placement_group = kwargs.get('proximity_placement_group', None) self.host = kwargs.get('host', None) self.provisioning_state = None diff --git a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models_py3.py b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models_py3.py index 20406a6af23..2ed807f65fb 100644 --- a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models_py3.py +++ b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models_py3.py @@ -4260,8 +4260,20 @@ class VirtualMachine(Resource): 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)

Currently, a VM can only be added to availability set at creation - time. An existing VM cannot be added to an availability set. + time. An existing VM cannot be added to an availability set.

This + property cannot exist along with a non-null + properties.virtualMachineScaleSet reference. :type availability_set: ~azure.mgmt.compute.v2019_03_01.models.SubResource + :param virtual_machine_scale_set: Specifies information about the virtual + machine scale set that the virtual machine should be assigned to. Virtual + machines specified in the same virtual machine scale set are allocated to + different nodes to maximize availability. Currently, a VM can only be + added to virtual machine scale set at creation time. An existing VM cannot + be added to a virtual machine scale set.

This property cannot + exist along with a non-null properties.availabilitySet reference. +

Minimum api‐version: 2019‐03‐01 + :type virtual_machine_scale_set: + ~azure.mgmt.compute.v2019_03_01.models.SubResource :param proximity_placement_group: Specifies information about the proximity placement group that the virtual machine should be assigned to.

Minimum api-version: 2018-04-01. @@ -4325,6 +4337,7 @@ class VirtualMachine(Resource): 'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'}, 'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'}, 'availability_set': {'key': 'properties.availabilitySet', 'type': 'SubResource'}, + 'virtual_machine_scale_set': {'key': 'properties.virtualMachineScaleSet', 'type': 'SubResource'}, 'proximity_placement_group': {'key': 'properties.proximityPlacementGroup', 'type': 'SubResource'}, 'host': {'key': 'properties.host', 'type': 'SubResource'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, @@ -4336,7 +4349,7 @@ class VirtualMachine(Resource): 'zones': {'key': 'zones', 'type': '[str]'}, } - def __init__(self, *, location: str, tags=None, plan=None, hardware_profile=None, storage_profile=None, additional_capabilities=None, os_profile=None, network_profile=None, diagnostics_profile=None, availability_set=None, proximity_placement_group=None, host=None, license_type: str=None, identity=None, zones=None, **kwargs) -> None: + def __init__(self, *, location: str, tags=None, plan=None, hardware_profile=None, storage_profile=None, additional_capabilities=None, os_profile=None, network_profile=None, diagnostics_profile=None, availability_set=None, virtual_machine_scale_set=None, proximity_placement_group=None, host=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 @@ -4346,6 +4359,7 @@ def __init__(self, *, location: str, tags=None, plan=None, hardware_profile=None self.network_profile = network_profile self.diagnostics_profile = diagnostics_profile self.availability_set = availability_set + self.virtual_machine_scale_set = virtual_machine_scale_set self.proximity_placement_group = proximity_placement_group self.host = host self.provisioning_state = None @@ -6964,8 +6978,20 @@ class VirtualMachineUpdate(UpdateResource): 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)

Currently, a VM can only be added to availability set at creation - time. An existing VM cannot be added to an availability set. + time. An existing VM cannot be added to an availability set.

This + property cannot exist along with a non-null + properties.virtualMachineScaleSet reference. :type availability_set: ~azure.mgmt.compute.v2019_03_01.models.SubResource + :param virtual_machine_scale_set: Specifies information about the virtual + machine scale set that the virtual machine should be assigned to. Virtual + machines specified in the same virtual machine scale set are allocated to + different nodes to maximize availability. Currently, a VM can only be + added to virtual machine scale set at creation time. An existing VM cannot + be added to a virtual machine scale set.

This property cannot + exist along with a non-null properties.availabilitySet reference. +

Minimum api‐version: 2019‐03‐01 + :type virtual_machine_scale_set: + ~azure.mgmt.compute.v2019_03_01.models.SubResource :param proximity_placement_group: Specifies information about the proximity placement group that the virtual machine should be assigned to.

Minimum api-version: 2018-04-01. @@ -7017,6 +7043,7 @@ class VirtualMachineUpdate(UpdateResource): 'network_profile': {'key': 'properties.networkProfile', 'type': 'NetworkProfile'}, 'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'}, 'availability_set': {'key': 'properties.availabilitySet', 'type': 'SubResource'}, + 'virtual_machine_scale_set': {'key': 'properties.virtualMachineScaleSet', 'type': 'SubResource'}, 'proximity_placement_group': {'key': 'properties.proximityPlacementGroup', 'type': 'SubResource'}, 'host': {'key': 'properties.host', 'type': 'SubResource'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, @@ -7027,7 +7054,7 @@ class VirtualMachineUpdate(UpdateResource): 'zones': {'key': 'zones', 'type': '[str]'}, } - def __init__(self, *, tags=None, plan=None, hardware_profile=None, storage_profile=None, additional_capabilities=None, os_profile=None, network_profile=None, diagnostics_profile=None, availability_set=None, proximity_placement_group=None, host=None, license_type: str=None, identity=None, zones=None, **kwargs) -> None: + def __init__(self, *, tags=None, plan=None, hardware_profile=None, storage_profile=None, additional_capabilities=None, os_profile=None, network_profile=None, diagnostics_profile=None, availability_set=None, virtual_machine_scale_set=None, proximity_placement_group=None, host=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 @@ -7037,6 +7064,7 @@ def __init__(self, *, tags=None, plan=None, hardware_profile=None, storage_profi self.network_profile = network_profile self.diagnostics_profile = diagnostics_profile self.availability_set = availability_set + self.virtual_machine_scale_set = virtual_machine_scale_set self.proximity_placement_group = proximity_placement_group self.host = host self.provisioning_state = None From acaa007b7cdb28612bcbeea3d67b7e7828261dae Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Thu, 22 Aug 2019 19:05:55 -0700 Subject: [PATCH 5/6] Generated from 9d5e30df16e3ea43cb3b21b5f5264373d8ed2397 (#6908) updating an incorrect description for uploadsizebytes --- .../compute/v2019_03_01/models/__init__.py | 11 ++- .../_compute_management_client_enums.py | 24 ++--- .../compute/v2019_03_01/models/_models.py | 82 +++++++++++++++++ .../compute/v2019_03_01/models/_models_py3.py | 90 ++++++++++++++++++- 4 files changed, 187 insertions(+), 20 deletions(-) diff --git a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/__init__.py b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/__init__.py index 090f6dc0c18..cec113526ae 100644 --- a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/__init__.py +++ b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/__init__.py @@ -19,6 +19,7 @@ from ._models_py3 import AutomaticOSUpgradeProperties from ._models_py3 import AvailabilitySet from ._models_py3 import AvailabilitySetUpdate + from ._models_py3 import BillingProfile from ._models_py3 import BootDiagnostics from ._models_py3 import BootDiagnosticsInstanceView from ._models_py3 import ComputeOperationValue @@ -192,6 +193,7 @@ from ._models import AutomaticOSUpgradeProperties from ._models import AvailabilitySet from ._models import AvailabilitySetUpdate + from ._models import BillingProfile from ._models import BootDiagnostics from ._models import BootDiagnosticsInstanceView from ._models import ComputeOperationValue @@ -394,11 +396,11 @@ ResourceIdentityType, MaintenanceOperationResultCodeTypes, HyperVGenerationType, + VirtualMachinePriorityTypes, + VirtualMachineEvictionPolicyTypes, UpgradeMode, OperatingSystemStateTypes, IPVersion, - VirtualMachinePriorityTypes, - VirtualMachineEvictionPolicyTypes, VirtualMachineScaleSetSkuScaleType, UpgradeState, UpgradeOperationInvoker, @@ -423,6 +425,7 @@ 'AutomaticOSUpgradeProperties', 'AvailabilitySet', 'AvailabilitySetUpdate', + 'BillingProfile', 'BootDiagnostics', 'BootDiagnosticsInstanceView', 'ComputeOperationValue', @@ -624,11 +627,11 @@ 'ResourceIdentityType', 'MaintenanceOperationResultCodeTypes', 'HyperVGenerationType', + 'VirtualMachinePriorityTypes', + 'VirtualMachineEvictionPolicyTypes', 'UpgradeMode', 'OperatingSystemStateTypes', 'IPVersion', - 'VirtualMachinePriorityTypes', - 'VirtualMachineEvictionPolicyTypes', 'VirtualMachineScaleSetSkuScaleType', 'UpgradeState', 'UpgradeOperationInvoker', diff --git a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_compute_management_client_enums.py b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_compute_management_client_enums.py index 37b80e93be0..ec8c7b1ee03 100644 --- a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_compute_management_client_enums.py +++ b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_compute_management_client_enums.py @@ -291,6 +291,18 @@ class HyperVGenerationType(str, Enum): v2 = "V2" +class VirtualMachinePriorityTypes(str, Enum): + + regular = "Regular" + low = "Low" + + +class VirtualMachineEvictionPolicyTypes(str, Enum): + + deallocate = "Deallocate" + delete = "Delete" + + class UpgradeMode(str, Enum): automatic = "Automatic" @@ -310,18 +322,6 @@ class IPVersion(str, Enum): ipv6 = "IPv6" -class VirtualMachinePriorityTypes(str, Enum): - - regular = "Regular" - low = "Low" - - -class VirtualMachineEvictionPolicyTypes(str, Enum): - - deallocate = "Deallocate" - delete = "Delete" - - class VirtualMachineScaleSetSkuScaleType(str, Enum): automatic = "Automatic" diff --git a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models.py b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models.py index 7fc5e702423..9535cb044fb 100644 --- a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models.py +++ b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models.py @@ -392,6 +392,36 @@ def __init__(self, **kwargs): self.sku = kwargs.get('sku', None) +class BillingProfile(Model): + """Specifies the billing related details of a low priority VM or VMSS. +

Minimum api-version: 2019-03-01. + + :param max_price: Specifies the maximum price you are willing to pay for a + low priority VM/VMSS. This price is in US Dollars.

This price + will be compared with the current low priority price for the VM size. + Also, the prices are compared at the time of create/update of low priority + VM/VMSS and the operation will only succeed if the maxPrice is greater + than the current low priority price.

The maxPrice will also be + used for evicting a low priority VM/VMSS if the current low priority price + goes beyond the maxPrice after creation of VM/VMSS.

Possible + values are:

- Any decimal value greater than zero. Example: + $0.01538

-1 – indicates default price to be up-to on-demand. +

You can set the maxPrice to -1 to indicate that the low priority + VM/VMSS should not be evicted for price reasons. Also, the default max + price is -1 if it is not provided by you.

Minimum api-version: + 2019-03-01. + :type max_price: float + """ + + _attribute_map = { + 'max_price': {'key': 'maxPrice', 'type': 'float'}, + } + + def __init__(self, **kwargs): + super(BillingProfile, self).__init__(**kwargs) + self.max_price = kwargs.get('max_price', None) + + class BootDiagnostics(Model): """Boot Diagnostics is a debugging feature which allows you to view Console Output and Screenshot to diagnose VM status.

You can easily view @@ -4279,6 +4309,20 @@ class VirtualMachine(Resource):

Minimum api-version: 2018-04-01. :type proximity_placement_group: ~azure.mgmt.compute.v2019_03_01.models.SubResource + :param priority: Specifies the priority for the virtual machine. +

Minimum api-version: 2019-03-01. Possible values include: + 'Regular', 'Low' + :type priority: str or + ~azure.mgmt.compute.v2019_03_01.models.VirtualMachinePriorityTypes + :param eviction_policy: Specifies the eviction policy for the low priority + virtual machine. Only supported value is 'Deallocate'.

Minimum + api-version: 2019-03-01. Possible values include: 'Deallocate', 'Delete' + :type eviction_policy: str or + ~azure.mgmt.compute.v2019_03_01.models.VirtualMachineEvictionPolicyTypes + :param billing_profile: Specifies the billing related details of a low + priority virtual machine.

Minimum api-version: 2019-03-01. + :type billing_profile: + ~azure.mgmt.compute.v2019_03_01.models.BillingProfile :param host: Specifies information about the dedicated host that the virtual machine resides in.

Minimum api-version: 2018-10-01. :type host: ~azure.mgmt.compute.v2019_03_01.models.SubResource @@ -4339,6 +4383,9 @@ class VirtualMachine(Resource): 'availability_set': {'key': 'properties.availabilitySet', 'type': 'SubResource'}, 'virtual_machine_scale_set': {'key': 'properties.virtualMachineScaleSet', 'type': 'SubResource'}, 'proximity_placement_group': {'key': 'properties.proximityPlacementGroup', 'type': 'SubResource'}, + 'priority': {'key': 'properties.priority', 'type': 'str'}, + 'eviction_policy': {'key': 'properties.evictionPolicy', 'type': 'str'}, + 'billing_profile': {'key': 'properties.billingProfile', 'type': 'BillingProfile'}, 'host': {'key': 'properties.host', 'type': 'SubResource'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineInstanceView'}, @@ -4361,6 +4408,9 @@ def __init__(self, **kwargs): self.availability_set = kwargs.get('availability_set', None) self.virtual_machine_scale_set = kwargs.get('virtual_machine_scale_set', None) self.proximity_placement_group = kwargs.get('proximity_placement_group', None) + self.priority = kwargs.get('priority', None) + self.eviction_policy = kwargs.get('eviction_policy', None) + self.billing_profile = kwargs.get('billing_profile', None) self.host = kwargs.get('host', None) self.provisioning_state = None self.instance_view = None @@ -6399,6 +6449,10 @@ class VirtualMachineScaleSetUpdateVMProfile(Model): :param license_type: The license type, which is for bring your own license scenario. :type license_type: str + :param billing_profile: Specifies the billing related details of a low + priority VMSS.

Minimum api-version: 2019-03-01. + :type billing_profile: + ~azure.mgmt.compute.v2019_03_01.models.BillingProfile :param scheduled_events_profile: Specifies Scheduled Event related configurations. :type scheduled_events_profile: @@ -6412,6 +6466,7 @@ class VirtualMachineScaleSetUpdateVMProfile(Model): 'diagnostics_profile': {'key': 'diagnosticsProfile', 'type': 'DiagnosticsProfile'}, 'extension_profile': {'key': 'extensionProfile', 'type': 'VirtualMachineScaleSetExtensionProfile'}, 'license_type': {'key': 'licenseType', 'type': 'str'}, + 'billing_profile': {'key': 'billingProfile', 'type': 'BillingProfile'}, 'scheduled_events_profile': {'key': 'scheduledEventsProfile', 'type': 'ScheduledEventsProfile'}, } @@ -6423,6 +6478,7 @@ def __init__(self, **kwargs): 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.billing_profile = kwargs.get('billing_profile', None) self.scheduled_events_profile = kwargs.get('scheduled_events_profile', None) @@ -6805,6 +6861,10 @@ class VirtualMachineScaleSetVMProfile(Model): 2017-10-30-preview. Possible values include: 'Deallocate', 'Delete' :type eviction_policy: str or ~azure.mgmt.compute.v2019_03_01.models.VirtualMachineEvictionPolicyTypes + :param billing_profile: Specifies the billing related details of a low + priority VMSS.

Minimum api-version: 2019-03-01. + :type billing_profile: + ~azure.mgmt.compute.v2019_03_01.models.BillingProfile :param scheduled_events_profile: Specifies Scheduled Event related configurations. :type scheduled_events_profile: @@ -6820,6 +6880,7 @@ class VirtualMachineScaleSetVMProfile(Model): 'license_type': {'key': 'licenseType', 'type': 'str'}, 'priority': {'key': 'priority', 'type': 'str'}, 'eviction_policy': {'key': 'evictionPolicy', 'type': 'str'}, + 'billing_profile': {'key': 'billingProfile', 'type': 'BillingProfile'}, 'scheduled_events_profile': {'key': 'scheduledEventsProfile', 'type': 'ScheduledEventsProfile'}, } @@ -6833,6 +6894,7 @@ def __init__(self, **kwargs): self.license_type = kwargs.get('license_type', None) self.priority = kwargs.get('priority', None) self.eviction_policy = kwargs.get('eviction_policy', None) + self.billing_profile = kwargs.get('billing_profile', None) self.scheduled_events_profile = kwargs.get('scheduled_events_profile', None) @@ -6997,6 +7059,20 @@ class VirtualMachineUpdate(UpdateResource):

Minimum api-version: 2018-04-01. :type proximity_placement_group: ~azure.mgmt.compute.v2019_03_01.models.SubResource + :param priority: Specifies the priority for the virtual machine. +

Minimum api-version: 2019-03-01. Possible values include: + 'Regular', 'Low' + :type priority: str or + ~azure.mgmt.compute.v2019_03_01.models.VirtualMachinePriorityTypes + :param eviction_policy: Specifies the eviction policy for the low priority + virtual machine. Only supported value is 'Deallocate'.

Minimum + api-version: 2019-03-01. Possible values include: 'Deallocate', 'Delete' + :type eviction_policy: str or + ~azure.mgmt.compute.v2019_03_01.models.VirtualMachineEvictionPolicyTypes + :param billing_profile: Specifies the billing related details of a low + priority virtual machine.

Minimum api-version: 2019-03-01. + :type billing_profile: + ~azure.mgmt.compute.v2019_03_01.models.BillingProfile :param host: Specifies information about the dedicated host that the virtual machine resides in.

Minimum api-version: 2018-10-01. :type host: ~azure.mgmt.compute.v2019_03_01.models.SubResource @@ -7045,6 +7121,9 @@ class VirtualMachineUpdate(UpdateResource): 'availability_set': {'key': 'properties.availabilitySet', 'type': 'SubResource'}, 'virtual_machine_scale_set': {'key': 'properties.virtualMachineScaleSet', 'type': 'SubResource'}, 'proximity_placement_group': {'key': 'properties.proximityPlacementGroup', 'type': 'SubResource'}, + 'priority': {'key': 'properties.priority', 'type': 'str'}, + 'eviction_policy': {'key': 'properties.evictionPolicy', 'type': 'str'}, + 'billing_profile': {'key': 'properties.billingProfile', 'type': 'BillingProfile'}, 'host': {'key': 'properties.host', 'type': 'SubResource'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineInstanceView'}, @@ -7066,6 +7145,9 @@ def __init__(self, **kwargs): self.availability_set = kwargs.get('availability_set', None) self.virtual_machine_scale_set = kwargs.get('virtual_machine_scale_set', None) self.proximity_placement_group = kwargs.get('proximity_placement_group', None) + self.priority = kwargs.get('priority', None) + self.eviction_policy = kwargs.get('eviction_policy', None) + self.billing_profile = kwargs.get('billing_profile', None) self.host = kwargs.get('host', None) self.provisioning_state = None self.instance_view = None diff --git a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models_py3.py b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models_py3.py index 2ed807f65fb..23e9b03627a 100644 --- a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models_py3.py +++ b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_03_01/models/_models_py3.py @@ -392,6 +392,36 @@ def __init__(self, *, tags=None, platform_update_domain_count: int=None, platfor self.sku = sku +class BillingProfile(Model): + """Specifies the billing related details of a low priority VM or VMSS. +

Minimum api-version: 2019-03-01. + + :param max_price: Specifies the maximum price you are willing to pay for a + low priority VM/VMSS. This price is in US Dollars.

This price + will be compared with the current low priority price for the VM size. + Also, the prices are compared at the time of create/update of low priority + VM/VMSS and the operation will only succeed if the maxPrice is greater + than the current low priority price.

The maxPrice will also be + used for evicting a low priority VM/VMSS if the current low priority price + goes beyond the maxPrice after creation of VM/VMSS.

Possible + values are:

- Any decimal value greater than zero. Example: + $0.01538

-1 – indicates default price to be up-to on-demand. +

You can set the maxPrice to -1 to indicate that the low priority + VM/VMSS should not be evicted for price reasons. Also, the default max + price is -1 if it is not provided by you.

Minimum api-version: + 2019-03-01. + :type max_price: float + """ + + _attribute_map = { + 'max_price': {'key': 'maxPrice', 'type': 'float'}, + } + + def __init__(self, *, max_price: float=None, **kwargs) -> None: + super(BillingProfile, self).__init__(**kwargs) + self.max_price = max_price + + class BootDiagnostics(Model): """Boot Diagnostics is a debugging feature which allows you to view Console Output and Screenshot to diagnose VM status.

You can easily view @@ -4279,6 +4309,20 @@ class VirtualMachine(Resource):

Minimum api-version: 2018-04-01. :type proximity_placement_group: ~azure.mgmt.compute.v2019_03_01.models.SubResource + :param priority: Specifies the priority for the virtual machine. +

Minimum api-version: 2019-03-01. Possible values include: + 'Regular', 'Low' + :type priority: str or + ~azure.mgmt.compute.v2019_03_01.models.VirtualMachinePriorityTypes + :param eviction_policy: Specifies the eviction policy for the low priority + virtual machine. Only supported value is 'Deallocate'.

Minimum + api-version: 2019-03-01. Possible values include: 'Deallocate', 'Delete' + :type eviction_policy: str or + ~azure.mgmt.compute.v2019_03_01.models.VirtualMachineEvictionPolicyTypes + :param billing_profile: Specifies the billing related details of a low + priority virtual machine.

Minimum api-version: 2019-03-01. + :type billing_profile: + ~azure.mgmt.compute.v2019_03_01.models.BillingProfile :param host: Specifies information about the dedicated host that the virtual machine resides in.

Minimum api-version: 2018-10-01. :type host: ~azure.mgmt.compute.v2019_03_01.models.SubResource @@ -4339,6 +4383,9 @@ class VirtualMachine(Resource): 'availability_set': {'key': 'properties.availabilitySet', 'type': 'SubResource'}, 'virtual_machine_scale_set': {'key': 'properties.virtualMachineScaleSet', 'type': 'SubResource'}, 'proximity_placement_group': {'key': 'properties.proximityPlacementGroup', 'type': 'SubResource'}, + 'priority': {'key': 'properties.priority', 'type': 'str'}, + 'eviction_policy': {'key': 'properties.evictionPolicy', 'type': 'str'}, + 'billing_profile': {'key': 'properties.billingProfile', 'type': 'BillingProfile'}, 'host': {'key': 'properties.host', 'type': 'SubResource'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineInstanceView'}, @@ -4349,7 +4396,7 @@ class VirtualMachine(Resource): 'zones': {'key': 'zones', 'type': '[str]'}, } - def __init__(self, *, location: str, tags=None, plan=None, hardware_profile=None, storage_profile=None, additional_capabilities=None, os_profile=None, network_profile=None, diagnostics_profile=None, availability_set=None, virtual_machine_scale_set=None, proximity_placement_group=None, host=None, license_type: str=None, identity=None, zones=None, **kwargs) -> None: + def __init__(self, *, location: str, tags=None, plan=None, hardware_profile=None, storage_profile=None, additional_capabilities=None, os_profile=None, network_profile=None, diagnostics_profile=None, availability_set=None, virtual_machine_scale_set=None, proximity_placement_group=None, priority=None, eviction_policy=None, billing_profile=None, host=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 @@ -4361,6 +4408,9 @@ def __init__(self, *, location: str, tags=None, plan=None, hardware_profile=None self.availability_set = availability_set self.virtual_machine_scale_set = virtual_machine_scale_set self.proximity_placement_group = proximity_placement_group + self.priority = priority + self.eviction_policy = eviction_policy + self.billing_profile = billing_profile self.host = host self.provisioning_state = None self.instance_view = None @@ -6399,6 +6449,10 @@ class VirtualMachineScaleSetUpdateVMProfile(Model): :param license_type: The license type, which is for bring your own license scenario. :type license_type: str + :param billing_profile: Specifies the billing related details of a low + priority VMSS.

Minimum api-version: 2019-03-01. + :type billing_profile: + ~azure.mgmt.compute.v2019_03_01.models.BillingProfile :param scheduled_events_profile: Specifies Scheduled Event related configurations. :type scheduled_events_profile: @@ -6412,10 +6466,11 @@ class VirtualMachineScaleSetUpdateVMProfile(Model): 'diagnostics_profile': {'key': 'diagnosticsProfile', 'type': 'DiagnosticsProfile'}, 'extension_profile': {'key': 'extensionProfile', 'type': 'VirtualMachineScaleSetExtensionProfile'}, 'license_type': {'key': 'licenseType', 'type': 'str'}, + 'billing_profile': {'key': 'billingProfile', 'type': 'BillingProfile'}, 'scheduled_events_profile': {'key': 'scheduledEventsProfile', 'type': 'ScheduledEventsProfile'}, } - def __init__(self, *, os_profile=None, storage_profile=None, network_profile=None, diagnostics_profile=None, extension_profile=None, license_type: str=None, scheduled_events_profile=None, **kwargs) -> None: + def __init__(self, *, os_profile=None, storage_profile=None, network_profile=None, diagnostics_profile=None, extension_profile=None, license_type: str=None, billing_profile=None, scheduled_events_profile=None, **kwargs) -> None: super(VirtualMachineScaleSetUpdateVMProfile, self).__init__(**kwargs) self.os_profile = os_profile self.storage_profile = storage_profile @@ -6423,6 +6478,7 @@ def __init__(self, *, os_profile=None, storage_profile=None, network_profile=Non self.diagnostics_profile = diagnostics_profile self.extension_profile = extension_profile self.license_type = license_type + self.billing_profile = billing_profile self.scheduled_events_profile = scheduled_events_profile @@ -6805,6 +6861,10 @@ class VirtualMachineScaleSetVMProfile(Model): 2017-10-30-preview. Possible values include: 'Deallocate', 'Delete' :type eviction_policy: str or ~azure.mgmt.compute.v2019_03_01.models.VirtualMachineEvictionPolicyTypes + :param billing_profile: Specifies the billing related details of a low + priority VMSS.

Minimum api-version: 2019-03-01. + :type billing_profile: + ~azure.mgmt.compute.v2019_03_01.models.BillingProfile :param scheduled_events_profile: Specifies Scheduled Event related configurations. :type scheduled_events_profile: @@ -6820,10 +6880,11 @@ class VirtualMachineScaleSetVMProfile(Model): 'license_type': {'key': 'licenseType', 'type': 'str'}, 'priority': {'key': 'priority', 'type': 'str'}, 'eviction_policy': {'key': 'evictionPolicy', 'type': 'str'}, + 'billing_profile': {'key': 'billingProfile', 'type': 'BillingProfile'}, 'scheduled_events_profile': {'key': 'scheduledEventsProfile', 'type': 'ScheduledEventsProfile'}, } - 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, scheduled_events_profile=None, **kwargs) -> None: + 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, billing_profile=None, scheduled_events_profile=None, **kwargs) -> None: super(VirtualMachineScaleSetVMProfile, self).__init__(**kwargs) self.os_profile = os_profile self.storage_profile = storage_profile @@ -6833,6 +6894,7 @@ def __init__(self, *, os_profile=None, storage_profile=None, network_profile=Non self.license_type = license_type self.priority = priority self.eviction_policy = eviction_policy + self.billing_profile = billing_profile self.scheduled_events_profile = scheduled_events_profile @@ -6997,6 +7059,20 @@ class VirtualMachineUpdate(UpdateResource):

Minimum api-version: 2018-04-01. :type proximity_placement_group: ~azure.mgmt.compute.v2019_03_01.models.SubResource + :param priority: Specifies the priority for the virtual machine. +

Minimum api-version: 2019-03-01. Possible values include: + 'Regular', 'Low' + :type priority: str or + ~azure.mgmt.compute.v2019_03_01.models.VirtualMachinePriorityTypes + :param eviction_policy: Specifies the eviction policy for the low priority + virtual machine. Only supported value is 'Deallocate'.

Minimum + api-version: 2019-03-01. Possible values include: 'Deallocate', 'Delete' + :type eviction_policy: str or + ~azure.mgmt.compute.v2019_03_01.models.VirtualMachineEvictionPolicyTypes + :param billing_profile: Specifies the billing related details of a low + priority virtual machine.

Minimum api-version: 2019-03-01. + :type billing_profile: + ~azure.mgmt.compute.v2019_03_01.models.BillingProfile :param host: Specifies information about the dedicated host that the virtual machine resides in.

Minimum api-version: 2018-10-01. :type host: ~azure.mgmt.compute.v2019_03_01.models.SubResource @@ -7045,6 +7121,9 @@ class VirtualMachineUpdate(UpdateResource): 'availability_set': {'key': 'properties.availabilitySet', 'type': 'SubResource'}, 'virtual_machine_scale_set': {'key': 'properties.virtualMachineScaleSet', 'type': 'SubResource'}, 'proximity_placement_group': {'key': 'properties.proximityPlacementGroup', 'type': 'SubResource'}, + 'priority': {'key': 'properties.priority', 'type': 'str'}, + 'eviction_policy': {'key': 'properties.evictionPolicy', 'type': 'str'}, + 'billing_profile': {'key': 'properties.billingProfile', 'type': 'BillingProfile'}, 'host': {'key': 'properties.host', 'type': 'SubResource'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineInstanceView'}, @@ -7054,7 +7133,7 @@ class VirtualMachineUpdate(UpdateResource): 'zones': {'key': 'zones', 'type': '[str]'}, } - def __init__(self, *, tags=None, plan=None, hardware_profile=None, storage_profile=None, additional_capabilities=None, os_profile=None, network_profile=None, diagnostics_profile=None, availability_set=None, virtual_machine_scale_set=None, proximity_placement_group=None, host=None, license_type: str=None, identity=None, zones=None, **kwargs) -> None: + def __init__(self, *, tags=None, plan=None, hardware_profile=None, storage_profile=None, additional_capabilities=None, os_profile=None, network_profile=None, diagnostics_profile=None, availability_set=None, virtual_machine_scale_set=None, proximity_placement_group=None, priority=None, eviction_policy=None, billing_profile=None, host=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 @@ -7066,6 +7145,9 @@ def __init__(self, *, tags=None, plan=None, hardware_profile=None, storage_profi self.availability_set = availability_set self.virtual_machine_scale_set = virtual_machine_scale_set self.proximity_placement_group = proximity_placement_group + self.priority = priority + self.eviction_policy = eviction_policy + self.billing_profile = billing_profile self.host = host self.provisioning_state = None self.instance_view = None From c62bf097ba60c5d74db7d40e1d578a048ec24677 Mon Sep 17 00:00:00 2001 From: zikalino Date: Tue, 27 Aug 2019 10:13:38 +0800 Subject: [PATCH 6/6] changelog and version --- sdk/compute/azure-mgmt-compute/HISTORY.rst | 23 +++++++++++++++++++ .../azure/mgmt/compute/version.py | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/sdk/compute/azure-mgmt-compute/HISTORY.rst b/sdk/compute/azure-mgmt-compute/HISTORY.rst index 0aeee142b5a..54d9523e537 100644 --- a/sdk/compute/azure-mgmt-compute/HISTORY.rst +++ b/sdk/compute/azure-mgmt-compute/HISTORY.rst @@ -3,6 +3,29 @@ Release History =============== +7.0.0 (2019-08-27) +++++++++++++++++++ + +**Features** + +- Model VirtualMachineScaleSetUpdateVMProfile has a new parameter scheduled_events_profile +- Model VirtualMachineScaleSetUpdateVMProfile has a new parameter billing_profile +- Model VirtualMachine has a new parameter virtual_machine_scale_set +- Model VirtualMachine has a new parameter priority +- Model VirtualMachine has a new parameter billing_profile +- Model VirtualMachine has a new parameter eviction_policy +- Model VirtualMachineScaleSetVMProfile has a new parameter scheduled_events_profile +- Model VirtualMachineScaleSetVMProfile has a new parameter billing_profile +- Model VirtualMachineImage has a new parameter hyper_vgeneration +- Model VirtualMachineUpdate has a new parameter virtual_machine_scale_set +- Model VirtualMachineUpdate has a new parameter priority +- Model VirtualMachineUpdate has a new parameter billing_profile +- Model VirtualMachineUpdate has a new parameter eviction_policy + +**Breaking changes** + +- Operation VirtualMachineScaleSetVMsOperations.get has a new signature + 6.0.0 (2019-07-20) ++++++++++++++++++ diff --git a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/version.py b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/version.py index d15d41e4399..99fc271627d 100644 --- a/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/version.py +++ b/sdk/compute/azure-mgmt-compute/azure/mgmt/compute/version.py @@ -5,4 +5,4 @@ # license information. # -------------------------------------------------------------------------- -VERSION = "6.0.0" +VERSION = "7.0.0"