Merge "Add ceilometerclient support for api-no-pipeline"1.4.0

2 files changed, 11 insertions, 3 deletions

diff --git a/ceilometerclient/v2/samples.py b/ceilometerclient/v2/samples.py
index 17aa10b..e68a761 100644
--- a/ceilometerclient/v2/samples.py
+++ b/ceilometerclient/v2/samples.py
@@ -49,15 +49,18 @@ class OldSampleManager(base.Manager):
         return self._list(options.build_url(path, q, params))
 
     def create(self, **kwargs):
+        direct = kwargs.pop('direct', False)
         new = dict((key, value) for (key, value) in kwargs.items()
                    if key in CREATION_ATTRIBUTES)
-        url = self._path(counter_name=kwargs['counter_name'])
+        url = self._path(counter_name=kwargs['counter_name'])+(
+            '?direct=%s' % (str(direct)) if direct else '')
         body = self.api.post(url, json=[new]).json()
         if body:
             return [OldSample(self, b) for b in body]
 
     def create_list(self, sample_list=None, **kwargs):
         sample_dict = {}
+        direct = kwargs.pop('direct', False)
 
         for sample_body in sample_list:
             sample = dict((key, value) for (key, value) in sample_body.items()
@@ -69,7 +72,8 @@ class OldSampleManager(base.Manager):
         sample_return_list = []
 
         for (counter_name, sample_body) in sample_dict.items():
-            url = self._path(counter_name=counter_name)
+            url = self._path(counter_name=counter_name)+(
+                '?direct=%s' % (str(direct)) if direct else '')
             body = self.api.post(url, json=sample_body).json()
 
             if body:
diff --git a/ceilometerclient/v2/shell.py b/ceilometerclient/v2/shell.py
index 18719b9..f5c6365 100644
--- a/ceilometerclient/v2/shell.py
+++ b/ceilometerclient/v2/shell.py
@@ -216,6 +216,8 @@ def _restore_shadowed_arg(shadowed, observed):
                 'key-value pairs e.g. {"key":"value"}.')
 @utils.arg('--timestamp', metavar='<TIMESTAMP>',
            help='The sample timestamp.')
+@utils.arg('--direct', metavar='<DIRECT>', default=False,
+           help='Post sample to storage directly.')
 @_restore_shadowed_arg('project_id', 'sample_project_id')
 @_restore_shadowed_arg('user_id', 'sample_user_id')
 def do_sample_create(cc, args={}):
@@ -265,10 +267,12 @@ def do_meter_list(cc, args={}):
 
 @utils.arg('samples_list', metavar='<SAMPLES_LIST>', action=NotEmptyAction,
            help='Json array with samples to create.')
+@utils.arg('--direct', metavar='<DIRECT>', default=False,
+           help='Post samples to storage directly.')
 def do_sample_create_list(cc, args={}):
     """Create a sample list."""
     sample_list_array = json.loads(args.samples_list)
-    samples = cc.samples.create_list(sample_list_array)
+    samples = cc.samples.create_list(sample_list_array, direct=args.direct)
     field_labels = ['Resource ID', 'Name', 'Type', 'Volume', 'Unit',
                     'Timestamp']
     fields = ['resource_id', 'counter_name', 'counter_type',