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
This commit is contained in:
@@ -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('''\
|
||||
+-------------+-----------+---------+------------+
|
||||
|
||||
@@ -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']
|
||||
|
||||
Reference in New Issue
Block a user