From d859a0ad99e3947731c877ac9b81c4431f3422c5 Mon Sep 17 00:00:00 2001 From: Travis Prescott Date: Mon, 23 Apr 2018 11:23:08 -0700 Subject: [PATCH] Fix #6031. (#6184) --- .../cli/command_modules/network/_format.py | 18 ++++++++++++++++++ .../cli/command_modules/network/commands.py | 6 +++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_format.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_format.py index 02bccf60923..190ae639599 100644 --- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_format.py +++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/_format.py @@ -120,6 +120,24 @@ def transform_nsg_create_output(result): return {'NewNSG': result.result()} +def transform_nsg_rule_table_output(result): + item = OrderedDict() + item['Name'] = result['name'] + item['ResourceGroup'] = result['resourceGroup'] + item['Priority'] = result['priority'] + item['SourcePortRanges'] = result['sourcePortRange'] or ' '.join(result['sourcePortRanges']) + item['SourceAddressPrefixes'] = result['sourceAddressPrefix'] or ' '.join(result['sourceAddressPrefixes']) + item['SourceASG'] = result['sourceApplicationSecurityGroups'] or 'None' + item['Access'] = result['access'] + item['Protocol'] = result['protocol'] + item['Direction'] = result['direction'] + item['DestinationPortRanges'] = result['destinationPortRange'] or ' '.join(result['destinationPortRanges']) + item['DestinationAddressPrefixes'] = result['destinationAddressPrefix'] or \ + ' '.join(result['destinationAddressPrefixes']) + item['DestinationASG'] = result['destinationApplicationSecurityGroups'] or 'None' + return item + + def transform_vnet_gateway_create_output(result): result = {'vnetGateway': result.result()} if result else result return result diff --git a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/commands.py b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/commands.py index 7f0b57c5318..e7b9442c207 100644 --- a/src/command_modules/azure-cli-network/azure/cli/command_modules/network/commands.py +++ b/src/command_modules/azure-cli-network/azure/cli/command_modules/network/commands.py @@ -33,7 +33,7 @@ transform_vpn_connection, transform_vpn_connection_list, transform_geographic_hierachy_table_output, transform_service_community_table_output, transform_waf_rule_sets_table_output, - transform_network_usage_list, transform_network_usage_table) + transform_network_usage_list, transform_network_usage_table, transform_nsg_rule_table_output) from azure.cli.command_modules.network._validators import ( process_ag_create_namespace, process_ag_listener_create_namespace, process_ag_http_settings_create_namespace, process_ag_rule_create_namespace, process_ag_ssl_policy_set_namespace, process_ag_url_path_map_create_namespace, @@ -488,8 +488,8 @@ def _make_singular(value): with self.command_group('network nsg rule', network_nsg_rule_sdk) as g: g.command('delete', 'delete') - g.command('show', 'get', exception_handler=empty_on_404) - g.command('list', 'list') + g.command('show', 'get', exception_handler=empty_on_404, table_transformer=transform_nsg_rule_table_output) + g.command('list', 'list', table_transformer=lambda x: [transform_nsg_rule_table_output(i) for i in x]) g.custom_command('create', 'create_nsg_rule_2017_06_01', min_api='2017-06-01') g.generic_update_command('update', setter_arg_name='security_rule_parameters', min_api='2017-06-01', custom_func_name='update_nsg_rule_2017_06_01', doc_string_source='SecurityRule')