between date filter

Neetuj · Neetuj · commit d90cb041663b · 2014-11-24T12:00:24.000-06:00
diff --git a/SoftLayer/CLI/billing/list.py b/SoftLayer/CLI/billing/list.py
@@ -11,26 +11,18 @@
 
 
 @click.command()
-@click.option('--frmdate', '-f', help='cost incurred from from_date')
-@click.option('--enddate', '-e',
+@click.option('--start_date', '-f', help='cost incurred from from_date')
+@click.option('--end_date', '-e',
               help='end date to consider, default is latest time stamp')
-@click.option('--group', '-g',
-              help='grouping by a resource type e.g server, iscsi etc.')
-@click.option('--resource', '-r',
-              help='shows only cost of the active/inactive resources',
-              type=click.Choice(['active',
-                                 'inactive']))
 @environment.pass_env
-def cli(env, frmdate, enddate, group, resource):
+def cli(env, start_date, end_date):
     """List billing information for accounts."""
     billing = SoftLayer.BillingManager(env.client)
-    from_date = frmdate
-    to_date = enddate
-    group_by = group
-    resource_status = resource
+    from_date = start_date
+    to_date = end_date
     table = formatting.Table(['Order ID', 'Resource Name', 'Resource Type',
                    'cost', 'create_date'])
-    resources = billing.list_resources(from_date, to_date, group_by)
+    resources = billing.list_resources(from_date, to_date)
 
     for resource in resources:
         resource = utils.NestedDict(resource)
diff --git a/SoftLayer/managers/billing.py b/SoftLayer/managers/billing.py
@@ -5,7 +5,7 @@
             
     :license: MIT, see LICENSE for more details.
 """
-from SoftLayer.utils import NestedDict, query_filter, IdentifierMixin, lookup
+from SoftLayer.utils import NestedDict, query_filter, query_filter_date, IdentifierMixin, lookup
 import SoftLayer
 from calendar import monthrange
 from datetime import datetime, date, timedelta
@@ -41,7 +41,7 @@ def get_info(self):
         return result
 
 
-    def list_resources(self, from_date=None, to_date=None, group_by=None, resource_status=None, **kwargs):
+    def list_resources(self, from_date=None, to_date=None, **kwargs):
         """ Retrieve a list of all ordered resources along with their costing.
 
         :param dict \\*\\*kwargs: response-level option (limit)
@@ -75,15 +75,15 @@ def list_resources(self, from_date=None, to_date=None, group_by=None, resource_s
         _filter['orders']['userRecordId'] = query_filter(user['id'])
         date_format = '%Y-%m-%d'
 
-        if from_date:
-            from_date_filter = from_date + '*'
+        if from_date and to_date:
+            filter['orders']['createDate'] = query_filter_date(from_date, to_date)
+        elif from_date:
+            from_date_filter = '>=' + ' ' + from_date
             _filter['orders']['createDate'] = query_filter(from_date_filter)
-        if to_date:
-            to_date_filter = to_date + '*'
+        elif to_date:
+            to_date_filter = '<=' + ' ' + to_date
             _filter['orders']['createDate'] = query_filter(to_date_filter)
-        if group_by:
-            group_by_filter = '*' + group_by
-            _filter['orders']['description'] = query_filter(group_by_filter)
+        print  _filter['orders']['createDate']
         orders = self.account.getOrders(filter=_filter.to_dict())
         total = 0.0
         result = []
diff --git a/SoftLayer/utils.py b/SoftLayer/utils.py
@@ -112,6 +112,15 @@ def query_filter(query):
     return {'operation': query}
 
 
+def query_filter_date(start, end):
+    return {'operation': 'betweenDate',
+            'options': [
+                {'name': 'startDate', 'value': [start+' 0:0:0']},
+                {'name': 'endDate', 'value': [end+' 0:0:0']}
+            ]
+    }
+
+
 class IdentifierMixin(object):
     """Mixin used to resolve ids from other names of objects.
 
