Merge pull request #997 from flavio-fernandes/vlan_detail_bug.merge

scli vlan detail: gracefully handle hardware that has no name/domain

Author: allmightyspiff

SoftLayer/CLI/vlan/detail.py

@@ -60,8 +60,8 @@ def cli(env, identifier, no_vs, no_hardware):
         if vlan.get('virtualGuests'):
             vs_table = formatting.KeyValueTable(server_columns)
             for vsi in vlan['virtualGuests']:
-                vs_table.add_row([vsi['hostname'],
-                                  vsi['domain'],
+                vs_table.add_row([vsi.get('hostname'),
+                                  vsi.get('domain'),
                                   vsi.get('primaryIpAddress'),
                                   vsi.get('primaryBackendIpAddress')])
             table.add_row(['vs', vs_table])
@@ -72,8 +72,8 @@ def cli(env, identifier, no_vs, no_hardware):
         if vlan.get('hardware'):
             hw_table = formatting.Table(server_columns)
             for hardware in vlan['hardware']:
-                hw_table.add_row([hardware['hostname'],
-                                  hardware['domain'],
+                hw_table.add_row([hardware.get('hostname'),
+                                  hardware.get('domain'),
                                   hardware.get('primaryIpAddress'),
                                   hardware.get('primaryBackendIpAddress')])
             table.add_row(['hardware', hw_table])

tests/CLI/modules/vlan_tests.py

@@ -47,3 +47,32 @@ def test_subnet_list(self):
         vlan_mock.return_value = getObject
         result = self.run_command(['vlan', 'detail', '1234'])
         self.assert_no_fail(result)
+
+    def test_detail_hardware_without_hostname(self):
+        vlan_mock = self.set_mock('SoftLayer_Network_Vlan', 'getObject')
+        getObject = {
+            'primaryRouter': {
+                'datacenter': {'id': 1234, 'longName': 'TestDC'},
+                'fullyQualifiedDomainName': 'fcr01.TestDC'
+            },
+            'id': 1234,
+            'vlanNumber': 4444,
+            'firewallInterfaces': None,
+            'subnets': [],
+            'hardware': [
+                {'a_hardware': 'that_has_none_of_the_expected_attributes_provided'},
+                {'domain': 'example.com',
+                 'networkManagementIpAddress': '10.171.202.131',
+                 'hardwareStatus': {'status': 'ACTIVE', 'id': 5},
+                 'notes': '',
+                 'hostname': 'hw1', 'hardwareStatusId': 5,
+                 'globalIdentifier': 'f6ea716a-41d8-4c52-bb2e-48d63105f4b0',
+                 'primaryIpAddress': '169.60.169.169',
+                 'primaryBackendIpAddress': '10.171.202.130', 'id': 826425,
+                 'privateIpAddress': '10.171.202.130',
+                 'fullyQualifiedDomainName': 'hw1.example.com'}
+            ]
+        }
+        vlan_mock.return_value = getObject
+        result = self.run_command(['vlan', 'detail', '1234'])
+        self.assert_no_fail(result)