Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AutoPR recoveryservicesbackup/resource-manager] Protection intent changes and bug fixes #3348

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion azure-mgmt-recoveryservicesbackup/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
include *.rst
include azure_bdist_wheel.py
2 changes: 1 addition & 1 deletion azure-mgmt-recoveryservicesbackup/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://pypi.python.org/pypi/azure-servicemanagement-legacy>`__ library.
Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-recoveryservicesbackup/azure/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__import__('pkg_resources').declare_namespace(__name__)
__path__ = __import__('pkgutil').extend_path(__path__, __name__)
2 changes: 1 addition & 1 deletion azure-mgmt-recoveryservicesbackup/azure/mgmt/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__import__('pkg_resources').declare_namespace(__name__)
__path__ = __import__('pkgutil').extend_path(__path__, __name__)
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -463,6 +466,7 @@
from .recovery_services_backup_client_enums import (
ProtectionState,
HealthStatus,
WorkloadType,
RecoveryType,
CopyOptions,
RestoreRequestType,
Expand All @@ -471,6 +475,7 @@
SupportStatus,
LastBackupStatus,
ProtectedItemHealthStatus,
PolicyType,
OverwriteOptions,
WorkloadItemType,
SQLDataDirectoryType,
Expand All @@ -488,11 +493,11 @@
WeekOfMonth,
MonthOfYear,
MabServerType,
WorkloadType,
HttpStatusCode,
ValidationStatus,
CreateMode,
HealthState,
IntentItemType,
ScheduleRunType,
AzureFileShareType,
InquiryStatus,
Expand Down Expand Up @@ -609,6 +614,7 @@
'ProtectedItemQueryObject',
'ProtectedItemResource',
'ProtectionIntent',
'ProtectionIntentQueryObject',
'ProtectionIntentResource',
'ProtectionPolicy',
'ProtectionPolicyQueryObject',
Expand Down Expand Up @@ -732,6 +738,7 @@
'JobResourcePaged',
'ProtectionPolicyResourcePaged',
'ProtectedItemResourcePaged',
'ProtectionIntentResourcePaged',
'BackupManagementUsagePaged',
'BackupEngineBaseResourcePaged',
'ProtectableContainerResourcePaged',
Expand All @@ -742,6 +749,7 @@
'ClientDiscoveryValueForSingleApiPaged',
'ProtectionState',
'HealthStatus',
'WorkloadType',
'RecoveryType',
'CopyOptions',
'RestoreRequestType',
Expand All @@ -750,6 +758,7 @@
'SupportStatus',
'LastBackupStatus',
'ProtectedItemHealthStatus',
'PolicyType',
'OverwriteOptions',
'WorkloadItemType',
'SQLDataDirectoryType',
Expand All @@ -767,11 +776,11 @@
'WeekOfMonth',
'MonthOfYear',
'MabServerType',
'WorkloadType',
'HttpStatusCode',
'ValidationStatus',
'CreateMode',
'HealthState',
'IntentItemType',
'ScheduleRunType',
'AzureFileShareType',
'InquiryStatus',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'},
Expand All @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'},
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'},
Expand Down
Loading