From 23b5cc33e99f8ec9f607a8b9a7c7ffb3a0fb256f Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Thu, 31 May 2018 08:57:07 -0700 Subject: [PATCH] Generated from 4abedb1c096796557fdd029401f3d317f99c7f61 (#2664) removing resourceUpdate, adding contents to disk and snapshot --- .../compute/v2018_04_01/models/__init__.py | 3 -- .../compute/v2018_04_01/models/disk_update.py | 18 ++++++----- .../v2018_04_01/models/disk_update_py3.py | 22 +++++++------ .../v2018_04_01/models/resource_update.py | 32 ------------------- .../v2018_04_01/models/resource_update_py3.py | 32 ------------------- .../v2018_04_01/models/snapshot_update.py | 18 ++++++----- .../v2018_04_01/models/snapshot_update_py3.py | 22 +++++++------ 7 files changed, 44 insertions(+), 103 deletions(-) delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/resource_update.py delete mode 100644 azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/resource_update_py3.py diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/__init__.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/__init__.py index a9b68bd118f4..e215874b54d3 100644 --- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/__init__.py +++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/__init__.py @@ -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 @@ -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 @@ -56,7 +54,6 @@ __all__ = [ 'Resource', 'DiskSku', - 'ResourceUpdate', 'ImageDiskReference', 'CreationData', 'SourceVault', diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update.py index 7364769892bf..3ca75fec3871 100644 --- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update.py +++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update.py @@ -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 @@ -32,14 +28,18 @@ 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): @@ -47,3 +47,5 @@ def __init__(self, **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) diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update_py3.py index b2445fda4cc9..407d553cff9e 100644 --- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update_py3.py +++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/disk_update_py3.py @@ -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 @@ -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 diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/resource_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/resource_update.py deleted file mode 100644 index 1ab6fb273f49..000000000000 --- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/resource_update.py +++ /dev/null @@ -1,32 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from msrest.serialization import Model - - -class ResourceUpdate(Model): - """The Resource model definition. - - :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'}, - } - - def __init__(self, **kwargs): - super(ResourceUpdate, self).__init__(**kwargs) - self.tags = kwargs.get('tags', None) - self.sku = kwargs.get('sku', None) diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/resource_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/resource_update_py3.py deleted file mode 100644 index 1074982f9341..000000000000 --- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/resource_update_py3.py +++ /dev/null @@ -1,32 +0,0 @@ -# coding=utf-8 -# -------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from msrest.serialization import Model - - -class ResourceUpdate(Model): - """The Resource model definition. - - :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'}, - } - - def __init__(self, *, tags=None, sku=None, **kwargs) -> None: - super(ResourceUpdate, self).__init__(**kwargs) - self.tags = tags - self.sku = sku diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update.py index 6483ca6dd981..119c6f05bc49 100644 --- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update.py +++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update.py @@ -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 @@ -32,14 +28,18 @@ 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): @@ -47,3 +47,5 @@ def __init__(self, **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) diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update_py3.py index c1a7cec5da8c..54e05426ce8e 100644 --- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update_py3.py +++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/models/snapshot_update_py3.py @@ -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 @@ -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