Merge pull request #1899 from caberos/issue1821

slcli firewall detail multiVlan:14109 --credentials

Author: allmightyspiff

SoftLayer/CLI/firewall/detail.py

@@ -12,10 +12,10 @@
 
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('identifier')
-@click.option('--credentials', type=click.BOOL,
+@click.option('--password', is_flag=True,
               help="Display FortiGate username and FortiGate password to multi vlans.")
 @environment.pass_env
-def cli(env, identifier, credentials):
+def cli(env, identifier, password):
     """Detail firewall.
 
     EXAMPLES:
@@ -63,7 +63,7 @@ def cli(env, identifier, credentials):
             table.add_row(['private vlan', utils.lookup(_firewall, 'networkGateway', 'privateVlan', 'vlanNumber')])
             table.add_row(['type', _firewall.get('firewallType')])
 
-            if credentials:
+            if password:
                 table.add_row(['fortiGate username', utils.lookup(_firewall, 'managementCredentials', 'username')])
                 table.add_row(['fortiGate password', utils.lookup(_firewall, 'managementCredentials', 'password')])
 

tests/CLI/modules/firewall_tests.py

@@ -73,7 +73,7 @@ def test_detail_vlan_firewall(self):
                                      'src_mask': '0.0.0.0'}]})
 
     def test_detail_multi_vlan_firewall(self):
-        result = self.run_command(['firewall', 'detail', 'multiVlan:1234', '--credentials', 'true'])
+        result = self.run_command(['firewall', 'detail', 'multiVlan:1234', '--password'])
         self.assert_no_fail(result)
         json_result = json.loads(result.output)
         self.assertEqual(json_result['rules'][0]['action'], 'permit')