commit 97962a381126edc18efe1ceca96749411fcb32a6
author Jenkins <jenkins@review.openstack.org> Wed Sep 02 22:07:23 2015 +0000
committer Gerrit Code Review <review@openstack.org> Wed Sep 02 22:07:23 2015 +0000
tree 457cadfb7982089355585d59f8e7bc0606e8b207
parent 1f60eaef0dd3000b55f32111dd9cb53c3d460893
parent 3ed090400f89e443e603c0ae5fd4608d04bb6cef

Merge "test_volume_boot_pattern: re-use create_floating_ip from base class"

tempest/scenario/test_volume_boot_pattern.py

diff --git a/tempest/scenario/test_volume_boot_pattern.py b/tempest/scenario/test_volume_boot_pattern.py
index 5a14a94..82f8b4c 100644
--- a/tempest/scenario/test_volume_boot_pattern.py
+++ b/tempest/scenario/test_volume_boot_pattern.py
@@ -100,14 +100,7 @@
 
     def _ssh_to_server(self, server, keypair):
         if CONF.compute.use_floatingip_for_ssh:
-            floating_ip = (self.floating_ips_client.create_floating_ip()
-                           ['floating_ip'])
-            self.addCleanup(self.delete_wrapper,
-                            self.floating_ips_client.delete_floating_ip,
-                            floating_ip['id'])
-            self.floating_ips_client.associate_floating_ip_to_server(
-                floating_ip['ip'], server['id'])
-            ip = floating_ip['ip']
+            ip = self.create_floating_ip(server)['ip']
         else:
             ip = server