openstack/deb-mistral
Code Issues Proposed changes

Merge "Fix SSHActionsTestsV2 failure"

Browse Source
This commit is contained in:
Jenkins 2016-06-30 09:19:03 +00:00 committed by Gerrit Code Review
commit 70944e5d82
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mistral_tempest_tests/tests/base.py
View File

@ -15,7 +15,6 @@
import os import os
import mock import mock
from tempest import clients
from tempest import config from tempest import config
from tempest import test as test from tempest import test as test
@ -75,12 +74,6 @@ class TestCaseAdvanced(TestCase):
def resource_setup(cls): def resource_setup(cls):
super(TestCaseAdvanced, cls).resource_setup() super(TestCaseAdvanced, cls).resource_setup()
cls.server_client = clients.ServersClient(
cls.mgr.auth_provider,
"compute",
region=CONF.identity.region
)
cls.image_ref = CONF.compute.image_ref cls.image_ref = CONF.compute.image_ref
cls.flavor_ref = CONF.compute.flavor_ref cls.flavor_ref = CONF.compute.flavor_ref

14
mistral_tempest_tests/tests/scenario/engine/actions/v2/test_ssh_actions.py
View File

@ -64,7 +64,7 @@ class SSHActionsTestsV2(base.TestCaseAdvanced):
@classmethod @classmethod
def _create_server(cls, server_name, **kwargs): def _create_server(cls, server_name, **kwargs):
return cls.server_client.create_server( return cls.mgr.servers_client.create_server(
name=server_name, name=server_name,
imageRef=CONF.compute.image_ref, imageRef=CONF.compute.image_ref,
flavorRef=CONF.compute.flavor_ref, flavorRef=CONF.compute.flavor_ref,
@ -126,7 +126,7 @@ class SSHActionsTestsV2(base.TestCaseAdvanced):
LOG.info("Waiting server [id=%s]..." % server_id) LOG.info("Waiting server [id=%s]..." % server_id)
while seconds_remain > 0: while seconds_remain > 0:
server_info = cls.server_client.show_server(server_id) server_info = cls.mgr.servers_client.show_server(server_id)
if server_info['server']['status'] == 'ACTIVE': if server_info['server']['status'] == 'ACTIVE':
return return
@ -145,7 +145,7 @@ class SSHActionsTestsV2(base.TestCaseAdvanced):
while seconds_remain > 0: while seconds_remain > 0:
try: try:
cls.server_client.show_server(server_id) cls.mgr.servers_client.show_server(server_id)
seconds_remain -= delay seconds_remain -= delay
time.sleep(delay) time.sleep(delay)
except exceptions.NotFound: except exceptions.NotFound:
@ -214,11 +214,11 @@ class SSHActionsTestsV2(base.TestCaseAdvanced):
cls._wait_until_server_up(cls.public_vm_ip) cls._wait_until_server_up(cls.public_vm_ip)
# Update servers info. # Update servers info.
cls.public_vm = cls.server_client.show_server( cls.public_vm = cls.mgr.servers_client.show_server(
cls.public_vm['id'] cls.public_vm['id']
).get('server') ).get('server')
cls.guest_vm = cls.server_client.show_server( cls.guest_vm = cls.mgr.servers_client.show_server(
cls.guest_vm['id'] cls.guest_vm['id']
).get('server') ).get('server')
@ -230,8 +230,8 @@ class SSHActionsTestsV2(base.TestCaseAdvanced):
cls.public_vm['id'] cls.public_vm['id']
) )
cls.server_client.delete_server(cls.public_vm['id']) cls.mgr.servers_client.delete_server(cls.public_vm['id'])
cls.server_client.delete_server(cls.guest_vm['id']) cls.mgr.servers_client.delete_server(cls.guest_vm['id'])
cls._wait_until_server_delete(cls.public_vm['id']) cls._wait_until_server_delete(cls.public_vm['id'])
cls._wait_until_server_delete(cls.guest_vm['id']) cls._wait_until_server_delete(cls.guest_vm['id'])