Merge pull request #1847 from caberos/issue1844

unexpected error when using vlan list with --limit 0 or 999 and a lar…

Author: allmightyspiff

SoftLayer/CLI/vlan/list.py

@@ -65,7 +65,7 @@ def cli(env, sortby, datacenter, number, name, limit):
             vlan.get('vlanNumber'),
             vlan.get('fullyQualifiedName'),
             vlan.get('name') or formatting.blank(),
-            vlan.get('networkSpace').capitalize(),
+            vlan.get('networkSpace', 'Direct Link').capitalize(),
             utils.lookup(vlan, 'primaryRouter', 'datacenter', 'name'),
             get_pod_with_closed_announcement(vlan, pods),
             get_gateway_firewall(vlan),

SoftLayer/fixtures/SoftLayer_Account.py

@@ -485,7 +485,7 @@
 
 getNetworkVlans = [{
     'id': 1,
-    'networkSpace': 'PRIVATE',
+    'networkSpace': '',
     'hardwareCount': 0,
     'hardware': [],
     'vlanNumber': 12,

tests/CLI/modules/vlan_tests.py

@@ -143,6 +143,12 @@ def test_vlan_list(self):
         self.assert_no_fail(result)
         self.assert_called_with('SoftLayer_Account', 'getNetworkVlans')
 
+    def test_vlan_list_space_empty(self):
+        result = self.run_command(['vlan', 'list'])
+        self.assert_no_fail(result)
+        self.assert_called_with('SoftLayer_Account', 'getNetworkVlans')
+        self.assertEqual(json.loads(result.output)[0]['Network'], '')
+
     def test_create_vlan(self):
         _mock = self.set_mock('SoftLayer_Product_Package', 'getItems')
         _mock.return_value = SoftLayer_Product_Package.getItemsVLAN