fix observations

Author: Brian Flores

SoftLayer/CLI/firewall/detail.py

@@ -57,11 +57,14 @@ def cli(env, identifier, credentials):
             table.add_row(['type', _firewall.get('firewallType')])
 
             if credentials:
-                table.add_row(['FortiGate username', utils.lookup(_firewall, 'managementCredentials', 'username')])
-                table.add_row(['FortiGate password', utils.lookup(_firewall, 'managementCredentials', 'password')])
+                table.add_row(['fortiGate username', utils.lookup(_firewall, 'managementCredentials', 'username')])
+                table.add_row(['fortiGate password', utils.lookup(_firewall, 'managementCredentials', 'password')])
 
             rules = mgr.get_dedicated_fwl_rules(firewall_id)
-            table.add_row(['rules', get_rules_table(rules)])
+            if len(rules) != 0:
+                table.add_row(['rules', get_rules_table(rules)])
+            else:
+                table.add_row(['rules', '-'])
 
         if firewall_type == 'vs' or firewall_type == 'server':
             rules = mgr.get_standard_fwl_rules(firewall_id)

tests/CLI/modules/firewall_tests.py

@@ -102,8 +102,8 @@ def test_detail_multi_vlan_firewall(self):
                           'public vlan': 1255,
                           'private vlan': 1330,
                           'type': 'fortigate-security-appliance-10gb',
-                          'FortiGate username': 'myusername',
-                          'FortiGate password': 'test1234',
+                          'fortiGate username': 'myusername',
+                          'fortiGate password': 'test1234',
                           'rules': [{'#': 1,
                                      'action': 'permit',
                                      'dest': 'any on server:80-80',