commit ae0e73deae341fc1bf35db44ec53791851f6e917
author Yair Fried <yfried@redhat.com> Mon Nov 24 11:56:26 2014 +0200
committer Yair Fried <yfried@redhat.com> Mon Nov 24 17:16:25 2014 +0200
tree 1cdc4da20a0684720d691b0cfda41fa3ec66be74
parent 9981e16846fdfbae294e31d565e215ad4f0a70bd

Unified interface for ScenarioTest and NetworkScenarioTest

Allows scenarios to use similar methods for Floating IP and network checks
regardless of network implementation done by Nova/Neutron

Creates floating IP helpers for Nova clients

Moves connectivity check helpers to manager.ScenarioTest to be used with both
classes

Change-Id: Id6a9feb7bcab811a5b5d4985397c419c02b4269a

tempest/scenario/test_stamp_pattern.py

diff --git a/tempest/scenario/test_stamp_pattern.py b/tempest/scenario/test_stamp_pattern.py
index e30c824..ee2c737 100644
--- a/tempest/scenario/test_stamp_pattern.py
+++ b/tempest/scenario/test_stamp_pattern.py
@@ -71,17 +71,6 @@
     def _add_keypair(self):
         self.keypair = self.create_keypair()
 
-    def _create_floating_ip(self):
-        _, floating_ip = self.floating_ips_client.create_floating_ip()
-        self.addCleanup(self.delete_wrapper,
-                        self.floating_ips_client.delete_floating_ip,
-                        floating_ip['id'])
-        return floating_ip
-
-    def _add_floating_ip(self, server, floating_ip):
-        self.floating_ips_client.associate_floating_ip_to_server(
-            floating_ip['ip'], server['id'])
-
     def _ssh_to_server(self, server_or_ip):
         return self.get_remote_client(server_or_ip)
 
@@ -163,8 +152,7 @@
 
         # create and add floating IP to server1
         if CONF.compute.use_floatingip_for_ssh:
-            floating_ip_for_server = self._create_floating_ip()
-            self._add_floating_ip(server, floating_ip_for_server)
+            floating_ip_for_server = self.create_floating_ip(server)
             ip_for_server = floating_ip_for_server['ip']
         else:
             ip_for_server = server
@@ -189,9 +177,8 @@
 
         # create and add floating IP to server_from_snapshot
         if CONF.compute.use_floatingip_for_ssh:
-            floating_ip_for_snapshot = self._create_floating_ip()
-            self._add_floating_ip(server_from_snapshot,
-                                  floating_ip_for_snapshot)
+            floating_ip_for_snapshot = self.create_floating_ip(
+                server_from_snapshot)
             ip_for_snapshot = floating_ip_for_snapshot['ip']
         else:
             ip_for_snapshot = server_from_snapshot