openstack/python-ceilometerclient
Code Issues Proposed changes

Merge "do not generate meter links on resource-list"

Browse Source
This commit is contained in:
Jenkins
2015-09-09 10:15:46 +00:00
committed by Gerrit Code Review
parent 9d76c8e94e 4f1b09f768
commit d40487643e
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ceilometerclient/tests/unit/v2/test_resources.py
View File

@@ -19,7 +19,7 @@ import ceilometerclient.v2.resources
fixtures = { fixtures = {
'/v2/resources': { '/v2/resources?meter_links=0': {
'GET': ( 'GET': (
{}, {},
[ [
@@ -38,7 +38,7 @@ fixtures = {
] ]
), ),
}, },
'/v2/resources?q.field=resource_id&q.op=&q.type=&q.value=a': '/v2/resources?q.field=resource_id&q.op=&q.type=&q.value=a&meter_links=0':
{ {
'GET': ( 'GET': (
{}, {},
@@ -78,7 +78,7 @@ class ResourceManagerTest(utils.BaseTestCase):
def test_list_all(self): def test_list_all(self):
resources = list(self.mgr.list()) resources = list(self.mgr.list())
expect = [ expect = [
'GET', '/v2/resources' 'GET', '/v2/resources?meter_links=0'
] ]
self.http_client.assert_called(*expect) self.http_client.assert_called(*expect)
self.assertEqual(len(resources), 2) self.assertEqual(len(resources), 2)
@@ -100,7 +100,7 @@ class ResourceManagerTest(utils.BaseTestCase):
])) ]))
expect = [ expect = [
'GET', '/v2/resources?q.field=resource_id&q.op=' 'GET', '/v2/resources?q.field=resource_id&q.op='
'&q.type=&q.value=a' '&q.type=&q.value=a&meter_links=0'
] ]
self.http_client.assert_called(*expect) self.http_client.assert_called(*expect)
self.assertEqual(len(resources), 1) self.assertEqual(len(resources), 1)

5
ceilometerclient/v2/resources.py
View File

@@ -30,9 +30,10 @@ class Resource(base.Resource):
class ResourceManager(base.Manager): class ResourceManager(base.Manager):
resource_class = Resource resource_class = Resource
def list(self, q=None): def list(self, q=None, links=None):
path = '/v2/resources' path = '/v2/resources'
return self._list(options.build_url(path, q)) params = ['meter_links=%d' % (1 if links else 0)]
return self._list(options.build_url(path, q, params))
def get(self, resource_id): def get(self, resource_id):
path = '/v2/resources/%s' % resource_id path = '/v2/resources/%s' % resource_id