diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-09 10:15:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-09 10:15:46 +0000 |
| commit | d40487643e2a069788e6f3218d946d86395a279e (patch) | |
| tree | 97e60dd1bf749f2d7aba28f0b19b4eef516fa55f | |
| parent | 9d76c8e94ece2cd027120e93f8036e6d0a67021d (diff) | |
| parent | 4f1b09f7687d59c313af59358b3a309fe1b90d7d (diff) | |
| download | python-ceilometerclient-d40487643e2a069788e6f3218d946d86395a279e.tar.gz | |
Merge "do not generate meter links on resource-list"
| -rw-r--r-- | ceilometerclient/tests/unit/v2/test_resources.py | 8 | ||||
| -rw-r--r-- | ceilometerclient/v2/resources.py | 5 |
2 files changed, 7 insertions, 6 deletions
diff --git a/ceilometerclient/tests/unit/v2/test_resources.py b/ceilometerclient/tests/unit/v2/test_resources.py index 4aa9131..3368b77 100644 --- a/ceilometerclient/tests/unit/v2/test_resources.py +++ b/ceilometerclient/tests/unit/v2/test_resources.py @@ -19,7 +19,7 @@ import ceilometerclient.v2.resources fixtures = { - '/v2/resources': { + '/v2/resources?meter_links=0': { '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': ( {}, @@ -78,7 +78,7 @@ class ResourceManagerTest(utils.BaseTestCase): def test_list_all(self): resources = list(self.mgr.list()) expect = [ - 'GET', '/v2/resources' + 'GET', '/v2/resources?meter_links=0' ] self.http_client.assert_called(*expect) self.assertEqual(len(resources), 2) @@ -100,7 +100,7 @@ class ResourceManagerTest(utils.BaseTestCase): ])) expect = [ '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.assertEqual(len(resources), 1) diff --git a/ceilometerclient/v2/resources.py b/ceilometerclient/v2/resources.py index 99e6fd5..aa80664 100644 --- a/ceilometerclient/v2/resources.py +++ b/ceilometerclient/v2/resources.py @@ -30,9 +30,10 @@ class Resource(base.Resource): class ResourceManager(base.Manager): resource_class = Resource - def list(self, q=None): + def list(self, q=None, links=None): 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): path = '/v2/resources/%s' % resource_id |