#2049

slcli ticket list command with --all, --limit refactoring

Author: JayasilanJibm

SoftLayer/CLI/ticket/list.py

@@ -13,20 +13,17 @@
 @click.option('--open / --closed', 'is_open', default=True,
               help="Display only open or closed tickets")
 @click.option('--limit', default=100, show_default=True, type=click.INT, help="Result limit")
-@click.option("--all", "-a", "all_open", is_flag=True, default=False, help="Results all Open tickets")
+@click.option("--all", "-a", "all_tickets", is_flag=True, default=False, help="Return all tickets")
 @environment.pass_env
-def cli(env, is_open, limit, all_open):
+def cli(env, is_open, limit, all_tickets):
     """List tickets."""
     ticket_mgr = SoftLayer.TicketManager(env.client)
     table = formatting.Table([
         'id', 'Case_Number', 'assigned_user', 'title', 'last_edited', 'status', 'updates', 'priority'
     ])
 
-    if all_open and is_open:
-        tickets = ticket_mgr.list_tickets(open_status=is_open, closed_status=not is_open, limit=limit,
-                                          all_tickets=all_open)
-    else:
-        tickets = ticket_mgr.list_tickets(open_status=is_open, closed_status=not is_open, limit=limit)
+    tickets = ticket_mgr.list_tickets(open_status=is_open,
+                                      closed_status=not is_open, limit=limit, all_tickets=all_tickets)
 
     for ticket in tickets:
         user = formatting.blank()

SoftLayer/managers/ticket.py

@@ -22,7 +22,7 @@ def __init__(self, client):
         self.account = self.client['Account']
         self.ticket = self.client['Ticket']
 
-    def list_tickets(self, open_status=True, closed_status=True, limit=None, all_tickets=None):
+    def list_tickets(self, open_status=True, closed_status=True, limit=None, all_tickets=False):
         """List all tickets.
 
         :param boolean open_status: include open tickets
@@ -33,7 +33,6 @@ def list_tickets(self, open_status=True, closed_status=True, limit=None, all_tic
                   createDate, lastEditDate, accountId, status, updateCount]"""
 
         call = 'getTickets'
-        # print('All Checks ',open_status, closed_status,all_tickets)
         if not all([open_status, closed_status]):
             if open_status:
                 call = 'getOpenTickets'
@@ -42,10 +41,7 @@ def list_tickets(self, open_status=True, closed_status=True, limit=None, all_tic
             else:
                 raise ValueError("open_status and closed_status cannot both be False")
 
-        if all([open_status, all_tickets]):
-            return self.client.call('Account', call, mask=mask, iter=all_tickets, limit=limit)
-
-        return self.client.call('Account', call, mask=mask, iter=False, limit=limit)
+        return self.client.call('Account', call, mask=mask, iter=all_tickets, limit=limit)
 
     def list_subjects(self):
         """List all ticket subjects."""