From 62f39af42f8da64c369253f7cdd9e2a04c2a27bb Mon Sep 17 00:00:00 2001 From: Cameron Porter Date: Thu, 22 Feb 2018 16:46:58 -0600 Subject: [PATCH 1/2] Do not fail if the source or destination subnet mask does not exist for ipv6 rules. --- SoftLayer/CLI/firewall/detail.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SoftLayer/CLI/firewall/detail.py b/SoftLayer/CLI/firewall/detail.py index 06c2c790b..11cc486ff 100644 --- a/SoftLayer/CLI/firewall/detail.py +++ b/SoftLayer/CLI/firewall/detail.py @@ -7,7 +7,7 @@ from SoftLayer.CLI import environment from SoftLayer.CLI import firewall from SoftLayer.CLI import formatting - +from SoftLayer import utils @click.command() @click.argument('identifier') @@ -41,9 +41,9 @@ def get_rules_table(rules): rule['action'], rule['protocol'], rule['sourceIpAddress'], - rule['sourceIpSubnetMask'], + utils.lookup(rule, 'sourceIpSubnetMask'), '%s:%s-%s' % (rule['destinationIpAddress'], rule['destinationPortRangeStart'], rule['destinationPortRangeEnd']), - rule['destinationIpSubnetMask']]) + utils.lookup(rule, 'destinationIpSubnetMask')]) return table From bcf74c45196db94dcb13400062a1c8f572add20a Mon Sep 17 00:00:00 2001 From: Cameron Porter Date: Thu, 22 Feb 2018 17:15:55 -0600 Subject: [PATCH 2/2] add space for pep8 --- SoftLayer/CLI/firewall/detail.py | 1 + 1 file changed, 1 insertion(+) diff --git a/SoftLayer/CLI/firewall/detail.py b/SoftLayer/CLI/firewall/detail.py index 11cc486ff..1beb1a32a 100644 --- a/SoftLayer/CLI/firewall/detail.py +++ b/SoftLayer/CLI/firewall/detail.py @@ -9,6 +9,7 @@ from SoftLayer.CLI import formatting from SoftLayer import utils + @click.command() @click.argument('identifier') @environment.pass_env