Revert "Remove the event class and use Meter instead."

Just rename Event to Sample

This reverts commit 46cedbcf1e0f7a329b8a895e1f97ca8b817dd319.

1 files changed, 37 insertions, 18 deletions

diff --git a/ceilometerclient/v1/shell.py b/ceilometerclient/v1/shell.py
index 351e87d..46d4eaa 100644
--- a/ceilometerclient/v1/shell.py
+++ b/ceilometerclient/v1/shell.py
@@ -20,33 +20,52 @@ import ceilometerclient.exc as exc
 
 
 @utils.arg('-s', '--source', metavar='<SOURCE>',
-           help='ID of the resource to show meters for.')
+           help='ID of the resource to show samples for.')
 @utils.arg('-r', '--resource_id', metavar='<RESOURCE_ID>',
-           help='ID of the resource to show meters for.')
+           help='ID of the resource to show samples for.')
 @utils.arg('-u', '--user_id', metavar='<USER_ID>',
-           help='ID of the user to show meters for.')
+           help='ID of the user to show samples for.')
 @utils.arg('-p', '--project_id', metavar='<PROJECT_ID>',
-           help='ID of the project to show meters for.')
+           help='ID of the project to show samples for.')
 @utils.arg('-c', '--counter_name', metavar='<NAME>',
-           help='Name of meter to show meters for.')
-def do_meter_list(cc, args):
-    '''List the meters for this meters'''
+           help='Name of meter to show samples for.')
+def do_sample_list(cc, args):
+    '''List the samples for this meters'''
     fields = {'counter_name': args.counter_name,
               'resource_id': args.resource_id,
               'user_id': args.user_id,
               'project_id': args.project_id,
               'source': args.source}
     try:
-        meters = cc.meters.list(**fields)
+        samples = cc.samples.list(**fields)
     except exc.HTTPNotFound:
-        raise exc.CommandError('meters not found: %s' % args.counter_name)
+        raise exc.CommandError('Samples not found: %s' % args.counter_name)
     else:
-        json_format = lambda js: json.dumps(js, indent=2)
-        formatters = {
-            'metadata': json_format,
-        }
-        for e in meters:
-            utils.print_dict(e.to_dict(), formatters=formatters)
+        field_labels = ['Resource ID', 'Name', 'Type', 'Volume', 'Timestamp']
+        fields = ['resource_id', 'counter_name', 'counter_type','counter_volume', 'timestamp']
+        utils.print_list(samples, fields, field_labels,
+                        sortby=0)
+
+
+@utils.arg('-s', '--source', metavar='<SOURCE>',
+           help='ID of the resource to show samples for.')
+@utils.arg('-r', '--resource_id', metavar='<RESOURCE_ID>',
+           help='ID of the resource to show samples for.')
+@utils.arg('-u', '--user_id', metavar='<USER_ID>',
+           help='ID of the user to show samples for.')
+@utils.arg('-p', '--project_id', metavar='<PROJECT_ID>',
+           help='ID of the project to show samples for.')
+def do_meter_list(cc, args={}):
+    '''List the user's meter'''
+    fields = {'resource_id': args.resource_id,
+              'user_id': args.user_id,
+              'project_id': args.project_id,
+              'source': args.source}
+    meters = cc.meters.list(**fields)
+    field_labels = ['Name', 'Type', 'Resource ID', 'User ID', 'Project ID']
+    fields = ['counter_name', 'counter_type', 'resource_id', 'user_id', 'project_id']
+    utils.print_list(meters, fields, field_labels,
+                     sortby=0)
 
 
 def do_user_list(cc, args={}):
@@ -60,9 +79,9 @@ def do_user_list(cc, args={}):
 
 
 @utils.arg('-s', '--source', metavar='<SOURCE>',
-           help='ID of the resource to show meters for.')
+           help='ID of the resource to show for.')
 @utils.arg('-u', '--user_id', metavar='<USER_ID>',
-           help='ID of the user to show meters for.')
+           help='ID of the user to show resources for.')
 def do_resource_list(cc, args={}):
     '''List the users'''
     kwargs = {'source': args.source,
@@ -76,7 +95,7 @@ def do_resource_list(cc, args={}):
 
 
 @utils.arg('-s', '--source', metavar='<SOURCE>',
-           help='ID of the resource to show meters for.')
+           help='ID of the resource to show projects for.')
 def do_project_list(cc, args={}):
     '''List the projects'''
     kwargs = {'source': args.source}