openstack
/
heat
Code Issues Proposed changes

Merge "Add parse_live_resource_data for zaqar queue"

This commit is contained in:
Jenkins 2016-02-24 22:42:00 +00:00 committed by Gerrit Code Review
parent e67f3a6494 85ccbef259
commit 42c1ebaf57
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
heat/engine/resources/openstack/zaqar/queue.py
View File

@ -122,6 +122,12 @@ class ZaqarQueue(resource.Resource):
metadata = queue.metadata()
return {self.METADATA: metadata}
def parse_live_resource_data(self, resource_properties, resource_data):
return {
self.NAME: self.resource_id,
self.METADATA: resource_data[self.METADATA]
}
def resource_mapping():
return {

29
heat/tests/openstack/zaqar/test_queue.py
View File

@ -241,3 +241,32 @@ class ZaqarMessageQueueTest(common.HeatTestCase):
queue._show_resource())
self.m.VerifyAll()
def test_parse_live_resource_data(self):
t = template_format.parse(wp_template)
self.parse_stack(t)
queue = self.stack['MyQueue2']
self.m.StubOutWithMock(queue, 'client')
queue.client().MultipleTimes().AndReturn(self.fc)
fake_q = FakeQueue(queue.physical_resource_name(), auto_create=False)
self.m.StubOutWithMock(self.fc, 'queue')
self.fc.queue(queue.physical_resource_name(),
auto_create=False).AndReturn(fake_q)
self.m.StubOutWithMock(fake_q, 'metadata')
fake_q.metadata(new_meta=queue.properties.get('metadata'))
self.fc.queue(queue.physical_resource_name(),
auto_create=False).AndReturn(fake_q)
fake_q.metadata().AndReturn(
{"key1": {"key2": "value", "key3": [1, 2]}})
self.m.ReplayAll()
scheduler.TaskRunner(queue.create)()
self.assertEqual(
{'metadata': {"key1": {"key2": "value", "key3": [1, 2]}},
'name': queue.resource_id},
queue.parse_live_resource_data(queue.properties,
queue._show_resource()))
self.m.VerifyAll()