Merge pull request #1475 from caberos/issue1472

add the firewall information on slcli firewall detail

Author: allmightyspiff

SoftLayer/CLI/firewall/detail.py

@@ -19,12 +19,24 @@ def cli(env, identifier):
     mgr = SoftLayer.FirewallManager(env.client)
 
     firewall_type, firewall_id = firewall.parse_id(identifier)
+    _firewall = mgr.get_instance(firewall_id)
+
+    table = formatting.KeyValueTable(['name', 'value'])
+    table.align['name'] = 'r'
+    table.align['value'] = 'l'
+
+    table.add_row(['id', _firewall.get('id')])
+    table.add_row(['primaryIpAddress', _firewall.get('primaryIpAddress')])
+    table.add_row(['datacenter', utils.lookup(_firewall, 'datacenter', 'longName')])
+    table.add_row(['networkVlan', utils.lookup(_firewall, 'networkVlan', 'name')])
+    table.add_row(['networkVlaniD', utils.lookup(_firewall, 'networkVlan', 'id')])
+
     if firewall_type == 'vlan':
         rules = mgr.get_dedicated_fwl_rules(firewall_id)
     else:
         rules = mgr.get_standard_fwl_rules(firewall_id)
-
-    env.fout(get_rules_table(rules))
+    table.add_row(['rules', get_rules_table(rules)])
+    env.fout(table)
 
 
 def get_rules_table(rules):

SoftLayer/fixtures/SoftLayer_Network_Vlan_Firewall.py

@@ -7,10 +7,17 @@
     },
     "id": 3130,
     "primaryIpAddress": "192.155.239.146",
+    "datacenter": {
+        "id": 265592,
+        "longName": "Amsterdam 1",
+        "name": "ams01",
+        "statusId": 2
+    },
     "networkVlan": {
         "accountId": 307608,
         "id": 371028,
         "primarySubnetId": 536252,
+        "name": 'testvlan',
         "vlanNumber": 1489,
         "firewallInterfaces": [
             {

SoftLayer/managers/firewall.py

@@ -290,3 +290,15 @@ def edit_standard_fwl_rules(self, firewall_id, rules):
         template = {'networkComponentFirewallId': firewall_id, 'rules': rules}
 
         return rule_svc.createObject(template)
+
+    def get_instance(self, firewall_id, mask=None):
+        """Get the firewall information
+
+        :param integer firewall_id: the instance ID of the standard firewall
+        """
+        if not mask:
+            mask = 'mask[datacenter,networkVlan]'
+
+        svc = self.client['Network_Vlan_Firewall']
+
+        return svc.getObject(id=firewall_id, mask=mask)

tests/CLI/modules/firewall_tests.py

@@ -58,28 +58,35 @@ def test_add_server(self, confirm_mock):
     def test_detail(self):
         result = self.run_command(['firewall', 'detail', 'vlan:1234'])
         self.assert_no_fail(result)
+        json_result = json.loads(result.output)
+        self.assertEqual(json_result['rules'][0]['action'], 'permit')
         self.assertEqual(json.loads(result.output),
-                         [{'#': 1,
-                           'action': 'permit',
-                           'dest': 'any on server:80-80',
-                           'dest_mask': '255.255.255.255',
-                           'protocol': 'tcp',
-                           'src_ip': '0.0.0.0',
-                           'src_mask': '0.0.0.0'},
-                          {'#': 2,
-                           'action': 'permit',
-                           'dest': 'any on server:1-65535',
-                           'dest_mask': '255.255.255.255',
-                           'protocol': 'tmp',
-                           'src_ip': '193.212.1.10',
-                           'src_mask': '255.255.255.255'},
-                          {'#': 3,
-                           'action': 'permit',
-                           'dest': 'any on server:80-800',
-                           'dest_mask': '255.255.255.255',
-                           'protocol': 'tcp',
-                           'src_ip': '0.0.0.0',
-                           'src_mask': '0.0.0.0'}])
+                         {'datacenter': 'Amsterdam 1',
+                          'id': 3130,
+                          'networkVlan': 'testvlan',
+                          'networkVlaniD': 371028,
+                          'primaryIpAddress': '192.155.239.146',
+                          'rules': [{'#': 1,
+                                     'action': 'permit',
+                                     'dest': 'any on server:80-80',
+                                     'dest_mask': '255.255.255.255',
+                                     'protocol': 'tcp',
+                                     'src_ip': '0.0.0.0',
+                                     'src_mask': '0.0.0.0'},
+                                    {'#': 2,
+                                     'action': 'permit',
+                                     'dest': 'any on server:1-65535',
+                                     'dest_mask': '255.255.255.255',
+                                     'protocol': 'tmp',
+                                     'src_ip': '193.212.1.10',
+                                     'src_mask': '255.255.255.255'},
+                                    {'#': 3,
+                                     'action': 'permit',
+                                     'dest': 'any on server:80-800',
+                                     'dest_mask': '255.255.255.255',
+                                     'protocol': 'tcp',
+                                     'src_ip': '0.0.0.0',
+                                     'src_mask': '0.0.0.0'}]})
 
     @mock.patch('SoftLayer.CLI.formatting.confirm')
     def test_cancel_firewall(self, confirm_mock):