commit ffe09dd61170bfccf7d60ef9c8eba2883ab6c148
author Joseph Lanoux <joseph.lanoux@hp.com> Wed Mar 18 16:45:33 2015 +0000
committer Joseph Lanoux <joseph.lanoux@hp.com> Wed Jul 15 09:29:06 2015 +0000
tree f0dcf8f5fb65ad55bcab8df6098de516e79c03ec
parent b5b118fb2035de76263aa155b79352057e4e7b8e

Migrate compute tests to the ssh-auth-strategy

Migrate the compute tests to the new ssh-auth-strategy format.

Partially implements: blueprint ssh-auth-strategy

Change-Id: I69ef7ba6e245d8d88f0a059115a0a232f0d46c31

tempest/api/compute/volumes/test_attach_volume.py

diff --git a/tempest/api/compute/volumes/test_attach_volume.py b/tempest/api/compute/volumes/test_attach_volume.py
index 580fb84..e7cd27d 100644
--- a/tempest/api/compute/volumes/test_attach_volume.py
+++ b/tempest/api/compute/volumes/test_attach_volume.py
@@ -43,6 +43,8 @@
 
     @classmethod
     def resource_setup(cls):
+        cls.set_validation_resources()
+
         super(AttachVolumeTestJSON, cls).resource_setup()
         cls.device = CONF.compute.volume_device_name
 
@@ -61,8 +63,10 @@
     def _create_and_attach(self):
         # Start a server and wait for it to become ready
         admin_pass = self.image_ssh_password
-        self.server = self.create_test_server(wait_until='ACTIVE',
-                                              adminPass=admin_pass)
+        self.server = self.create_test_server(
+            validatable=True,
+            wait_until='ACTIVE',
+            adminPass=admin_pass)
 
         # Record addresses so that we can ssh later
         self.server['addresses'] = (
@@ -99,9 +103,12 @@
         self.servers_client.start(self.server['id'])
         self.servers_client.wait_for_server_status(self.server['id'], 'ACTIVE')
 
-        linux_client = remote_client.RemoteClient(self.server,
-                                                  self.image_ssh_user,
-                                                  self.server['adminPass'])
+        linux_client = remote_client.RemoteClient(
+            self.get_server_ip(self.server),
+            self.image_ssh_user,
+            self.server['adminPass'],
+            self.validation_resources['keypair']['private_key'])
+
         partitions = linux_client.get_partitions()
         self.assertIn(self.device, partitions)
 
@@ -114,9 +121,12 @@
         self.servers_client.start(self.server['id'])
         self.servers_client.wait_for_server_status(self.server['id'], 'ACTIVE')
 
-        linux_client = remote_client.RemoteClient(self.server,
-                                                  self.image_ssh_user,
-                                                  self.server['adminPass'])
+        linux_client = remote_client.RemoteClient(
+            self.get_server_ip(self.server),
+            self.image_ssh_user,
+            self.server['adminPass'],
+            self.validation_resources['keypair']['private_key'])
+
         partitions = linux_client.get_partitions()
         self.assertNotIn(self.device, partitions)