openstack
/
tempest
Code Issues Proposed changes

Merge "Add server_id in exception ServerUnreachable"

This commit is contained in:
Jenkins 2016-07-28 01:31:36 +00:00 committed by Gerrit Code Review
parent de34d556e0 955f82b47f
commit 5ba5d648f6
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tempest/api/compute/base.py
View File

@ -359,7 +359,7 @@ class BaseV2ComputeTest(api_version_utils.BaseMicroversionTest,
for address in addresses:
if address['version'] == CONF.validation.ip_version_for_ssh:
return address['addr']
raise exceptions.ServerUnreachable()
raise exceptions.ServerUnreachable(server_id=server['id'])
else:
raise exceptions.InvalidConfiguration()

3
tempest/exceptions.py
View File

@ -63,7 +63,8 @@ class StackBuildErrorException(exceptions.TempestException):
class ServerUnreachable(exceptions.TempestException):
message = "The server is not reachable via the configured network"
message = ("Server %(server_id)s is not reachable via "
"the configured network")
# NOTE(andreaf) This exception is added here to facilitate the migration

2
tempest/scenario/manager.py
View File

@ -664,7 +664,7 @@ class ScenarioTest(tempest.test.BaseTestCase):
for address in addresses:
if address['version'] == CONF.validation.ip_version_for_ssh:
return address['addr']
raise exceptions.ServerUnreachable()
raise exceptions.ServerUnreachable(server_id=server['id'])
else:
raise exceptions.InvalidConfiguration()