openstack
/
trove-tempest-plugin
Code Issues Proposed changes

Support HEALTHY status 

Change-Id: Idb14339f8c84b45fa7ee47d95b41b4790ef5f564
This commit is contained in:
Lingxian Kong 2019-12-14 12:54:34 +13:00
parent 18e399b9e0
commit a5183e9312
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
trove_tempest_plugin/tests/base.py
View File

@ -246,25 +246,32 @@ class BaseTroveTest(test.BaseTestCase):
res = cls.client.create_resource("instances", body)
instance_id = res["instance"]["id"]
cls.addClassResourceCleanup(cls.wait_for_instance_status, instance_id,
need_delete=True, status="DELETED")
need_delete=True,
expected_status="DELETED")
return instance_id
@classmethod
def wait_for_instance_status(cls, id, status="ACTIVE", need_delete=False):
def wait_for_instance_status(cls, id,
expected_status=["HEALTHY", "ACTIVE"],
need_delete=False):
if type(expected_status) != list:
expected_status = [expected_status]
def _wait():
try:
res = cls.client.get_resource("instances", id)
cur_status = res["instance"]["status"]
except exceptions.NotFound:
if need_delete or status == "DELETED":
if need_delete or "DELETED" in expected_status:
LOG.info('Instance %s is deleted', id)
raise loopingcall.LoopingCallDone()
return
if res["instance"]["status"] == status:
LOG.info('Instance %s becomes %s', id, status)
if cur_status in expected_status:
LOG.info('Instance %s becomes %s', id, cur_status)
raise loopingcall.LoopingCallDone()
elif status != "ERROR" and res["instance"]["status"] == "ERROR":
elif "ERROR" not in expected_status and cur_status == "ERROR":
# If instance status goes to ERROR but is not expected, stop
# waiting
message = "Instance status is ERROR."
@ -283,7 +290,7 @@ class BaseTroveTest(test.BaseTestCase):
timeout=CONF.database.database_build_timeout).wait()
except loopingcall.LoopingCallTimeOut:
message = ("Instance %s is not in the expected status: %s" %
(id, status))
(id, expected_status))
caller = test_utils.find_test_caller()
if caller:
message = '({caller}) {message}'.format(caller=caller,