openstack/python-ceilometerclient
Code Issues Proposed changes

Merge "Fix to disable meter-links from CLI"

Browse Source
This commit is contained in:
Jenkins
2016-01-19 00:03:21 +00:00
committed by Gerrit Code Review
parent 5b37a18b9c e93aed197a
commit 500e6129ae
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ceilometerclient/tests/unit/v2/test_shell.py
View File

@@ -1885,10 +1885,8 @@ class ShellResourceListCommandTest(utils.BaseTestCase):
def test_resource_list(self): def test_resource_list(self):
resource = resources.Resource(mock.Mock(), self.RESOURCE) resource = resources.Resource(mock.Mock(), self.RESOURCE)
self.cc.resources.list.return_value = [resource] self.cc.resources.list.return_value = [resource]
ceilometer_shell.do_resource_list(self.cc, self.args) ceilometer_shell.do_resource_list(self.cc, self.args)
self.cc.resources.list.assert_called_once_with(q=[], self.cc.resources.list.assert_called_once_with(q=[],
links=None,
limit=None) limit=None)
self.assertEqual('''\ self.assertEqual('''\
@@ -1901,12 +1899,10 @@ class ShellResourceListCommandTest(utils.BaseTestCase):
@mock.patch('sys.stdout', new=six.StringIO()) @mock.patch('sys.stdout', new=six.StringIO())
def test_resource_list_with_links(self): def test_resource_list_with_links(self):
self.args.meter_links = True
resource = resources.Resource(mock.Mock(), self.RESOURCE) resource = resources.Resource(mock.Mock(), self.RESOURCE)
self.cc.resources.list.return_value = [resource] self.cc.resources.list.return_value = [resource]
ceilometer_shell.do_resource_list(self.cc, self.args) ceilometer_shell.do_resource_list(self.cc, self.args)
self.cc.resources.list.assert_called_once_with(q=[], self.cc.resources.list.assert_called_once_with(q=[],
links=True,
limit=None) limit=None)
self.assertEqual('''\ self.assertEqual('''\
+-------------+-----------+---------+------------+ +-------------+-----------+---------+------------+

3
ceilometerclient/v2/shell.py
View File

@@ -1077,15 +1077,12 @@ def do_alarm_history(cc, args={}):
@utils.arg('-q', '--query', metavar='<QUERY>', @utils.arg('-q', '--query', metavar='<QUERY>',
help='key[op]data_type::value; list. data_type is optional, ' help='key[op]data_type::value; list. data_type is optional, '
'but if supplied must be string, integer, float, or boolean.') '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>', @utils.arg('-l', '--limit', metavar='<NUMBER>',
help='Maximum number of resources to return. %s' % help='Maximum number of resources to return. %s' %
DEFAULT_API_LIMIT) DEFAULT_API_LIMIT)
def do_resource_list(cc, args={}): def do_resource_list(cc, args={}):
"""List the resources.""" """List the resources."""
resources = cc.resources.list(q=options.cli_to_array(args.query), resources = cc.resources.list(q=options.cli_to_array(args.query),
links=args.meter_links,
limit=args.limit) limit=args.limit)
field_labels = ['Resource ID', 'Source', 'User ID', 'Project ID'] field_labels = ['Resource ID', 'Source', 'User ID', 'Project ID']