diff options
| author | akanksha <akanksha.mehrotra@hpe.com> | 2016-01-07 13:53:08 -0800 |
|---|---|---|
| committer | akanksha <akanksha.mehrotra@hpe.com> | 2016-01-08 11:32:01 -0800 |
| commit | e93aed197a0627e351f422ae7a93b65b4862181c (patch) | |
| tree | fb1031d5fcc26ebf37b1bb58eb359928aa7d495a | |
| parent | 6097b0ce2ed80651f2e49c47adf7c0b5a11f5431 (diff) | |
| download | python-ceilometerclient-e93aed197a0627e351f422ae7a93b65b4862181c.tar.gz | |
Fix to disable meter-links from CLI
Removes the option of meter-links
from CLI.Since meter-links are
never shown.
Change-Id: I3949bb6d77786926f22506d97d988f73fa614958
Closes-Bug: #1528318
| -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 a4209f7..436a62b 100644 --- a/ceilometerclient/tests/unit/v2/test_shell.py +++ b/ceilometerclient/tests/unit/v2/test_shell.py @@ -1388,10 +1388,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('''\ @@ -1404,12 +1402,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 0041798..02102c9 100644 --- a/ceilometerclient/v2/shell.py +++ b/ceilometerclient/v2/shell.py @@ -1060,14 +1060,11 @@ 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.') 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'] |