diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/compute_management_client.py b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/compute_management_client.py index cfda081b1567..ffcfe0787b8c 100644 --- a/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/compute_management_client.py +++ b/azure-mgmt-compute/azure/mgmt/compute/v2015_06_15/compute_management_client.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from msrest.service_client import ServiceClient +from msrest.service_client import SDKClient from msrest import Serializer, Deserializer from msrestazure import AzureConfiguration from .version import VERSION @@ -59,7 +59,7 @@ def __init__( self.subscription_id = subscription_id -class ComputeManagementClient(object): +class ComputeManagementClient(SDKClient): """Compute Client :ivar config: Configuration for client. @@ -98,7 +98,7 @@ def __init__( self, credentials, subscription_id, base_url=None): self.config = ComputeManagementClientConfiguration(credentials, subscription_id, base_url) - self._client = ServiceClient(self.config.credentials, self.config) + super(ComputeManagementClient, self).__init__(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} self.api_version = '2015-06-15' diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/compute_management_client.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/compute_management_client.py index fd70594a902c..403c3f4449d9 100644 --- a/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/compute_management_client.py +++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_03_30/compute_management_client.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from msrest.service_client import ServiceClient +from msrest.service_client import SDKClient from msrest import Serializer, Deserializer from msrestazure import AzureConfiguration from .version import VERSION @@ -59,7 +59,7 @@ def __init__( self.subscription_id = subscription_id -class ComputeManagementClient(object): +class ComputeManagementClient(SDKClient): """Compute Client :ivar config: Configuration for client. @@ -98,7 +98,7 @@ def __init__( self, credentials, subscription_id, base_url=None): self.config = ComputeManagementClientConfiguration(credentials, subscription_id, base_url) - self._client = ServiceClient(self.config.credentials, self.config) + super(ComputeManagementClient, self).__init__(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} self.api_version = '2016-03-30' diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/compute_management_client.py b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/compute_management_client.py index c58b204ba4d0..2c43eb9b0c1a 100644 --- a/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/compute_management_client.py +++ b/azure-mgmt-compute/azure/mgmt/compute/v2016_04_30_preview/compute_management_client.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from msrest.service_client import ServiceClient +from msrest.service_client import SDKClient from msrest import Serializer, Deserializer from msrestazure import AzureConfiguration from .version import VERSION @@ -62,7 +62,7 @@ def __init__( self.subscription_id = subscription_id -class ComputeManagementClient(object): +class ComputeManagementClient(SDKClient): """Compute Client :ivar config: Configuration for client. @@ -107,7 +107,7 @@ def __init__( self, credentials, subscription_id, base_url=None): self.config = ComputeManagementClientConfiguration(credentials, subscription_id, base_url) - self._client = ServiceClient(self.config.credentials, self.config) + super(ComputeManagementClient, self).__init__(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} self.api_version = '2016-04-30-preview' diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/compute_management_client.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/compute_management_client.py index 1b2633721f7e..d671c7a363df 100644 --- a/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/compute_management_client.py +++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_03_30/compute_management_client.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from msrest.service_client import ServiceClient +from msrest.service_client import SDKClient from msrest import Serializer, Deserializer from msrestazure import AzureConfiguration from .version import VERSION @@ -66,7 +66,7 @@ def __init__( self.subscription_id = subscription_id -class ComputeManagementClient(object): +class ComputeManagementClient(SDKClient): """Compute Client :ivar config: Configuration for client. @@ -119,7 +119,7 @@ def __init__( self, credentials, subscription_id, base_url=None): self.config = ComputeManagementClientConfiguration(credentials, subscription_id, base_url) - self._client = ServiceClient(self.config.credentials, self.config) + super(ComputeManagementClient, self).__init__(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} self.api_version = '2017-03-30' diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_09_01/compute_management_client.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_09_01/compute_management_client.py index fd0c043a6b79..0dc37e4ed0a2 100644 --- a/azure-mgmt-compute/azure/mgmt/compute/v2017_09_01/compute_management_client.py +++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_09_01/compute_management_client.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from msrest.service_client import ServiceClient +from msrest.service_client import SDKClient from msrest import Serializer, Deserializer from msrestazure import AzureConfiguration from .version import VERSION @@ -51,7 +51,7 @@ def __init__( self.subscription_id = subscription_id -class ComputeManagementClient(object): +class ComputeManagementClient(SDKClient): """Compute Client :ivar config: Configuration for client. @@ -74,7 +74,7 @@ def __init__( self, credentials, subscription_id, base_url=None): self.config = ComputeManagementClientConfiguration(credentials, subscription_id, base_url) - self._client = ServiceClient(self.config.credentials, self.config) + super(ComputeManagementClient, self).__init__(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} self.api_version = '2017-09-01' diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/compute_management_client.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/compute_management_client.py index 3fcf22e996e6..fcd609539a4e 100644 --- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/compute_management_client.py +++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/compute_management_client.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from msrest.service_client import ServiceClient +from msrest.service_client import SDKClient from msrest import Serializer, Deserializer from msrestazure import AzureConfiguration from .version import VERSION @@ -65,7 +65,7 @@ def __init__( self.subscription_id = subscription_id -class ComputeManagementClient(object): +class ComputeManagementClient(SDKClient): """Compute Client :ivar config: Configuration for client. @@ -116,7 +116,7 @@ def __init__( self, credentials, subscription_id, base_url=None): self.config = ComputeManagementClientConfiguration(credentials, subscription_id, base_url) - self._client = ServiceClient(self.config.credentials, self.config) + super(ComputeManagementClient, self).__init__(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} self.api_version = '2017-12-01' diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/__init__.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/__init__.py index 54fd6fca22fd..d9f5c5707555 100644 --- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/__init__.py +++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/__init__.py @@ -106,11 +106,12 @@ from .virtual_machine_scale_set_instance_view_py3 import VirtualMachineScaleSetInstanceView from .virtual_machine_scale_set_sku_capacity_py3 import VirtualMachineScaleSetSkuCapacity from .virtual_machine_scale_set_sku_py3 import VirtualMachineScaleSetSku - from .upgrade_operation_history_status_py3 import UpgradeOperationHistoryStatus - from .rolling_upgrade_progress_info_py3 import RollingUpgradeProgressInfo from .api_error_base_py3 import ApiErrorBase from .inner_error_py3 import InnerError from .api_error_py3 import ApiError + from .rollback_status_info_py3 import RollbackStatusInfo + from .upgrade_operation_history_status_py3 import UpgradeOperationHistoryStatus + 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_scale_set_vm_py3 import VirtualMachineScaleSetVM @@ -232,11 +233,12 @@ from .virtual_machine_scale_set_instance_view import VirtualMachineScaleSetInstanceView from .virtual_machine_scale_set_sku_capacity import VirtualMachineScaleSetSkuCapacity from .virtual_machine_scale_set_sku import VirtualMachineScaleSetSku - from .upgrade_operation_history_status import UpgradeOperationHistoryStatus - from .rolling_upgrade_progress_info import RollingUpgradeProgressInfo from .api_error_base import ApiErrorBase from .inner_error import InnerError from .api_error import ApiError + from .rollback_status_info import RollbackStatusInfo + from .upgrade_operation_history_status import UpgradeOperationHistoryStatus + 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_scale_set_vm import VirtualMachineScaleSetVM @@ -397,11 +399,12 @@ 'VirtualMachineScaleSetInstanceView', 'VirtualMachineScaleSetSkuCapacity', 'VirtualMachineScaleSetSku', - 'UpgradeOperationHistoryStatus', - 'RollingUpgradeProgressInfo', 'ApiErrorBase', 'InnerError', 'ApiError', + 'RollbackStatusInfo', + 'UpgradeOperationHistoryStatus', + 'RollingUpgradeProgressInfo', 'UpgradeOperationHistoricalStatusInfoProperties', 'UpgradeOperationHistoricalStatusInfo', 'VirtualMachineScaleSetVM', diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/rollback_status_info.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/rollback_status_info.py new file mode 100644 index 000000000000..83b559715648 --- /dev/null +++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/rollback_status_info.py @@ -0,0 +1,48 @@ +# 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 RollbackStatusInfo(Model): + """Information about rollback on failed VM instances after a OS Upgrade + operation. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar successfully_rolledback_instance_count: The number of instances + which have been successfully rolled back. + :vartype successfully_rolledback_instance_count: int + :ivar failed_rolledback_instance_count: The number of instances which + failed to rollback. + :vartype failed_rolledback_instance_count: int + :ivar rollback_error: Error Details if OS rollback failed. + :vartype rollback_error: ~azure.mgmt.compute.v2017_12_01.models.ApiError + """ + + _validation = { + 'successfully_rolledback_instance_count': {'readonly': True}, + 'failed_rolledback_instance_count': {'readonly': True}, + 'rollback_error': {'readonly': True}, + } + + _attribute_map = { + 'successfully_rolledback_instance_count': {'key': 'successfullyRolledbackInstanceCount', 'type': 'int'}, + 'failed_rolledback_instance_count': {'key': 'failedRolledbackInstanceCount', 'type': 'int'}, + 'rollback_error': {'key': 'rollbackError', 'type': 'ApiError'}, + } + + def __init__(self, **kwargs): + super(RollbackStatusInfo, self).__init__(**kwargs) + self.successfully_rolledback_instance_count = None + self.failed_rolledback_instance_count = None + self.rollback_error = None diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/rollback_status_info_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/rollback_status_info_py3.py new file mode 100644 index 000000000000..5edbb3f476d9 --- /dev/null +++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/rollback_status_info_py3.py @@ -0,0 +1,48 @@ +# 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 RollbackStatusInfo(Model): + """Information about rollback on failed VM instances after a OS Upgrade + operation. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar successfully_rolledback_instance_count: The number of instances + which have been successfully rolled back. + :vartype successfully_rolledback_instance_count: int + :ivar failed_rolledback_instance_count: The number of instances which + failed to rollback. + :vartype failed_rolledback_instance_count: int + :ivar rollback_error: Error Details if OS rollback failed. + :vartype rollback_error: ~azure.mgmt.compute.v2017_12_01.models.ApiError + """ + + _validation = { + 'successfully_rolledback_instance_count': {'readonly': True}, + 'failed_rolledback_instance_count': {'readonly': True}, + 'rollback_error': {'readonly': True}, + } + + _attribute_map = { + 'successfully_rolledback_instance_count': {'key': 'successfullyRolledbackInstanceCount', 'type': 'int'}, + 'failed_rolledback_instance_count': {'key': 'failedRolledbackInstanceCount', 'type': 'int'}, + 'rollback_error': {'key': 'rollbackError', 'type': 'ApiError'}, + } + + def __init__(self, **kwargs) -> None: + super(RollbackStatusInfo, self).__init__(**kwargs) + self.successfully_rolledback_instance_count = None + self.failed_rolledback_instance_count = None + self.rollback_error = None diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/upgrade_operation_historical_status_info_properties.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/upgrade_operation_historical_status_info_properties.py index 3c5d883f1b9c..a0c1af8046e9 100644 --- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/upgrade_operation_historical_status_info_properties.py +++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/upgrade_operation_historical_status_info_properties.py @@ -34,6 +34,9 @@ class UpgradeOperationHistoricalStatusInfoProperties(Model): :ivar target_image_reference: Image Reference details :vartype target_image_reference: ~azure.mgmt.compute.v2017_12_01.models.ImageReference + :ivar rollback_info: Information about OS rollback if performed + :vartype rollback_info: + ~azure.mgmt.compute.v2017_12_01.models.RollbackStatusInfo """ _validation = { @@ -42,6 +45,7 @@ class UpgradeOperationHistoricalStatusInfoProperties(Model): 'error': {'readonly': True}, 'started_by': {'readonly': True}, 'target_image_reference': {'readonly': True}, + 'rollback_info': {'readonly': True}, } _attribute_map = { @@ -50,6 +54,7 @@ class UpgradeOperationHistoricalStatusInfoProperties(Model): 'error': {'key': 'error', 'type': 'ApiError'}, 'started_by': {'key': 'startedBy', 'type': 'UpgradeOperationInvoker'}, 'target_image_reference': {'key': 'targetImageReference', 'type': 'ImageReference'}, + 'rollback_info': {'key': 'rollbackInfo', 'type': 'RollbackStatusInfo'}, } def __init__(self, **kwargs): @@ -59,3 +64,4 @@ def __init__(self, **kwargs): self.error = None self.started_by = None self.target_image_reference = None + self.rollback_info = None diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/upgrade_operation_historical_status_info_properties_py3.py b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/upgrade_operation_historical_status_info_properties_py3.py index beadceadf33a..d623b4968ad4 100644 --- a/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/upgrade_operation_historical_status_info_properties_py3.py +++ b/azure-mgmt-compute/azure/mgmt/compute/v2017_12_01/models/upgrade_operation_historical_status_info_properties_py3.py @@ -34,6 +34,9 @@ class UpgradeOperationHistoricalStatusInfoProperties(Model): :ivar target_image_reference: Image Reference details :vartype target_image_reference: ~azure.mgmt.compute.v2017_12_01.models.ImageReference + :ivar rollback_info: Information about OS rollback if performed + :vartype rollback_info: + ~azure.mgmt.compute.v2017_12_01.models.RollbackStatusInfo """ _validation = { @@ -42,6 +45,7 @@ class UpgradeOperationHistoricalStatusInfoProperties(Model): 'error': {'readonly': True}, 'started_by': {'readonly': True}, 'target_image_reference': {'readonly': True}, + 'rollback_info': {'readonly': True}, } _attribute_map = { @@ -50,6 +54,7 @@ class UpgradeOperationHistoricalStatusInfoProperties(Model): 'error': {'key': 'error', 'type': 'ApiError'}, 'started_by': {'key': 'startedBy', 'type': 'UpgradeOperationInvoker'}, 'target_image_reference': {'key': 'targetImageReference', 'type': 'ImageReference'}, + 'rollback_info': {'key': 'rollbackInfo', 'type': 'RollbackStatusInfo'}, } def __init__(self, **kwargs) -> None: @@ -59,3 +64,4 @@ def __init__(self, **kwargs) -> None: self.error = None self.started_by = None self.target_image_reference = None + self.rollback_info = None diff --git a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/compute_management_client.py b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/compute_management_client.py index 382bad2d0135..d815c08ac257 100644 --- a/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/compute_management_client.py +++ b/azure-mgmt-compute/azure/mgmt/compute/v2018_04_01/compute_management_client.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from msrest.service_client import ServiceClient +from msrest.service_client import SDKClient from msrest import Serializer, Deserializer from msrestazure import AzureConfiguration from .version import VERSION @@ -52,7 +52,7 @@ def __init__( self.subscription_id = subscription_id -class ComputeManagementClient(object): +class ComputeManagementClient(SDKClient): """Compute Client :ivar config: Configuration for client. @@ -77,7 +77,7 @@ def __init__( self, credentials, subscription_id, base_url=None): self.config = ComputeManagementClientConfiguration(credentials, subscription_id, base_url) - self._client = ServiceClient(self.config.credentials, self.config) + super(ComputeManagementClient, self).__init__(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} self.api_version = '2018-04-01'