Merge pull request #1498 from ATGE/issues/1480

Add gateway/firewall name to vlan detail and list command

Author: allmightyspiff

SoftLayer/CLI/vlan/detail.py

@@ -7,6 +7,7 @@
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
 from SoftLayer.CLI import helpers
+from SoftLayer import utils
 
 
 @click.command()
@@ -30,26 +31,24 @@ def cli(env, identifier, no_vs, no_hardware):
     table.align['name'] = 'r'
     table.align['value'] = 'l'
 
-    table.add_row(['id', vlan['id']])
-    table.add_row(['number', vlan['vlanNumber']])
+    table.add_row(['id', vlan.get('id')])
+    table.add_row(['number', vlan.get('vlanNumber')])
     table.add_row(['datacenter',
-                   vlan['primaryRouter']['datacenter']['longName']])
+                   utils.lookup(vlan, 'primaryRouter', 'datacenter', 'longName')])
     table.add_row(['primary_router',
-                   vlan['primaryRouter']['fullyQualifiedDomainName']])
-    table.add_row(['firewall',
-                   'Yes' if vlan['firewallInterfaces'] else 'No'])
+                   utils.lookup(vlan, 'primaryRouter', 'fullyQualifiedDomainName')])
+    table.add_row(['Gateway/Firewall', get_gateway_firewall(vlan)])
     subnets = []
     for subnet in vlan.get('subnets', []):
         subnet_table = formatting.KeyValueTable(['name', 'value'])
         subnet_table.align['name'] = 'r'
         subnet_table.align['value'] = 'l'
-        subnet_table.add_row(['id', subnet['id']])
-        subnet_table.add_row(['identifier', subnet['networkIdentifier']])
-        subnet_table.add_row(['netmask', subnet['netmask']])
-        subnet_table.add_row(['gateway', subnet.get('gateway', '-')])
-        subnet_table.add_row(['type', subnet['subnetType']])
-        subnet_table.add_row(['usable ips',
-                              subnet['usableIpAddressCount']])
+        subnet_table.add_row(['id', subnet.get('id')])
+        subnet_table.add_row(['identifier', subnet.get('networkIdentifier')])
+        subnet_table.add_row(['netmask', subnet.get('netmask')])
+        subnet_table.add_row(['gateway', subnet.get('gateway', formatting.blank())])
+        subnet_table.add_row(['type', subnet.get('subnetType')])
+        subnet_table.add_row(['usable ips', subnet.get('usableIpAddressCount')])
         subnets.append(subnet_table)
 
     table.add_row(['subnets', subnets])
@@ -81,3 +80,15 @@ def cli(env, identifier, no_vs, no_hardware):
             table.add_row(['hardware', 'none'])
 
     env.fout(table)
+
+
+def get_gateway_firewall(vlan):
+    """Gets the name of a gateway/firewall from a VLAN. """
+
+    firewall = utils.lookup(vlan, 'networkVlanFirewall', 'fullyQualifiedDomainName')
+    if firewall:
+        return firewall
+    gateway = utils.lookup(vlan, 'attachedNetworkGateway', 'name')
+    if gateway:
+        return gateway
+    return formatting.blank()

SoftLayer/CLI/vlan/list.py

@@ -6,12 +6,13 @@
 import SoftLayer
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
+from SoftLayer.CLI.vlan.detail import get_gateway_firewall
 from SoftLayer import utils
 
 COLUMNS = ['id',
            'number',
            'name',
-           'firewall',
+           'Gateway/Firewall',
            'datacenter',
            'hardware',
            'virtual_servers',
@@ -45,14 +46,14 @@ def cli(env, sortby, datacenter, number, name, limit):
                            limit=limit)
     for vlan in vlans:
         table.add_row([
-            vlan['id'],
-            vlan['vlanNumber'],
+            vlan.get('id'),
+            vlan.get('vlanNumber'),
             vlan.get('name') or formatting.blank(),
-            'Yes' if vlan['firewallInterfaces'] else 'No',
+            get_gateway_firewall(vlan),
             utils.lookup(vlan, 'primaryRouter', 'datacenter', 'name'),
-            vlan['hardwareCount'],
-            vlan['virtualGuestCount'],
-            vlan['totalPrimaryIpAddressCount'],
+            vlan.get('hardwareCount'),
+            vlan.get('virtualGuestCount'),
+            vlan.get('totalPrimaryIpAddressCount'),
         ])
 
     env.fout(table)

SoftLayer/managers/network.py

@@ -43,6 +43,8 @@
     'totalPrimaryIpAddressCount',
     'virtualGuestCount',
     'networkSpace',
+    'networkVlanFirewall[id,fullyQualifiedDomainName,primaryIpAddress]',
+    'attachedNetworkGateway[id,name,networkFirewall]',
 ])
 DEFAULT_GET_VLAN_MASK = ','.join([
     'firewallInterfaces',
@@ -53,6 +55,8 @@
     'hardware',
     'subnets',
     'virtualGuests',
+    'networkVlanFirewall[id,fullyQualifiedDomainName,primaryIpAddress]',
+    'attachedNetworkGateway[id,name,networkFirewall]',
 ])
 
 

tests/CLI/modules/vlan_tests.py

@@ -95,6 +95,42 @@ def test_vlan_edit_failure(self, click):
         self.assert_no_fail(result)
         self.assert_called_with('SoftLayer_Network_Vlan', 'editObject', identifier=100)
 
+    def test_vlan_detail_firewall(self):
+        vlan_mock = self.set_mock('SoftLayer_Network_Vlan', 'getObject')
+        get_object = {
+            'primaryRouter': {
+                'datacenter': {'id': 1234, 'longName': 'TestDC'},
+                'fullyQualifiedDomainName': 'fcr01.TestDC'
+            },
+            'id': 1234,
+            'vlanNumber': 4444,
+            'networkVlanFirewall': {
+                'datacenter': {'id': 1234, 'longName': 'TestDC'},
+                'fullyQualifiedDomainName': 'fcr01.TestDC'
+            },
+        }
+        vlan_mock.return_value = get_object
+        result = self.run_command(['vlan', 'detail', '1234'])
+        self.assert_no_fail(result)
+
+    def test_vlan_detail_gateway(self):
+        vlan_mock = self.set_mock('SoftLayer_Network_Vlan', 'getObject')
+        get_object = {
+            'primaryRouter': {
+                'datacenter': {'id': 1234, 'longName': 'TestDC'},
+                'fullyQualifiedDomainName': 'fcr01.TestDC'
+            },
+            'id': 1234,
+            'vlanNumber': 4444,
+            'attachedNetworkGateway': {
+                'id': 54321,
+                "name": 'support'
+            },
+        }
+        vlan_mock.return_value = get_object
+        result = self.run_command(['vlan', 'detail', '1234'])
+        self.assert_no_fail(result)
+
     def test_vlan_list(self):
         result = self.run_command(['vlan', 'list'])
         self.assert_no_fail(result)