openstack
/
heat
Code Issues Proposed changes

Merge "Unit tests: Don't use ResourceDefinition as cfn snippet"

This commit is contained in:
Jenkins 2016-12-07 10:17:23 +00:00 committed by Gerrit Code Review
parent 8f8403e9f8 53482b0d37
commit 5e5e44fefd
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
heat/tests/openstack/glance/test_image.py
View File

@ -221,7 +221,10 @@ class GlanceImageTest(common.HeatTestCase):
value.id = image_id
self.images.create.return_value = value
self.image_tags.update.return_value = None
self.my_image.t['Properties']['tags'] = ['tag1']
props = self.stack.t.t['resources']['my_image']['properties'].copy()
props['tags'] = ['tag1']
self.my_image.t = self.my_image.t.freeze(properties=props)
self.my_image.reparse()
self.my_image.handle_create()
self.assertEqual(image_id, self.my_image.resource_id)
@ -295,7 +298,10 @@ class GlanceImageTest(common.HeatTestCase):
def test_image_handle_update_tags(self):
self.my_image.resource_id = '477e8273-60a7-4c41-b683-fdb0bc7cd151'
self.my_image.t['Properties']['tags'] = ['tag1']
props = self.stack.t.t['resources']['my_image']['properties'].copy()
props['tags'] = ['tag1']
self.my_image.t = self.my_image.t.freeze(properties=props)
self.my_image.reparse()
prop_diff = {'tags': ['tag2']}
self._handle_update_tags(prop_diff)
@ -303,7 +309,10 @@ class GlanceImageTest(common.HeatTestCase):
def test_image_handle_update_remove_tags(self):
self.my_image.resource_id = '477e8273-60a7-4c41-b683-fdb0bc7cd151'
self.my_image.t['Properties']['tags'] = ['tag1']
props = self.stack.t.t['resources']['my_image']['properties'].copy()
props['tags'] = ['tag1']
self.my_image.t = self.my_image.t.freeze(properties=props)
self.my_image.reparse()
prop_diff = {'tags': None}
self.my_image.handle_update(json_snippet=None,
@ -318,7 +327,10 @@ class GlanceImageTest(common.HeatTestCase):
def test_image_handle_update_tags_delete_not_found(self):
self.my_image.resource_id = '477e8273-60a7-4c41-b683-fdb0bc7cd151'
self.my_image.t['Properties']['tags'] = ['tag1']
props = self.stack.t.t['resources']['my_image']['properties'].copy()
props['tags'] = ['tag1']
self.my_image.t = self.my_image.t.freeze(properties=props)
self.my_image.reparse()
prop_diff = {'tags': ['tag2']}
self.image_tags.delete.side_effect = exc.HTTPNotFound()

15
heat/tests/openstack/nova/test_server.py
View File

@ -3345,13 +3345,18 @@ class ServersTest(common.HeatTestCase):
server = self._create_test_server(return_server, 'update_subnet')
# set old properties for 'networks' and 'security_groups'
server.t['Properties']['networks'] = [
{'subnet': 'aaa09d50-8c23-4498-a542-aa0deb24f73e'}]
server.t['Properties']['security_groups'] = ['the_sg']
before_props = self.server_props.copy()
before_props['networks'] = [
{'subnet': 'aaa09d50-8c23-4498-a542-aa0deb24f73e'}
]
before_props['security_groups'] = ['the_sg']
# set new property 'networks'
new_networks = [{'subnet': '2a60cbaa-3d33-4af6-a9ce-83594ac546fc'}]
update_template = copy.deepcopy(server.t)
update_template['Properties']['networks'] = new_networks
update_props = self.server_props.copy()
update_props['networks'] = new_networks
update_props['security_groups'] = ['the_sg']
update_template = server.t.freeze(properties=update_props)
server.t = server.t.freeze(properties=before_props)
sec_uuids = ['86c0f8ae-23a8-464f-8603-c54113ef5467']