diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-02-15 03:24:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-02-15 03:24:19 +0000 |
| commit | f8765ce532a45391c5366be8fa0f583f96a30d22 (patch) | |
| tree | 0c930ba7a2a5f24b6429a522db92b98608c0252c | |
| parent | d84371e11010e54a2851bc20301cd9aeab48be1d (diff) | |
| parent | 80b15778beafa2ea52315305cd0c0d0c62aea4ba (diff) | |
| download | python-ceilometerclient-f8765ce532a45391c5366be8fa0f583f96a30d22.tar.gz | |
Merge "Corrected the errors in sample-show and sample-create"1.0.13
| -rw-r--r-- | ceilometerclient/tests/v2/test_shell.py | 10 | ||||
| -rw-r--r-- | ceilometerclient/v2/shell.py | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/ceilometerclient/tests/v2/test_shell.py b/ceilometerclient/tests/v2/test_shell.py index 2f13c12..4030439 100644 --- a/ceilometerclient/tests/v2/test_shell.py +++ b/ceilometerclient/tests/v2/test_shell.py @@ -379,6 +379,8 @@ class ShellSampleListCommandTest(utils.BaseTestCase): def setUp(self): super(ShellSampleListCommandTest, self).setUp() self.cc = mock.Mock() + self.cc.samples = mock.Mock() + self.cc.new_samples = mock.Mock() self.args = mock.Mock() self.args.query = None self.args.limit = None @@ -469,16 +471,17 @@ class ShellSampleShowCommandTest(utils.BaseTestCase): def setUp(self): super(ShellSampleShowCommandTest, self).setUp() self.cc = mock.Mock() + self.cc.new_samples = mock.Mock() self.args = mock.Mock() self.args.sample_id = "98b5f258-635e-11e4-8bdd-0025647390c1" @mock.patch('sys.stdout', new=six.StringIO()) def test_sample_show(self): sample = samples.Sample(mock.Mock(), self.SAMPLE) - self.cc.samples.get.return_value = sample + self.cc.new_samples.get.return_value = sample ceilometer_shell.do_sample_show(self.cc, self.args) - self.cc.samples.get.assert_called_once_with( + self.cc.new_samples.get.assert_called_once_with( "98b5f258-635e-11e4-8bdd-0025647390c1") self.assertEqual('''\ @@ -525,6 +528,7 @@ class ShellSampleCreateCommandTest(utils.BaseTestCase): def setUp(self): super(ShellSampleCreateCommandTest, self).setUp() self.cc = mock.Mock() + self.cc.samples = mock.Mock() self.args = mock.Mock() self.args.meter_name = self.METER self.args.meter_type = self.METER_TYPE @@ -536,7 +540,7 @@ class ShellSampleCreateCommandTest(utils.BaseTestCase): def test_sample_create(self): ret_sample = [samples.OldSample(mock.Mock(), sample) for sample in self.SAMPLE] - self.cc.old_samples.create.return_value = ret_sample + self.cc.samples.create.return_value = ret_sample ceilometer_shell.do_sample_create(self.cc, self.args) diff --git a/ceilometerclient/v2/shell.py b/ceilometerclient/v2/shell.py index 3e53b24..67a7646 100644 --- a/ceilometerclient/v2/shell.py +++ b/ceilometerclient/v2/shell.py @@ -169,7 +169,7 @@ def _do_sample_list(cc, args): help='ID (aka message ID) of the sample to show.') def do_sample_show(cc, args): '''Show an sample.''' - sample = cc.samples.get(args.sample_id) + sample = cc.new_samples.get(args.sample_id) if sample is None: raise exc.CommandError('Sample not found: %s' % args.sample_id) @@ -216,7 +216,7 @@ def do_sample_create(cc, args={}): fields[k] = json.loads(v) else: fields[arg_to_field_mapping.get(k, k)] = v - sample = cc.old_samples.create(**fields) + sample = cc.samples.create(**fields) fields = ['counter_name', 'user_id', 'resource_id', 'timestamp', 'message_id', 'source', 'counter_unit', 'counter_volume', 'project_id', 'resource_metadata', |