Merge pull request #1803 from caberos/issue1799

Improve subnet detail

Author: allmightyspiff

SoftLayer/CLI/subnet/detail.py

@@ -26,7 +26,8 @@ def cli(env, identifier, no_vs, no_hardware):
     subnet_id = helpers.resolve_id(mgr.resolve_subnet_ids, identifier,
                                    name='subnet')
 
-    mask = 'mask[ipAddresses[id, ipAddress,note], datacenter, virtualGuests, hardware, networkVlan[networkSpace]]'
+    mask = 'mask[ipAddresses[id, ipAddress,note, hardware, virtualGuest], datacenter, virtualGuests, hardware,' \
+           ' networkVlan[networkSpace,primaryRouter]]'
 
     subnet = mgr.get_subnet(subnet_id, mask=mask)
 
@@ -56,7 +57,13 @@ def cli(env, identifier, no_vs, no_hardware):
 
     ip_table = formatting.KeyValueTable(['id', 'ip', 'note'])
     for address in ip_address:
-        ip_table.add_row([address.get('id'), address.get('ipAddress'), address.get('note')])
+        description = '-'
+        if address.get('hardware') is not None:
+            description = address['hardware']['fullyQualifiedDomainName']
+        elif address.get('virtualGuest') is not None:
+            description = address['virtualGuest']['fullyQualifiedDomainName']
+        ip_table.add_row([address.get('id'),
+                          address.get('ipAddress') + '/' + description, address.get('note', '-')])
 
     table.add_row(['ipAddresses', ip_table])
 

SoftLayer/fixtures/SoftLayer_Network_Subnet.py

@@ -8,7 +8,10 @@
     'cidr': '26',
     'subnetType': 'ADDITIONAL_PRIMARY',
     'networkVlan': {
-        'networkSpace': 'PUBLIC'
+        'networkSpace': 'PUBLIC',
+        'primaryRouter': {
+            'fullyQualifiedDomainName': 'fcr03a.dal13.softlayer.com'
+        }
     },
     'gateway': '1.2.3.254',
     'broadcastAddress': '1.2.3.255',

SoftLayer/managers/network.py

@@ -34,7 +34,7 @@
                                 'usableIpAddressCount',
                                 'note',
                                 'tagReferences[tag]',
-                                'networkVlan[id,networkSpace,fullyQualifiedName]',
+                                'networkVlan[id, primaryRouter, networkSpace,fullyQualifiedName]',
                                 'addressSpace',
                                 'endPointIpAddress'
                                 ])
@@ -698,7 +698,7 @@ def _list_subnets_by_identifier(self, identifier):
         """
         identifier = identifier.split('/', 1)[0]
 
-        results = self.list_subnets()
+        results = self.list_subnets(identifier=identifier, mask='id')
         return [result['id'] for result in results]
 
     def _list_vlans_by_name(self, name):