Skip to content

Commit 6d22b90

Browse files
AutorestCIAutorestCI
committed
Generated from 4abedb1c096796557fdd029401f3d317f99c7f61 (#2664)
removing resourceUpdate, adding contents to disk and snapshot
1 parent 7404489 commit 6d22b90

File tree

7 files changed

+44
-103
lines changed

7 files changed

+44
-103
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
try:
1313
from .resource_py3 import Resource
1414
from .disk_sku_py3 import DiskSku
15-
from .resource_update_py3 import ResourceUpdate
1615
from .image_disk_reference_py3 import ImageDiskReference
1716
from .creation_data_py3 import CreationData
1817
from .source_vault_py3 import SourceVault
@@ -29,7 +28,6 @@
2928
except (SyntaxError, ImportError):
3029
from .resource import Resource
3130
from .disk_sku import DiskSku
32-
from .resource_update import ResourceUpdate
3331
from .image_disk_reference import ImageDiskReference
3432
from .creation_data import CreationData
3533
from .source_vault import SourceVault
@@ -56,7 +54,6 @@
5654
__all__ = [
5755
'Resource',
5856
'DiskSku',
59-
'ResourceUpdate',
6057
'ImageDiskReference',
6158
'CreationData',
6259
'SourceVault',

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,12 @@
99
# regenerated.
1010
# --------------------------------------------------------------------------
1111

12-
from .resource_update import ResourceUpdate
12+
from msrest.serialization import Model
1313

1414

15-
class DiskUpdate(ResourceUpdate):
15+
class DiskUpdate(Model):
1616
"""Disk update resource.
1717
18-
:param tags: Resource tags
19-
:type tags: dict[str, str]
20-
:param sku:
21-
:type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
2218
:param os_type: the Operating System type. Possible values include:
2319
'Windows', 'Linux'
2420
:type os_type: str or
@@ -32,18 +28,24 @@ class DiskUpdate(ResourceUpdate):
3228
:param encryption_settings: Encryption settings for disk or snapshot
3329
:type encryption_settings:
3430
~azure.mgmt.compute.v2018_04_01.models.EncryptionSettings
31+
:param tags: Resource tags
32+
:type tags: dict[str, str]
33+
:param sku:
34+
:type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
3535
"""
3636

3737
_attribute_map = {
38-
'tags': {'key': 'tags', 'type': '{str}'},
39-
'sku': {'key': 'sku', 'type': 'DiskSku'},
4038
'os_type': {'key': 'properties.osType', 'type': 'OperatingSystemTypes'},
4139
'disk_size_gb': {'key': 'properties.diskSizeGB', 'type': 'int'},
4240
'encryption_settings': {'key': 'properties.encryptionSettings', 'type': 'EncryptionSettings'},
41+
'tags': {'key': 'tags', 'type': '{str}'},
42+
'sku': {'key': 'sku', 'type': 'DiskSku'},
4343
}
4444

4545
def __init__(self, **kwargs):
4646
super(DiskUpdate, self).__init__(**kwargs)
4747
self.os_type = kwargs.get('os_type', None)
4848
self.disk_size_gb = kwargs.get('disk_size_gb', None)
4949
self.encryption_settings = kwargs.get('encryption_settings', None)
50+
self.tags = kwargs.get('tags', None)
51+
self.sku = kwargs.get('sku', None)

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,12 @@
99
# regenerated.
1010
# --------------------------------------------------------------------------
1111

12-
from .resource_update_py3 import ResourceUpdate
12+
from msrest.serialization import Model
1313

1414

15-
class DiskUpdate(ResourceUpdate):
15+
class DiskUpdate(Model):
1616
"""Disk update resource.
1717
18-
:param tags: Resource tags
19-
:type tags: dict[str, str]
20-
:param sku:
21-
:type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
2218
:param os_type: the Operating System type. Possible values include:
2319
'Windows', 'Linux'
2420
:type os_type: str or
@@ -32,18 +28,24 @@ class DiskUpdate(ResourceUpdate):
3228
:param encryption_settings: Encryption settings for disk or snapshot
3329
:type encryption_settings:
3430
~azure.mgmt.compute.v2018_04_01.models.EncryptionSettings
31+
:param tags: Resource tags
32+
:type tags: dict[str, str]
33+
:param sku:
34+
:type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
3535
"""
3636

3737
_attribute_map = {
38-
'tags': {'key': 'tags', 'type': '{str}'},
39-
'sku': {'key': 'sku', 'type': 'DiskSku'},
4038
'os_type': {'key': 'properties.osType', 'type': 'OperatingSystemTypes'},
4139
'disk_size_gb': {'key': 'properties.diskSizeGB', 'type': 'int'},
4240
'encryption_settings': {'key': 'properties.encryptionSettings', 'type': 'EncryptionSettings'},
41+
'tags': {'key': 'tags', 'type': '{str}'},
42+
'sku': {'key': 'sku', 'type': 'DiskSku'},
4343
}
4444

45-
def __init__(self, *, tags=None, sku=None, os_type=None, disk_size_gb: int=None, encryption_settings=None, **kwargs) -> None:
46-
super(DiskUpdate, self).__init__(tags=tags, sku=sku, **kwargs)
45+
def __init__(self, *, os_type=None, disk_size_gb: int=None, encryption_settings=None, tags=None, sku=None, **kwargs) -> None:
46+
super(DiskUpdate, self).__init__(**kwargs)
4747
self.os_type = os_type
4848
self.disk_size_gb = disk_size_gb
4949
self.encryption_settings = encryption_settings
50+
self.tags = tags
51+
self.sku = sku

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

Lines changed: 0 additions & 32 deletions
This file was deleted.

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

Lines changed: 0 additions & 32 deletions
This file was deleted.

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,12 @@
99
# regenerated.
1010
# --------------------------------------------------------------------------
1111

12-
from .resource_update import ResourceUpdate
12+
from msrest.serialization import Model
1313

1414

15-
class SnapshotUpdate(ResourceUpdate):
15+
class SnapshotUpdate(Model):
1616
"""Snapshot update resource.
1717
18-
:param tags: Resource tags
19-
:type tags: dict[str, str]
20-
:param sku:
21-
:type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
2218
:param os_type: the Operating System type. Possible values include:
2319
'Windows', 'Linux'
2420
:type os_type: str or
@@ -32,18 +28,24 @@ class SnapshotUpdate(ResourceUpdate):
3228
:param encryption_settings: Encryption settings for disk or snapshot
3329
:type encryption_settings:
3430
~azure.mgmt.compute.v2018_04_01.models.EncryptionSettings
31+
:param tags: Resource tags
32+
:type tags: dict[str, str]
33+
:param sku:
34+
:type sku: ~azure.mgmt.compute.v2018_04_01.models.SnapshotSku
3535
"""
3636

3737
_attribute_map = {
38-
'tags': {'key': 'tags', 'type': '{str}'},
39-
'sku': {'key': 'sku', 'type': 'DiskSku'},
4038
'os_type': {'key': 'properties.osType', 'type': 'OperatingSystemTypes'},
4139
'disk_size_gb': {'key': 'properties.diskSizeGB', 'type': 'int'},
4240
'encryption_settings': {'key': 'properties.encryptionSettings', 'type': 'EncryptionSettings'},
41+
'tags': {'key': 'tags', 'type': '{str}'},
42+
'sku': {'key': 'sku', 'type': 'SnapshotSku'},
4343
}
4444

4545
def __init__(self, **kwargs):
4646
super(SnapshotUpdate, self).__init__(**kwargs)
4747
self.os_type = kwargs.get('os_type', None)
4848
self.disk_size_gb = kwargs.get('disk_size_gb', None)
4949
self.encryption_settings = kwargs.get('encryption_settings', None)
50+
self.tags = kwargs.get('tags', None)
51+
self.sku = kwargs.get('sku', None)

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,12 @@
99
# regenerated.
1010
# --------------------------------------------------------------------------
1111

12-
from .resource_update_py3 import ResourceUpdate
12+
from msrest.serialization import Model
1313

1414

15-
class SnapshotUpdate(ResourceUpdate):
15+
class SnapshotUpdate(Model):
1616
"""Snapshot update resource.
1717
18-
:param tags: Resource tags
19-
:type tags: dict[str, str]
20-
:param sku:
21-
:type sku: ~azure.mgmt.compute.v2018_04_01.models.DiskSku
2218
:param os_type: the Operating System type. Possible values include:
2319
'Windows', 'Linux'
2420
:type os_type: str or
@@ -32,18 +28,24 @@ class SnapshotUpdate(ResourceUpdate):
3228
:param encryption_settings: Encryption settings for disk or snapshot
3329
:type encryption_settings:
3430
~azure.mgmt.compute.v2018_04_01.models.EncryptionSettings
31+
:param tags: Resource tags
32+
:type tags: dict[str, str]
33+
:param sku:
34+
:type sku: ~azure.mgmt.compute.v2018_04_01.models.SnapshotSku
3535
"""
3636

3737
_attribute_map = {
38-
'tags': {'key': 'tags', 'type': '{str}'},
39-
'sku': {'key': 'sku', 'type': 'DiskSku'},
4038
'os_type': {'key': 'properties.osType', 'type': 'OperatingSystemTypes'},
4139
'disk_size_gb': {'key': 'properties.diskSizeGB', 'type': 'int'},
4240
'encryption_settings': {'key': 'properties.encryptionSettings', 'type': 'EncryptionSettings'},
41+
'tags': {'key': 'tags', 'type': '{str}'},
42+
'sku': {'key': 'sku', 'type': 'SnapshotSku'},
4343
}
4444

45-
def __init__(self, *, tags=None, sku=None, os_type=None, disk_size_gb: int=None, encryption_settings=None, **kwargs) -> None:
46-
super(SnapshotUpdate, self).__init__(tags=tags, sku=sku, **kwargs)
45+
def __init__(self, *, os_type=None, disk_size_gb: int=None, encryption_settings=None, tags=None, sku=None, **kwargs) -> None:
46+
super(SnapshotUpdate, self).__init__(**kwargs)
4747
self.os_type = os_type
4848
self.disk_size_gb = disk_size_gb
4949
self.encryption_settings = encryption_settings
50+
self.tags = tags
51+
self.sku = sku

0 commit comments

Comments
 (0)