Merge pull request #1805 from edsonarios/issue1798

Improve subnet list

Author: allmightyspiff

SoftLayer/CLI/subnet/list.py

@@ -35,8 +35,8 @@ def cli(env, sortby, datacenter, identifier, subnet_type, network_space, ipv4, i
     mgr = SoftLayer.NetworkManager(env.client)
 
     table = formatting.Table([
-        'id', 'identifier', 'type', 'network_space', 'datacenter', 'vlan_id',
-        'IPs', 'hardware', 'vs',
+        'Id', 'Identifier', 'Network', 'Type', 'VLAN', 'Location', 'Target',
+        'IPs', 'Hardware', 'Vs', 'Tags', 'Note'
     ])
     table.sortby = sortby
 
@@ -55,18 +55,36 @@ def cli(env, sortby, datacenter, identifier, subnet_type, network_space, ipv4, i
     )
 
     for subnet in subnets:
+        subnet_type = subnet.get('subnetType', formatting.blank())
+        if subnet_type == 'PRIMARY' or subnet_type == 'PRIMARY_6' or subnet_type == 'ADDITIONAL_PRIMARY':
+            subnet_type = 'Primary'
+        if subnet_type == 'SECONDARY_ON_VLAN':
+            subnet_type = 'Portable'
+        if subnet_type == 'STATIC_IP_ROUTED':
+            subnet_type = 'Static'
+        if subnet_type == 'GLOBAL_IP':
+            subnet_type = 'Global'
+
+        network = subnet.get('addressSpace', formatting.blank())
+        if network is not None:
+            network = str(network).capitalize()
+
+        vlan = utils.lookup(subnet, 'networkVlan', 'fullyQualifiedName')
+        if vlan is None:
+            vlan = 'Unrouted'
         table.add_row([
             subnet['id'],
             '%s/%s' % (subnet['networkIdentifier'], str(subnet['cidr'])),
-            subnet.get('subnetType', formatting.blank()),
-            utils.lookup(subnet,
-                         'networkVlan',
-                         'networkSpace') or formatting.blank(),
-            utils.lookup(subnet, 'datacenter', 'name',) or formatting.blank(),
-            subnet['networkVlanId'],
+            network,
+            subnet_type,
+            vlan,
+            utils.lookup(subnet, 'datacenter', 'name') or formatting.blank(),
+            utils.lookup(subnet, 'endPointIpAddress', 'ipAddress') or formatting.blank(),
             subnet['ipAddressCount'],
             len(subnet['hardware']),
             len(subnet['virtualGuests']),
+            formatting.tags(subnet.get('tagReferences')),
+            utils.lookup(subnet, 'note') or formatting.blank(),
         ])
 
     env.fout(table)

SoftLayer/managers/network.py

@@ -34,7 +34,10 @@
                                 'usableIpAddressCount',
                                 'note',
                                 'tagReferences[tag]',
-                                'networkVlan[id,networkSpace]'])
+                                'networkVlan[id,networkSpace,fullyQualifiedName]',
+                                'addressSpace',
+                                'endPointIpAddress'
+                                ])
 DEFAULT_VLAN_MASK = ','.join([
     'firewallInterfaces',
     'hardwareCount',
@@ -503,7 +506,6 @@ def list_subnets(self, identifier=None, datacenter=None, version=0,
             _filter['subnets']['version'] = utils.query_filter(version)
         if subnet_type:
             _filter['subnets']['subnetType'] = utils.query_filter(subnet_type)
-
         if network_space:
             _filter['subnets']['networkVlan']['networkSpace'] = (
                 utils.query_filter(network_space))