code review fixes

Author: allmightyspiff

SoftLayer/CLI/account/event_detail.py

@@ -31,7 +31,8 @@ def cli(env, identifier, ack):
 
 def basic_event_table(event):
     """Formats a basic event table"""
-    table = formatting.Table(["Id", "Status", "Type", "Start", "End"], title=event.get('subject'))
+    table = formatting.Table(["Id", "Status", "Type", "Start", "End"],
+                             title=utils.clean_splitlines(event.get('subject')))
 
     table.add_row([
         event.get('id'),
@@ -47,7 +48,7 @@ def basic_event_table(event):
 def impacted_table(event):
     """Formats a basic impacted resources table"""
     table = formatting.Table([
-        "Type", "Id", "hostname", "privateIp", "Label"
+        "Type", "Id", "Hostname", "PrivateIp", "Label"
     ])
     for item in event.get('impactedResources', []):
         table.add_row([
@@ -69,4 +70,4 @@ def update_table(event):
         update_number = update_number + 1
         text = update.get('contents')
         # deals with all the \r\n from the API
-        click.secho("\n".join(text.splitlines()))
+        click.secho(utils.clean_splitlines(text))

SoftLayer/CLI/account/events.py

@@ -44,7 +44,8 @@ def event_table(events):
             event.get('id'),
             utils.clean_time(event.get('startDate')),
             utils.clean_time(event.get('endDate')),
-            event.get('subject'),
+            # Some subjects can have \r\n for some reason.
+            utils.clean_splitlines(event.get('subject')),
             utils.lookup(event, 'statusCode', 'name'),
             event.get('acknowledgedFlag'),
             event.get('updateCount'),

SoftLayer/CLI/account/invoice_detail.py

@@ -21,7 +21,7 @@ def cli(env, identifier, details):
     top_items = manager.get_billing_items(identifier)
 
     title = "Invoice %s" % identifier
-    table = formatting.Table(["Item Id", "category", "description", "Single",
+    table = formatting.Table(["Item Id", "Category", "Description", "Single",
                               "Monthly", "Create Date", "Location"], title=title)
     table.align['category'] = 'l'
     table.align['description'] = 'l'

SoftLayer/CLI/account/invoices.py

@@ -30,6 +30,8 @@ def cli(env, limit, closed=False, get_all=False):
     table.align['Ending Balance'] = 'l'
     table.align['Invoice Amount'] = 'l'
     table.align['Items'] = 'l'
+    if isinstance(invoices, dict):
+        invoices = [invoices]
     for invoice in invoices:
         table.add_row([
             invoice.get('id'),

SoftLayer/utils.py

@@ -290,6 +290,14 @@ def clean_string(string):
         return " ".join(string.split())
 
 
+def clean_splitlines(string):
+    """Returns a string where \r\n is replaced with \n"""
+    if string is None:
+        return ''
+    else:
+        return "\n".join(string.splitlines())
+
+
 def clean_time(sltime, in_format='%Y-%m-%dT%H:%M:%S%z', out_format='%Y-%m-%d %H:%M'):
     """Easy way to format time strings
 

tests/CLI/modules/account_tests.py

@@ -4,6 +4,7 @@
 
     Tests for the user cli command
 """
+from SoftLayer.fixtures import SoftLayer_Account as SoftLayer_Account
 from SoftLayer import testing
 
 
@@ -80,6 +81,13 @@ def test_invoices_all(self):
         self.assert_no_fail(result)
         self.assert_called_with('SoftLayer_Account', 'getInvoices', limit=50)
 
+    def test_single_invoice(self):
+        amock = self.set_mock('SoftLayer_Account', 'getInvoices')
+        amock.return_value = SoftLayer_Account.getInvoices[0]
+        result = self.run_command(['account', 'invoices', '--limit=1'])
+        self.assert_no_fail(result)
+        self.assert_called_with('SoftLayer_Account', 'getInvoices', limit=1)
+
     # slcli account summary
     def test_account_summary(self):
         result = self.run_command(['account', 'summary'])