diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-19 00:03:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-19 00:03:21 +0000 |
| commit | 500e6129aee983cacaacbd48d0a706323e54bc71 (patch) | |
| tree | 12363c237d00b040a9af4c33955f1c79ac87fd1a | |
| parent | 5b37a18b9c43e22e5116879aeceee808bf435422 (diff) | |
| parent | e93aed197a0627e351f422ae7a93b65b4862181c (diff) | |
| download | python-ceilometerclient-500e6129aee983cacaacbd48d0a706323e54bc71.tar.gz | |
Merge "Fix to disable meter-links from CLI"
| -rw-r--r-- | ceilometerclient/tests/unit/v2/test_shell.py | 4 | ||||
| -rw-r--r-- | ceilometerclient/v2/shell.py | 3 |
2 files changed, 0 insertions, 7 deletions
diff --git a/ceilometerclient/tests/unit/v2/test_shell.py b/ceilometerclient/tests/unit/v2/test_shell.py index ff092c5..053936b 100644 --- a/ceilometerclient/tests/unit/v2/test_shell.py +++ b/ceilometerclient/tests/unit/v2/test_shell.py @@ -1885,10 +1885,8 @@ class ShellResourceListCommandTest(utils.BaseTestCase): def test_resource_list(self): resource = resources.Resource(mock.Mock(), self.RESOURCE) self.cc.resources.list.return_value = [resource] - ceilometer_shell.do_resource_list(self.cc, self.args) self.cc.resources.list.assert_called_once_with(q=[], - links=None, limit=None) self.assertEqual('''\ @@ -1901,12 +1899,10 @@ class ShellResourceListCommandTest(utils.BaseTestCase): @mock.patch('sys.stdout', new=six.StringIO()) def test_resource_list_with_links(self): - self.args.meter_links = True resource = resources.Resource(mock.Mock(), self.RESOURCE) self.cc.resources.list.return_value = [resource] ceilometer_shell.do_resource_list(self.cc, self.args) self.cc.resources.list.assert_called_once_with(q=[], - links=True, limit=None) self.assertEqual('''\ +-------------+-----------+---------+------------+ diff --git a/ceilometerclient/v2/shell.py b/ceilometerclient/v2/shell.py index 7cfb9c0..b1f8734 100644 --- a/ceilometerclient/v2/shell.py +++ b/ceilometerclient/v2/shell.py @@ -1077,15 +1077,12 @@ def do_alarm_history(cc, args={}): @utils.arg('-q', '--query', metavar='<QUERY>', help='key[op]data_type::value; list. data_type is optional, ' 'but if supplied must be string, integer, float, or boolean.') -@utils.arg('--meter-links', dest='meter_links', action='store_true', - help='If specified, meter links will be generated.') @utils.arg('-l', '--limit', metavar='<NUMBER>', help='Maximum number of resources to return. %s' % DEFAULT_API_LIMIT) def do_resource_list(cc, args={}): """List the resources.""" resources = cc.resources.list(q=options.cli_to_array(args.query), - links=args.meter_links, limit=args.limit) field_labels = ['Resource ID', 'Source', 'User ID', 'Project ID'] |