diff --git a/azure-mgmt-recoveryservicesbackup/MANIFEST.in b/azure-mgmt-recoveryservicesbackup/MANIFEST.in index 9ecaeb15de50..bb37a2723dae 100644 --- a/azure-mgmt-recoveryservicesbackup/MANIFEST.in +++ b/azure-mgmt-recoveryservicesbackup/MANIFEST.in @@ -1,2 +1 @@ include *.rst -include azure_bdist_wheel.py \ No newline at end of file diff --git a/azure-mgmt-recoveryservicesbackup/README.rst b/azure-mgmt-recoveryservicesbackup/README.rst index 940d0af77f11..5594cc03800d 100644 --- a/azure-mgmt-recoveryservicesbackup/README.rst +++ b/azure-mgmt-recoveryservicesbackup/README.rst @@ -6,7 +6,7 @@ This is the Microsoft Azure Recovery Services Backup Management Client Library. Azure Resource Manager (ARM) is the next generation of management APIs that replace the old Azure Service Management (ASM). -This package has been tested with Python 2.7, 3.4, 3.5 and 3.6. +This package has been tested with Python 2.7, 3.4, 3.5, 3.6 and 3.7. For the older Azure Service Management (ASM) libraries, see `azure-servicemanagement-legacy `__ library. diff --git a/azure-mgmt-recoveryservicesbackup/azure/__init__.py b/azure-mgmt-recoveryservicesbackup/azure/__init__.py index de40ea7ca058..0260537a02bb 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/__init__.py +++ b/azure-mgmt-recoveryservicesbackup/azure/__init__.py @@ -1 +1 @@ -__import__('pkg_resources').declare_namespace(__name__) +__path__ = __import__('pkgutil').extend_path(__path__, __name__) \ No newline at end of file diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/__init__.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/__init__.py index de40ea7ca058..0260537a02bb 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/__init__.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/__init__.py @@ -1 +1 @@ -__import__('pkg_resources').declare_namespace(__name__) +__path__ = __import__('pkgutil').extend_path(__path__, __name__) \ No newline at end of file diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/__init__.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/__init__.py index dcb4a3dce339..8f6884e7fe37 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/__init__.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/__init__.py @@ -109,6 +109,7 @@ from .protected_item_query_object_py3 import ProtectedItemQueryObject from .protected_item_resource_py3 import ProtectedItemResource from .protection_intent_py3 import ProtectionIntent + from .protection_intent_query_object_py3 import ProtectionIntentQueryObject from .protection_intent_resource_py3 import ProtectionIntentResource from .protection_policy_py3 import ProtectionPolicy from .protection_policy_query_object_py3 import ProtectionPolicyQueryObject @@ -329,6 +330,7 @@ from .protected_item_query_object import ProtectedItemQueryObject from .protected_item_resource import ProtectedItemResource from .protection_intent import ProtectionIntent + from .protection_intent_query_object import ProtectionIntentQueryObject from .protection_intent_resource import ProtectionIntentResource from .protection_policy import ProtectionPolicy from .protection_policy_query_object import ProtectionPolicyQueryObject @@ -452,6 +454,7 @@ from .job_resource_paged import JobResourcePaged from .protection_policy_resource_paged import ProtectionPolicyResourcePaged from .protected_item_resource_paged import ProtectedItemResourcePaged +from .protection_intent_resource_paged import ProtectionIntentResourcePaged from .backup_management_usage_paged import BackupManagementUsagePaged from .backup_engine_base_resource_paged import BackupEngineBaseResourcePaged from .protectable_container_resource_paged import ProtectableContainerResourcePaged @@ -463,6 +466,7 @@ from .recovery_services_backup_client_enums import ( ProtectionState, HealthStatus, + WorkloadType, RecoveryType, CopyOptions, RestoreRequestType, @@ -471,6 +475,7 @@ SupportStatus, LastBackupStatus, ProtectedItemHealthStatus, + PolicyType, OverwriteOptions, WorkloadItemType, SQLDataDirectoryType, @@ -488,11 +493,11 @@ WeekOfMonth, MonthOfYear, MabServerType, - WorkloadType, HttpStatusCode, ValidationStatus, CreateMode, HealthState, + IntentItemType, ScheduleRunType, AzureFileShareType, InquiryStatus, @@ -609,6 +614,7 @@ 'ProtectedItemQueryObject', 'ProtectedItemResource', 'ProtectionIntent', + 'ProtectionIntentQueryObject', 'ProtectionIntentResource', 'ProtectionPolicy', 'ProtectionPolicyQueryObject', @@ -732,6 +738,7 @@ 'JobResourcePaged', 'ProtectionPolicyResourcePaged', 'ProtectedItemResourcePaged', + 'ProtectionIntentResourcePaged', 'BackupManagementUsagePaged', 'BackupEngineBaseResourcePaged', 'ProtectableContainerResourcePaged', @@ -742,6 +749,7 @@ 'ClientDiscoveryValueForSingleApiPaged', 'ProtectionState', 'HealthStatus', + 'WorkloadType', 'RecoveryType', 'CopyOptions', 'RestoreRequestType', @@ -750,6 +758,7 @@ 'SupportStatus', 'LastBackupStatus', 'ProtectedItemHealthStatus', + 'PolicyType', 'OverwriteOptions', 'WorkloadItemType', 'SQLDataDirectoryType', @@ -767,11 +776,11 @@ 'WeekOfMonth', 'MonthOfYear', 'MabServerType', - 'WorkloadType', 'HttpStatusCode', 'ValidationStatus', 'CreateMode', 'HealthState', + 'IntentItemType', 'ScheduleRunType', 'AzureFileShareType', 'InquiryStatus', diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_file_share_protection_policy.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_file_share_protection_policy.py index d22ebaef61da..81807350b28b 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_file_share_protection_policy.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_file_share_protection_policy.py @@ -21,8 +21,12 @@ class AzureFileShareProtectionPolicy(ProtectionPolicy): :type protected_items_count: int :param backup_management_type: Required. Constant filled by server. :type backup_management_type: str - :param work_load_type: Type of workload for the backup management - :type work_load_type: str + :param work_load_type: Type of workload for the backup management. + Possible values include: 'Invalid', 'VM', 'FileFolder', 'AzureSqlDb', + 'SQLDB', 'Exchange', 'Sharepoint', 'VMwareVM', 'SystemState', 'Client', + 'GenericDataSource', 'SQLDataBase', 'AzureFileShare', 'SAPHanaDatabase' + :type work_load_type: str or + ~azure.mgmt.recoveryservicesbackup.models.WorkloadType :param schedule_policy: Backup schedule specified as part of backup policy. :type schedule_policy: diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_file_share_protection_policy_py3.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_file_share_protection_policy_py3.py index b54214ed91d0..17044e56f6a7 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_file_share_protection_policy_py3.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_file_share_protection_policy_py3.py @@ -21,8 +21,12 @@ class AzureFileShareProtectionPolicy(ProtectionPolicy): :type protected_items_count: int :param backup_management_type: Required. Constant filled by server. :type backup_management_type: str - :param work_load_type: Type of workload for the backup management - :type work_load_type: str + :param work_load_type: Type of workload for the backup management. + Possible values include: 'Invalid', 'VM', 'FileFolder', 'AzureSqlDb', + 'SQLDB', 'Exchange', 'Sharepoint', 'VMwareVM', 'SystemState', 'Client', + 'GenericDataSource', 'SQLDataBase', 'AzureFileShare', 'SAPHanaDatabase' + :type work_load_type: str or + ~azure.mgmt.recoveryservicesbackup.models.WorkloadType :param schedule_policy: Backup schedule specified as part of backup policy. :type schedule_policy: @@ -49,7 +53,7 @@ class AzureFileShareProtectionPolicy(ProtectionPolicy): 'time_zone': {'key': 'timeZone', 'type': 'str'}, } - def __init__(self, *, protected_items_count: int=None, work_load_type: str=None, schedule_policy=None, retention_policy=None, time_zone: str=None, **kwargs) -> None: + def __init__(self, *, protected_items_count: int=None, work_load_type=None, schedule_policy=None, retention_policy=None, time_zone: str=None, **kwargs) -> None: super(AzureFileShareProtectionPolicy, self).__init__(protected_items_count=protected_items_count, **kwargs) self.work_load_type = work_load_type self.schedule_policy = schedule_policy diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_protectable_item.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_protectable_item.py index 24ffedbd5d3a..1dd6230906d6 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_protectable_item.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_protectable_item.py @@ -50,6 +50,8 @@ class AzureVmWorkloadProtectableItem(WorkloadProtectableItem): :param is_auto_protectable: Indicates if protectable item is auto-protectable :type is_auto_protectable: bool + :param is_auto_protected: Indicates if protectable item is auto-protected + :type is_auto_protected: bool :param subinquireditemcount: For instance or AG, indicates number of DB's present :type subinquireditemcount: int @@ -75,6 +77,7 @@ class AzureVmWorkloadProtectableItem(WorkloadProtectableItem): 'parent_unique_name': {'key': 'parentUniqueName', 'type': 'str'}, 'server_name': {'key': 'serverName', 'type': 'str'}, 'is_auto_protectable': {'key': 'isAutoProtectable', 'type': 'bool'}, + 'is_auto_protected': {'key': 'isAutoProtected', 'type': 'bool'}, 'subinquireditemcount': {'key': 'subinquireditemcount', 'type': 'int'}, 'subprotectableitemcount': {'key': 'subprotectableitemcount', 'type': 'int'}, 'prebackupvalidation': {'key': 'prebackupvalidation', 'type': 'PreBackupValidation'}, @@ -90,6 +93,7 @@ def __init__(self, **kwargs): self.parent_unique_name = kwargs.get('parent_unique_name', None) self.server_name = kwargs.get('server_name', None) self.is_auto_protectable = kwargs.get('is_auto_protectable', None) + self.is_auto_protected = kwargs.get('is_auto_protected', None) self.subinquireditemcount = kwargs.get('subinquireditemcount', None) self.subprotectableitemcount = kwargs.get('subprotectableitemcount', None) self.prebackupvalidation = kwargs.get('prebackupvalidation', None) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_protectable_item_py3.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_protectable_item_py3.py index e778af1fe61d..c25dd7e230db 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_protectable_item_py3.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_protectable_item_py3.py @@ -50,6 +50,8 @@ class AzureVmWorkloadProtectableItem(WorkloadProtectableItem): :param is_auto_protectable: Indicates if protectable item is auto-protectable :type is_auto_protectable: bool + :param is_auto_protected: Indicates if protectable item is auto-protected + :type is_auto_protected: bool :param subinquireditemcount: For instance or AG, indicates number of DB's present :type subinquireditemcount: int @@ -75,6 +77,7 @@ class AzureVmWorkloadProtectableItem(WorkloadProtectableItem): 'parent_unique_name': {'key': 'parentUniqueName', 'type': 'str'}, 'server_name': {'key': 'serverName', 'type': 'str'}, 'is_auto_protectable': {'key': 'isAutoProtectable', 'type': 'bool'}, + 'is_auto_protected': {'key': 'isAutoProtected', 'type': 'bool'}, 'subinquireditemcount': {'key': 'subinquireditemcount', 'type': 'int'}, 'subprotectableitemcount': {'key': 'subprotectableitemcount', 'type': 'int'}, 'prebackupvalidation': {'key': 'prebackupvalidation', 'type': 'PreBackupValidation'}, @@ -84,12 +87,13 @@ class AzureVmWorkloadProtectableItem(WorkloadProtectableItem): 'protectable_item_type': {'SAPHanaDatabase': 'AzureVmWorkloadSAPHanaDatabaseProtectableItem', 'SAPHanaSystem': 'AzureVmWorkloadSAPHanaSystemProtectableItem', 'SQLAvailabilityGroupContainer': 'AzureVmWorkloadSQLAvailabilityGroupProtectableItem', 'SQLDataBase': 'AzureVmWorkloadSQLDatabaseProtectableItem', 'SQLInstance': 'AzureVmWorkloadSQLInstanceProtectableItem'} } - def __init__(self, *, backup_management_type: str=None, workload_type: str=None, friendly_name: str=None, protection_state=None, parent_name: str=None, parent_unique_name: str=None, server_name: str=None, is_auto_protectable: bool=None, subinquireditemcount: int=None, subprotectableitemcount: int=None, prebackupvalidation=None, **kwargs) -> None: + def __init__(self, *, backup_management_type: str=None, workload_type: str=None, friendly_name: str=None, protection_state=None, parent_name: str=None, parent_unique_name: str=None, server_name: str=None, is_auto_protectable: bool=None, is_auto_protected: bool=None, subinquireditemcount: int=None, subprotectableitemcount: int=None, prebackupvalidation=None, **kwargs) -> None: super(AzureVmWorkloadProtectableItem, self).__init__(backup_management_type=backup_management_type, workload_type=workload_type, friendly_name=friendly_name, protection_state=protection_state, **kwargs) self.parent_name = parent_name self.parent_unique_name = parent_unique_name self.server_name = server_name self.is_auto_protectable = is_auto_protectable + self.is_auto_protected = is_auto_protected self.subinquireditemcount = subinquireditemcount self.subprotectableitemcount = subprotectableitemcount self.prebackupvalidation = prebackupvalidation diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_protection_policy.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_protection_policy.py index a8fd70352c3b..247776fdb934 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_protection_policy.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_protection_policy.py @@ -21,8 +21,12 @@ class AzureVmWorkloadProtectionPolicy(ProtectionPolicy): :type protected_items_count: int :param backup_management_type: Required. Constant filled by server. :type backup_management_type: str - :param work_load_type: Type of workload for the backup management - :type work_load_type: str + :param work_load_type: Type of workload for the backup management. + Possible values include: 'Invalid', 'VM', 'FileFolder', 'AzureSqlDb', + 'SQLDB', 'Exchange', 'Sharepoint', 'VMwareVM', 'SystemState', 'Client', + 'GenericDataSource', 'SQLDataBase', 'AzureFileShare', 'SAPHanaDatabase' + :type work_load_type: str or + ~azure.mgmt.recoveryservicesbackup.models.WorkloadType :param settings: Common settings for the backup management :type settings: ~azure.mgmt.recoveryservicesbackup.models.Settings :param sub_protection_policy: List of sub-protection policies which diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_protection_policy_py3.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_protection_policy_py3.py index 9d10a880a8f4..8adaca83759c 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_protection_policy_py3.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_protection_policy_py3.py @@ -21,8 +21,12 @@ class AzureVmWorkloadProtectionPolicy(ProtectionPolicy): :type protected_items_count: int :param backup_management_type: Required. Constant filled by server. :type backup_management_type: str - :param work_load_type: Type of workload for the backup management - :type work_load_type: str + :param work_load_type: Type of workload for the backup management. + Possible values include: 'Invalid', 'VM', 'FileFolder', 'AzureSqlDb', + 'SQLDB', 'Exchange', 'Sharepoint', 'VMwareVM', 'SystemState', 'Client', + 'GenericDataSource', 'SQLDataBase', 'AzureFileShare', 'SAPHanaDatabase' + :type work_load_type: str or + ~azure.mgmt.recoveryservicesbackup.models.WorkloadType :param settings: Common settings for the backup management :type settings: ~azure.mgmt.recoveryservicesbackup.models.Settings :param sub_protection_policy: List of sub-protection policies which @@ -43,7 +47,7 @@ class AzureVmWorkloadProtectionPolicy(ProtectionPolicy): 'sub_protection_policy': {'key': 'subProtectionPolicy', 'type': '[SubProtectionPolicy]'}, } - def __init__(self, *, protected_items_count: int=None, work_load_type: str=None, settings=None, sub_protection_policy=None, **kwargs) -> None: + def __init__(self, *, protected_items_count: int=None, work_load_type=None, settings=None, sub_protection_policy=None, **kwargs) -> None: super(AzureVmWorkloadProtectionPolicy, self).__init__(protected_items_count=protected_items_count, **kwargs) self.work_load_type = work_load_type self.settings = settings diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sap_hana_database_protectable_item.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sap_hana_database_protectable_item.py index 08461cc45507..d7ae19ee6ebc 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sap_hana_database_protectable_item.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sap_hana_database_protectable_item.py @@ -43,6 +43,8 @@ class AzureVmWorkloadSAPHanaDatabaseProtectableItem(AzureVmWorkloadProtectableIt :param is_auto_protectable: Indicates if protectable item is auto-protectable :type is_auto_protectable: bool + :param is_auto_protected: Indicates if protectable item is auto-protected + :type is_auto_protected: bool :param subinquireditemcount: For instance or AG, indicates number of DB's present :type subinquireditemcount: int @@ -68,6 +70,7 @@ class AzureVmWorkloadSAPHanaDatabaseProtectableItem(AzureVmWorkloadProtectableIt 'parent_unique_name': {'key': 'parentUniqueName', 'type': 'str'}, 'server_name': {'key': 'serverName', 'type': 'str'}, 'is_auto_protectable': {'key': 'isAutoProtectable', 'type': 'bool'}, + 'is_auto_protected': {'key': 'isAutoProtected', 'type': 'bool'}, 'subinquireditemcount': {'key': 'subinquireditemcount', 'type': 'int'}, 'subprotectableitemcount': {'key': 'subprotectableitemcount', 'type': 'int'}, 'prebackupvalidation': {'key': 'prebackupvalidation', 'type': 'PreBackupValidation'}, diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sap_hana_database_protectable_item_py3.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sap_hana_database_protectable_item_py3.py index 14840640a0a1..345bf1b00c7a 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sap_hana_database_protectable_item_py3.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sap_hana_database_protectable_item_py3.py @@ -43,6 +43,8 @@ class AzureVmWorkloadSAPHanaDatabaseProtectableItem(AzureVmWorkloadProtectableIt :param is_auto_protectable: Indicates if protectable item is auto-protectable :type is_auto_protectable: bool + :param is_auto_protected: Indicates if protectable item is auto-protected + :type is_auto_protected: bool :param subinquireditemcount: For instance or AG, indicates number of DB's present :type subinquireditemcount: int @@ -68,11 +70,12 @@ class AzureVmWorkloadSAPHanaDatabaseProtectableItem(AzureVmWorkloadProtectableIt 'parent_unique_name': {'key': 'parentUniqueName', 'type': 'str'}, 'server_name': {'key': 'serverName', 'type': 'str'}, 'is_auto_protectable': {'key': 'isAutoProtectable', 'type': 'bool'}, + 'is_auto_protected': {'key': 'isAutoProtected', 'type': 'bool'}, 'subinquireditemcount': {'key': 'subinquireditemcount', 'type': 'int'}, 'subprotectableitemcount': {'key': 'subprotectableitemcount', 'type': 'int'}, 'prebackupvalidation': {'key': 'prebackupvalidation', 'type': 'PreBackupValidation'}, } - def __init__(self, *, backup_management_type: str=None, workload_type: str=None, friendly_name: str=None, protection_state=None, parent_name: str=None, parent_unique_name: str=None, server_name: str=None, is_auto_protectable: bool=None, subinquireditemcount: int=None, subprotectableitemcount: int=None, prebackupvalidation=None, **kwargs) -> None: - super(AzureVmWorkloadSAPHanaDatabaseProtectableItem, self).__init__(backup_management_type=backup_management_type, workload_type=workload_type, friendly_name=friendly_name, protection_state=protection_state, parent_name=parent_name, parent_unique_name=parent_unique_name, server_name=server_name, is_auto_protectable=is_auto_protectable, subinquireditemcount=subinquireditemcount, subprotectableitemcount=subprotectableitemcount, prebackupvalidation=prebackupvalidation, **kwargs) + def __init__(self, *, backup_management_type: str=None, workload_type: str=None, friendly_name: str=None, protection_state=None, parent_name: str=None, parent_unique_name: str=None, server_name: str=None, is_auto_protectable: bool=None, is_auto_protected: bool=None, subinquireditemcount: int=None, subprotectableitemcount: int=None, prebackupvalidation=None, **kwargs) -> None: + super(AzureVmWorkloadSAPHanaDatabaseProtectableItem, self).__init__(backup_management_type=backup_management_type, workload_type=workload_type, friendly_name=friendly_name, protection_state=protection_state, parent_name=parent_name, parent_unique_name=parent_unique_name, server_name=server_name, is_auto_protectable=is_auto_protectable, is_auto_protected=is_auto_protected, subinquireditemcount=subinquireditemcount, subprotectableitemcount=subprotectableitemcount, prebackupvalidation=prebackupvalidation, **kwargs) self.protectable_item_type = 'SAPHanaDatabase' diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sap_hana_system_protectable_item.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sap_hana_system_protectable_item.py index 6944eefd06ba..df3785d87706 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sap_hana_system_protectable_item.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sap_hana_system_protectable_item.py @@ -43,6 +43,8 @@ class AzureVmWorkloadSAPHanaSystemProtectableItem(AzureVmWorkloadProtectableItem :param is_auto_protectable: Indicates if protectable item is auto-protectable :type is_auto_protectable: bool + :param is_auto_protected: Indicates if protectable item is auto-protected + :type is_auto_protected: bool :param subinquireditemcount: For instance or AG, indicates number of DB's present :type subinquireditemcount: int @@ -68,6 +70,7 @@ class AzureVmWorkloadSAPHanaSystemProtectableItem(AzureVmWorkloadProtectableItem 'parent_unique_name': {'key': 'parentUniqueName', 'type': 'str'}, 'server_name': {'key': 'serverName', 'type': 'str'}, 'is_auto_protectable': {'key': 'isAutoProtectable', 'type': 'bool'}, + 'is_auto_protected': {'key': 'isAutoProtected', 'type': 'bool'}, 'subinquireditemcount': {'key': 'subinquireditemcount', 'type': 'int'}, 'subprotectableitemcount': {'key': 'subprotectableitemcount', 'type': 'int'}, 'prebackupvalidation': {'key': 'prebackupvalidation', 'type': 'PreBackupValidation'}, diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sap_hana_system_protectable_item_py3.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sap_hana_system_protectable_item_py3.py index a6e5516382f9..072820141090 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sap_hana_system_protectable_item_py3.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sap_hana_system_protectable_item_py3.py @@ -43,6 +43,8 @@ class AzureVmWorkloadSAPHanaSystemProtectableItem(AzureVmWorkloadProtectableItem :param is_auto_protectable: Indicates if protectable item is auto-protectable :type is_auto_protectable: bool + :param is_auto_protected: Indicates if protectable item is auto-protected + :type is_auto_protected: bool :param subinquireditemcount: For instance or AG, indicates number of DB's present :type subinquireditemcount: int @@ -68,11 +70,12 @@ class AzureVmWorkloadSAPHanaSystemProtectableItem(AzureVmWorkloadProtectableItem 'parent_unique_name': {'key': 'parentUniqueName', 'type': 'str'}, 'server_name': {'key': 'serverName', 'type': 'str'}, 'is_auto_protectable': {'key': 'isAutoProtectable', 'type': 'bool'}, + 'is_auto_protected': {'key': 'isAutoProtected', 'type': 'bool'}, 'subinquireditemcount': {'key': 'subinquireditemcount', 'type': 'int'}, 'subprotectableitemcount': {'key': 'subprotectableitemcount', 'type': 'int'}, 'prebackupvalidation': {'key': 'prebackupvalidation', 'type': 'PreBackupValidation'}, } - def __init__(self, *, backup_management_type: str=None, workload_type: str=None, friendly_name: str=None, protection_state=None, parent_name: str=None, parent_unique_name: str=None, server_name: str=None, is_auto_protectable: bool=None, subinquireditemcount: int=None, subprotectableitemcount: int=None, prebackupvalidation=None, **kwargs) -> None: - super(AzureVmWorkloadSAPHanaSystemProtectableItem, self).__init__(backup_management_type=backup_management_type, workload_type=workload_type, friendly_name=friendly_name, protection_state=protection_state, parent_name=parent_name, parent_unique_name=parent_unique_name, server_name=server_name, is_auto_protectable=is_auto_protectable, subinquireditemcount=subinquireditemcount, subprotectableitemcount=subprotectableitemcount, prebackupvalidation=prebackupvalidation, **kwargs) + def __init__(self, *, backup_management_type: str=None, workload_type: str=None, friendly_name: str=None, protection_state=None, parent_name: str=None, parent_unique_name: str=None, server_name: str=None, is_auto_protectable: bool=None, is_auto_protected: bool=None, subinquireditemcount: int=None, subprotectableitemcount: int=None, prebackupvalidation=None, **kwargs) -> None: + super(AzureVmWorkloadSAPHanaSystemProtectableItem, self).__init__(backup_management_type=backup_management_type, workload_type=workload_type, friendly_name=friendly_name, protection_state=protection_state, parent_name=parent_name, parent_unique_name=parent_unique_name, server_name=server_name, is_auto_protectable=is_auto_protectable, is_auto_protected=is_auto_protected, subinquireditemcount=subinquireditemcount, subprotectableitemcount=subprotectableitemcount, prebackupvalidation=prebackupvalidation, **kwargs) self.protectable_item_type = 'SAPHanaSystem' diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sql_availability_group_protectable_item.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sql_availability_group_protectable_item.py index 17c847e0230d..5b150919e087 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sql_availability_group_protectable_item.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sql_availability_group_protectable_item.py @@ -44,6 +44,8 @@ class AzureVmWorkloadSQLAvailabilityGroupProtectableItem(AzureVmWorkloadProtecta :param is_auto_protectable: Indicates if protectable item is auto-protectable :type is_auto_protectable: bool + :param is_auto_protected: Indicates if protectable item is auto-protected + :type is_auto_protected: bool :param subinquireditemcount: For instance or AG, indicates number of DB's present :type subinquireditemcount: int @@ -69,6 +71,7 @@ class AzureVmWorkloadSQLAvailabilityGroupProtectableItem(AzureVmWorkloadProtecta 'parent_unique_name': {'key': 'parentUniqueName', 'type': 'str'}, 'server_name': {'key': 'serverName', 'type': 'str'}, 'is_auto_protectable': {'key': 'isAutoProtectable', 'type': 'bool'}, + 'is_auto_protected': {'key': 'isAutoProtected', 'type': 'bool'}, 'subinquireditemcount': {'key': 'subinquireditemcount', 'type': 'int'}, 'subprotectableitemcount': {'key': 'subprotectableitemcount', 'type': 'int'}, 'prebackupvalidation': {'key': 'prebackupvalidation', 'type': 'PreBackupValidation'}, diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sql_availability_group_protectable_item_py3.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sql_availability_group_protectable_item_py3.py index d928c60e93be..7fbf834350f0 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sql_availability_group_protectable_item_py3.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sql_availability_group_protectable_item_py3.py @@ -44,6 +44,8 @@ class AzureVmWorkloadSQLAvailabilityGroupProtectableItem(AzureVmWorkloadProtecta :param is_auto_protectable: Indicates if protectable item is auto-protectable :type is_auto_protectable: bool + :param is_auto_protected: Indicates if protectable item is auto-protected + :type is_auto_protected: bool :param subinquireditemcount: For instance or AG, indicates number of DB's present :type subinquireditemcount: int @@ -69,11 +71,12 @@ class AzureVmWorkloadSQLAvailabilityGroupProtectableItem(AzureVmWorkloadProtecta 'parent_unique_name': {'key': 'parentUniqueName', 'type': 'str'}, 'server_name': {'key': 'serverName', 'type': 'str'}, 'is_auto_protectable': {'key': 'isAutoProtectable', 'type': 'bool'}, + 'is_auto_protected': {'key': 'isAutoProtected', 'type': 'bool'}, 'subinquireditemcount': {'key': 'subinquireditemcount', 'type': 'int'}, 'subprotectableitemcount': {'key': 'subprotectableitemcount', 'type': 'int'}, 'prebackupvalidation': {'key': 'prebackupvalidation', 'type': 'PreBackupValidation'}, } - def __init__(self, *, backup_management_type: str=None, workload_type: str=None, friendly_name: str=None, protection_state=None, parent_name: str=None, parent_unique_name: str=None, server_name: str=None, is_auto_protectable: bool=None, subinquireditemcount: int=None, subprotectableitemcount: int=None, prebackupvalidation=None, **kwargs) -> None: - super(AzureVmWorkloadSQLAvailabilityGroupProtectableItem, self).__init__(backup_management_type=backup_management_type, workload_type=workload_type, friendly_name=friendly_name, protection_state=protection_state, parent_name=parent_name, parent_unique_name=parent_unique_name, server_name=server_name, is_auto_protectable=is_auto_protectable, subinquireditemcount=subinquireditemcount, subprotectableitemcount=subprotectableitemcount, prebackupvalidation=prebackupvalidation, **kwargs) + def __init__(self, *, backup_management_type: str=None, workload_type: str=None, friendly_name: str=None, protection_state=None, parent_name: str=None, parent_unique_name: str=None, server_name: str=None, is_auto_protectable: bool=None, is_auto_protected: bool=None, subinquireditemcount: int=None, subprotectableitemcount: int=None, prebackupvalidation=None, **kwargs) -> None: + super(AzureVmWorkloadSQLAvailabilityGroupProtectableItem, self).__init__(backup_management_type=backup_management_type, workload_type=workload_type, friendly_name=friendly_name, protection_state=protection_state, parent_name=parent_name, parent_unique_name=parent_unique_name, server_name=server_name, is_auto_protectable=is_auto_protectable, is_auto_protected=is_auto_protected, subinquireditemcount=subinquireditemcount, subprotectableitemcount=subprotectableitemcount, prebackupvalidation=prebackupvalidation, **kwargs) self.protectable_item_type = 'SQLAvailabilityGroupContainer' diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sql_database_protectable_item.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sql_database_protectable_item.py index 4ad8206ff337..7fe8d98990ec 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sql_database_protectable_item.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sql_database_protectable_item.py @@ -43,6 +43,8 @@ class AzureVmWorkloadSQLDatabaseProtectableItem(AzureVmWorkloadProtectableItem): :param is_auto_protectable: Indicates if protectable item is auto-protectable :type is_auto_protectable: bool + :param is_auto_protected: Indicates if protectable item is auto-protected + :type is_auto_protected: bool :param subinquireditemcount: For instance or AG, indicates number of DB's present :type subinquireditemcount: int @@ -68,6 +70,7 @@ class AzureVmWorkloadSQLDatabaseProtectableItem(AzureVmWorkloadProtectableItem): 'parent_unique_name': {'key': 'parentUniqueName', 'type': 'str'}, 'server_name': {'key': 'serverName', 'type': 'str'}, 'is_auto_protectable': {'key': 'isAutoProtectable', 'type': 'bool'}, + 'is_auto_protected': {'key': 'isAutoProtected', 'type': 'bool'}, 'subinquireditemcount': {'key': 'subinquireditemcount', 'type': 'int'}, 'subprotectableitemcount': {'key': 'subprotectableitemcount', 'type': 'int'}, 'prebackupvalidation': {'key': 'prebackupvalidation', 'type': 'PreBackupValidation'}, diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sql_database_protectable_item_py3.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sql_database_protectable_item_py3.py index c13578efb69b..a445adcabf49 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sql_database_protectable_item_py3.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sql_database_protectable_item_py3.py @@ -43,6 +43,8 @@ class AzureVmWorkloadSQLDatabaseProtectableItem(AzureVmWorkloadProtectableItem): :param is_auto_protectable: Indicates if protectable item is auto-protectable :type is_auto_protectable: bool + :param is_auto_protected: Indicates if protectable item is auto-protected + :type is_auto_protected: bool :param subinquireditemcount: For instance or AG, indicates number of DB's present :type subinquireditemcount: int @@ -68,11 +70,12 @@ class AzureVmWorkloadSQLDatabaseProtectableItem(AzureVmWorkloadProtectableItem): 'parent_unique_name': {'key': 'parentUniqueName', 'type': 'str'}, 'server_name': {'key': 'serverName', 'type': 'str'}, 'is_auto_protectable': {'key': 'isAutoProtectable', 'type': 'bool'}, + 'is_auto_protected': {'key': 'isAutoProtected', 'type': 'bool'}, 'subinquireditemcount': {'key': 'subinquireditemcount', 'type': 'int'}, 'subprotectableitemcount': {'key': 'subprotectableitemcount', 'type': 'int'}, 'prebackupvalidation': {'key': 'prebackupvalidation', 'type': 'PreBackupValidation'}, } - def __init__(self, *, backup_management_type: str=None, workload_type: str=None, friendly_name: str=None, protection_state=None, parent_name: str=None, parent_unique_name: str=None, server_name: str=None, is_auto_protectable: bool=None, subinquireditemcount: int=None, subprotectableitemcount: int=None, prebackupvalidation=None, **kwargs) -> None: - super(AzureVmWorkloadSQLDatabaseProtectableItem, self).__init__(backup_management_type=backup_management_type, workload_type=workload_type, friendly_name=friendly_name, protection_state=protection_state, parent_name=parent_name, parent_unique_name=parent_unique_name, server_name=server_name, is_auto_protectable=is_auto_protectable, subinquireditemcount=subinquireditemcount, subprotectableitemcount=subprotectableitemcount, prebackupvalidation=prebackupvalidation, **kwargs) + def __init__(self, *, backup_management_type: str=None, workload_type: str=None, friendly_name: str=None, protection_state=None, parent_name: str=None, parent_unique_name: str=None, server_name: str=None, is_auto_protectable: bool=None, is_auto_protected: bool=None, subinquireditemcount: int=None, subprotectableitemcount: int=None, prebackupvalidation=None, **kwargs) -> None: + super(AzureVmWorkloadSQLDatabaseProtectableItem, self).__init__(backup_management_type=backup_management_type, workload_type=workload_type, friendly_name=friendly_name, protection_state=protection_state, parent_name=parent_name, parent_unique_name=parent_unique_name, server_name=server_name, is_auto_protectable=is_auto_protectable, is_auto_protected=is_auto_protected, subinquireditemcount=subinquireditemcount, subprotectableitemcount=subprotectableitemcount, prebackupvalidation=prebackupvalidation, **kwargs) self.protectable_item_type = 'SQLDataBase' diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sql_instance_protectable_item.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sql_instance_protectable_item.py index 5281a2047b25..0bc2c3d458bd 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sql_instance_protectable_item.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sql_instance_protectable_item.py @@ -43,6 +43,8 @@ class AzureVmWorkloadSQLInstanceProtectableItem(AzureVmWorkloadProtectableItem): :param is_auto_protectable: Indicates if protectable item is auto-protectable :type is_auto_protectable: bool + :param is_auto_protected: Indicates if protectable item is auto-protected + :type is_auto_protected: bool :param subinquireditemcount: For instance or AG, indicates number of DB's present :type subinquireditemcount: int @@ -68,6 +70,7 @@ class AzureVmWorkloadSQLInstanceProtectableItem(AzureVmWorkloadProtectableItem): 'parent_unique_name': {'key': 'parentUniqueName', 'type': 'str'}, 'server_name': {'key': 'serverName', 'type': 'str'}, 'is_auto_protectable': {'key': 'isAutoProtectable', 'type': 'bool'}, + 'is_auto_protected': {'key': 'isAutoProtected', 'type': 'bool'}, 'subinquireditemcount': {'key': 'subinquireditemcount', 'type': 'int'}, 'subprotectableitemcount': {'key': 'subprotectableitemcount', 'type': 'int'}, 'prebackupvalidation': {'key': 'prebackupvalidation', 'type': 'PreBackupValidation'}, diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sql_instance_protectable_item_py3.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sql_instance_protectable_item_py3.py index e4f23a4b4f3f..cb9101ca6547 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sql_instance_protectable_item_py3.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_vm_workload_sql_instance_protectable_item_py3.py @@ -43,6 +43,8 @@ class AzureVmWorkloadSQLInstanceProtectableItem(AzureVmWorkloadProtectableItem): :param is_auto_protectable: Indicates if protectable item is auto-protectable :type is_auto_protectable: bool + :param is_auto_protected: Indicates if protectable item is auto-protected + :type is_auto_protected: bool :param subinquireditemcount: For instance or AG, indicates number of DB's present :type subinquireditemcount: int @@ -68,11 +70,12 @@ class AzureVmWorkloadSQLInstanceProtectableItem(AzureVmWorkloadProtectableItem): 'parent_unique_name': {'key': 'parentUniqueName', 'type': 'str'}, 'server_name': {'key': 'serverName', 'type': 'str'}, 'is_auto_protectable': {'key': 'isAutoProtectable', 'type': 'bool'}, + 'is_auto_protected': {'key': 'isAutoProtected', 'type': 'bool'}, 'subinquireditemcount': {'key': 'subinquireditemcount', 'type': 'int'}, 'subprotectableitemcount': {'key': 'subprotectableitemcount', 'type': 'int'}, 'prebackupvalidation': {'key': 'prebackupvalidation', 'type': 'PreBackupValidation'}, } - def __init__(self, *, backup_management_type: str=None, workload_type: str=None, friendly_name: str=None, protection_state=None, parent_name: str=None, parent_unique_name: str=None, server_name: str=None, is_auto_protectable: bool=None, subinquireditemcount: int=None, subprotectableitemcount: int=None, prebackupvalidation=None, **kwargs) -> None: - super(AzureVmWorkloadSQLInstanceProtectableItem, self).__init__(backup_management_type=backup_management_type, workload_type=workload_type, friendly_name=friendly_name, protection_state=protection_state, parent_name=parent_name, parent_unique_name=parent_unique_name, server_name=server_name, is_auto_protectable=is_auto_protectable, subinquireditemcount=subinquireditemcount, subprotectableitemcount=subprotectableitemcount, prebackupvalidation=prebackupvalidation, **kwargs) + def __init__(self, *, backup_management_type: str=None, workload_type: str=None, friendly_name: str=None, protection_state=None, parent_name: str=None, parent_unique_name: str=None, server_name: str=None, is_auto_protectable: bool=None, is_auto_protected: bool=None, subinquireditemcount: int=None, subprotectableitemcount: int=None, prebackupvalidation=None, **kwargs) -> None: + super(AzureVmWorkloadSQLInstanceProtectableItem, self).__init__(backup_management_type=backup_management_type, workload_type=workload_type, friendly_name=friendly_name, protection_state=protection_state, parent_name=parent_name, parent_unique_name=parent_unique_name, server_name=server_name, is_auto_protectable=is_auto_protectable, is_auto_protected=is_auto_protected, subinquireditemcount=subinquireditemcount, subprotectableitemcount=subprotectableitemcount, prebackupvalidation=prebackupvalidation, **kwargs) self.protectable_item_type = 'SQLInstance' diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_workload_container.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_workload_container.py index 76d7bfad9b30..db6b05313b41 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_workload_container.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_workload_container.py @@ -79,4 +79,4 @@ def __init__(self, **kwargs): self.last_updated_time = kwargs.get('last_updated_time', None) self.extended_info = kwargs.get('extended_info', None) self.workload_type = kwargs.get('workload_type', None) - self.container_type = 'AzureWorkloadContainer' + self.container_type = 'AzureWorkloadBackupRequest' diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_workload_container_py3.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_workload_container_py3.py index 41bba7c73a24..811cef922984 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_workload_container_py3.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/azure_workload_container_py3.py @@ -79,4 +79,4 @@ def __init__(self, *, friendly_name: str=None, backup_management_type=None, regi self.last_updated_time = last_updated_time self.extended_info = extended_info self.workload_type = workload_type - self.container_type = 'AzureWorkloadContainer' + self.container_type = 'AzureWorkloadBackupRequest' diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/backup_status_response.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/backup_status_response.py index 80885ec72e6d..ea069da3d138 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/backup_status_response.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/backup_status_response.py @@ -20,8 +20,6 @@ class BackupStatusResponse(Model): 'Protected', 'ProtectionFailed' :type protection_status: str or ~azure.mgmt.recoveryservicesbackup.models.ProtectionStatus - :param vault_id: Specifies the arm resource id of the vault - :type vault_id: str :param fabric_name: Specifies the fabric name - Azure or AD. Possible values include: 'Invalid', 'Azure' :type fabric_name: str or @@ -44,7 +42,6 @@ class BackupStatusResponse(Model): _attribute_map = { 'protection_status': {'key': 'protectionStatus', 'type': 'str'}, - 'vault_id': {'key': 'vaultId', 'type': 'str'}, 'fabric_name': {'key': 'fabricName', 'type': 'str'}, 'container_name': {'key': 'containerName', 'type': 'str'}, 'protected_item_name': {'key': 'protectedItemName', 'type': 'str'}, @@ -57,7 +54,6 @@ class BackupStatusResponse(Model): def __init__(self, **kwargs): super(BackupStatusResponse, self).__init__(**kwargs) self.protection_status = kwargs.get('protection_status', None) - self.vault_id = kwargs.get('vault_id', None) self.fabric_name = kwargs.get('fabric_name', None) self.container_name = kwargs.get('container_name', None) self.protected_item_name = kwargs.get('protected_item_name', None) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/backup_status_response_py3.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/backup_status_response_py3.py index 2a9b7641efb1..58a81a574ca0 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/backup_status_response_py3.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/backup_status_response_py3.py @@ -20,8 +20,6 @@ class BackupStatusResponse(Model): 'Protected', 'ProtectionFailed' :type protection_status: str or ~azure.mgmt.recoveryservicesbackup.models.ProtectionStatus - :param vault_id: Specifies the arm resource id of the vault - :type vault_id: str :param fabric_name: Specifies the fabric name - Azure or AD. Possible values include: 'Invalid', 'Azure' :type fabric_name: str or @@ -44,7 +42,6 @@ class BackupStatusResponse(Model): _attribute_map = { 'protection_status': {'key': 'protectionStatus', 'type': 'str'}, - 'vault_id': {'key': 'vaultId', 'type': 'str'}, 'fabric_name': {'key': 'fabricName', 'type': 'str'}, 'container_name': {'key': 'containerName', 'type': 'str'}, 'protected_item_name': {'key': 'protectedItemName', 'type': 'str'}, @@ -54,10 +51,9 @@ class BackupStatusResponse(Model): 'registration_status': {'key': 'registrationStatus', 'type': 'str'}, } - def __init__(self, *, protection_status=None, vault_id: str=None, fabric_name=None, container_name: str=None, protected_item_name: str=None, error_code: str=None, error_message: str=None, policy_name: str=None, registration_status: str=None, **kwargs) -> None: + def __init__(self, *, protection_status=None, fabric_name=None, container_name: str=None, protected_item_name: str=None, error_code: str=None, error_message: str=None, policy_name: str=None, registration_status: str=None, **kwargs) -> None: super(BackupStatusResponse, self).__init__(**kwargs) self.protection_status = protection_status - self.vault_id = vault_id self.fabric_name = fabric_name self.container_name = container_name self.protected_item_name = protected_item_name diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/pre_validate_enable_backup_request.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/pre_validate_enable_backup_request.py index 23b321378d7c..2926a069f7c6 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/pre_validate_enable_backup_request.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/pre_validate_enable_backup_request.py @@ -28,8 +28,6 @@ class PreValidateEnableBackupRequest(Model): ~azure.mgmt.recoveryservicesbackup.models.DataSourceType :param resource_id: ARM Virtual Machine Id :type resource_id: str - :param vault_id: ARM id of the Recovery Services Vault - :type vault_id: str :param properties: Configuration of VM if any needs to be validated like OS type etc :type properties: str @@ -38,7 +36,6 @@ class PreValidateEnableBackupRequest(Model): _attribute_map = { 'resource_type': {'key': 'resourceType', 'type': 'str'}, 'resource_id': {'key': 'resourceId', 'type': 'str'}, - 'vault_id': {'key': 'vaultId', 'type': 'str'}, 'properties': {'key': 'properties', 'type': 'str'}, } @@ -46,5 +43,4 @@ def __init__(self, **kwargs): super(PreValidateEnableBackupRequest, self).__init__(**kwargs) self.resource_type = kwargs.get('resource_type', None) self.resource_id = kwargs.get('resource_id', None) - self.vault_id = kwargs.get('vault_id', None) self.properties = kwargs.get('properties', None) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/pre_validate_enable_backup_request_py3.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/pre_validate_enable_backup_request_py3.py index be47c3d34ecc..5c5ebdfd7356 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/pre_validate_enable_backup_request_py3.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/pre_validate_enable_backup_request_py3.py @@ -28,8 +28,6 @@ class PreValidateEnableBackupRequest(Model): ~azure.mgmt.recoveryservicesbackup.models.DataSourceType :param resource_id: ARM Virtual Machine Id :type resource_id: str - :param vault_id: ARM id of the Recovery Services Vault - :type vault_id: str :param properties: Configuration of VM if any needs to be validated like OS type etc :type properties: str @@ -38,13 +36,11 @@ class PreValidateEnableBackupRequest(Model): _attribute_map = { 'resource_type': {'key': 'resourceType', 'type': 'str'}, 'resource_id': {'key': 'resourceId', 'type': 'str'}, - 'vault_id': {'key': 'vaultId', 'type': 'str'}, 'properties': {'key': 'properties', 'type': 'str'}, } - def __init__(self, *, resource_type=None, resource_id: str=None, vault_id: str=None, properties: str=None, **kwargs) -> None: + def __init__(self, *, resource_type=None, resource_id: str=None, properties: str=None, **kwargs) -> None: super(PreValidateEnableBackupRequest, self).__init__(**kwargs) self.resource_type = resource_type self.resource_id = resource_id - self.vault_id = vault_id self.properties = properties diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/protection_container.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/protection_container.py index b410911db36b..282a97bfb37a 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/protection_container.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/protection_container.py @@ -53,7 +53,7 @@ class ProtectionContainer(Model): } _subtype_map = { - 'container_type': {'AzureBackupServerContainer': 'AzureBackupServerContainer', 'AzureSqlContainer': 'AzureSqlContainer', 'StorageContainer': 'AzureStorageContainer', 'AzureWorkloadContainer': 'AzureWorkloadContainer', 'DPMContainer': 'DpmContainer', 'GenericContainer': 'GenericContainer', 'IaaSVMContainer': 'IaaSVMContainer', 'Windows': 'MabContainer'} + 'container_type': {'AzureBackupServerContainer': 'AzureBackupServerContainer', 'AzureSqlContainer': 'AzureSqlContainer', 'StorageContainer': 'AzureStorageContainer', 'AzureWorkloadBackupRequest': 'AzureWorkloadContainer', 'DPMContainer': 'DpmContainer', 'GenericContainer': 'GenericContainer', 'IaaSVMContainer': 'IaaSVMContainer', 'Windows': 'MabContainer'} } def __init__(self, **kwargs): diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/protection_container_py3.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/protection_container_py3.py index 4c04ec07a967..5d9424d50441 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/protection_container_py3.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/protection_container_py3.py @@ -53,7 +53,7 @@ class ProtectionContainer(Model): } _subtype_map = { - 'container_type': {'AzureBackupServerContainer': 'AzureBackupServerContainer', 'AzureSqlContainer': 'AzureSqlContainer', 'StorageContainer': 'AzureStorageContainer', 'AzureWorkloadContainer': 'AzureWorkloadContainer', 'DPMContainer': 'DpmContainer', 'GenericContainer': 'GenericContainer', 'IaaSVMContainer': 'IaaSVMContainer', 'Windows': 'MabContainer'} + 'container_type': {'AzureBackupServerContainer': 'AzureBackupServerContainer', 'AzureSqlContainer': 'AzureSqlContainer', 'StorageContainer': 'AzureStorageContainer', 'AzureWorkloadBackupRequest': 'AzureWorkloadContainer', 'DPMContainer': 'DpmContainer', 'GenericContainer': 'GenericContainer', 'IaaSVMContainer': 'IaaSVMContainer', 'Windows': 'MabContainer'} } def __init__(self, *, friendly_name: str=None, backup_management_type=None, registration_status: str=None, health_status: str=None, **kwargs) -> None: diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/protection_intent_query_object.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/protection_intent_query_object.py new file mode 100644 index 000000000000..c70412714d67 --- /dev/null +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/protection_intent_query_object.py @@ -0,0 +1,46 @@ +# 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 ProtectionIntentQueryObject(Model): + """Filters to list protection intent. + + :param backup_management_type: Backup management type for the backed up + item. Possible values include: 'Invalid', 'AzureIaasVM', 'MAB', 'DPM', + 'AzureBackupServer', 'AzureSql', 'AzureStorage', 'AzureWorkload', + 'DefaultBackup' + :type backup_management_type: str or + ~azure.mgmt.recoveryservicesbackup.models.BackupManagementType + :param item_type: Type of workload this item represents. Possible values + include: 'Invalid', 'SQLInstance', 'SQLAvailabilityGroupContainer' + :type item_type: str or + ~azure.mgmt.recoveryservicesbackup.models.IntentItemType + :param parent_name: Parent name of the intent + :type parent_name: str + :param item_name: Item name of the intent + :type item_name: str + """ + + _attribute_map = { + 'backup_management_type': {'key': 'backupManagementType', 'type': 'str'}, + 'item_type': {'key': 'itemType', 'type': 'str'}, + 'parent_name': {'key': 'parentName', 'type': 'str'}, + 'item_name': {'key': 'itemName', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ProtectionIntentQueryObject, self).__init__(**kwargs) + self.backup_management_type = kwargs.get('backup_management_type', None) + self.item_type = kwargs.get('item_type', None) + self.parent_name = kwargs.get('parent_name', None) + self.item_name = kwargs.get('item_name', None) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/protection_intent_query_object_py3.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/protection_intent_query_object_py3.py new file mode 100644 index 000000000000..c82789fd7f67 --- /dev/null +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/protection_intent_query_object_py3.py @@ -0,0 +1,46 @@ +# 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 ProtectionIntentQueryObject(Model): + """Filters to list protection intent. + + :param backup_management_type: Backup management type for the backed up + item. Possible values include: 'Invalid', 'AzureIaasVM', 'MAB', 'DPM', + 'AzureBackupServer', 'AzureSql', 'AzureStorage', 'AzureWorkload', + 'DefaultBackup' + :type backup_management_type: str or + ~azure.mgmt.recoveryservicesbackup.models.BackupManagementType + :param item_type: Type of workload this item represents. Possible values + include: 'Invalid', 'SQLInstance', 'SQLAvailabilityGroupContainer' + :type item_type: str or + ~azure.mgmt.recoveryservicesbackup.models.IntentItemType + :param parent_name: Parent name of the intent + :type parent_name: str + :param item_name: Item name of the intent + :type item_name: str + """ + + _attribute_map = { + 'backup_management_type': {'key': 'backupManagementType', 'type': 'str'}, + 'item_type': {'key': 'itemType', 'type': 'str'}, + 'parent_name': {'key': 'parentName', 'type': 'str'}, + 'item_name': {'key': 'itemName', 'type': 'str'}, + } + + def __init__(self, *, backup_management_type=None, item_type=None, parent_name: str=None, item_name: str=None, **kwargs) -> None: + super(ProtectionIntentQueryObject, self).__init__(**kwargs) + self.backup_management_type = backup_management_type + self.item_type = item_type + self.parent_name = parent_name + self.item_name = item_name diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/protection_intent_resource_paged.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/protection_intent_resource_paged.py new file mode 100644 index 000000000000..1a2b461a70d1 --- /dev/null +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/protection_intent_resource_paged.py @@ -0,0 +1,27 @@ +# 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.paging import Paged + + +class ProtectionIntentResourcePaged(Paged): + """ + A paging container for iterating over a list of :class:`ProtectionIntentResource ` object + """ + + _attribute_map = { + 'next_link': {'key': 'nextLink', 'type': 'str'}, + 'current_page': {'key': 'value', 'type': '[ProtectionIntentResource]'} + } + + def __init__(self, *args, **kwargs): + + super(ProtectionIntentResourcePaged, self).__init__(*args, **kwargs) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/recovery_services_backup_client_enums.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/recovery_services_backup_client_enums.py index 676fd6d041fa..4e15ffdad402 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/recovery_services_backup_client_enums.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/recovery_services_backup_client_enums.py @@ -30,6 +30,24 @@ class HealthStatus(str, Enum): invalid = "Invalid" +class WorkloadType(str, Enum): + + invalid = "Invalid" + vm = "VM" + file_folder = "FileFolder" + azure_sql_db = "AzureSqlDb" + sqldb = "SQLDB" + exchange = "Exchange" + sharepoint = "Sharepoint" + vmware_vm = "VMwareVM" + system_state = "SystemState" + client = "Client" + generic_data_source = "GenericDataSource" + sql_data_base = "SQLDataBase" + azure_file_share = "AzureFileShare" + sap_hana_database = "SAPHanaDatabase" + + class RecoveryType(str, Enum): invalid = "Invalid" @@ -97,6 +115,15 @@ class ProtectedItemHealthStatus(str, Enum): ir_pending = "IRPending" +class PolicyType(str, Enum): + + invalid = "Invalid" + full = "Full" + differential = "Differential" + log = "Log" + copy_only_full = "CopyOnlyFull" + + class OverwriteOptions(str, Enum): invalid = "Invalid" @@ -279,24 +306,6 @@ class MabServerType(str, Enum): generic_container = "GenericContainer" -class WorkloadType(str, Enum): - - invalid = "Invalid" - vm = "VM" - file_folder = "FileFolder" - azure_sql_db = "AzureSqlDb" - sqldb = "SQLDB" - exchange = "Exchange" - sharepoint = "Sharepoint" - vmware_vm = "VMwareVM" - system_state = "SystemState" - client = "Client" - generic_data_source = "GenericDataSource" - sql_data_base = "SQLDataBase" - azure_file_share = "AzureFileShare" - sap_hana_database = "SAPHanaDatabase" - - class HttpStatusCode(str, Enum): continue_enum = "Continue" @@ -370,6 +379,13 @@ class HealthState(str, Enum): invalid = "Invalid" +class IntentItemType(str, Enum): + + invalid = "Invalid" + sql_instance = "SQLInstance" + sql_availability_group_container = "SQLAvailabilityGroupContainer" + + class ScheduleRunType(str, Enum): invalid = "Invalid" diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/sub_protection_policy.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/sub_protection_policy.py index f7216d1ac89a..a41232946121 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/sub_protection_policy.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/sub_protection_policy.py @@ -15,8 +15,10 @@ class SubProtectionPolicy(Model): """Sub-protection policy which includes schedule and retention. - :param policy_type: Type of backup policy type - :type policy_type: str + :param policy_type: Type of backup policy type. Possible values include: + 'Invalid', 'Full', 'Differential', 'Log', 'CopyOnlyFull' + :type policy_type: str or + ~azure.mgmt.recoveryservicesbackup.models.PolicyType :param schedule_policy: Backup schedule specified as part of backup policy. :type schedule_policy: diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/sub_protection_policy_py3.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/sub_protection_policy_py3.py index 3744766dcefd..d49b000296b2 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/sub_protection_policy_py3.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/models/sub_protection_policy_py3.py @@ -15,8 +15,10 @@ class SubProtectionPolicy(Model): """Sub-protection policy which includes schedule and retention. - :param policy_type: Type of backup policy type - :type policy_type: str + :param policy_type: Type of backup policy type. Possible values include: + 'Invalid', 'Full', 'Differential', 'Log', 'CopyOnlyFull' + :type policy_type: str or + ~azure.mgmt.recoveryservicesbackup.models.PolicyType :param schedule_policy: Backup schedule specified as part of backup policy. :type schedule_policy: @@ -33,7 +35,7 @@ class SubProtectionPolicy(Model): 'retention_policy': {'key': 'retentionPolicy', 'type': 'RetentionPolicy'}, } - def __init__(self, *, policy_type: str=None, schedule_policy=None, retention_policy=None, **kwargs) -> None: + def __init__(self, *, policy_type=None, schedule_policy=None, retention_policy=None, **kwargs) -> None: super(SubProtectionPolicy, self).__init__(**kwargs) self.policy_type = policy_type self.schedule_policy = schedule_policy diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/__init__.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/__init__.py index fa7881ca064f..7d402d8d2f2a 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/__init__.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/__init__.py @@ -18,6 +18,7 @@ from .jobs_operations import JobsOperations from .backup_policies_operations import BackupPoliciesOperations from .backup_protected_items_operations import BackupProtectedItemsOperations +from .backup_protection_intent_operations import BackupProtectionIntentOperations from .backup_usage_summaries_operations import BackupUsageSummariesOperations from .operation_operations import OperationOperations from .backup_resource_vault_configs_operations import BackupResourceVaultConfigsOperations @@ -57,6 +58,7 @@ 'JobsOperations', 'BackupPoliciesOperations', 'BackupProtectedItemsOperations', + 'BackupProtectionIntentOperations', 'BackupUsageSummariesOperations', 'OperationOperations', 'BackupResourceVaultConfigsOperations', diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_engines_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_engines_operations.py index a63a7f71b0d9..99331c86fd7d 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_engines_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_engines_operations.py @@ -87,7 +87,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -96,9 +96,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -164,7 +163,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -173,8 +172,8 @@ def get( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_jobs_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_jobs_operations.py index 8becb59e8914..565028761494 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_jobs_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_jobs_operations.py @@ -86,7 +86,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -95,9 +95,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_operation_results_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_operation_results_operations.py index 182f7236607e..056e358def83 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_operation_results_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_operation_results_operations.py @@ -79,7 +79,6 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -88,8 +87,8 @@ def get( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202, 204]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_operation_statuses_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_operation_statuses_operations.py index 14b39e3af5dc..e790184f8d8d 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_operation_statuses_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_operation_statuses_operations.py @@ -79,7 +79,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -88,8 +88,8 @@ def get( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_policies_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_policies_operations.py index 5ad8fe88e255..7e9c8a091164 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_policies_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_policies_operations.py @@ -84,7 +84,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -93,9 +93,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_protectable_items_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_protectable_items_operations.py index bd1c33f1f686..67533c1f1c99 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_protectable_items_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_protectable_items_operations.py @@ -88,7 +88,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -97,9 +97,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_protected_items_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_protected_items_operations.py index f2b06237a06a..32237a752a59 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_protected_items_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_protected_items_operations.py @@ -87,7 +87,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -96,9 +96,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_protection_containers_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_protection_containers_operations.py index dbc03196d434..ad8b8241dfca 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_protection_containers_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_protection_containers_operations.py @@ -82,7 +82,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -91,9 +91,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_protection_intent_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_protection_intent_operations.py new file mode 100644 index 000000000000..861e3d02627a --- /dev/null +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_protection_intent_operations.py @@ -0,0 +1,118 @@ +# 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. +# -------------------------------------------------------------------------- + +import uuid +from msrest.pipeline import ClientRawResponse +from msrestazure.azure_exceptions import CloudError + +from .. import models + + +class BackupProtectionIntentOperations(object): + """BackupProtectionIntentOperations operations. + + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + :ivar api_version: Client Api Version. Constant value: "2017-07-01". + """ + + models = models + + def __init__(self, client, config, serializer, deserializer): + + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self.api_version = "2017-07-01" + + self.config = config + + def list( + self, vault_name, resource_group_name, filter=None, skip_token=None, custom_headers=None, raw=False, **operation_config): + """Provides a pageable list of all intents that are present within a + vault. + + :param vault_name: The name of the recovery services vault. + :type vault_name: str + :param resource_group_name: The name of the resource group where the + recovery services vault is present. + :type resource_group_name: str + :param filter: OData filter options. + :type filter: str + :param skip_token: skipToken Filter. + :type skip_token: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: An iterator like instance of ProtectionIntentResource + :rtype: + ~azure.mgmt.recoveryservicesbackup.models.ProtectionIntentResourcePaged[~azure.mgmt.recoveryservicesbackup.models.ProtectionIntentResource] + :raises: :class:`CloudError` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = self.list.metadata['url'] + path_format_arguments = { + 'vaultName': self._serialize.url("vault_name", vault_name, 'str'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + if filter is not None: + query_parameters['$filter'] = self._serialize.query("filter", filter, 'str') + if skip_token is not None: + query_parameters['$skipToken'] = self._serialize.query("skip_token", skip_token, 'str') + + else: + url = next_link + query_parameters = {} + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + return response + + # Deserialize response + deserialized = models.ProtectionIntentResourcePaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.ProtectionIntentResourcePaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list.metadata = {'url': '/Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/backupProtectionIntents'} diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_resource_storage_configs_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_resource_storage_configs_operations.py index 435b7f4aec9d..f3f51fa0df1e 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_resource_storage_configs_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_resource_storage_configs_operations.py @@ -72,7 +72,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -81,8 +81,8 @@ def get( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -149,9 +149,8 @@ def update( body_content = self._serialize.body(parameters, 'BackupResourceConfigResource') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_resource_vault_configs_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_resource_vault_configs_operations.py index da652c2678d8..7305c22c15fb 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_resource_vault_configs_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_resource_vault_configs_operations.py @@ -73,7 +73,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -82,8 +82,8 @@ def get( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -141,6 +141,7 @@ def update( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) @@ -153,9 +154,8 @@ def update( body_content = self._serialize.body(parameters, 'BackupResourceVaultConfigResource') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_status_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_status_operations.py index 21a5688cf429..4c169b73880b 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_status_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_status_operations.py @@ -70,6 +70,7 @@ def get( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) @@ -82,9 +83,8 @@ def get( body_content = self._serialize.body(parameters, 'BackupStatusRequest') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_usage_summaries_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_usage_summaries_operations.py index d4425f3c9ade..5ee8be6a5471 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_usage_summaries_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_usage_summaries_operations.py @@ -86,7 +86,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -95,9 +95,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_workload_items_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_workload_items_operations.py index 018490292e5e..70a669d49e41 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_workload_items_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backup_workload_items_operations.py @@ -94,7 +94,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -103,9 +103,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backups_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backups_operations.py index 9d73ab2788c8..fb1cea28b101 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backups_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/backups_operations.py @@ -97,9 +97,8 @@ def trigger( body_content = self._serialize.body(parameters, 'BackupRequestResource') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [202]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/export_jobs_operation_results_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/export_jobs_operation_results_operations.py index c1b2239f8431..ca9d4e158a85 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/export_jobs_operation_results_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/export_jobs_operation_results_operations.py @@ -79,7 +79,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -88,8 +88,8 @@ def get( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/feature_support_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/feature_support_operations.py index 82dd110e4f5d..fe5c56f1a209 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/feature_support_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/feature_support_operations.py @@ -73,6 +73,7 @@ def validate( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) @@ -85,9 +86,8 @@ def validate( body_content = self._serialize.body(parameters, 'FeatureSupportRequest') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/item_level_recovery_connections_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/item_level_recovery_connections_operations.py index 4d8a9d37b9e8..7e9b9761cddc 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/item_level_recovery_connections_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/item_level_recovery_connections_operations.py @@ -105,9 +105,8 @@ def provision( body_content = self._serialize.body(parameters, 'ILRRequestResource') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [202]: exp = CloudError(response) @@ -171,7 +170,6 @@ def revoke( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -180,8 +178,8 @@ def revoke( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [202]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/job_cancellations_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/job_cancellations_operations.py index e06b4e26b54c..95fadd78a6e2 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/job_cancellations_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/job_cancellations_operations.py @@ -75,7 +75,6 @@ def trigger( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -84,8 +83,8 @@ def trigger( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [202]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/job_details_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/job_details_operations.py index bead01dde009..c35346f42293 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/job_details_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/job_details_operations.py @@ -74,7 +74,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -83,8 +83,8 @@ def get( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/job_operation_results_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/job_operation_results_operations.py index f330e26c026d..c686eb1f1258 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/job_operation_results_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/job_operation_results_operations.py @@ -78,7 +78,6 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -87,8 +86,8 @@ def get( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202, 204]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/jobs_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/jobs_operations.py index d2d5d6487c42..1ec44f09f9bc 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/jobs_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/jobs_operations.py @@ -75,7 +75,6 @@ def export( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -84,8 +83,8 @@ def export( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [202]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/operation_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/operation_operations.py index e853f762647e..1f8729366aa6 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/operation_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/operation_operations.py @@ -76,6 +76,7 @@ def validate( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) @@ -88,9 +89,8 @@ def validate( body_content = self._serialize.body(parameters, 'ValidateOperationRequest') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/operations.py index a132e003a369..8afe7ebaf2fb 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/operations.py @@ -67,7 +67,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -76,9 +76,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protectable_containers_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protectable_containers_operations.py index 4185ca6b12b8..e558936fd648 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protectable_containers_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protectable_containers_operations.py @@ -39,7 +39,7 @@ def __init__(self, client, config, serializer, deserializer): def list( self, vault_name, resource_group_name, fabric_name, filter=None, custom_headers=None, raw=False, **operation_config): - """Lists the containers registered to Recovery Services Vault. + """Lists the containers that can be registered to Recovery Services Vault. :param vault_name: The name of the recovery services vault. :type vault_name: str @@ -85,7 +85,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -94,9 +94,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protected_item_operation_results_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protected_item_operation_results_operations.py index e187c6afe2ab..b263a504edb0 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protected_item_operation_results_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protected_item_operation_results_operations.py @@ -86,7 +86,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -95,8 +95,8 @@ def get( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202, 204]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protected_item_operation_statuses_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protected_item_operation_statuses_operations.py index 3caa7488906a..3530e3e72ff8 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protected_item_operation_statuses_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protected_item_operation_statuses_operations.py @@ -90,7 +90,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -99,8 +99,8 @@ def get( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protected_items_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protected_items_operations.py index df320e7a1654..e7fabfcf6a12 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protected_items_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protected_items_operations.py @@ -89,7 +89,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -98,8 +98,8 @@ def get( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -144,8 +144,10 @@ def create_or_update( deserialized response :param operation_config: :ref:`Operation configuration overrides`. - :return: None or ClientRawResponse if raw=true - :rtype: None or ~msrest.pipeline.ClientRawResponse + :return: ProtectedItemResource or ClientRawResponse if raw=true + :rtype: + ~azure.mgmt.recoveryservicesbackup.models.ProtectedItemResource or + ~msrest.pipeline.ClientRawResponse :raises: :class:`CloudError` """ # Construct URL @@ -166,6 +168,7 @@ def create_or_update( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) @@ -178,18 +181,24 @@ def create_or_update( body_content = self._serialize.body(parameters, 'ProtectedItemResource') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) - if response.status_code not in [202]: + if response.status_code not in [200, 202]: exp = CloudError(response) exp.request_id = response.headers.get('x-ms-request-id') raise exp + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('ProtectedItemResource', response) + if raw: - client_raw_response = ClientRawResponse(None, response) + client_raw_response = ClientRawResponse(deserialized, response) return client_raw_response + + return deserialized create_or_update.metadata = {'url': '/Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/backupFabrics/{fabricName}/protectionContainers/{containerName}/protectedItems/{protectedItemName}'} def delete( @@ -237,7 +246,6 @@ def delete( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -246,8 +254,8 @@ def delete( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [202, 204]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protection_container_operation_results_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protection_container_operation_results_operations.py index 78fa589157fb..689b231c0f95 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protection_container_operation_results_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protection_container_operation_results_operations.py @@ -83,7 +83,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -92,8 +92,8 @@ def get( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202, 204]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protection_container_refresh_operation_results_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protection_container_refresh_operation_results_operations.py index bbb8db755f04..bbb90bb4d967 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protection_container_refresh_operation_results_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protection_container_refresh_operation_results_operations.py @@ -78,7 +78,6 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -87,8 +86,8 @@ def get( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [202, 204]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protection_containers_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protection_containers_operations.py index 72c71f022aba..0380362c45c9 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protection_containers_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protection_containers_operations.py @@ -80,7 +80,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -89,8 +89,8 @@ def get( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -156,6 +156,7 @@ def register( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) @@ -168,9 +169,8 @@ def register( body_content = self._serialize.body(parameters, 'ProtectionContainerResource') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: exp = CloudError(response) @@ -232,7 +232,6 @@ def unregister( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -241,8 +240,8 @@ def unregister( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [202, 204]: exp = CloudError(response) @@ -256,11 +255,10 @@ def unregister( def inquire( self, vault_name, resource_group_name, fabric_name, container_name, filter=None, custom_headers=None, raw=False, **operation_config): - """Inquires all the protectable item in the given container that can be - protected. + """Inquires all the protectable items under the given container. - Inquires all the protectable items that are protectable under the given - container. + This is an async operation and the results should be tracked using + location header or Azure-async-url. :param vault_name: The name of the recovery services vault. :type vault_name: str @@ -302,7 +300,6 @@ def inquire( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -311,8 +308,8 @@ def inquire( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [202]: exp = CloudError(response) @@ -367,7 +364,6 @@ def refresh( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -376,8 +372,8 @@ def refresh( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [202]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protection_intent_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protection_intent_operations.py index bb2b67f38c8e..ba2cb2753e22 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protection_intent_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protection_intent_operations.py @@ -75,6 +75,7 @@ def validate( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) @@ -87,9 +88,8 @@ def validate( body_content = self._serialize.body(parameters, 'PreValidateEnableBackupRequest') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -108,6 +108,79 @@ def validate( return deserialized validate.metadata = {'url': '/Subscriptions/{subscriptionId}/providers/Microsoft.RecoveryServices/locations/{azureRegion}/backupPreValidateProtection'} + def get( + self, vault_name, resource_group_name, fabric_name, intent_object_name, custom_headers=None, raw=False, **operation_config): + """Provides the details of the protection intent up item. This is an + asynchronous operation. To know the status of the operation, + call the GetItemOperationResult API. + + :param vault_name: The name of the recovery services vault. + :type vault_name: str + :param resource_group_name: The name of the resource group where the + recovery services vault is present. + :type resource_group_name: str + :param fabric_name: Fabric name associated with the backed up item. + :type fabric_name: str + :param intent_object_name: Backed up item name whose details are to be + fetched. + :type intent_object_name: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: ProtectionIntentResource or ClientRawResponse if raw=true + :rtype: + ~azure.mgmt.recoveryservicesbackup.models.ProtectionIntentResource or + ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + # Construct URL + url = self.get.metadata['url'] + path_format_arguments = { + 'vaultName': self._serialize.url("vault_name", vault_name, 'str'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'fabricName': self._serialize.url("fabric_name", fabric_name, 'str'), + 'intentObjectName': self._serialize.url("intent_object_name", intent_object_name, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('ProtectionIntentResource', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + get.metadata = {'url': '/Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/backupFabrics/{fabricName}/backupProtectionIntent/{intentObjectName}'} + def create_or_update( self, vault_name, resource_group_name, fabric_name, intent_object_name, parameters, custom_headers=None, raw=False, **operation_config): """Create Intent for Enabling backup of an item. This is a synchronous @@ -153,6 +226,7 @@ def create_or_update( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) @@ -165,9 +239,8 @@ def create_or_update( body_content = self._serialize.body(parameters, 'ProtectionIntentResource') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -185,3 +258,63 @@ def create_or_update( return deserialized create_or_update.metadata = {'url': '/Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/backupFabrics/{fabricName}/backupProtectionIntent/{intentObjectName}'} + + def delete( + self, vault_name, resource_group_name, fabric_name, intent_object_name, custom_headers=None, raw=False, **operation_config): + """Used to remove intent from an item. + + :param vault_name: The name of the recovery services vault. + :type vault_name: str + :param resource_group_name: The name of the resource group where the + recovery services vault is present. + :type resource_group_name: str + :param fabric_name: Fabric name associated with the intent. + :type fabric_name: str + :param intent_object_name: Intent to be deleted. + :type intent_object_name: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: None or ClientRawResponse if raw=true + :rtype: None or ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + # Construct URL + url = self.delete.metadata['url'] + path_format_arguments = { + 'vaultName': self._serialize.url("vault_name", vault_name, 'str'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'fabricName': self._serialize.url("fabric_name", fabric_name, 'str'), + 'intentObjectName': self._serialize.url("intent_object_name", intent_object_name, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [204]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + if raw: + client_raw_response = ClientRawResponse(None, response) + return client_raw_response + delete.metadata = {'url': '/Subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RecoveryServices/vaults/{vaultName}/backupFabrics/{fabricName}/backupProtectionIntent/{intentObjectName}'} diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protection_policies_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protection_policies_operations.py index 138f4f9d0786..3de545c15e37 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protection_policies_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protection_policies_operations.py @@ -78,7 +78,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -87,8 +87,8 @@ def get( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -150,6 +150,7 @@ def create_or_update( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) @@ -162,9 +163,8 @@ def create_or_update( body_content = self._serialize.body(parameters, 'ProtectionPolicyResource') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 202]: exp = CloudError(response) @@ -221,7 +221,6 @@ def delete( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -230,8 +229,8 @@ def delete( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 204]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protection_policy_operation_results_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protection_policy_operation_results_operations.py index 1f4a02cdd591..520336ef86ac 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protection_policy_operation_results_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protection_policy_operation_results_operations.py @@ -80,7 +80,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -89,8 +89,8 @@ def get( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protection_policy_operation_statuses_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protection_policy_operation_statuses_operations.py index 0fe0877a9a68..b960f1e012c3 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protection_policy_operation_statuses_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/protection_policy_operation_statuses_operations.py @@ -84,7 +84,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -93,8 +93,8 @@ def get( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/recovery_points_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/recovery_points_operations.py index f94d128995db..00a604bb66e1 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/recovery_points_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/recovery_points_operations.py @@ -93,7 +93,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -102,9 +102,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) @@ -176,7 +175,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -185,8 +184,8 @@ def get( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/restores_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/restores_operations.py index c003b9bdf2f4..5a7d37ff3e47 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/restores_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/restores_operations.py @@ -101,9 +101,8 @@ def trigger( body_content = self._serialize.body(parameters, 'RestoreRequestResource') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [202]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/security_pi_ns_operations.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/security_pi_ns_operations.py index e73066c76107..e0e2e64c24c5 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/security_pi_ns_operations.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/operations/security_pi_ns_operations.py @@ -71,7 +71,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -80,8 +80,8 @@ def get( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: exp = CloudError(response) diff --git a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/recovery_services_backup_client.py b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/recovery_services_backup_client.py index b4619898b954..3daeb404eb15 100644 --- a/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/recovery_services_backup_client.py +++ b/azure-mgmt-recoveryservicesbackup/azure/mgmt/recoveryservicesbackup/recovery_services_backup_client.py @@ -22,6 +22,7 @@ from .operations.jobs_operations import JobsOperations from .operations.backup_policies_operations import BackupPoliciesOperations from .operations.backup_protected_items_operations import BackupProtectedItemsOperations +from .operations.backup_protection_intent_operations import BackupProtectionIntentOperations from .operations.backup_usage_summaries_operations import BackupUsageSummariesOperations from .operations.operation_operations import OperationOperations from .operations.backup_resource_vault_configs_operations import BackupResourceVaultConfigsOperations @@ -109,6 +110,8 @@ class RecoveryServicesBackupClient(SDKClient): :vartype backup_policies: azure.mgmt.recoveryservicesbackup.operations.BackupPoliciesOperations :ivar backup_protected_items: BackupProtectedItems operations :vartype backup_protected_items: azure.mgmt.recoveryservicesbackup.operations.BackupProtectedItemsOperations + :ivar backup_protection_intent: BackupProtectionIntent operations + :vartype backup_protection_intent: azure.mgmt.recoveryservicesbackup.operations.BackupProtectionIntentOperations :ivar backup_usage_summaries: BackupUsageSummaries operations :vartype backup_usage_summaries: azure.mgmt.recoveryservicesbackup.operations.BackupUsageSummariesOperations :ivar operation: Operation operations @@ -202,6 +205,8 @@ def __init__( self._client, self.config, self._serialize, self._deserialize) self.backup_protected_items = BackupProtectedItemsOperations( self._client, self.config, self._serialize, self._deserialize) + self.backup_protection_intent = BackupProtectionIntentOperations( + self._client, self.config, self._serialize, self._deserialize) self.backup_usage_summaries = BackupUsageSummariesOperations( self._client, self.config, self._serialize, self._deserialize) self.operation = OperationOperations( diff --git a/azure-mgmt-recoveryservicesbackup/azure_bdist_wheel.py b/azure-mgmt-recoveryservicesbackup/azure_bdist_wheel.py deleted file mode 100644 index 8a81d1b61775..000000000000 --- a/azure-mgmt-recoveryservicesbackup/azure_bdist_wheel.py +++ /dev/null @@ -1,54 +0,0 @@ -#------------------------------------------------------------------------- -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See License.txt in the project root for -# license information. -#-------------------------------------------------------------------------- - -from distutils import log as logger -import os.path - -from wheel.bdist_wheel import bdist_wheel -class azure_bdist_wheel(bdist_wheel): - """The purpose of this class is to build wheel a little differently than the sdist, - without requiring to build the wheel from the sdist (i.e. you can build the wheel - directly from source). - """ - - description = "Create an Azure wheel distribution" - - user_options = bdist_wheel.user_options + \ - [('azure-namespace-package=', None, - "Name of the deepest nspkg used")] - - def initialize_options(self): - bdist_wheel.initialize_options(self) - self.azure_namespace_package = None - - def finalize_options(self): - bdist_wheel.finalize_options(self) - if self.azure_namespace_package and not self.azure_namespace_package.endswith("-nspkg"): - raise ValueError("azure_namespace_package must finish by -nspkg") - - def run(self): - if not self.distribution.install_requires: - self.distribution.install_requires = [] - self.distribution.install_requires.append( - "{}>=2.0.0".format(self.azure_namespace_package)) - bdist_wheel.run(self) - - def write_record(self, bdist_dir, distinfo_dir): - if self.azure_namespace_package: - # Split and remove last part, assuming it's "nspkg" - subparts = self.azure_namespace_package.split('-')[0:-1] - folder_with_init = [os.path.join(*subparts[0:i+1]) for i in range(len(subparts))] - for azure_sub_package in folder_with_init: - init_file = os.path.join(bdist_dir, azure_sub_package, '__init__.py') - if os.path.isfile(init_file): - logger.info("manually remove {} while building the wheel".format(init_file)) - os.remove(init_file) - else: - raise ValueError("Unable to find {}. Are you sure of your namespace package?".format(init_file)) - bdist_wheel.write_record(self, bdist_dir, distinfo_dir) -cmdclass = { - 'bdist_wheel': azure_bdist_wheel, -} diff --git a/azure-mgmt-recoveryservicesbackup/setup.cfg b/azure-mgmt-recoveryservicesbackup/setup.cfg index 856f4164982c..3c6e79cf31da 100644 --- a/azure-mgmt-recoveryservicesbackup/setup.cfg +++ b/azure-mgmt-recoveryservicesbackup/setup.cfg @@ -1,3 +1,2 @@ [bdist_wheel] universal=1 -azure-namespace-package=azure-mgmt-nspkg \ No newline at end of file diff --git a/azure-mgmt-recoveryservicesbackup/setup.py b/azure-mgmt-recoveryservicesbackup/setup.py index e375e8a291f5..e6d4f870be26 100644 --- a/azure-mgmt-recoveryservicesbackup/setup.py +++ b/azure-mgmt-recoveryservicesbackup/setup.py @@ -10,12 +10,6 @@ import os.path from io import open from setuptools import find_packages, setup -try: - from azure_bdist_wheel import cmdclass -except ImportError: - from distutils import log as logger - logger.warn("Wheel is not available, disabling bdist_wheel hook") - cmdclass = {} # Change the PACKAGE_NAME only to change folder and different name PACKAGE_NAME = "azure-mgmt-recoveryservicesbackup" @@ -72,13 +66,22 @@ 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', 'License :: OSI Approved :: MIT License', ], zip_safe=False, - packages=find_packages(exclude=["tests"]), + packages=find_packages(exclude=[ + 'tests', + # Exclude packages that will be covered by PEP420 or nspkg + 'azure', + 'azure.mgmt', + ]), install_requires=[ - 'msrestazure>=0.4.27,<2.0.0', + 'msrest>=0.5.0', + 'msrestazure>=0.4.32,<2.0.0', 'azure-common~=1.1', ], - cmdclass=cmdclass + extras_require={ + ":python_version<'3.0'": ['azure-mgmt-nspkg'], + } )