commit 8606dd8fe5cf5eabd7056edee071449574b6f15c
author Jenkins <jenkins@review.openstack.org> Mon May 19 12:14:09 2014 +0000
committer Gerrit Code Review <review@openstack.org> Mon May 19 12:14:09 2014 +0000
tree fe4e6639218ecf98df7b08cb68df1172701c2d6a
parent 41e1cb5843a67996b606e245c5e6c4403fb61103
parent 7c8176e9795ba31781a50c88082966cd9644f8d2

Merge "Use fixed ips for lbaas pool members"

tempest/scenario/test_load_balancer_basic.py

diff --git a/tempest/scenario/test_load_balancer_basic.py b/tempest/scenario/test_load_balancer_basic.py
index d771aed..9152220 100644
--- a/tempest/scenario/test_load_balancer_basic.py
+++ b/tempest/scenario/test_load_balancer_basic.py
@@ -68,6 +68,7 @@
     def setUp(self):
         super(TestLoadBalancerBasic, self).setUp()
         self.server_ips = {}
+        self.server_fixed_ips = {}
         self._create_security_group()
 
     def cleanup_wrapper(self, resource):
@@ -119,6 +120,7 @@
             self.server_ips[server.id] = floating_ip.floating_ip_address
         else:
             self.server_ips[server.id] = server.networks[net['name']][0]
+        self.server_fixed_ips[server.id] = server.networks[net['name']][0]
         self.assertTrue(self.servers_keypairs)
         return server
 
@@ -231,8 +233,8 @@
         but with different ports to listen on.
         """
 
-        for server_id, ip in self.server_ips.iteritems():
-            if len(self.server_ips) == 1:
+        for server_id, ip in self.server_fixed_ips.iteritems():
+            if len(self.server_fixed_ips) == 1:
                 member1 = self._create_member(address=ip,
                                               protocol_port=self.port1,
                                               pool_id=self.pool.id)