Skip to content
New issue

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

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

Already on GitHub? # to your account

[AutoPR compute/resource-manager] Swagger changes for adding diffdisksettings property for the Ephemeral OS Disks #3373

Merged
merged 4 commits into from
Sep 24, 2018
Merged
Changes from 1 commit
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
Prev Previous commit
Generated from 474d5b03008f5780dcb546ed5264bae7eb3d8e59
 updated 2018-10-01 version specs with diffdisk property
  • Loading branch information
AutorestCI committed Sep 22, 2018
commit df94f34316f2c97a0b5cb670f0198ee58d3b03dc
Original file line number Diff line number Diff line change
@@ -358,12 +358,13 @@
from .snapshot_paged import SnapshotPaged
from .compute_management_client_enums import (
StatusLevelTypes,
AvailabilitySetSkuTypes,
OperatingSystemTypes,
VirtualMachineSizeTypes,
CachingTypes,
DiskCreateOptionTypes,
StorageAccountTypes,
DiffDiskOption,
DiffDiskOptions,
PassNames,
ComponentNames,
SettingNames,
@@ -575,12 +576,13 @@
'DiskPaged',
'SnapshotPaged',
'StatusLevelTypes',
'AvailabilitySetSkuTypes',
'OperatingSystemTypes',
'VirtualMachineSizeTypes',
'CachingTypes',
'DiskCreateOptionTypes',
'StorageAccountTypes',
'DiffDiskOption',
'DiffDiskOptions',
'PassNames',
'ComponentNames',
'SettingNames',
Original file line number Diff line number Diff line change
@@ -16,11 +16,11 @@ class AdditionalCapabilities(Model):
"""Enables or disables a capability on the virtual machine or virtual machine
scale set.

:param ultra_ssd_enabled: Enables or disables a capability to have 1 or
more managed data disks with UltraSSD_LRS storage account on the VM or
VMSS. Managed disks with storage account type UltraSSD_LRS can be added to
a virtual machine or virtual machine scale set only if this property is
enabled.
:param ultra_ssd_enabled: The flag that enables or disables a capability
to have one or more managed data disks with UltraSSD_LRS storage account
type on the VM or VMSS. Managed disks with storage account type
UltraSSD_LRS can be added to a virtual machine or virtual machine scale
set only if this property is enabled.
:type ultra_ssd_enabled: bool
"""

Original file line number Diff line number Diff line change
@@ -16,11 +16,11 @@ class AdditionalCapabilities(Model):
"""Enables or disables a capability on the virtual machine or virtual machine
scale set.

:param ultra_ssd_enabled: Enables or disables a capability to have 1 or
more managed data disks with UltraSSD_LRS storage account on the VM or
VMSS. Managed disks with storage account type UltraSSD_LRS can be added to
a virtual machine or virtual machine scale set only if this property is
enabled.
:param ultra_ssd_enabled: The flag that enables or disables a capability
to have one or more managed data disks with UltraSSD_LRS storage account
type on the VM or VMSS. Managed disks with storage account type
UltraSSD_LRS can be added to a virtual machine or virtual machine scale
set only if this property is enabled.
:type ultra_ssd_enabled: bool
"""

Original file line number Diff line number Diff line change
@@ -51,7 +51,10 @@ class AvailabilitySet(Resource):
:ivar statuses: The resource status information.
:vartype statuses:
list[~azure.mgmt.compute.v2018_06_01.models.InstanceViewStatus]
:param sku: Sku of the availability set
:param sku: Sku of the availability set, only name is required to be set.
See AvailabilitySetSkuTypes for possible set of values. Use 'Aligned' for
virtual machines with managed disks and 'Classic' for virtual machines
with unmanaged disks. Default value is 'Classic'.
:type sku: ~azure.mgmt.compute.v2018_06_01.models.Sku
"""

Original file line number Diff line number Diff line change
@@ -51,7 +51,10 @@ class AvailabilitySet(Resource):
:ivar statuses: The resource status information.
:vartype statuses:
list[~azure.mgmt.compute.v2018_06_01.models.InstanceViewStatus]
:param sku: Sku of the availability set
:param sku: Sku of the availability set, only name is required to be set.
See AvailabilitySetSkuTypes for possible set of values. Use 'Aligned' for
virtual machines with managed disks and 'Classic' for virtual machines
with unmanaged disks. Default value is 'Classic'.
:type sku: ~azure.mgmt.compute.v2018_06_01.models.Sku
"""

Original file line number Diff line number Diff line change
@@ -19,6 +19,12 @@ class StatusLevelTypes(str, Enum):
error = "Error"


class AvailabilitySetSkuTypes(str, Enum):

classic = "Classic"
aligned = "Aligned"


class OperatingSystemTypes(str, Enum):

windows = "Windows"
@@ -217,7 +223,7 @@ class StorageAccountTypes(str, Enum):
ultra_ssd_lrs = "UltraSSD_LRS"


class DiffDiskOption(str, Enum):
class DiffDiskOptions(str, Enum):

local = "Local"

Original file line number Diff line number Diff line change
@@ -13,11 +13,14 @@


class DiffDiskSettings(Model):
"""The parameters of a DiffDiskSettings for operating system disk.
"""Describes the parameters of differencing disk settings that can be be
specified for operating system disk. <br><br> NOTE: The differencing disk
settings can only be specified for managed disk.

:param option: Specifies the differencing disk settings for operating
system disk. Possible values include: 'Local'
:type option: str or ~azure.mgmt.compute.v2018_06_01.models.DiffDiskOption
:type option: str or
~azure.mgmt.compute.v2018_06_01.models.DiffDiskOptions
"""

_attribute_map = {
Original file line number Diff line number Diff line change
@@ -13,11 +13,14 @@


class DiffDiskSettings(Model):
"""The parameters of a DiffDiskSettings for operating system disk.
"""Describes the parameters of differencing disk settings that can be be
specified for operating system disk. <br><br> NOTE: The differencing disk
settings can only be specified for managed disk.

:param option: Specifies the differencing disk settings for operating
system disk. Possible values include: 'Local'
:type option: str or ~azure.mgmt.compute.v2018_06_01.models.DiffDiskOption
:type option: str or
~azure.mgmt.compute.v2018_06_01.models.DiffDiskOptions
"""

_attribute_map = {
Original file line number Diff line number Diff line change
@@ -37,9 +37,9 @@ class ImageDataDisk(Model):
machine image. <br><br> This value cannot be larger than 1023 GB
:type disk_size_gb: int
:param storage_account_type: Specifies the storage account type for the
managed disk. Possible values are: Standard_LRS, Premium_LRS, and
StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
'StandardSSD_LRS', 'UltraSSD_LRS'
managed disk. NOTE: UltraSSD_LRS can only be used with data disks, it
cannot be used with OS Disk. Possible values include: 'Standard_LRS',
'Premium_LRS', 'StandardSSD_LRS', 'UltraSSD_LRS'
:type storage_account_type: str or
~azure.mgmt.compute.v2018_06_01.models.StorageAccountTypes
"""
Original file line number Diff line number Diff line change
@@ -37,9 +37,9 @@ class ImageDataDisk(Model):
machine image. <br><br> This value cannot be larger than 1023 GB
:type disk_size_gb: int
:param storage_account_type: Specifies the storage account type for the
managed disk. Possible values are: Standard_LRS, Premium_LRS, and
StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
'StandardSSD_LRS', 'UltraSSD_LRS'
managed disk. NOTE: UltraSSD_LRS can only be used with data disks, it
cannot be used with OS Disk. Possible values include: 'Standard_LRS',
'Premium_LRS', 'StandardSSD_LRS', 'UltraSSD_LRS'
:type storage_account_type: str or
~azure.mgmt.compute.v2018_06_01.models.StorageAccountTypes
"""
Original file line number Diff line number Diff line change
@@ -43,9 +43,8 @@ class ImageOSDisk(Model):
machine image. <br><br> This value cannot be larger than 1023 GB
:type disk_size_gb: int
:param storage_account_type: Specifies the storage account type for the
managed disk. Possible values are: Standard_LRS, Premium_LRS, and
StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
'StandardSSD_LRS', 'UltraSSD_LRS'
managed disk. UltraSSD_LRS cannot be used with OS Disk. Possible values
include: 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS', 'UltraSSD_LRS'
:type storage_account_type: str or
~azure.mgmt.compute.v2018_06_01.models.StorageAccountTypes
"""
Original file line number Diff line number Diff line change
@@ -43,9 +43,8 @@ class ImageOSDisk(Model):
machine image. <br><br> This value cannot be larger than 1023 GB
:type disk_size_gb: int
:param storage_account_type: Specifies the storage account type for the
managed disk. Possible values are: Standard_LRS, Premium_LRS, and
StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
'StandardSSD_LRS', 'UltraSSD_LRS'
managed disk. UltraSSD_LRS cannot be used with OS Disk. Possible values
include: 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS', 'UltraSSD_LRS'
:type storage_account_type: str or
~azure.mgmt.compute.v2018_06_01.models.StorageAccountTypes
"""
Original file line number Diff line number Diff line change
@@ -18,9 +18,9 @@ class ManagedDiskParameters(SubResource):
:param id: Resource Id
:type id: str
:param storage_account_type: Specifies the storage account type for the
managed disk. UltraSSD_LRS can only be used for data disks. Possible
values include: 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS',
'UltraSSD_LRS'
managed disk. NOTE: UltraSSD_LRS can only be used with data disks, it
cannot be used with OS Disk. Possible values include: 'Standard_LRS',
'Premium_LRS', 'StandardSSD_LRS', 'UltraSSD_LRS'
:type storage_account_type: str or
~azure.mgmt.compute.v2018_06_01.models.StorageAccountTypes
"""
Original file line number Diff line number Diff line change
@@ -18,9 +18,9 @@ class ManagedDiskParameters(SubResource):
:param id: Resource Id
:type id: str
:param storage_account_type: Specifies the storage account type for the
managed disk. UltraSSD_LRS can only be used for data disks. Possible
values include: 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS',
'UltraSSD_LRS'
managed disk. NOTE: UltraSSD_LRS can only be used with data disks, it
cannot be used with OS Disk. Possible values include: 'Standard_LRS',
'Premium_LRS', 'StandardSSD_LRS', 'UltraSSD_LRS'
:type storage_account_type: str or
~azure.mgmt.compute.v2018_06_01.models.StorageAccountTypes
"""
Original file line number Diff line number Diff line change
@@ -15,13 +15,19 @@
class TargetRegion(Model):
"""Describes the target region information.

:param name: The name of the region.
All required parameters must be populated in order to send to Azure.

:param name: Required. The name of the region.
:type name: str
:param regional_replica_count: The number of replicas of the Image Version
to be created per region. This property is updateable.
:type regional_replica_count: int
"""

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

_attribute_map = {
'name': {'key': 'name', 'type': 'str'},
'regional_replica_count': {'key': 'regionalReplicaCount', 'type': 'int'},
Original file line number Diff line number Diff line change
@@ -15,19 +15,25 @@
class TargetRegion(Model):
"""Describes the target region information.

:param name: The name of the region.
All required parameters must be populated in order to send to Azure.

:param name: Required. The name of the region.
:type name: str
:param regional_replica_count: The number of replicas of the Image Version
to be created per region. This property is updateable.
:type regional_replica_count: int
"""

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

_attribute_map = {
'name': {'key': 'name', 'type': 'str'},
'regional_replica_count': {'key': 'regionalReplicaCount', 'type': 'int'},
}

def __init__(self, *, name: str=None, regional_replica_count: int=None, **kwargs) -> None:
def __init__(self, *, name: str, regional_replica_count: int=None, **kwargs) -> None:
super(TargetRegion, self).__init__(**kwargs)
self.name = name
self.regional_replica_count = regional_replica_count
Original file line number Diff line number Diff line change
@@ -47,9 +47,7 @@ class VirtualMachine(Resource):
:type storage_profile:
~azure.mgmt.compute.v2018_06_01.models.StorageProfile
:param additional_capabilities: Specifies additional capabilities enabled
or disabled on the virtual machine. For instance: whether the virtual
machine has the capability to support attaching managed data disks with
UltraSSD_LRS storage account type.
or disabled on the virtual machine.
:type additional_capabilities:
~azure.mgmt.compute.v2018_06_01.models.AdditionalCapabilities
:param os_profile: Specifies the operating system settings for the virtual
Original file line number Diff line number Diff line change
@@ -47,9 +47,7 @@ class VirtualMachine(Resource):
:type storage_profile:
~azure.mgmt.compute.v2018_06_01.models.StorageProfile
:param additional_capabilities: Specifies additional capabilities enabled
or disabled on the virtual machine. For instance: whether the virtual
machine has the capability to support attaching managed data disks with
UltraSSD_LRS storage account type.
or disabled on the virtual machine.
:type additional_capabilities:
~azure.mgmt.compute.v2018_06_01.models.AdditionalCapabilities
:param os_profile: Specifies the operating system settings for the virtual
Original file line number Diff line number Diff line change
@@ -16,9 +16,9 @@ class VirtualMachineScaleSetManagedDiskParameters(Model):
"""Describes the parameters of a ScaleSet managed disk.

:param storage_account_type: Specifies the storage account type for the
managed disk. Possible values are: Standard_LRS, Premium_LRS, and
StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
'StandardSSD_LRS', 'UltraSSD_LRS'
managed disk. NOTE: UltraSSD_LRS can only be used with data disks, it
cannot be used with OS Disk. Possible values include: 'Standard_LRS',
'Premium_LRS', 'StandardSSD_LRS', 'UltraSSD_LRS'
:type storage_account_type: str or
~azure.mgmt.compute.v2018_06_01.models.StorageAccountTypes
"""
Original file line number Diff line number Diff line change
@@ -16,9 +16,9 @@ class VirtualMachineScaleSetManagedDiskParameters(Model):
"""Describes the parameters of a ScaleSet managed disk.

:param storage_account_type: Specifies the storage account type for the
managed disk. Possible values are: Standard_LRS, Premium_LRS, and
StandardSSD_LRS. Possible values include: 'Standard_LRS', 'Premium_LRS',
'StandardSSD_LRS', 'UltraSSD_LRS'
managed disk. NOTE: UltraSSD_LRS can only be used with data disks, it
cannot be used with OS Disk. Possible values include: 'Standard_LRS',
'Premium_LRS', 'StandardSSD_LRS', 'UltraSSD_LRS'
:type storage_account_type: str or
~azure.mgmt.compute.v2018_06_01.models.StorageAccountTypes
"""
Original file line number Diff line number Diff line change
@@ -37,9 +37,7 @@ class VirtualMachineUpdate(UpdateResource):
:type storage_profile:
~azure.mgmt.compute.v2018_06_01.models.StorageProfile
:param additional_capabilities: Specifies additional capabilities enabled
or disabled on the virtual machine. For instance: whether the virtual
machine has the capability to support attaching managed data disks with
UltraSSD_LRS storage account type.
or disabled on the virtual machine.
:type additional_capabilities:
~azure.mgmt.compute.v2018_06_01.models.AdditionalCapabilities
:param os_profile: Specifies the operating system settings for the virtual
Original file line number Diff line number Diff line change
@@ -37,9 +37,7 @@ class VirtualMachineUpdate(UpdateResource):
:type storage_profile:
~azure.mgmt.compute.v2018_06_01.models.StorageProfile
:param additional_capabilities: Specifies additional capabilities enabled
or disabled on the virtual machine. For instance: whether the virtual
machine has the capability to support attaching managed data disks with
UltraSSD_LRS storage account type.
or disabled on the virtual machine.
:type additional_capabilities:
~azure.mgmt.compute.v2018_06_01.models.AdditionalCapabilities
:param os_profile: Specifies the operating system settings for the virtual
Original file line number Diff line number Diff line change
@@ -100,8 +100,8 @@ def create_or_update(
:param resource_group_name: The name of the resource group.
:type resource_group_name: str
:param gallery_name: The name of the Shared Image Gallery. The allowed
characters are alphabets and numbers with dots, dashes, and periods
allowed in the middle. The maximum length is 80 characters.
characters are alphabets and numbers with dots and periods allowed in
the middle. The maximum length is 80 characters.
:type gallery_name: str
:param gallery: Parameters supplied to the create or update Shared
Image Gallery operation.