commit e317b0b84080a8afcb15311d9b86a89753306cde
author Zuul <zuul@review.openstack.org> Wed May 30 03:51:58 2018 +0000
committer Gerrit Code Review <review@openstack.org> Wed May 30 03:51:58 2018 +0000
tree d3f35073938ba9b4c9154c04e8130971b60b748f
parent 33b8bce92c708dc9b3f97c6c172473d5f41ac2b8
parent a77c7d6eab1b763631bec8c66408ca7c65315f31

Merge "Improve use of RemoteClient in device tagging test"

tempest/api/compute/servers/test_device_tagging.py

diff --git a/tempest/api/compute/servers/test_device_tagging.py b/tempest/api/compute/servers/test_device_tagging.py
index b0d527c..1213a04 100644
--- a/tempest/api/compute/servers/test_device_tagging.py
+++ b/tempest/api/compute/servers/test_device_tagging.py
@@ -134,7 +134,6 @@
         self.addCleanup(self.ports_client.delete_port, self.port2['id'])
 
         # Create server
-        admin_pass = data_utils.rand_password()
         config_drive_enabled = CONF.compute_feature_enabled.config_drive
         validation_resources = self.get_test_validation_resources(
             self.os_primary)
@@ -144,7 +143,6 @@
             wait_until='ACTIVE',
             validation_resources=validation_resources,
             config_drive=config_drive_enabled,
-            adminPass=admin_pass,
             name=data_utils.rand_name('device-tagging-server'),
             networks=[
                 # Validation network for ssh
@@ -212,8 +210,7 @@
         self.ssh_client = remote_client.RemoteClient(
             self.get_server_ip(server, validation_resources),
             CONF.validation.image_ssh_user,
-            admin_pass,
-            validation_resources['keypair']['private_key'],
+            pkey=validation_resources['keypair']['private_key'],
             server=server,
             servers_client=self.servers_client)