tox cleanup

Author: allmightyspiff

SoftLayer/CLI/account/event_detail.py

@@ -3,9 +3,7 @@
 
 import click
 
-import SoftLayer
 from SoftLayer.CLI import environment
-from SoftLayer.CLI import exceptions
 from SoftLayer.CLI import formatting
 from SoftLayer.managers.account import AccountManager as AccountManager
 from SoftLayer import utils
@@ -24,7 +22,7 @@ def cli(env, identifier, ack):
     event = manager.get_event(identifier)
 
     if ack:
-        result = manager.ack_event(identifier)
+        manager.ack_event(identifier)
 
     env.fout(basic_event_table(event))
     env.fout(impacted_table(event))

SoftLayer/CLI/account/events.py

@@ -2,7 +2,6 @@
 # :license: MIT, see LICENSE for more details.
 import click
 
-import SoftLayer
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
 from SoftLayer.managers.account import AccountManager as AccountManager
@@ -27,6 +26,7 @@ def cli(env, ack_all):
 
 
 def event_table(events):
+    """Formats a table for events"""
     table = formatting.Table([
         "Id",
         "Start Date",

SoftLayer/CLI/account/invoice_detail.py

@@ -3,7 +3,6 @@
 
 import click
 
-import SoftLayer
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
 from SoftLayer.managers.account import AccountManager as AccountManager

SoftLayer/CLI/account/invoices.py

@@ -3,7 +3,6 @@
 
 import click
 
-import SoftLayer
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
 from SoftLayer.managers.account import AccountManager as AccountManager

SoftLayer/CLI/account/summary.py

@@ -1,12 +1,8 @@
 """Account Summary page"""
 # :license: MIT, see LICENSE for more details.
-from pprint import pprint as pp
-
 import click
 
-import SoftLayer
 from SoftLayer.CLI import environment
-from SoftLayer.CLI import exceptions
 from SoftLayer.CLI import formatting
 from SoftLayer.managers.account import AccountManager as AccountManager
 from SoftLayer import utils

SoftLayer/CLI/user/orders.py

@@ -6,6 +6,8 @@
         'id': 724951323,
         'oneTimeAfterTaxAmount': '0',
         'recurringAfterTaxAmount': '0',
+        'hostName': 'bleg',
+        'domainName': 'beh.com',
         'category': {'name': 'Private (only) Secondary VLAN IP Addresses'},
         'children': [
             {

SoftLayer/fixtures/SoftLayer_Billing_Invoice.py

@@ -10,15 +10,20 @@
     'systemTicketId': 76057381,
     'acknowledgedFlag': False,
     'attachments': [],
-    'impactedResources': [],
+    'impactedResources': [{
+        'resourceType': 'Server',
+        'resourceTableId': 12345,
+        'hostname': 'test',
+        'privateIp': '10.0.0.1',
+        'filterLable': 'Server'
+    }],
     'notificationOccurrenceEventType': {'keyName': 'PLANNED'},
     'statusCode': {'keyName': 'PUBLISHED', 'name': 'Published'},
     'updates': [{
         'contents': 'More Blah Blah',
         'createDate': '2019-03-12T13:07:22-06:00',
         'endDate': None, 'startDate': '2019-03-12T13:07:22-06:00'
-    }
-    ]
+    }]
 }
 
 getAllObjects = [getObject]

SoftLayer/fixtures/SoftLayer_Notification_Occurrence_Event.py

@@ -7,7 +7,6 @@
 """
 
 import logging
-import SoftLayer
 
 from SoftLayer import utils
 
@@ -80,7 +79,7 @@ def get_event(self, event_id):
         """Gets details about a maintenance event
 
         :param int event_id: Notification_Occurrence_Event ID
-        :return: Notification_Occurrence_Event  
+        :return: Notification_Occurrence_Event
         """
         mask = """mask[
             acknowledgedFlag,
@@ -120,16 +119,16 @@ def get_invoices(self, limit=50, closed=False, get_all=False):
 
     def get_billing_items(self, identifier):
         """Gets all topLevelBillingItems from a specific invoice
-        
+
         :param int identifier: Invoice Id
         :return: Billing_Invoice_Item
         """
 
         mask = """mask[
             id, description, hostName, domainName, oneTimeAfterTaxAmount, recurringAfterTaxAmount, createDate,
-            categoryCode, 
-            category[name], 
-            location[name], 
+            categoryCode,
+            category[name],
+            location[name],
             children[id, category[name], description, oneTimeAfterTaxAmount, recurringAfterTaxAmount]
         ]"""
         return self.client.call(

SoftLayer/managers/account.py

@@ -142,9 +142,9 @@ def format_event_log_date(date_string, utc):
         utc = "+0000"
 
     iso_time_zone = utc[:3] + ':' + utc[3:]
-    clean_time = "{}.000000{}".format(dirty_time, iso_time_zone)
+    cleaned_time = "{}.000000{}".format(dirty_time, iso_time_zone)
 
-    return clean_time
+    return cleaned_time
 
 
 def event_log_filter_between_date(start, end, utc):