From 908dae924e21c75755275b45f37d945211f61dae Mon Sep 17 00:00:00 2001 From: Trixie Zhang Date: Fri, 11 Aug 2017 09:41:13 -0500 Subject: [PATCH 1/2] Added source_subnet when viewing access lists --- SoftLayer/CLI/storage_utils.py | 10 ++++++++++ SoftLayer/managers/block.py | 2 +- SoftLayer/managers/file.py | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/SoftLayer/CLI/storage_utils.py b/SoftLayer/CLI/storage_utils.py index f70c2569f..5f2714505 100644 --- a/SoftLayer/CLI/storage_utils.py +++ b/SoftLayer/CLI/storage_utils.py @@ -48,6 +48,15 @@ def _format_name(obj): allowedHardware.primaryBackendIpAddress allowedSubnets.primaryBackendIpAddress allowedIpAddresses.primaryBackendIpAddress +"""), + column_helper.Column( + 'source_subnet', + ('allowedHost','sourceSubnet',), + """ +allowedVirtualGuests.allowedHost.sourceSubnet +allowedHardware.allowedHost.sourceSubnet +allowedSubnets.allowedHost.sourceSubnet +allowedIpAddresses.allowedHost.sourceSubnet """), column_helper.Column( 'host_iqn', @@ -93,6 +102,7 @@ def _format_name(obj): 'name', 'type', 'private_ip_address', + 'source_subnet', 'host_iqn', 'username', 'password', diff --git a/SoftLayer/managers/block.py b/SoftLayer/managers/block.py index eb6d49264..2a427a7fe 100644 --- a/SoftLayer/managers/block.py +++ b/SoftLayer/managers/block.py @@ -118,7 +118,7 @@ def get_block_volume_access_list(self, volume_id, **kwargs): if 'mask' not in kwargs: items = [ 'id', - 'allowedVirtualGuests[allowedHost[credential]]', + 'allowedVirtualGuests[allowedHost[credential, sourceSubnet]]', 'allowedHardware[allowedHost[credential]]', 'allowedSubnets[allowedHost[credential]]', 'allowedIpAddresses[allowedHost[credential]]', diff --git a/SoftLayer/managers/file.py b/SoftLayer/managers/file.py index 7f12a7bf4..b8f460da4 100644 --- a/SoftLayer/managers/file.py +++ b/SoftLayer/managers/file.py @@ -115,7 +115,7 @@ def get_file_volume_access_list(self, volume_id, **kwargs): if 'mask' not in kwargs: items = [ 'id', - 'allowedVirtualGuests[allowedHost[credential]]', + 'allowedVirtualGuests[allowedHost[credential, sourceSubnet]]', 'allowedHardware[allowedHost[credential]]', 'allowedSubnets[allowedHost[credential]]', 'allowedIpAddresses[allowedHost[credential]]', From 25905b372661b32294d775a26f3345bf4e98fffe Mon Sep 17 00:00:00 2001 From: Trixie Zhang Date: Fri, 11 Aug 2017 10:34:15 -0500 Subject: [PATCH 2/2] Fixed PEP8 E231 issue --- SoftLayer/CLI/storage_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SoftLayer/CLI/storage_utils.py b/SoftLayer/CLI/storage_utils.py index 5f2714505..47c888960 100644 --- a/SoftLayer/CLI/storage_utils.py +++ b/SoftLayer/CLI/storage_utils.py @@ -51,7 +51,7 @@ def _format_name(obj): """), column_helper.Column( 'source_subnet', - ('allowedHost','sourceSubnet',), + ('allowedHost', 'sourceSubnet',), """ allowedVirtualGuests.allowedHost.sourceSubnet allowedHardware.allowedHost.sourceSubnet