Merge pull request #851 from sergiocarlosmorales/sync-vlan-subnet-ip-details

Sync VLAN and subnet detail CLI output

Author: sergiocarlosmorales

SoftLayer/CLI/subnet/detail.py

@@ -47,26 +47,24 @@ def cli(env, identifier, no_vs, no_hardware):
 
     if not no_vs:
         if subnet['virtualGuests']:
-            vs_table = formatting.Table(['Hostname', 'Domain', 'IP'])
-            vs_table.align['Hostname'] = 'r'
-            vs_table.align['IP'] = 'l'
+            vs_table = formatting.Table(['hostname', 'domain', 'public_ip', 'private_ip'])
             for vsi in subnet['virtualGuests']:
                 vs_table.add_row([vsi['hostname'],
                                   vsi['domain'],
-                                  vsi.get('primaryIpAddress')])
+                                  vsi.get('primaryIpAddress'),
+                                  vsi.get('primaryBackendIpAddress')])
             table.add_row(['vs', vs_table])
         else:
             table.add_row(['vs', 'none'])
 
     if not no_hardware:
         if subnet['hardware']:
-            hw_table = formatting.Table(['Hostname', 'Domain', 'IP'])
-            hw_table.align['Hostname'] = 'r'
-            hw_table.align['IP'] = 'l'
+            hw_table = formatting.Table(['hostname', 'domain', 'public_ip', 'private_ip'])
             for hardware in subnet['hardware']:
                 hw_table.add_row([hardware['hostname'],
                                   hardware['domain'],
-                                  hardware.get('primaryIpAddress')])
+                                  hardware.get('primaryIpAddress'),
+                                  hardware.get('primaryBackendIpAddress')])
             table.add_row(['hardware', hw_table])
         else:
             table.add_row(['hardware', 'none'])

SoftLayer/fixtures/SoftLayer_Network_Subnet.py

@@ -1 +1,29 @@
-getObject = {'id': 1234, 'billingItem': {'id': 1056}}
+getObject = {
+    'id': 1234,
+    'billingItem': {
+        'id': 1056
+    },
+    'number': 999,
+    'networkIdentifier': '1.2.3.4',
+    'cidr': '26',
+    'subnetType': 'ADDITIONAL_PRIMARY',
+    'networkVlan': {
+        'networkSpace': 'PUBLIC'
+    },
+    'gateway': '1.2.3.254',
+    'broadcastAddress': '1.2.3.255',
+    'datacenter': {
+        'name': 'dal10',
+        'id': 1
+    },
+    'virtualGuests': [
+        {
+            'hostname': 'hostname0',
+            'domain': 'sl.test',
+            'primaryIpAddress': '1.2.3.10',
+            'primaryBackendIpAddress': '10.0.1.2'
+        }
+    ],
+    'hardware': [],
+    'usableIpAddressCount': 22
+}

tests/CLI/modules/subnet_tests.py

@@ -0,0 +1,37 @@
+"""
+    SoftLayer.tests.CLI.modules.subnet_tests
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    :license: MIT, see LICENSE for more details.
+"""
+from SoftLayer import testing
+
+import json
+
+
+class SubnetTests(testing.TestCase):
+    def test_detail(self):
+        result = self.run_command(['subnet', 'detail', '1234'])
+
+        self.assert_no_fail(result)
+        self.assertEqual(
+            {
+                'id': 1234,
+                'identifier': '1.2.3.4/26',
+                'subnet type': 'ADDITIONAL_PRIMARY',
+                'network space': 'PUBLIC',
+                'gateway': '1.2.3.254',
+                'broadcast': '1.2.3.255',
+                'datacenter': 'dal10',
+                'vs': [
+                    {
+                        'hostname': 'hostname0',
+                        'domain': 'sl.test',
+                        'public_ip': '1.2.3.10',
+                        'private_ip': '10.0.1.2'
+                    }
+                ],
+                'hardware': 'none',
+                'usable ips': 22
+            },
+            json.loads(result.output))