openstack/openstacksdk
Code Issues Proposed changes

Merge "Add path_args when invoking Resource.list() from proxy layer"

Browse Source
This commit is contained in:
Jenkins
2015-06-21 22:30:40 +00:00
committed by Gerrit Code Review
parent 5c8f591711 185bb29db4
commit 2356490a0a
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
openstack/proxy.py
View File

@@ -185,7 +185,8 @@ class BaseProxy(object):
res = self._get_resource(resource_type, value, path_args)
query = res._convert_ids(query)
return res.list(self.session, paginated=paginated, **query)
return res.list(self.session, path_args=path_args, paginated=paginated,
**query)
def _head(self, resource_type, value=None, path_args=None):
"""Retrieve a resource's header

1
openstack/tests/unit/message/v1/test_message.py
View File

@@ -11,6 +11,7 @@
# under the License.
import json
import mock
import testtools

12
openstack/tests/unit/test_proxy.py
View File

@@ -248,28 +248,32 @@ class TestProxyList(testtools.TestCase):
self.fake_a = 1
self.fake_b = 2
self.fake_c = 3
self.fake_resource = resource.Resource.new(id=self.fake_a)
self.fake_response = [resource.Resource()]
self.fake_query = {"a": self.fake_resource, "b": self.fake_b}
self.fake_path_args = {"c": self.fake_c}
self.sot = proxy.BaseProxy(self.session)
ListableResource.list = mock.Mock()
ListableResource.list.return_value = self.fake_response
def _test_list(self, paginated, **query):
rv = self.sot._list(ListableResource, paginated=paginated, **query)
def _test_list(self, path_args, paginated, **query):
rv = self.sot._list(ListableResource, path_args=path_args,
paginated=paginated, **query)
self.assertEqual(self.fake_response, rv)
ListableResource.list.assert_called_once_with(self.session,
path_args=path_args,
paginated=paginated,
a=self.fake_a,
b=self.fake_b)
def test_list_paginated(self):
self._test_list(True, **self.fake_query)
self._test_list(self.fake_path_args, True, **self.fake_query)
def test_list_non_paginated(self):
self._test_list(False, **self.fake_query)
self._test_list(self.fake_path_args, False, **self.fake_query)
class TestProxyHead(testtools.TestCase):