Skip to content

Commit ef0b165

Browse files
author
SDKAuto
committed
CodeGen from PR 11704 in Azure/azure-rest-api-specs
Merge 285800493b510bf0da60be96437040eeb566ea46 into f7fd049
1 parent 022e775 commit ef0b165

19 files changed

+2077
-114
lines changed

‎sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_07_01/operations/_virtual_machine_scale_set_vms_operations.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1116,7 +1116,9 @@ def _perform_maintenance_initial(
11161116

11171117
def perform_maintenance(
11181118
self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
1119-
"""Performs maintenance on a virtual machine in a VM scale set.
1119+
"""Shuts down the virtual machine in a VMScaleSet, moves it to an already
1120+
updated node, and powers it back on during the self-service phase of
1121+
planned maintenance.
11201122
11211123
:param resource_group_name: The name of the resource group.
11221124
:type resource_group_name: str

‎sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_07_01/operations/_virtual_machines_operations.py‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,12 @@ def convert_to_managed_disks(
676676
self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
677677
"""Converts virtual machine disks from blob-based to managed disks.
678678
Virtual machine must be stop-deallocated before invoking this
679-
operation.
679+
operation. <br>For Windows, please refer to [Convert a virtual machine
680+
from unmanaged disks to managed
681+
disks.](https://docs.microsoft.com/en-us/azure/virtual-machines/windows/convert-unmanaged-to-managed-disks).<br>For
682+
Linux, please refer to [Convert a virtual machine from unmanaged disks
683+
to managed
684+
disks.](https://docs.microsoft.com/en-us/azure/virtual-machines/linux/convert-unmanaged-to-managed-disks).
680685
681686
:param resource_group_name: The name of the resource group.
682687
:type resource_group_name: str
@@ -1614,7 +1619,9 @@ def _perform_maintenance_initial(
16141619

16151620
def perform_maintenance(
16161621
self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
1617-
"""The operation to perform maintenance on a virtual machine.
1622+
"""Shuts down the virtual machine, moves it to an already updated node,
1623+
and powers it back on during the self-service phase of planned
1624+
maintenance.
16181625
16191626
:param resource_group_name: The name of the resource group.
16201627
:type resource_group_name: str

‎sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_12_01/operations/_virtual_machine_scale_set_vms_operations.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1116,7 +1116,9 @@ def _perform_maintenance_initial(
11161116

11171117
def perform_maintenance(
11181118
self, resource_group_name, vm_scale_set_name, instance_id, custom_headers=None, raw=False, polling=True, **operation_config):
1119-
"""Performs maintenance on a virtual machine in a VM scale set.
1119+
"""Shuts down the virtual machine in a VMScaleSet, moves it to an already
1120+
updated node, and powers it back on during the self-service phase of
1121+
planned maintenance.
11201122
11211123
:param resource_group_name: The name of the resource group.
11221124
:type resource_group_name: str

‎sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_12_01/operations/_virtual_machines_operations.py‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,12 @@ def convert_to_managed_disks(
676676
self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
677677
"""Converts virtual machine disks from blob-based to managed disks.
678678
Virtual machine must be stop-deallocated before invoking this
679-
operation.
679+
operation. <br>For Windows, please refer to [Convert a virtual machine
680+
from unmanaged disks to managed
681+
disks.](https://docs.microsoft.com/en-us/azure/virtual-machines/windows/convert-unmanaged-to-managed-disks).<br>For
682+
Linux, please refer to [Convert a virtual machine from unmanaged disks
683+
to managed
684+
disks.](https://docs.microsoft.com/en-us/azure/virtual-machines/linux/convert-unmanaged-to-managed-disks).
680685
681686
:param resource_group_name: The name of the resource group.
682687
:type resource_group_name: str
@@ -1614,7 +1619,9 @@ def _perform_maintenance_initial(
16141619

16151620
def perform_maintenance(
16161621
self, resource_group_name, vm_name, custom_headers=None, raw=False, polling=True, **operation_config):
1617-
"""The operation to perform maintenance on a virtual machine.
1622+
"""Shuts down the virtual machine, moves it to an already updated node,
1623+
and powers it back on during the self-service phase of planned
1624+
maintenance.
16181625
16191626
:param resource_group_name: The name of the resource group.
16201627
:type resource_group_name: str

‎sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2020_06_01/_compute_management_client.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
from .operations import VirtualMachineScaleSetVMsOperations
3434
from .operations import LogAnalyticsOperations
3535
from .operations import VirtualMachineRunCommandsOperations
36+
from .operations import VirtualMachineScaleSetVMRunCommandsOperations
3637
from . import models
3738

3839

@@ -82,6 +83,8 @@ class ComputeManagementClient(SDKClient):
8283
:vartype log_analytics: azure.mgmt.compute.v2020_06_01.operations.LogAnalyticsOperations
8384
:ivar virtual_machine_run_commands: VirtualMachineRunCommands operations
8485
:vartype virtual_machine_run_commands: azure.mgmt.compute.v2020_06_01.operations.VirtualMachineRunCommandsOperations
86+
:ivar virtual_machine_scale_set_vm_run_commands: VirtualMachineScaleSetVMRunCommands operations
87+
:vartype virtual_machine_scale_set_vm_run_commands: azure.mgmt.compute.v2020_06_01.operations.VirtualMachineScaleSetVMRunCommandsOperations
8588
8689
:param credentials: Credentials needed for the client to connect to Azure.
8790
:type credentials: :mod:`A msrestazure Credentials
@@ -144,3 +147,5 @@ def __init__(
144147
self._client, self.config, self._serialize, self._deserialize)
145148
self.virtual_machine_run_commands = VirtualMachineRunCommandsOperations(
146149
self._client, self.config, self._serialize, self._deserialize)
150+
self.virtual_machine_scale_set_vm_run_commands = VirtualMachineScaleSetVMRunCommandsOperations(
151+
self._client, self.config, self._serialize, self._deserialize)

‎sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2020_06_01/models/__init__.py‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,10 @@
132132
from ._models_py3 import VirtualMachineInstanceView
133133
from ._models_py3 import VirtualMachinePatchStatus
134134
from ._models_py3 import VirtualMachineReimageParameters
135+
from ._models_py3 import VirtualMachineRunCommand
136+
from ._models_py3 import VirtualMachineRunCommandInstanceView
137+
from ._models_py3 import VirtualMachineRunCommandScriptSource
138+
from ._models_py3 import VirtualMachineRunCommandUpdate
135139
from ._models_py3 import VirtualMachineScaleSet
136140
from ._models_py3 import VirtualMachineScaleSetDataDisk
137141
from ._models_py3 import VirtualMachineScaleSetExtension
@@ -165,7 +169,10 @@
165169
from ._models_py3 import VirtualMachineScaleSetUpdateStorageProfile
166170
from ._models_py3 import VirtualMachineScaleSetUpdateVMProfile
167171
from ._models_py3 import VirtualMachineScaleSetVM
172+
from ._models_py3 import VirtualMachineScaleSetVMExtension
173+
from ._models_py3 import VirtualMachineScaleSetVMExtensionsListResult
168174
from ._models_py3 import VirtualMachineScaleSetVMExtensionsSummary
175+
from ._models_py3 import VirtualMachineScaleSetVMExtensionUpdate
169176
from ._models_py3 import VirtualMachineScaleSetVMInstanceIDs
170177
from ._models_py3 import VirtualMachineScaleSetVMInstanceRequiredIDs
171178
from ._models_py3 import VirtualMachineScaleSetVMInstanceView
@@ -304,6 +311,10 @@
304311
from ._models import VirtualMachineInstanceView
305312
from ._models import VirtualMachinePatchStatus
306313
from ._models import VirtualMachineReimageParameters
314+
from ._models import VirtualMachineRunCommand
315+
from ._models import VirtualMachineRunCommandInstanceView
316+
from ._models import VirtualMachineRunCommandScriptSource
317+
from ._models import VirtualMachineRunCommandUpdate
307318
from ._models import VirtualMachineScaleSet
308319
from ._models import VirtualMachineScaleSetDataDisk
309320
from ._models import VirtualMachineScaleSetExtension
@@ -337,7 +348,10 @@
337348
from ._models import VirtualMachineScaleSetUpdateStorageProfile
338349
from ._models import VirtualMachineScaleSetUpdateVMProfile
339350
from ._models import VirtualMachineScaleSetVM
351+
from ._models import VirtualMachineScaleSetVMExtension
352+
from ._models import VirtualMachineScaleSetVMExtensionsListResult
340353
from ._models import VirtualMachineScaleSetVMExtensionsSummary
354+
from ._models import VirtualMachineScaleSetVMExtensionUpdate
341355
from ._models import VirtualMachineScaleSetVMInstanceIDs
342356
from ._models import VirtualMachineScaleSetVMInstanceRequiredIDs
343357
from ._models import VirtualMachineScaleSetVMInstanceView
@@ -364,6 +378,7 @@
364378
from ._paged_models import UpgradeOperationHistoricalStatusInfoPaged
365379
from ._paged_models import UsagePaged
366380
from ._paged_models import VirtualMachinePaged
381+
from ._paged_models import VirtualMachineRunCommandPaged
367382
from ._paged_models import VirtualMachineScaleSetExtensionPaged
368383
from ._paged_models import VirtualMachineScaleSetPaged
369384
from ._paged_models import VirtualMachineScaleSetSkuPaged
@@ -410,6 +425,7 @@
410425
RollingUpgradeActionType,
411426
IntervalInMins,
412427
OrchestrationServiceStateAction,
428+
ExecutionState,
413429
InstanceViewTypes,
414430
)
415431

@@ -536,6 +552,10 @@
536552
'VirtualMachineInstanceView',
537553
'VirtualMachinePatchStatus',
538554
'VirtualMachineReimageParameters',
555+
'VirtualMachineRunCommand',
556+
'VirtualMachineRunCommandInstanceView',
557+
'VirtualMachineRunCommandScriptSource',
558+
'VirtualMachineRunCommandUpdate',
539559
'VirtualMachineScaleSet',
540560
'VirtualMachineScaleSetDataDisk',
541561
'VirtualMachineScaleSetExtension',
@@ -569,7 +589,10 @@
569589
'VirtualMachineScaleSetUpdateStorageProfile',
570590
'VirtualMachineScaleSetUpdateVMProfile',
571591
'VirtualMachineScaleSetVM',
592+
'VirtualMachineScaleSetVMExtension',
593+
'VirtualMachineScaleSetVMExtensionsListResult',
572594
'VirtualMachineScaleSetVMExtensionsSummary',
595+
'VirtualMachineScaleSetVMExtensionUpdate',
573596
'VirtualMachineScaleSetVMInstanceIDs',
574597
'VirtualMachineScaleSetVMInstanceRequiredIDs',
575598
'VirtualMachineScaleSetVMInstanceView',
@@ -601,6 +624,7 @@
601624
'VirtualMachineScaleSetExtensionPaged',
602625
'VirtualMachineScaleSetVMPaged',
603626
'RunCommandDocumentBasePaged',
627+
'VirtualMachineRunCommandPaged',
604628
'VmDiskTypes',
605629
'HyperVGenerationTypes',
606630
'StatusLevelTypes',
@@ -641,5 +665,6 @@
641665
'RollingUpgradeActionType',
642666
'IntervalInMins',
643667
'OrchestrationServiceStateAction',
668+
'ExecutionState',
644669
'InstanceViewTypes',
645670
]

‎sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2020_06_01/models/_compute_management_client_enums.py‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,17 @@ class OrchestrationServiceStateAction(str, Enum):
444444
suspend = "Suspend"
445445

446446

447+
class ExecutionState(str, Enum):
448+
449+
unknown = "Unknown"
450+
pending = "Pending"
451+
running = "Running"
452+
failed = "Failed"
453+
succeeded = "Succeeded"
454+
timed_out = "TimedOut"
455+
canceled = "Canceled"
456+
457+
447458
class InstanceViewTypes(str, Enum):
448459

449460
instance_view = "instanceView"

0 commit comments

Comments
 (0)