Merge pull request #859 from fryxxie/feature/viewSourceSubnet

Added source_subnet when viewing access lists

Author: allmightyspiff

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',

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]]',

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]]',