openstack/deb-python-openstacksdk
Code Issues Proposed changes

Merge "Add attribute 'location' to base resource."

Browse Source
This commit is contained in:
Jenkins
2016-01-16 00:22:52 +00:00
committed by Gerrit Code Review
parent 1f0913b6c9 7078c12620
commit df3bead9b6
2 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
openstack/resource.py
View File

@@ -218,6 +218,8 @@ class Resource(collections.MutableMapping):
id_attribute = 'id'
#: Attribute key associated with the name for this resource.
name_attribute = 'name'
#: Attribute key associated with 'location' from response headers
location = header('location')
#: The base part of the url for this resource.
base_path = ''
@@ -548,10 +550,13 @@ class Resource(collections.MutableMapping):
resp = session.put(url, endpoint_filter=cls.service, **args)
else:
resp = session.post(url, endpoint_filter=cls.service, **args)
resp_headers = resp.headers
resp = resp.json()
if cls.resource_key:
resp = resp[cls.resource_key]
if resp_headers:
resp[HEADERS] = copy.deepcopy(resp_headers)
return resp
@@ -567,6 +572,8 @@ class Resource(collections.MutableMapping):
"""
resp = self.create_by_id(session, self._attrs, self.id, path_args=self)
self._attrs[self.id_attribute] = resp[self.id_attribute]
if HEADERS in resp:
self.set_headers(resp[HEADERS])
self._reset_dirty()
return self
@@ -754,10 +761,13 @@ class Resource(collections.MutableMapping):
resp = session.patch(url, endpoint_filter=cls.service, **args)
else:
resp = session.put(url, endpoint_filter=cls.service, **args)
resp_headers = resp.headers
resp = resp.json()
if cls.resource_key and cls.resource_key in resp.keys():
resp = resp[cls.resource_key]
if resp_headers:
resp[HEADERS] = resp_headers
return resp
@@ -783,7 +793,8 @@ class Resource(collections.MutableMapping):
pass
else:
assert resp_id == self.id
if HEADERS in resp:
self.set_headers(resp[HEADERS])
self._reset_dirty()
return self

47
openstack/tests/unit/test_resource.py
View File

@@ -262,6 +262,7 @@ class HeaderTests(base.TestCase):
response = mock.Mock()
response_body = {'id': 1}
response.json = mock.Mock(return_value=response_body)
response.headers = None
sess = mock.Mock()
sess.post = mock.Mock(return_value=response)
sess.put = mock.Mock(return_value=response)
@@ -352,7 +353,7 @@ class ResourceTests(base.TestCase):
matchers.raises(exceptions.MethodNotSupported))
def _test_create_by_id(self, key, response_value, response_body,
attrs, json_body):
attrs, json_body, response_headers=None):
class FakeResource2(FakeResource):
resource_key = key
@@ -360,13 +361,17 @@ class ResourceTests(base.TestCase):
response = mock.Mock()
response.json = mock.Mock(return_value=response_body)
response.headers = response_headers
expected_resp = response_value.copy()
if response_headers:
expected_resp.update({'headers': response_headers})
sess = mock.Mock()
sess.put = mock.Mock(return_value=response)
sess.post = mock.Mock(return_value=response)
resp = FakeResource2.create_by_id(sess, attrs)
self.assertEqual(response_value, resp)
self.assertEqual(expected_resp, resp)
sess.post.assert_called_with(FakeResource2.base_path,
endpoint_filter=FakeResource2.service,
json=json_body)
@@ -403,6 +408,17 @@ class ResourceTests(base.TestCase):
self._test_create_by_id(key, response_value, response_body,
attrs, json_body)
def test_create_with_response_headers(self):
key = None
response_value = {"a": 1, "b": 2, "c": 3}
response_body = response_value
response_headers = {'location': 'foo'}
attrs = response_value.copy()
json_body = attrs
self._test_create_by_id(key, response_value, response_body,
attrs, json_body,
response_headers=response_headers)
def test_create_with_resource_key(self):
key = "my_key"
response_value = {"a": 1, "b": 2, "c": 3}
@@ -491,7 +507,7 @@ class ResourceTests(base.TestCase):
self._test_head_data_by_id(key, response_value)
def _test_update_by_id(self, key, response_value, response_body,
attrs, json_body):
attrs, json_body, response_headers=None):
class FakeResource2(FakeResource):
patch_update = True
@@ -500,13 +516,17 @@ class ResourceTests(base.TestCase):
response = mock.Mock()
response.json = mock.Mock(return_value=response_body)
response.headers = response_headers
expected_resp = response_value.copy()
if response_headers:
expected_resp.update({'headers': response_headers})
sess = mock.Mock()
sess.patch = mock.Mock(return_value=response)
r_id = "my_id"
resp = FakeResource2.update_by_id(sess, r_id, attrs)
self.assertEqual(response_value, resp)
self.assertEqual(expected_resp, resp)
sess.patch.assert_called_with(
utils.urljoin(FakeResource2.base_path, r_id),
endpoint_filter=FakeResource2.service,
@@ -515,7 +535,7 @@ class ResourceTests(base.TestCase):
path_args = {"parent_name": "my_name"}
resp = FakeResource2.update_by_id(sess, r_id, attrs,
path_args=path_args)
self.assertEqual(response_value, resp)
self.assertEqual(expected_resp, resp)
sess.patch.assert_called_with(
utils.urljoin(FakeResource2.base_path % path_args, r_id),
endpoint_filter=FakeResource2.service,
@@ -539,6 +559,17 @@ class ResourceTests(base.TestCase):
self._test_update_by_id(key, response_value, response_body,
attrs, json_body)
def test_update_with_response_headers(self):
key = "my_key"
response_value = {"a": 1, "b": 2, "c": 3}
response_body = {key: response_value}
response_headers = {'location': 'foo'}
attrs = response_value.copy()
json_body = {key: attrs}
self._test_update_by_id(key, response_value, response_body,
attrs, json_body,
response_headers=response_headers)
def test_delete_by_id(self):
class FakeResource2(FakeResource):
service = "my_service"
@@ -567,6 +598,7 @@ class ResourceTests(base.TestCase):
def test_create(self):
resp = mock.Mock()
resp.json = mock.Mock(return_value=fake_body)
resp.headers = {'location': 'foo'}
self.session.post = mock.Mock(return_value=resp)
obj = FakeResource.new(parent_name=fake_parent,
@@ -598,6 +630,7 @@ class ResourceTests(base.TestCase):
self.assertEqual(fake_name, obj.name)
self.assertEqual(fake_attr1, obj.first)
self.assertEqual(fake_attr2, obj.second)
self.assertEqual('foo', obj.location)
def test_get(self):
resp = mock.Mock()
@@ -683,6 +716,7 @@ class ResourceTests(base.TestCase):
resp = mock.Mock()
resp.json = mock.Mock(return_value=fake_body)
resp.headers = {'location': 'foo'}
self.session.patch = mock.Mock(return_value=resp)
obj = FakeResourcePatch.new(id=fake_id, parent_name=fake_parent,
@@ -710,6 +744,7 @@ class ResourceTests(base.TestCase):
self.assertEqual(fake_name, obj.name)
self.assertEqual(fake_attr1, obj.first)
self.assertEqual(fake_attr2, obj.second)
self.assertEqual('foo', obj.location)
def test_put_update(self):
class FakeResourcePut(FakeResource):
@@ -718,6 +753,7 @@ class ResourceTests(base.TestCase):
resp = mock.Mock()
resp.json = mock.Mock(return_value=fake_body)
resp.headers = {'location': 'foo'}
self.session.put = mock.Mock(return_value=resp)
obj = FakeResourcePut.new(id=fake_id, parent_name=fake_parent,
@@ -745,6 +781,7 @@ class ResourceTests(base.TestCase):
self.assertEqual(fake_name, obj.name)
self.assertEqual(fake_attr1, obj.first)
self.assertEqual(fake_attr2, obj.second)
self.assertEqual('foo', obj.location)
def test_update_early_exit(self):
obj = FakeResource()