Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AutoPR compute/resource-manager] [Compute] add zone and rolling upgrade. #3148

Merged
merged 2 commits into from
Aug 20, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@
from .virtual_machine_identity_py3 import VirtualMachineIdentity
from .maintenance_redeploy_status_py3 import MaintenanceRedeployStatus
from .virtual_machine_instance_view_py3 import VirtualMachineInstanceView
from .virtual_machine_health_status_py3 import VirtualMachineHealthStatus
from .virtual_machine_scale_set_vm_instance_view_py3 import VirtualMachineScaleSetVMInstanceView
from .virtual_machine_py3 import VirtualMachine
from .virtual_machine_update_py3 import VirtualMachineUpdate
from .auto_os_upgrade_policy_py3 import AutoOSUpgradePolicy
Expand Down Expand Up @@ -117,6 +115,8 @@
from .rolling_upgrade_progress_info_py3 import RollingUpgradeProgressInfo
from .upgrade_operation_historical_status_info_properties_py3 import UpgradeOperationHistoricalStatusInfoProperties
from .upgrade_operation_historical_status_info_py3 import UpgradeOperationHistoricalStatusInfo
from .virtual_machine_health_status_py3 import VirtualMachineHealthStatus
from .virtual_machine_scale_set_vm_instance_view_py3 import VirtualMachineScaleSetVMInstanceView
from .virtual_machine_scale_set_vm_py3 import VirtualMachineScaleSetVM
from .rolling_upgrade_running_status_py3 import RollingUpgradeRunningStatus
from .rolling_upgrade_status_info_py3 import RollingUpgradeStatusInfo
Expand Down Expand Up @@ -191,8 +191,6 @@
from .virtual_machine_identity import VirtualMachineIdentity
from .maintenance_redeploy_status import MaintenanceRedeployStatus
from .virtual_machine_instance_view import VirtualMachineInstanceView
from .virtual_machine_health_status import VirtualMachineHealthStatus
from .virtual_machine_scale_set_vm_instance_view import VirtualMachineScaleSetVMInstanceView
from .virtual_machine import VirtualMachine
from .virtual_machine_update import VirtualMachineUpdate
from .auto_os_upgrade_policy import AutoOSUpgradePolicy
Expand Down Expand Up @@ -245,6 +243,8 @@
from .rolling_upgrade_progress_info import RollingUpgradeProgressInfo
from .upgrade_operation_historical_status_info_properties import UpgradeOperationHistoricalStatusInfoProperties
from .upgrade_operation_historical_status_info import UpgradeOperationHistoricalStatusInfo
from .virtual_machine_health_status import VirtualMachineHealthStatus
from .virtual_machine_scale_set_vm_instance_view import VirtualMachineScaleSetVMInstanceView
from .virtual_machine_scale_set_vm import VirtualMachineScaleSetVM
from .rolling_upgrade_running_status import RollingUpgradeRunningStatus
from .rolling_upgrade_status_info import RollingUpgradeStatusInfo
Expand Down Expand Up @@ -358,8 +358,6 @@
'VirtualMachineIdentity',
'MaintenanceRedeployStatus',
'VirtualMachineInstanceView',
'VirtualMachineHealthStatus',
'VirtualMachineScaleSetVMInstanceView',
'VirtualMachine',
'VirtualMachineUpdate',
'AutoOSUpgradePolicy',
Expand Down Expand Up @@ -412,6 +410,8 @@
'RollingUpgradeProgressInfo',
'UpgradeOperationHistoricalStatusInfoProperties',
'UpgradeOperationHistoricalStatusInfo',
'VirtualMachineHealthStatus',
'VirtualMachineScaleSetVMInstanceView',
'VirtualMachineScaleSetVM',
'RollingUpgradeRunningStatus',
'RollingUpgradeStatusInfo',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class VirtualMachine(Resource):
:vartype provisioning_state: str
:ivar instance_view: The virtual machine instance view.
:vartype instance_view:
~azure.mgmt.compute.v2017_12_01.models.VirtualMachineScaleSetVMInstanceView
~azure.mgmt.compute.v2017_12_01.models.VirtualMachineInstanceView
:param license_type: Specifies that the image or disk that is being used
was licensed on-premises. This element is only used for images that
contain the Windows Server operating system. <br><br> Possible values are:
Expand Down Expand Up @@ -124,7 +124,7 @@ class VirtualMachine(Resource):
'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'},
'availability_set': {'key': 'properties.availabilitySet', 'type': 'SubResource'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineScaleSetVMInstanceView'},
'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineInstanceView'},
'license_type': {'key': 'properties.licenseType', 'type': 'str'},
'vm_id': {'key': 'properties.vmId', 'type': 'str'},
'resources': {'key': 'resources', 'type': '[VirtualMachineExtension]'},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class VirtualMachine(Resource):
:vartype provisioning_state: str
:ivar instance_view: The virtual machine instance view.
:vartype instance_view:
~azure.mgmt.compute.v2017_12_01.models.VirtualMachineScaleSetVMInstanceView
~azure.mgmt.compute.v2017_12_01.models.VirtualMachineInstanceView
:param license_type: Specifies that the image or disk that is being used
was licensed on-premises. This element is only used for images that
contain the Windows Server operating system. <br><br> Possible values are:
Expand Down Expand Up @@ -124,7 +124,7 @@ class VirtualMachine(Resource):
'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'},
'availability_set': {'key': 'properties.availabilitySet', 'type': 'SubResource'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineScaleSetVMInstanceView'},
'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineInstanceView'},
'license_type': {'key': 'properties.licenseType', 'type': 'str'},
'vm_id': {'key': 'properties.vmId', 'type': 'str'},
'resources': {'key': 'resources', 'type': '[VirtualMachineExtension]'},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class VirtualMachineScaleSetVM(Resource):
:vartype vm_id: str
:ivar instance_view: The virtual machine instance view.
:vartype instance_view:
~azure.mgmt.compute.v2017_12_01.models.VirtualMachineInstanceView
~azure.mgmt.compute.v2017_12_01.models.VirtualMachineScaleSetVMInstanceView
:param hardware_profile: Specifies the hardware settings for the virtual
machine.
:type hardware_profile:
Expand Down Expand Up @@ -123,7 +123,7 @@ class VirtualMachineScaleSetVM(Resource):
'sku': {'key': 'sku', 'type': 'Sku'},
'latest_model_applied': {'key': 'properties.latestModelApplied', 'type': 'bool'},
'vm_id': {'key': 'properties.vmId', 'type': 'str'},
'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineInstanceView'},
'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineScaleSetVMInstanceView'},
'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class VirtualMachineScaleSetVM(Resource):
:vartype vm_id: str
:ivar instance_view: The virtual machine instance view.
:vartype instance_view:
~azure.mgmt.compute.v2017_12_01.models.VirtualMachineInstanceView
~azure.mgmt.compute.v2017_12_01.models.VirtualMachineScaleSetVMInstanceView
:param hardware_profile: Specifies the hardware settings for the virtual
machine.
:type hardware_profile:
Expand Down Expand Up @@ -123,7 +123,7 @@ class VirtualMachineScaleSetVM(Resource):
'sku': {'key': 'sku', 'type': 'Sku'},
'latest_model_applied': {'key': 'properties.latestModelApplied', 'type': 'bool'},
'vm_id': {'key': 'properties.vmId', 'type': 'str'},
'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineInstanceView'},
'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineScaleSetVMInstanceView'},
'hardware_profile': {'key': 'properties.hardwareProfile', 'type': 'HardwareProfile'},
'storage_profile': {'key': 'properties.storageProfile', 'type': 'StorageProfile'},
'os_profile': {'key': 'properties.osProfile', 'type': 'OSProfile'},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class VirtualMachineUpdate(UpdateResource):
:vartype provisioning_state: str
:ivar instance_view: The virtual machine instance view.
:vartype instance_view:
~azure.mgmt.compute.v2017_12_01.models.VirtualMachineScaleSetVMInstanceView
~azure.mgmt.compute.v2017_12_01.models.VirtualMachineInstanceView
:param license_type: Specifies that the image or disk that is being used
was licensed on-premises. This element is only used for images that
contain the Windows Server operating system. <br><br> Possible values are:
Expand Down Expand Up @@ -102,7 +102,7 @@ class VirtualMachineUpdate(UpdateResource):
'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'},
'availability_set': {'key': 'properties.availabilitySet', 'type': 'SubResource'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineScaleSetVMInstanceView'},
'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineInstanceView'},
'license_type': {'key': 'properties.licenseType', 'type': 'str'},
'vm_id': {'key': 'properties.vmId', 'type': 'str'},
'identity': {'key': 'identity', 'type': 'VirtualMachineIdentity'},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class VirtualMachineUpdate(UpdateResource):
:vartype provisioning_state: str
:ivar instance_view: The virtual machine instance view.
:vartype instance_view:
~azure.mgmt.compute.v2017_12_01.models.VirtualMachineScaleSetVMInstanceView
~azure.mgmt.compute.v2017_12_01.models.VirtualMachineInstanceView
:param license_type: Specifies that the image or disk that is being used
was licensed on-premises. This element is only used for images that
contain the Windows Server operating system. <br><br> Possible values are:
Expand Down Expand Up @@ -102,7 +102,7 @@ class VirtualMachineUpdate(UpdateResource):
'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'DiagnosticsProfile'},
'availability_set': {'key': 'properties.availabilitySet', 'type': 'SubResource'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineScaleSetVMInstanceView'},
'instance_view': {'key': 'properties.instanceView', 'type': 'VirtualMachineInstanceView'},
'license_type': {'key': 'properties.licenseType', 'type': 'str'},
'vm_id': {'key': 'properties.vmId', 'type': 'str'},
'identity': {'key': 'identity', 'type': 'VirtualMachineIdentity'},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class AccessUri(Model):
}

_attribute_map = {
'access_sas': {'key': 'properties.output.accessSAS', 'type': 'str'},
'access_sas': {'key': 'accessSAS', 'type': 'str'},
}

def __init__(self, **kwargs):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class AccessUri(Model):
}

_attribute_map = {
'access_sas': {'key': 'properties.output.accessSAS', 'type': 'str'},
'access_sas': {'key': 'accessSAS', 'type': 'str'},
}

def __init__(self, **kwargs) -> None:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,18 @@
class GalleryArtifactPublishingProfileBase(Model):
"""Describes the basic gallery artifact publishing profile.

All required parameters must be populated in order to send to Azure.

:param regions: The regions where the artifact is going to be published.
:type regions: list[str]
:param source:
:param source: Required.
:type source: ~azure.mgmt.compute.v2018_06_01.models.GalleryArtifactSource
"""

_validation = {
'source': {'required': True},
}

_attribute_map = {
'regions': {'key': 'regions', 'type': '[str]'},
'source': {'key': 'source', 'type': 'GalleryArtifactSource'},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,24 @@
class GalleryArtifactPublishingProfileBase(Model):
"""Describes the basic gallery artifact publishing profile.

All required parameters must be populated in order to send to Azure.

:param regions: The regions where the artifact is going to be published.
:type regions: list[str]
:param source:
:param source: Required.
:type source: ~azure.mgmt.compute.v2018_06_01.models.GalleryArtifactSource
"""

_validation = {
'source': {'required': True},
}

_attribute_map = {
'regions': {'key': 'regions', 'type': '[str]'},
'source': {'key': 'source', 'type': 'GalleryArtifactSource'},
}

def __init__(self, *, regions=None, source=None, **kwargs) -> None:
def __init__(self, *, source, regions=None, **kwargs) -> None:
super(GalleryArtifactPublishingProfileBase, self).__init__(**kwargs)
self.regions = regions
self.source = source
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,17 @@
class GalleryArtifactSource(Model):
"""The source of the gallery artifact.

:param managed_image:
All required parameters must be populated in order to send to Azure.

:param managed_image: Required.
:type managed_image:
~azure.mgmt.compute.v2018_06_01.models.ManagedArtifact
"""

_validation = {
'managed_image': {'required': True},
}

_attribute_map = {
'managed_image': {'key': 'managedImage', 'type': 'ManagedArtifact'},
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,21 @@
class GalleryArtifactSource(Model):
"""The source of the gallery artifact.

:param managed_image:
All required parameters must be populated in order to send to Azure.

:param managed_image: Required.
:type managed_image:
~azure.mgmt.compute.v2018_06_01.models.ManagedArtifact
"""

_validation = {
'managed_image': {'required': True},
}

_attribute_map = {
'managed_image': {'key': 'managedImage', 'type': 'ManagedArtifact'},
}

def __init__(self, *, managed_image=None, **kwargs) -> None:
def __init__(self, *, managed_image, **kwargs) -> None:
super(GalleryArtifactSource, self).__init__(**kwargs)
self.managed_image = managed_image
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,19 @@ class GalleryImage(Resource):
:type privacy_statement_uri: str
:param release_note_uri: The release note uri.
:type release_note_uri: str
:param os_type: This property allows you to specify the type of the OS
that is included in the disk if creating a VM from user-image or a
:param os_type: Required. This property allows you to specify the type of
the OS that is included in the disk if creating a VM from user-image or a
specialized VHD. <br><br> Possible values are: <br><br> **Windows**
<br><br> **Linux**. Possible values include: 'Windows', 'Linux'
:type os_type: str or
~azure.mgmt.compute.v2018_06_01.models.OperatingSystemTypes
:param os_state: The OS State. Possible values include: 'Generalized',
'Specialized'
:param os_state: Required. The OS State. Possible values include:
'Generalized', 'Specialized'
:type os_state: str or
~azure.mgmt.compute.v2018_06_01.models.OperatingSystemStateTypes
:param end_of_life_date: The end of life of this gallery image.
:type end_of_life_date: datetime
:param identifier:
:param identifier: Required.
:type identifier:
~azure.mgmt.compute.v2018_06_01.models.GalleryImageIdentifier
:param recommended:
Expand All @@ -75,6 +75,9 @@ class GalleryImage(Resource):
'name': {'readonly': True},
'type': {'readonly': True},
'location': {'required': True},
'os_type': {'required': True},
'os_state': {'required': True},
'identifier': {'required': True},
'provisioning_state': {'readonly': True},
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,22 @@
class GalleryImageIdentifier(Model):
"""This is the gallery image identifier.

:param publisher: The gallery image publisher name.
All required parameters must be populated in order to send to Azure.

:param publisher: Required. The gallery image publisher name.
:type publisher: str
:param offer: The gallery image offer name.
:param offer: Required. The gallery image offer name.
:type offer: str
:param sku: The gallery image sku name.
:param sku: Required. The gallery image sku name.
:type sku: str
"""

_validation = {
'publisher': {'required': True},
'offer': {'required': True},
'sku': {'required': True},
}

_attribute_map = {
'publisher': {'key': 'publisher', 'type': 'str'},
'offer': {'key': 'offer', 'type': 'str'},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,29 @@
class GalleryImageIdentifier(Model):
"""This is the gallery image identifier.

:param publisher: The gallery image publisher name.
All required parameters must be populated in order to send to Azure.

:param publisher: Required. The gallery image publisher name.
:type publisher: str
:param offer: The gallery image offer name.
:param offer: Required. The gallery image offer name.
:type offer: str
:param sku: The gallery image sku name.
:param sku: Required. The gallery image sku name.
:type sku: str
"""

_validation = {
'publisher': {'required': True},
'offer': {'required': True},
'sku': {'required': True},
}

_attribute_map = {
'publisher': {'key': 'publisher', 'type': 'str'},
'offer': {'key': 'offer', 'type': 'str'},
'sku': {'key': 'sku', 'type': 'str'},
}

def __init__(self, *, publisher: str=None, offer: str=None, sku: str=None, **kwargs) -> None:
def __init__(self, *, publisher: str, offer: str, sku: str, **kwargs) -> None:
super(GalleryImageIdentifier, self).__init__(**kwargs)
self.publisher = publisher
self.offer = offer
Expand Down
Loading