Merge pull request #1830 from edsonarios/issue1827

Added flag to command slcli account events --date-min

Author: allmightyspiff

SoftLayer/CLI/account/events.py

@@ -10,22 +10,26 @@
 
 
 @click.command(cls=SLCommand)
+@click.option('--announcement', is_flag=True, default=False,
+              help="Show only announcement events.")
 @click.option('--ack-all', is_flag=True, default=False,
-              help="Acknowledge every upcoming event. Doing so will turn off the popup in the control portal")
+              help="Acknowledge every upcoming event. Doing so will turn off the popup in the control portal.")
+@click.option('--date-min', help="Earliest date to retrieve events for [MM/DD/YYYY]. Default: 2 days ago.")
 @click.option('--planned', is_flag=True, default=False,
-              help="Show only planned events")
+              help="Show only planned events.")
 @click.option('--unplanned', is_flag=True, default=False,
-              help="Show only unplanned events")
-@click.option('--announcement', is_flag=True, default=False,
-              help="Show only announcement events")
+              help="Show only unplanned events.")
 @environment.pass_env
-def cli(env, ack_all, planned, unplanned, announcement):
+def cli(env, ack_all, planned, unplanned, announcement, date_min):
     """Summary and acknowledgement of upcoming and ongoing maintenance events"""
 
+    if date_min:
+        utils.verify_date(date_min)
+
     manager = AccountManager(env.client)
-    planned_events = manager.get_upcoming_events("PLANNED")
-    unplanned_events = manager.get_upcoming_events("UNPLANNED_INCIDENT")
-    announcement_events = manager.get_upcoming_events("ANNOUNCEMENT")
+    planned_events = manager.get_upcoming_events("PLANNED", date_min)
+    unplanned_events = manager.get_upcoming_events("UNPLANNED_INCIDENT", date_min)
+    announcement_events = manager.get_upcoming_events("ANNOUNCEMENT", date_min)
 
     add_ack_flag(planned_events, manager, ack_all)
     add_ack_flag(unplanned_events, manager, ack_all)

SoftLayer/CLI/account/invoices.py

@@ -11,12 +11,12 @@
 
 
 @click.command(cls=SLCommand)
-@click.option('--limit', default=50, show_default=True,
-              help="How many invoices to get back.")
-@click.option('--closed', is_flag=True, default=False, show_default=True,
-              help="Include invoices with a CLOSED status.")
 @click.option('--all', 'get_all', is_flag=True, default=False, show_default=True,
               help="Return ALL invoices. There may be a lot of these.")
+@click.option('--closed', is_flag=True, default=False, show_default=True,
+              help="Include invoices with a CLOSED status.")
+@click.option('--limit', default=50, show_default=True,
+              help="How many invoices to get back.")
 @environment.pass_env
 def cli(env, limit, closed=False, get_all=False):
     """List invoices"""

SoftLayer/CLI/account/orders.py

@@ -13,7 +13,7 @@
 @click.command(cls=SLCommand)
 @click.option('--limit', '-l',
               help='How many results to get in one api call',
-              default=100,
+              default=50,
               show_default=True)
 @environment.pass_env
 def cli(env, limit):

SoftLayer/managers/account.py

@@ -53,10 +53,11 @@ def get_summary(self):
         """
         return self.client.call('Account', 'getObject', mask=mask)
 
-    def get_upcoming_events(self, event_type):
+    def get_upcoming_events(self, event_type, date_min=None):
         """Retrieves a list of Notification_Occurrence_Events that have not ended yet
 
         :param: String event_type: notification event type.
+        :param: String date_min: greater Than Date to data recovery, default is 2 days ago.
         :return: SoftLayer_Notification_Occurrence_Event
         """
         mask = "mask[id, subject, startDate, endDate, modifyDate, statusCode, acknowledgedFlag, " \
@@ -70,21 +71,32 @@ def get_upcoming_events(self, event_type):
             }
         }
 
-        self.add_event_filter(_filter, event_type)
+        self.add_event_filter(_filter, event_type, date_min)
 
         return self.client.call('Notification_Occurrence_Event', 'getAllObjects', filter=_filter, mask=mask, iter=True)
 
     @staticmethod
-    def add_event_filter(_filter, event_type):
+    def add_event_filter(_filter, event_type, date_min=None):
         """Add data to the object filter.
 
         :param: _filter: event filter.
         :param: string event_type: event type.
+        :param: string date_min: greater Than Date to data recovery, default is 2 days ago.
         """
+
         if event_type == 'PLANNED':
-            _filter['endDate'] = {
-                'operation': '> sysdate - 2'
-            }
+            if date_min:
+                _filter['endDate'] = {
+                    'operation': 'greaterThanDate',
+                    'options': [{
+                        'name': 'date',
+                        'value': [date_min]
+                    }]
+                }
+            else:
+                _filter['endDate'] = {
+                    'operation': '> sysdate - 2'
+                }
             _filter['startDate'] = {
                 'operation': 'orderBy',
                 'options': [{
@@ -94,9 +106,18 @@ def add_event_filter(_filter, event_type):
             }
 
         if event_type == 'UNPLANNED_INCIDENT':
-            _filter['modifyDate'] = {
-                'operation': '> sysdate - 2'
-            }
+            if date_min:
+                _filter['modifyDate'] = {
+                    'operation': 'greaterThanDate',
+                    'options': [{
+                        'name': 'date',
+                        'value': [date_min]
+                    }]
+                }
+            else:
+                _filter['modifyDate'] = {
+                    'operation': '> sysdate - 2'
+                }
 
         if event_type == 'ANNOUNCEMENT':
             _filter['statusCode'] = {

SoftLayer/utils.py

@@ -13,7 +13,7 @@
 
 from rich.console import Console
 from rich.theme import Theme
-
+from SoftLayer.CLI import exceptions
 # pylint: disable=no-member, invalid-name
 
 UUID_RE = re.compile(r'^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$', re.I)
@@ -371,6 +371,18 @@ def clean_time(sltime, in_format='%Y-%m-%dT%H:%M:%S%z', out_format='%Y-%m-%d %H:
         return sltime
 
 
+def verify_date(date):
+    """Verify if the date format is correct
+
+    :param string date: A date in format string
+    :return a exception if the date is not the correct format
+    """
+    try:
+        date = datetime.datetime.strptime(date, '%m/%d/%Y')
+    except Exception as exc:
+        raise exceptions.CLIAbort('Date invalid, example date: mm/dd/yyyy, 01/15/2023.') from exc
+
+
 def timestamp(date):
     """Converts a datetime to timestamp