Skip to content

[BACKUP] az backup protectable-item list: Add server-name as an optional argument #17614

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

Merged
fengzhou-msft merged 2 commits into from
Apr 9, 2021
Merged

[BACKUP] az backup protectable-item list: Add server-name as an optional argument #17614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
690aad0
added optional server name input for protectable item list command
Apr 8, 2021
a838b44
merge conflict with dev resolved
Apr 8, 2021
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: 1 addition & 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 @@ -253,6 +253,7 @@ def load_arguments(self, _):
c.argument('protectable_item_type', protectable_item_type)

with self.argument_context('backup protectable-item list') as c:
c.argument('server_name', options_list=['--server-name'], help='Parent Server name of the item.')
c.argument('protectable_item_type', protectable_item_type)
c.argument('backup_management_type', arg_type=get_enum_type(allowed_backup_management_types + ["MAB"]), help=backup_management_type_help)

Expand Down
5 changes: 3 additions & 2 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 @@ -193,7 +193,8 @@ def list_associated_items_for_policy(client, resource_group_name, vault_name, na


def list_protectable_items(cmd, client, resource_group_name, vault_name, workload_type,
backup_management_type="AzureWorkload", container_name=None, protectable_item_type=None):
backup_management_type="AzureWorkload", container_name=None, protectable_item_type=None,
server_name=None):

if backup_management_type != "AzureWorkload":
raise ValidationError("""
Expand All @@ -215,7 +216,7 @@ def list_protectable_items(cmd, client, resource_group_name, vault_name, workloa
""")
container_uri = container.name
return custom_wl.list_protectable_items(client, resource_group_name, vault_name, workload_type,
backup_management_type, container_uri, protectable_item_type)
backup_management_type, container_uri, protectable_item_type, server_name)


def show_protectable_item(cmd, client, resource_group_name, vault_name, name, server_name, protectable_item_type,
Expand Down
7 changes: 6 additions & 1 deletion src/azure-cli/azure/cli/command_modules/backup/custom_wl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,8 @@ def show_protectable_instance(items, server_name, protectable_item_type):


def list_protectable_items(client, resource_group_name, vault_name, workload_type,
backup_management_type="AzureWorkload", container_uri=None, protectable_item_type=None):
backup_management_type="AzureWorkload", container_uri=None, protectable_item_type=None,
server_name=None):

workload_type = _check_map(workload_type, workload_type_map)
if protectable_item_type is not None:
Expand All @@ -308,6 +309,10 @@ def list_protectable_items(client, resource_group_name, vault_name, workload_typ
# Protectable Item Type filter
paged_items = [item for item in paged_items if
item.properties.protectable_item_type.lower() == protectable_item_type.lower()]
if server_name is not None:
# Server Name filter
paged_items = [item for item in paged_items if
item.properties.server_name.lower() == server_name.lower()]
if container_uri:
return [item for item in paged_items if
cust_help.get_protection_container_uri_from_id(item.id).lower() == container_uri.lower()]
Expand Down