Skip to content

Commit 9900670

Browse files
AutorestCIAutorestCI
authored
[AutoPR compute/resource-manager] [Compute] add zone and rolling upgrade. (#3148)
* Generated from 8f16e79b245d1c099de8ba5252eee3950d22f3c9 Update compute.json and disk.json for some issues and add zone and rolling upgrade. * Generated from 88a505b7a2de9272891f77bbf24c4eeeb34aa0d2 Update compute.json and disk.json for some issues and add zone and rolling upgrade.
1 parent 8819a52 commit 9900670

35 files changed

+253
-58
lines changed

‎azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/__init__.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@
6363
from .virtual_machine_identity_py3 import VirtualMachineIdentity
6464
from .maintenance_redeploy_status_py3 import MaintenanceRedeployStatus
6565
from .virtual_machine_instance_view_py3 import VirtualMachineInstanceView
66-
from .virtual_machine_health_status_py3 import VirtualMachineHealthStatus
67-
from .virtual_machine_scale_set_vm_instance_view_py3 import VirtualMachineScaleSetVMInstanceView
6866
from .virtual_machine_py3 import VirtualMachine
6967
from .virtual_machine_update_py3 import VirtualMachineUpdate
7068
from .auto_os_upgrade_policy_py3 import AutoOSUpgradePolicy
@@ -117,6 +115,8 @@
117115
from .rolling_upgrade_progress_info_py3 import RollingUpgradeProgressInfo
118116
from .upgrade_operation_historical_status_info_properties_py3 import UpgradeOperationHistoricalStatusInfoProperties
119117
from .upgrade_operation_historical_status_info_py3 import UpgradeOperationHistoricalStatusInfo
118+
from .virtual_machine_health_status_py3 import VirtualMachineHealthStatus
119+
from .virtual_machine_scale_set_vm_instance_view_py3 import VirtualMachineScaleSetVMInstanceView
120120
from .virtual_machine_scale_set_vm_py3 import VirtualMachineScaleSetVM
121121
from .rolling_upgrade_running_status_py3 import RollingUpgradeRunningStatus
122122
from .rolling_upgrade_status_info_py3 import RollingUpgradeStatusInfo
@@ -191,8 +191,6 @@
191191
from .virtual_machine_identity import VirtualMachineIdentity
192192
from .maintenance_redeploy_status import MaintenanceRedeployStatus
193193
from .virtual_machine_instance_view import VirtualMachineInstanceView
194-
from .virtual_machine_health_status import VirtualMachineHealthStatus
195-
from .virtual_machine_scale_set_vm_instance_view import VirtualMachineScaleSetVMInstanceView
196194
from .virtual_machine import VirtualMachine
197195
from .virtual_machine_update import VirtualMachineUpdate
198196
from .auto_os_upgrade_policy import AutoOSUpgradePolicy
@@ -245,6 +243,8 @@
245243
from .rolling_upgrade_progress_info import RollingUpgradeProgressInfo
246244
from .upgrade_operation_historical_status_info_properties import UpgradeOperationHistoricalStatusInfoProperties
247245
from .upgrade_operation_historical_status_info import UpgradeOperationHistoricalStatusInfo
246+
from .virtual_machine_health_status import VirtualMachineHealthStatus
247+
from .virtual_machine_scale_set_vm_instance_view import VirtualMachineScaleSetVMInstanceView
248248
from .virtual_machine_scale_set_vm import VirtualMachineScaleSetVM
249249
from .rolling_upgrade_running_status import RollingUpgradeRunningStatus
250250
from .rolling_upgrade_status_info import RollingUpgradeStatusInfo
@@ -358,8 +358,6 @@
358358
'VirtualMachineIdentity',
359359
'MaintenanceRedeployStatus',
360360
'VirtualMachineInstanceView',
361-
'VirtualMachineHealthStatus',
362-
'VirtualMachineScaleSetVMInstanceView',
363361
'VirtualMachine',
364362
'VirtualMachineUpdate',
365363
'AutoOSUpgradePolicy',
@@ -412,6 +410,8 @@
412410
'RollingUpgradeProgressInfo',
413411
'UpgradeOperationHistoricalStatusInfoProperties',
414412
'UpgradeOperationHistoricalStatusInfo',
413+
'VirtualMachineHealthStatus',
414+
'VirtualMachineScaleSetVMInstanceView',
415415
'VirtualMachineScaleSetVM',
416416
'RollingUpgradeRunningStatus',
417417
'RollingUpgradeStatusInfo',

‎azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class VirtualMachine(Resource):
7474
:vartype provisioning_state: str
7575
:ivar instance_view: The virtual machine instance view.
7676
:vartype instance_view:
77-
~azure.mgmt.compute.v2017_12_01.models.VirtualMachineScaleSetVMInstanceView
77+
~azure.mgmt.compute.v2017_12_01.models.VirtualMachineInstanceView
7878
:param license_type: Specifies that the image or disk that is being used
7979
was licensed on-premises. This element is only used for images that
8080
contain the Windows Server operating system. <br><br> Possible values are:
@@ -124,7 +124,7 @@ class VirtualMachine(Resource):
124124
'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'},
125125
'availability_set': {'key': 'properties.availabilitySet', 'type': 'SubResource'},
126126
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
127-
'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineScaleSetVMInstanceView'},
127+
'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineInstanceView'},
128128
'license_type': {'key': 'properties.licenseType', 'type': 'str'},
129129
'vm_id': {'key': 'properties.vmId', 'type': 'str'},
130130
'resources': {'key': 'resources', 'type': '[VirtualMachineExtension]'},

‎azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_py3.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class VirtualMachine(Resource):
7474
:vartype provisioning_state: str
7575
:ivar instance_view: The virtual machine instance view.
7676
:vartype instance_view:
77-
~azure.mgmt.compute.v2017_12_01.models.VirtualMachineScaleSetVMInstanceView
77+
~azure.mgmt.compute.v2017_12_01.models.VirtualMachineInstanceView
7878
:param license_type: Specifies that the image or disk that is being used
7979
was licensed on-premises. This element is only used for images that
8080
contain the Windows Server operating system. <br><br> Possible values are:
@@ -124,7 +124,7 @@ class VirtualMachine(Resource):
124124
'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'},
125125
'availability_set': {'key': 'properties.availabilitySet', 'type': 'SubResource'},
126126
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
127-
'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineScaleSetVMInstanceView'},
127+
'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineInstanceView'},
128128
'license_type': {'key': 'properties.licenseType', 'type': 'str'},
129129
'vm_id': {'key': 'properties.vmId', 'type': 'str'},
130130
'resources': {'key': 'resources', 'type': '[VirtualMachineExtension]'},

‎azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_vm.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class VirtualMachineScaleSetVM(Resource):
4141
:vartype vm_id: str
4242
:ivar instance_view: The virtual machine instance view.
4343
:vartype instance_view:
44-
~azure.mgmt.compute.v2017_12_01.models.VirtualMachineInstanceView
44+
~azure.mgmt.compute.v2017_12_01.models.VirtualMachineScaleSetVMInstanceView
4545
:param hardware_profile: Specifies the hardware settings for the virtual
4646
machine.
4747
:type hardware_profile:
@@ -123,7 +123,7 @@ class VirtualMachineScaleSetVM(Resource):
123123
'sku': {'key': 'sku', 'type': 'Sku'},
124124
'latest_model_applied': {'key': 'properties.latestModelApplied', 'type': 'bool'},
125125
'vm_id': {'key': 'properties.vmId', 'type': 'str'},
126-
'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineInstanceView'},
126+
'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineScaleSetVMInstanceView'},
127127
'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
128128
'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
129129
'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},

‎azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_scale_set_vm_py3.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class VirtualMachineScaleSetVM(Resource):
4141
:vartype vm_id: str
4242
:ivar instance_view: The virtual machine instance view.
4343
:vartype instance_view:
44-
~azure.mgmt.compute.v2017_12_01.models.VirtualMachineInstanceView
44+
~azure.mgmt.compute.v2017_12_01.models.VirtualMachineScaleSetVMInstanceView
4545
:param hardware_profile: Specifies the hardware settings for the virtual
4646
machine.
4747
:type hardware_profile:
@@ -123,7 +123,7 @@ class VirtualMachineScaleSetVM(Resource):
123123
'sku': {'key': 'sku', 'type': 'Sku'},
124124
'latest_model_applied': {'key': 'properties.latestModelApplied', 'type': 'bool'},
125125
'vm_id': {'key': 'properties.vmId', 'type': 'str'},
126-
'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineInstanceView'},
126+
'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineScaleSetVMInstanceView'},
127127
'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
128128
'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
129129
'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},

‎azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_update.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class VirtualMachineUpdate(UpdateResource):
6464
:vartype provisioning_state: str
6565
:ivar instance_view: The virtual machine instance view.
6666
:vartype instance_view:
67-
~azure.mgmt.compute.v2017_12_01.models.VirtualMachineScaleSetVMInstanceView
67+
~azure.mgmt.compute.v2017_12_01.models.VirtualMachineInstanceView
6868
:param license_type: Specifies that the image or disk that is being used
6969
was licensed on-premises. This element is only used for images that
7070
contain the Windows Server operating system. <br><br> Possible values are:
@@ -102,7 +102,7 @@ class VirtualMachineUpdate(UpdateResource):
102102
'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'},
103103
'availability_set': {'key': 'properties.availabilitySet', 'type': 'SubResource'},
104104
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
105-
'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineScaleSetVMInstanceView'},
105+
'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineInstanceView'},
106106
'license_type': {'key': 'properties.licenseType', 'type': 'str'},
107107
'vm_id': {'key': 'properties.vmId', 'type': 'str'},
108108
'identity': {'key': 'identity', 'type': 'VirtualMachineIdentity'},

‎azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/virtual_machine_update_py3.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class VirtualMachineUpdate(UpdateResource):
6464
:vartype provisioning_state: str
6565
:ivar instance_view: The virtual machine instance view.
6666
:vartype instance_view:
67-
~azure.mgmt.compute.v2017_12_01.models.VirtualMachineScaleSetVMInstanceView
67+
~azure.mgmt.compute.v2017_12_01.models.VirtualMachineInstanceView
6868
:param license_type: Specifies that the image or disk that is being used
6969
was licensed on-premises. This element is only used for images that
7070
contain the Windows Server operating system. <br><br> Possible values are:
@@ -102,7 +102,7 @@ class VirtualMachineUpdate(UpdateResource):
102102
'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'},
103103
'availability_set': {'key': 'properties.availabilitySet', 'type': 'SubResource'},
104104
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
105-
'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineScaleSetVMInstanceView'},
105+
'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineInstanceView'},
106106
'license_type': {'key': 'properties.licenseType', 'type': 'str'},
107107
'vm_id': {'key': 'properties.vmId', 'type': 'str'},
108108
'identity': {'key': 'identity', 'type': 'VirtualMachineIdentity'},

‎azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/access_uri.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class AccessUri(Model):
2727
}
2828

2929
_attribute_map = {
30-
'access_sas': {'key': 'properties.output.accessSAS', 'type': 'str'},
30+
'access_sas': {'key': 'accessSAS', 'type': 'str'},
3131
}
3232

3333
def __init__(self, **kwargs):

‎azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/access_uri_py3.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class AccessUri(Model):
2727
}
2828

2929
_attribute_map = {
30-
'access_sas': {'key': 'properties.output.accessSAS', 'type': 'str'},
30+
'access_sas': {'key': 'accessSAS', 'type': 'str'},
3131
}
3232

3333
def __init__(self, **kwargs) -> None:

‎azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_artifact_publishing_profile_base.py

+7-1
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,18 @@
1515
class GalleryArtifactPublishingProfileBase(Model):
1616
"""Describes the basic gallery artifact publishing profile.
1717
18+
All required parameters must be populated in order to send to Azure.
19+
1820
:param regions: The regions where the artifact is going to be published.
1921
:type regions: list[str]
20-
:param source:
22+
:param source: Required.
2123
:type source: ~azure.mgmt.compute.v2018_06_01.models.GalleryArtifactSource
2224
"""
2325

26+
_validation = {
27+
'source': {'required': True},
28+
}
29+
2430
_attribute_map = {
2531
'regions': {'key': 'regions', 'type': '[str]'},
2632
'source': {'key': 'source', 'type': 'GalleryArtifactSource'},

‎azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_artifact_publishing_profile_base_py3.py

+8-2
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,24 @@
1515
class GalleryArtifactPublishingProfileBase(Model):
1616
"""Describes the basic gallery artifact publishing profile.
1717
18+
All required parameters must be populated in order to send to Azure.
19+
1820
:param regions: The regions where the artifact is going to be published.
1921
:type regions: list[str]
20-
:param source:
22+
:param source: Required.
2123
:type source: ~azure.mgmt.compute.v2018_06_01.models.GalleryArtifactSource
2224
"""
2325

26+
_validation = {
27+
'source': {'required': True},
28+
}
29+
2430
_attribute_map = {
2531
'regions': {'key': 'regions', 'type': '[str]'},
2632
'source': {'key': 'source', 'type': 'GalleryArtifactSource'},
2733
}
2834

29-
def __init__(self, *, regions=None, source=None, **kwargs) -> None:
35+
def __init__(self, *, source, regions=None, **kwargs) -> None:
3036
super(GalleryArtifactPublishingProfileBase, self).__init__(**kwargs)
3137
self.regions = regions
3238
self.source = source

‎azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_artifact_source.py

+7-1
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,17 @@
1515
class GalleryArtifactSource(Model):
1616
"""The source of the gallery artifact.
1717
18-
:param managed_image:
18+
All required parameters must be populated in order to send to Azure.
19+
20+
:param managed_image: Required.
1921
:type managed_image:
2022
~azure.mgmt.compute.v2018_06_01.models.ManagedArtifact
2123
"""
2224

25+
_validation = {
26+
'managed_image': {'required': True},
27+
}
28+
2329
_attribute_map = {
2430
'managed_image': {'key': 'managedImage', 'type': 'ManagedArtifact'},
2531
}

‎azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_artifact_source_py3.py

+8-2
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,21 @@
1515
class GalleryArtifactSource(Model):
1616
"""The source of the gallery artifact.
1717
18-
:param managed_image:
18+
All required parameters must be populated in order to send to Azure.
19+
20+
:param managed_image: Required.
1921
:type managed_image:
2022
~azure.mgmt.compute.v2018_06_01.models.ManagedArtifact
2123
"""
2224

25+
_validation = {
26+
'managed_image': {'required': True},
27+
}
28+
2329
_attribute_map = {
2430
'managed_image': {'key': 'managedImage', 'type': 'ManagedArtifact'},
2531
}
2632

27-
def __init__(self, *, managed_image=None, **kwargs) -> None:
33+
def __init__(self, *, managed_image, **kwargs) -> None:
2834
super(GalleryArtifactSource, self).__init__(**kwargs)
2935
self.managed_image = managed_image

‎azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image.py

+8-5
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,19 @@ class GalleryImage(Resource):
3939
:type privacy_statement_uri: str
4040
:param release_note_uri: The release note uri.
4141
:type release_note_uri: str
42-
:param os_type: This property allows you to specify the type of the OS
43-
that is included in the disk if creating a VM from user-image or a
42+
:param os_type: Required. This property allows you to specify the type of
43+
the OS that is included in the disk if creating a VM from user-image or a
4444
specialized VHD. <br><br> Possible values are: <br><br> **Windows**
4545
<br><br> **Linux**. Possible values include: 'Windows', 'Linux'
4646
:type os_type: str or
4747
~azure.mgmt.compute.v2018_06_01.models.OperatingSystemTypes
48-
:param os_state: The OS State. Possible values include: 'Generalized',
49-
'Specialized'
48+
:param os_state: Required. The OS State. Possible values include:
49+
'Generalized', 'Specialized'
5050
:type os_state: str or
5151
~azure.mgmt.compute.v2018_06_01.models.OperatingSystemStateTypes
5252
:param end_of_life_date: The end of life of this gallery image.
5353
:type end_of_life_date: datetime
54-
:param identifier:
54+
:param identifier: Required.
5555
:type identifier:
5656
~azure.mgmt.compute.v2018_06_01.models.GalleryImageIdentifier
5757
:param recommended:
@@ -75,6 +75,9 @@ class GalleryImage(Resource):
7575
'name': {'readonly': True},
7676
'type': {'readonly': True},
7777
'location': {'required': True},
78+
'os_type': {'required': True},
79+
'os_state': {'required': True},
80+
'identifier': {'required': True},
7881
'provisioning_state': {'readonly': True},
7982
}
8083

‎azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_identifier.py

+11-3
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,22 @@
1515
class GalleryImageIdentifier(Model):
1616
"""This is the gallery image identifier.
1717
18-
:param publisher: The gallery image publisher name.
18+
All required parameters must be populated in order to send to Azure.
19+
20+
:param publisher: Required. The gallery image publisher name.
1921
:type publisher: str
20-
:param offer: The gallery image offer name.
22+
:param offer: Required. The gallery image offer name.
2123
:type offer: str
22-
:param sku: The gallery image sku name.
24+
:param sku: Required. The gallery image sku name.
2325
:type sku: str
2426
"""
2527

28+
_validation = {
29+
'publisher': {'required': True},
30+
'offer': {'required': True},
31+
'sku': {'required': True},
32+
}
33+
2634
_attribute_map = {
2735
'publisher': {'key': 'publisher', 'type': 'str'},
2836
'offer': {'key': 'offer', 'type': 'str'},

‎azure-mgmt-compute/azure/mgmt/compute/v2018_06_01/models/gallery_image_identifier_py3.py

+12-4
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,29 @@
1515
class GalleryImageIdentifier(Model):
1616
"""This is the gallery image identifier.
1717
18-
:param publisher: The gallery image publisher name.
18+
All required parameters must be populated in order to send to Azure.
19+
20+
:param publisher: Required. The gallery image publisher name.
1921
:type publisher: str
20-
:param offer: The gallery image offer name.
22+
:param offer: Required. The gallery image offer name.
2123
:type offer: str
22-
:param sku: The gallery image sku name.
24+
:param sku: Required. The gallery image sku name.
2325
:type sku: str
2426
"""
2527

28+
_validation = {
29+
'publisher': {'required': True},
30+
'offer': {'required': True},
31+
'sku': {'required': True},
32+
}
33+
2634
_attribute_map = {
2735
'publisher': {'key': 'publisher', 'type': 'str'},
2836
'offer': {'key': 'offer', 'type': 'str'},
2937
'sku': {'key': 'sku', 'type': 'str'},
3038
}
3139

32-
def __init__(self, *, publisher: str=None, offer: str=None, sku: str=None, **kwargs) -> None:
40+
def __init__(self, *, publisher: str, offer: str, sku: str, **kwargs) -> None:
3341
super(GalleryImageIdentifier, self).__init__(**kwargs)
3442
self.publisher = publisher
3543
self.offer = offer

0 commit comments

Comments
 (0)