openstack
/
heat
Code Issues Proposed changes

Merge "Support cloud-specific suffixes to server status."

This commit is contained in:
Jenkins 2013-06-18 23:22:17 +00:00 committed by Gerrit Code Review
parent 7d10e72f80 b0701f6c22
commit 2d673e5147
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat/engine/resources/instance.py
View File

@ -360,7 +360,9 @@ class Instance(resource.Resource):
if server.status != 'ACTIVE':
server.get()
if server.status in self._deferred_server_statuses:
# Some clouds append extra (STATUS) strings to the status
short_server_status = server.status.split('(')[0]
if short_server_status in self._deferred_server_statuses:
return False
elif server.status == 'ACTIVE':
self._set_ipaddress(server.networks)

3
heat/tests/test_instance.py
View File

@ -288,6 +288,9 @@ class instancesTest(HeatTestCase):
scheduler.TaskRunner(instance.create)()
self.assertEqual(instance.state, (instance.CREATE, instance.COMPLETE))
def test_instance_status_build_spawning(self):
self._test_instance_status_not_build_active('BUILD(SPAWNING)')
def test_instance_status_hard_reboot(self):
self._test_instance_status_not_build_active('HARD_REBOOT')