Merge "Fixing two tests when nova-net is enabled and run_validation = True"
diff --git a/tempest/api/compute/servers/test_server_personality.py b/tempest/api/compute/servers/test_server_personality.py
index 58d26d3..c948f8c 100644
--- a/tempest/api/compute/servers/test_server_personality.py
+++ b/tempest/api/compute/servers/test_server_personality.py
@@ -55,13 +55,14 @@
file_path = '/test.txt'
personality = [{'path': file_path,
'contents': base64.b64encode(file_contents)}]
- server = self.create_test_server(personality=personality,
- wait_until='ACTIVE',
- validatable=True)
+ created_server = self.create_test_server(personality=personality,
+ wait_until='ACTIVE',
+ validatable=True)
+ server = self.client.show_server(created_server['id'])['server']
if CONF.validation.run_validation:
linux_client = remote_client.RemoteClient(
self.get_server_ip(server),
- self.ssh_user, server['adminPass'],
+ self.ssh_user, created_server['adminPass'],
self.validation_resources['keypair']['private_key'])
self.assertEqual(file_contents,
linux_client.exec_command(
@@ -116,13 +117,14 @@
'path': path,
'contents': base64.b64encode(file_contents),
})
- server = self.create_test_server(personality=person,
- wait_until='ACTIVE',
- validatable=True)
+ created_server = self.create_test_server(personality=person,
+ wait_until='ACTIVE',
+ validatable=True)
+ server = self.client.show_server(created_server['id'])['server']
if CONF.validation.run_validation:
linux_client = remote_client.RemoteClient(
self.get_server_ip(server),
- self.ssh_user, server['adminPass'],
+ self.ssh_user, created_server['adminPass'],
self.validation_resources['keypair']['private_key'])
for i in person:
self.assertEqual(base64.b64decode(i['contents']),