fix the some problems and update the branch

Author: caberos

README.rst

@@ -153,11 +153,16 @@ If you are using the library directly in python, you can do something like this.
 
 System Requirements
 -------------------
-* Python 3.5, 3.6, 3.7, 3.8, or 3.9.
+* Python 3.8, 3.9, or 3.10.
 * A valid SoftLayer API username and key.
 * A connection to SoftLayer's private network is required to use
   our private network API endpoints.
 
+Python 3.6 Support
+------------------
+As of version 6.0.0 SoftLayer-Python will no longer support python3.6, which is `End of Life as of 2022 <https://endoflife.date/python>`_.
+If you cannot install python 3.8+ for some reason, you will need to use a version of softlayer-python <= 6.0.0
+
 Python 2.7 Support
 ------------------
 As of version 5.8.0 SoftLayer-Python will no longer support python2.7, which is `End Of Life as of 2020 <https://www.python.org/dev/peps/pep-0373/>`_ .
@@ -167,12 +172,15 @@ If you cannot install python 3.6+ for some reason, you will need to use a versio
 
 Python Packages
 ---------------
-* prettytable >= 2.0.0
-* click >= 7
+* prettytable >= 2.5.0
+* click >= 8.0.4
 * requests >= 2.20.0
 * prompt_toolkit >= 2
 * pygments >= 2.0.0
 * urllib3 >= 1.24
+* rich == 12.3.0
+
+*NOTE* If `ptable` (not prettytable) is installed, this will cause issues rendering tables.
 
 Copyright
 ---------

SoftLayer/CLI/block/duplicate_convert_status.py

@@ -0,0 +1,30 @@
+"""Get status for split or move completed percentage of a given block duplicate volume."""
+# :license: MIT, see LICENSE for more details.
+
+import click
+import SoftLayer
+from SoftLayer.CLI import environment
+from SoftLayer.CLI import formatting
+
+
+@click.command(cls=SoftLayer.CLI.command.SLCommand,
+               epilog="""Get status for split or move completed percentage of a given block duplicate volume.""")
+@click.argument('volume-id')
+@environment.pass_env
+def cli(env, volume_id):
+    """Get status for split or move completed percentage of a given block duplicate volume."""
+    table = formatting.Table(['Username', 'Active Conversion Start Timestamp', 'Completed Percentage'])
+
+    block_manager = SoftLayer.BlockStorageManager(env.client)
+
+    value = block_manager.convert_dupe_status(volume_id)
+
+    table.add_row(
+        [
+            value['volumeUsername'],
+            value['activeConversionStartTime'],
+            value['deDuplicateConversionPercentage']
+        ]
+    )
+
+    env.fout(table)

SoftLayer/CLI/environment.py

@@ -17,7 +17,7 @@
 from SoftLayer.CLI import formatting
 from SoftLayer.CLI import routes
 
-# pylint: disable=too-many-instance-attributes, invalid-name, no-self-use
+# pylint: disable=too-many-instance-attributes, invalid-name
 
 # Calling pkg_resources.iter_entry_points shows a false-positive
 # pylint: disable=no-member

SoftLayer/CLI/file/duplicate_convert_status.py

@@ -0,0 +1,30 @@
+"""Get status for split or move completed percentage of a given file duplicate volume."""
+# :license: MIT, see LICENSE for more details.
+
+import click
+import SoftLayer
+from SoftLayer.CLI import environment
+from SoftLayer.CLI import formatting
+
+
+@click.command(cls=SoftLayer.CLI.command.SLCommand,
+               epilog="""Get status for split or move completed percentage of a given file duplicate volume.""")
+@click.argument('volume-id')
+@environment.pass_env
+def cli(env, volume_id):
+    """Get status for split or move completed percentage of a given file duplicate volume."""
+    table = formatting.Table(['Username', 'Active Conversion Start Timestamp', 'Completed Percentage'])
+
+    file_manager = SoftLayer.FileStorageManager(env.client)
+
+    value = file_manager.convert_dupe_status(volume_id)
+
+    table.add_row(
+        [
+            value['volumeUsername'],
+            value['activeConversionStartTime'],
+            value['deDuplicateConversionPercentage']
+        ]
+    )
+
+    env.fout(table)

SoftLayer/CLI/firewall/detail.py

@@ -12,31 +12,77 @@
 
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('identifier')
+@click.option('--credentials', type=click.BOOL,
+              help="Display FortiGate username and FortiGate password to multi vlans.")
 @environment.pass_env
-def cli(env, identifier):
-    """Detail firewall."""
+def cli(env, identifier, credentials):
+    """Detail firewall.
+
+    EXAMPLES:
+
+        slcli firewall detail vs:12345
+
+        slcli firewall detail --credentials true multiVlan:456789
+    """
 
     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'
+    if firewall_type in ('vs', 'server', 'vlan', 'multiVlan'):
+
+        if firewall_type == 'vlan':
+            _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')])
+
+            rules = mgr.get_dedicated_fwl_rules(firewall_id)
+            table.add_row(['rules', get_rules_table(rules)])
+
+        if firewall_type == 'multiVlan':
+            _firewall = mgr.get_instance(firewall_id)
+
+            table = formatting.KeyValueTable(['name', 'value'])
+            table.align['name'] = 'r'
+            table.align['value'] = 'l'
+
+            table.add_row(['name', utils.lookup(_firewall, 'networkGateway', 'name')])
+            table.add_row(['datacenter', utils.lookup(_firewall, 'datacenter', 'longName')])
+            table.add_row(['public ip', utils.lookup(_firewall, 'networkGateway', 'publicIpAddress', 'ipAddress')])
+            table.add_row(['private ip', utils.lookup(_firewall, 'networkGateway', 'privateIpAddress', 'ipAddress')])
+            table.add_row(['public  ipv6', utils.lookup(_firewall, 'networkGateway', 'publicIpv6Address', 'ipAddress')])
+            table.add_row(['public vlan', utils.lookup(_firewall, 'networkGateway', 'publicVlan', 'vlanNumber')])
+            table.add_row(['private vlan', utils.lookup(_firewall, 'networkGateway', 'privateVlan', 'vlanNumber')])
+            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')])
+
+            rules = mgr.get_dedicated_fwl_rules(firewall_id)
+            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)
+            table = get_rules_table(rules)
 
-    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')])
+        env.fout(table)
 
-    if firewall_type == 'vlan':
-        rules = mgr.get_dedicated_fwl_rules(firewall_id)
     else:
-        rules = mgr.get_standard_fwl_rules(firewall_id)
-    table.add_row(['rules', get_rules_table(rules)])
-    env.fout(table)
+        click.secho('Invalid firewall type %s: firewall type should be either vlan, multiVlan, vs or server.'
+                    % firewall_type, fg='red')
+        return
 
 
 def get_rules_table(rules):

SoftLayer/CLI/firewall/list.py

@@ -18,7 +18,7 @@ def cli(env):
     table = formatting.Table(['firewall id',
                               'type',
                               'features',
-                              'server/vlan id'])
+                              'server/vlan id'], title='Single Server Firewalls')
     fwvlans = mgr.get_firewalls()
     dedicated_firewalls = [firewall for firewall in fwvlans
                            if firewall['dedicatedFirewallFlag']]
@@ -70,7 +70,27 @@ def cli(env):
                              'hardwareId')
             ])
 
+    table_gatewalls = formatting.Table(['Id',
+                                        'firewall',
+                                        'type',
+                                        'Hostname',
+                                        'Location',
+                                        'Public Ip',
+                                        'Private Ip',
+                                        'Associated vlan',
+                                        'status'], title='Multi Vlan Firewall')
+    fw_gatewwalls = mgr.get_firewalls_gatewalls()
+
+    for gatewalls in fw_gatewwalls:
+        table_gatewalls.add_row([gatewalls['networkFirewall']['id'], gatewalls.get('name'),
+                                 gatewalls['networkFirewall']['firewallType'],
+                                 gatewalls['members'][0]['hardware']['hostname'],
+                                 gatewalls['networkFirewall']['datacenter']['name'],
+                                 gatewalls['publicIpAddress']['ipAddress'],
+                                 gatewalls['privateIpAddress']['ipAddress'],
+                                 len(gatewalls['insideVlans']), gatewalls['status']['keyName']])
     env.fout(table)
+    env.fout(table_gatewalls)
 
 
 def has_firewall_component(server):

SoftLayer/CLI/licenses/cancel.py

@@ -16,4 +16,7 @@ def cli(env, key, immediate):
 
     licenses = SoftLayer.LicensesManager(env.client)
 
-    env.fout(licenses.cancel_item(key, immediate))
+    item = licenses.cancel_item(key, immediate)
+
+    if item:
+        env.fout("License key: {} was cancelled.".format(key))

SoftLayer/CLI/report/dc_closures.py

@@ -13,7 +13,7 @@ def cli(env):
     """Report on Resources in closing datacenters
 
     Displays a list of Datacenters soon to be shutdown, and any resources on the account
-in those locations
+    in those locations
     """
 
     closing_filter = {

SoftLayer/CLI/routes.py

@@ -93,6 +93,7 @@
     ('block:access-list', 'SoftLayer.CLI.block.access.list:cli'),
     ('block:access-revoke', 'SoftLayer.CLI.block.access.revoke:cli'),
     ('block:access-password', 'SoftLayer.CLI.block.access.password:cli'),
+    ('block:duplicate-convert-status', 'SoftLayer.CLI.block.duplicate_convert_status:cli'),
     ('block:subnets-list', 'SoftLayer.CLI.block.subnets.list:cli'),
     ('block:subnets-assign', 'SoftLayer.CLI.block.subnets.assign:cli'),
     ('block:subnets-remove', 'SoftLayer.CLI.block.subnets.remove:cli'),
@@ -143,6 +144,7 @@
     ('file:access-authorize', 'SoftLayer.CLI.file.access.authorize:cli'),
     ('file:access-list', 'SoftLayer.CLI.file.access.list:cli'),
     ('file:access-revoke', 'SoftLayer.CLI.file.access.revoke:cli'),
+    ('file:duplicate-convert-status', 'SoftLayer.CLI.file.duplicate_convert_status:cli'),
     ('file:replica-failback', 'SoftLayer.CLI.file.replication.failback:cli'),
     ('file:replica-failover', 'SoftLayer.CLI.file.replication.failover:cli'),
     ('file:disaster-recovery-failover', 'SoftLayer.CLI.file.replication.disaster_recovery_failover:cli'),

SoftLayer/auth.py

@@ -5,7 +5,7 @@
 
     :license: MIT, see LICENSE for more details.
 """
-# pylint: disable=no-self-use
+
 
 __all__ = [
     'BasicAuthentication',