tox fixes

allmightyspiff · allmightyspiff · commit 4b3519b98802 · 2023-10-11T15:17:03.000-05:00
diff --git a/SoftLayer/CLI/formatting.py b/SoftLayer/CLI/formatting.py
@@ -335,7 +335,6 @@ def set_empty_message(self, message):
         """
         self.empty_message = message
 
-
     def add_row(self, row):
         """Add a row to the table.
 
diff --git a/SoftLayer/CLI/hardware/vlan_trunkable.py b/SoftLayer/CLI/hardware/vlan_trunkable.py
@@ -8,7 +8,7 @@
 from SoftLayer.CLI import formatting
 from SoftLayer.CLI import helpers
 
-from pprint import pprint as pp
+
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('hardware')
 @environment.pass_env
diff --git a/SoftLayer/managers/hardware.py b/SoftLayer/managers/hardware.py
@@ -21,7 +21,7 @@
 LOGGER = logging.getLogger(__name__)
 
 # Invalid names are ignored due to long method names and short argument names
-# pylint: disable=invalid-name, too-many-lines
+# pylint: disable=invalid-name, too-many-lines, too-many-public-methods
 
 EXTRA_CATEGORIES = ['pri_ipv6_addresses',
                     'static_ipv6_addresses',
@@ -1207,6 +1207,7 @@ def remove_vlan(self, component_id, vlans):
         :param list vlans: list of SoftLayer_Network_Vlan objects to remove. Each object needs at least id or vlanNumber
         """
         return self.client.call('SoftLayer_Network_Component', 'removeNetworkVlanTrunks', vlans, id=component_id)
+
     def clear_vlan(self, hardware_id):
         """Clears all vlan trunks from a hardware_id
 
@@ -1219,14 +1220,14 @@ def clear_vlan(self, hardware_id):
             "]"
         )
         components = self.client.call('SoftLayer_Hardware_Server', 'getObject', id=hardware_id, mask=component_mask)
-        back_component_id = utils.lookup(components, 'backendNetworkComponent', 'id')
-        front_component_id = utils.lookup(components, 'frontendNetworkComponent', 'id')
+        # We only want to call this API on components with actual trunks.
+        # Calling this on the primary and redundant components might cause exceptions.
         for c in components.get('backendNetworkComponent', []):
             if len(c.get('networkVlanTrunks')):
                 self.client.call('SoftLayer_Network_Component', 'clearNetworkVlanTrunks', id=c.get('id'))
         for c in components.get('frontendNetworkComponent', []):
             if len(c.get('networkVlanTrunks')):
-                self.client.call('SoftLayer_Network_Component', 'clearNetworkVlanTrunks', id=c.get('id'))            
+                self.client.call('SoftLayer_Network_Component', 'clearNetworkVlanTrunks', id=c.get('id'))
 
     def get_sensors(self, hardware_id):
         """Returns Hardware sensor data"""
diff --git a/tests/CLI/formatting_table_tests.py b/tests/CLI/formatting_table_tests.py
@@ -4,22 +4,12 @@
 
     :license: MIT, see LICENSE for more details.
 """
-import json
-import os
-import sys
-import tempfile
 
-import click
-from rich.table import Table
-from unittest import mock as mock
-
-from SoftLayer.CLI import core
 from SoftLayer.CLI import exceptions
 from SoftLayer.CLI import formatting
-from SoftLayer.CLI import helpers
-from SoftLayer.CLI import template
 from SoftLayer import testing
 
+
 class TestTable(testing.TestCase):
 
     def test_table_with_duplicated_columns(self):
@@ -69,4 +59,4 @@ def test_format_api_list_with_empty_array(self):
         formatted = formatting.format_output(result, "table")
         # No good ways to test whats actually in a Rich.Table without going through the hassel of
         # printing it out. As long as this didn't throw and exception it should be fine.
-        self.assertEqual(formatted.row_count, 1)
+        self.assertEqual(formatted.row_count, 1)
