From 14f218e3160a72a79abc2dd8b373da9acd3e89e0 Mon Sep 17 00:00:00 2001 From: necusjz Date: Tue, 19 Dec 2023 14:21:48 +0800 Subject: [PATCH] [Network] `az network nsg rule list`: Fix ranges and prefixes disappeared with `-o table` option (#27972) * fix: table transformer of nsg rule list * style: fix over-indented * style: fix line too long --- .../cli/command_modules/network/_format.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/azure-cli/azure/cli/command_modules/network/_format.py b/src/azure-cli/azure/cli/command_modules/network/_format.py index 874d7a20ffd..2e6ad60e949 100644 --- a/src/azure-cli/azure/cli/command_modules/network/_format.py +++ b/src/azure-cli/azure/cli/command_modules/network/_format.py @@ -2,8 +2,8 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. See License.txt in the project root for license information. # -------------------------------------------------------------------------------------------- - - +# +# pylint: disable=line-too-long from collections import OrderedDict @@ -112,16 +112,15 @@ def transform_nsg_rule_table_output(result): item['Name'] = result['name'] item['ResourceGroup'] = result['resourceGroup'] item['Priority'] = result['priority'] - item['SourcePortRanges'] = result.get('sourcePortRange', ' '.join(result['sourcePortRanges'])) - item['SourceAddressPrefixes'] = result.get('sourceAddressPrefix', ' '.join(result['sourceAddressPrefixes'])) - item['SourceASG'] = result.get('sourceApplicationSecurityGroups', 'None') + item['SourcePortRanges'] = result.get('sourcePortRange', None) or ' '.join(result['sourcePortRanges']) + item['SourceAddressPrefixes'] = result.get('sourceAddressPrefix', None) or ' '.join(result['sourceAddressPrefixes']) + item['SourceASG'] = result.get('sourceApplicationSecurityGroups', None) or 'None' item['Access'] = result['access'] item['Protocol'] = result['protocol'] item['Direction'] = result['direction'] - item['DestinationPortRanges'] = result.get('destinationPortRange', ' '.join(result['destinationPortRanges'])) - item['DestinationAddressPrefixes'] = result.get('destinationAddressPrefix', - ' '.join(result['destinationAddressPrefixes'])) - item['DestinationASG'] = result.get('destinationApplicationSecurityGroups', 'None') + item['DestinationPortRanges'] = result.get('destinationPortRange', None) or ' '.join(result['destinationPortRanges']) + item['DestinationAddressPrefixes'] = result.get('destinationAddressPrefix', None) or ' '.join(result['destinationAddressPrefixes']) + item['DestinationASG'] = result.get('destinationApplicationSecurityGroups', None) or 'None' return item