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.

Sign up for GitHub

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

[Backup]Added support for Backing up OS Disks only #12680

Merged
merged 1 commit into from
Mar 24, 2020
Merged

[Backup]Added support for Backing up OS Disks only #12680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions src/azure-cli/azure/cli/command_modules/backup/_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,12 @@ def load_arguments(self, _):
with self.argument_context('backup protection enable-for-vm') as c:
c.argument('diskslist', diskslist_type)
c.argument('disk_list_setting', arg_type=get_enum_type(['include', 'exclude']), options_list=['--disk-list-setting'], help=disk_list_setting_help)
c.argument('exclude_all_data_disks', arg_type=get_three_state_flag(), help='Option to specify to backup OS disk only.')

with self.argument_context('backup protection update-for-vm') as c:
c.argument('diskslist', diskslist_type)
c.argument('disk_list_setting', arg_type=get_enum_type(['include', 'exclude', 'resetexclusionsettings']), options_list=['--disk-list-setting'], help=disk_list_setting_help)
c.argument('exclude_all_data_disks', arg_type=get_three_state_flag(), help='Option to specify to backup OS disk only.')

with self.argument_context('backup protection enable-for-azurefileshare') as c:
c.argument('azure_file_share', options_list=['--azure-file-share'], help='Name of the Azure FileShare.')
Expand Down
14 changes: 12 additions & 2 deletions src/azure-cli/azure/cli/command_modules/backup/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ def check_protection_enabled_for_vm(cmd, vm_id):


def enable_protection_for_vm(cmd, client, resource_group_name, vault_name, vm, policy_name, diskslist=None,
disk_list_setting=None):
disk_list_setting=None, exclude_all_data_disks=None):
vm_name, vm_rg = _get_resource_name_and_rg(resource_group_name, vm)
vm = virtual_machines_cf(cmd.cli_ctx).get(vm_rg, vm_name)
vault = vaults_cf(cmd.cli_ctx).get(resource_group_name, vault_name)
Expand Down Expand Up @@ -246,6 +246,11 @@ def enable_protection_for_vm(cmd, client, resource_group_name, vault_name, vm, p
is_inclusion_list=is_inclusion_list)
extended_properties = ExtendedProperties(disk_exclusion_properties=disk_exclusion_properties)
vm_item_properties.extended_properties = extended_properties
elif exclude_all_data_disks:
disk_exclusion_properties = DiskExclusionProperties(disk_lun_list=[],
is_inclusion_list=True)
extended_properties = ExtendedProperties(disk_exclusion_properties=disk_exclusion_properties)
vm_item_properties.extended_properties = extended_properties

vm_item = ProtectedItemResource(properties=vm_item_properties)

Expand All @@ -256,7 +261,7 @@ def enable_protection_for_vm(cmd, client, resource_group_name, vault_name, vm, p


def update_protection_for_vm(cmd, client, resource_group_name, vault_name, item, diskslist=None,
disk_list_setting=None):
disk_list_setting=None, exclude_all_data_disks=None):
container_uri = _get_protection_container_uri_from_id(item.id)
item_uri = item.name
vm_type = '/'.join(item.properties.virtual_machine_id.split('/')[-3:-1])
Expand All @@ -277,6 +282,11 @@ def update_protection_for_vm(cmd, client, resource_group_name, vault_name, item,
is_inclusion_list=is_inclusion_list)
extended_properties = ExtendedProperties(disk_exclusion_properties=disk_exclusion_properties)
vm_item_properties.extended_properties = extended_properties
elif exclude_all_data_disks:
disk_exclusion_properties = DiskExclusionProperties(disk_lun_list=[],
is_inclusion_list=True)
extended_properties = ExtendedProperties(disk_exclusion_properties=disk_exclusion_properties)
vm_item_properties.extended_properties = extended_properties

vm_item = ProtectedItemResource(properties=vm_item_properties)

Expand Down
10 changes: 5 additions & 5 deletions src/azure-cli/azure/cli/command_modules/backup/custom_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,13 +245,13 @@ def check_protection_enabled_for_vm(cmd, vm_id):


def enable_protection_for_vm(cmd, client, resource_group_name, vault_name, vm, policy_name, diskslist=None,
disk_list_setting=None):
disk_list_setting=None, exclude_all_data_disks=None):
return custom.enable_protection_for_vm(cmd, client, resource_group_name, vault_name, vm, policy_name,
diskslist, disk_list_setting)
diskslist, disk_list_setting, exclude_all_data_disks)


def update_protection_for_vm(cmd, client, resource_group_name, vault_name, container_name, item_name, diskslist,
disk_list_setting):
def update_protection_for_vm(cmd, client, resource_group_name, vault_name, container_name, item_name, diskslist=None,
disk_list_setting=None, exclude_all_data_disks=None):
items_client = backup_protected_items_cf(cmd.cli_ctx)
item = show_item(cmd, items_client, resource_group_name, vault_name, container_name, item_name,
"AzureIaasVM", "VM")
Expand All @@ -260,7 +260,7 @@ def update_protection_for_vm(cmd, client, resource_group_name, vault_name, conta
if isinstance(item, list):
raise CLIError("Multiple items found. Please give native names instead.")
return custom.update_protection_for_vm(cmd, client, resource_group_name, vault_name, item, diskslist,
disk_list_setting)
disk_list_setting, exclude_all_data_disks)


def enable_protection_for_azure_wl(cmd, client, resource_group_name, vault_name, policy_name, protectable_item_type,
Expand Down
Loading