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] [Disk swagger] Removing resourceUpdate, adding contents to diskupdate and snapshotupdate #2664

Merged
merged 1 commit into from
May 31, 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 @@ -12,7 +12,6 @@
try:
from .resource_py3 import Resource
from .disk_sku_py3 import DiskSku
from .resource_update_py3 import ResourceUpdate
from .image_disk_reference_py3 import ImageDiskReference
from .creation_data_py3 import CreationData
from .source_vault_py3 import SourceVault
Expand All @@ -29,7 +28,6 @@
except (SyntaxError, ImportError):
from .resource import Resource
from .disk_sku import DiskSku
from .resource_update import ResourceUpdate
from .image_disk_reference import ImageDiskReference
from .creation_data import CreationData
from .source_vault import SourceVault
Expand All @@ -56,7 +54,6 @@
__all__ = [
'Resource',
'DiskSku',
'ResourceUpdate',
'ImageDiskReference',
'CreationData',
'SourceVault',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,12 @@
# regenerated.
# --------------------------------------------------------------------------

from .resource_update import ResourceUpdate
from msrest.serialization import Model


class DiskUpdate(ResourceUpdate):
class DiskUpdate(Model):
"""Disk update resource.

:param tags: Resource tags
:type tags: dict[str, str]
:param sku:
:type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
:param os_type: the Operating System type. Possible values include:
'Windows', 'Linux'
:type os_type: str or
Expand All @@ -32,18 +28,24 @@ class DiskUpdate(ResourceUpdate):
:param encryption_settings: Encryption settings for disk or snapshot
:type encryption_settings:
~azure.mgmt.compute.v2018_04_01.models.EncryptionSettings
:param tags: Resource tags
:type tags: dict[str, str]
:param sku:
:type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
"""

_attribute_map = {
'tags': {'key': 'tags', 'type': '{str}'},
'sku': {'key': 'sku', 'type': 'DiskSku'},
'os_type': {'key': 'properties.osType', 'type': 'OperatingSystemTypes'},
'disk_size_gb': {'key': 'properties.diskSizeGB', 'type': 'int'},
'encryption_settings': {'key': 'properties.encryptionSettings', 'type': 'EncryptionSettings'},
'tags': {'key': 'tags', 'type': '{str}'},
'sku': {'key': 'sku', 'type': 'DiskSku'},
}

def __init__(self, **kwargs):
super(DiskUpdate, self).__init__(**kwargs)
self.os_type = kwargs.get('os_type', None)
self.disk_size_gb = kwargs.get('disk_size_gb', None)
self.encryption_settings = kwargs.get('encryption_settings', None)
self.tags = kwargs.get('tags', None)
self.sku = kwargs.get('sku', None)
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,12 @@
# regenerated.
# --------------------------------------------------------------------------

from .resource_update_py3 import ResourceUpdate
from msrest.serialization import Model


class DiskUpdate(ResourceUpdate):
class DiskUpdate(Model):
"""Disk update resource.

:param tags: Resource tags
:type tags: dict[str, str]
:param sku:
:type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
:param os_type: the Operating System type. Possible values include:
'Windows', 'Linux'
:type os_type: str or
Expand All @@ -32,18 +28,24 @@ class DiskUpdate(ResourceUpdate):
:param encryption_settings: Encryption settings for disk or snapshot
:type encryption_settings:
~azure.mgmt.compute.v2018_04_01.models.EncryptionSettings
:param tags: Resource tags
:type tags: dict[str, str]
:param sku:
:type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
"""

_attribute_map = {
'tags': {'key': 'tags', 'type': '{str}'},
'sku': {'key': 'sku', 'type': 'DiskSku'},
'os_type': {'key': 'properties.osType', 'type': 'OperatingSystemTypes'},
'disk_size_gb': {'key': 'properties.diskSizeGB', 'type': 'int'},
'encryption_settings': {'key': 'properties.encryptionSettings', 'type': 'EncryptionSettings'},
'tags': {'key': 'tags', 'type': '{str}'},
'sku': {'key': 'sku', 'type': 'DiskSku'},
}

def __init__(self, *, tags=None, sku=None, os_type=None, disk_size_gb: int=None, encryption_settings=None, **kwargs) -> None:
super(DiskUpdate, self).__init__(tags=tags, sku=sku, **kwargs)
def __init__(self, *, os_type=None, disk_size_gb: int=None, encryption_settings=None, tags=None, sku=None, **kwargs) -> None:
super(DiskUpdate, self).__init__(**kwargs)
self.os_type = os_type
self.disk_size_gb = disk_size_gb
self.encryption_settings = encryption_settings
self.tags = tags
self.sku = sku

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,12 @@
# regenerated.
# --------------------------------------------------------------------------

from .resource_update import ResourceUpdate
from msrest.serialization import Model


class SnapshotUpdate(ResourceUpdate):
class SnapshotUpdate(Model):
"""Snapshot update resource.

:param tags: Resource tags
:type tags: dict[str, str]
:param sku:
:type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
:param os_type: the Operating System type. Possible values include:
'Windows', 'Linux'
:type os_type: str or
Expand All @@ -32,18 +28,24 @@ class SnapshotUpdate(ResourceUpdate):
:param encryption_settings: Encryption settings for disk or snapshot
:type encryption_settings:
~azure.mgmt.compute.v2018_04_01.models.EncryptionSettings
:param tags: Resource tags
:type tags: dict[str, str]
:param sku:
:type sku: ~azure.mgmt.compute.v2018_04_01.models.SnapshotSku
"""

_attribute_map = {
'tags': {'key': 'tags', 'type': '{str}'},
'sku': {'key': 'sku', 'type': 'DiskSku'},
'os_type': {'key': 'properties.osType', 'type': 'OperatingSystemTypes'},
'disk_size_gb': {'key': 'properties.diskSizeGB', 'type': 'int'},
'encryption_settings': {'key': 'properties.encryptionSettings', 'type': 'EncryptionSettings'},
'tags': {'key': 'tags', 'type': '{str}'},
'sku': {'key': 'sku', 'type': 'SnapshotSku'},
}

def __init__(self, **kwargs):
super(SnapshotUpdate, self).__init__(**kwargs)
self.os_type = kwargs.get('os_type', None)
self.disk_size_gb = kwargs.get('disk_size_gb', None)
self.encryption_settings = kwargs.get('encryption_settings', None)
self.tags = kwargs.get('tags', None)
self.sku = kwargs.get('sku', None)
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,12 @@
# regenerated.
# --------------------------------------------------------------------------

from .resource_update_py3 import ResourceUpdate
from msrest.serialization import Model


class SnapshotUpdate(ResourceUpdate):
class SnapshotUpdate(Model):
"""Snapshot update resource.

:param tags: Resource tags
:type tags: dict[str, str]
:param sku:
:type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
:param os_type: the Operating System type. Possible values include:
'Windows', 'Linux'
:type os_type: str or
Expand All @@ -32,18 +28,24 @@ class SnapshotUpdate(ResourceUpdate):
:param encryption_settings: Encryption settings for disk or snapshot
:type encryption_settings:
~azure.mgmt.compute.v2018_04_01.models.EncryptionSettings
:param tags: Resource tags
:type tags: dict[str, str]
:param sku:
:type sku: ~azure.mgmt.compute.v2018_04_01.models.SnapshotSku
"""

_attribute_map = {
'tags': {'key': 'tags', 'type': '{str}'},
'sku': {'key': 'sku', 'type': 'DiskSku'},
'os_type': {'key': 'properties.osType', 'type': 'OperatingSystemTypes'},
'disk_size_gb': {'key': 'properties.diskSizeGB', 'type': 'int'},
'encryption_settings': {'key': 'properties.encryptionSettings', 'type': 'EncryptionSettings'},
'tags': {'key': 'tags', 'type': '{str}'},
'sku': {'key': 'sku', 'type': 'SnapshotSku'},
}

def __init__(self, *, tags=None, sku=None, os_type=None, disk_size_gb: int=None, encryption_settings=None, **kwargs) -> None:
super(SnapshotUpdate, self).__init__(tags=tags, sku=sku, **kwargs)
def __init__(self, *, os_type=None, disk_size_gb: int=None, encryption_settings=None, tags=None, sku=None, **kwargs) -> None:
super(SnapshotUpdate, self).__init__(**kwargs)
self.os_type = os_type
self.disk_size_gb = disk_size_gb
self.encryption_settings = encryption_settings
self.tags = tags
self.sku = sku