commit 6fa238035d2695871f32ff4bd9964d37d3a66677
author Pavlo Shchelokovskyy <pshchelokovskyy@mirantis.com> Mon Mar 23 11:22:35 2015 +0000
committer Pavlo Shchelokovskyy <pshchelokovskyy@mirantis.com> Mon Mar 23 14:02:46 2015 +0000
tree aa8e8e4d11c1afa2cf70db064e0c9ef9e719f9cb
parent 803f150aa1dea68e7a1c0f93b57018243d60d2bb

Add floating network config option

for integration tests.

Change-Id: I14c93a5ffb5e336258105869dcb5fbbe4d6c9e6f

common/config.py

diff --git a/common/config.py b/common/config.py
index f07ee86..ce7407a 100644
--- a/common/config.py
+++ b/common/config.py
@@ -65,6 +65,9 @@
     cfg.StrOpt('fixed_network_name',
                default='private',
                help="Visible fixed network name "),
+    cfg.StrOpt('floating_network_name',
+               default='public',
+               help="Visible floating network name "),
     cfg.StrOpt('boot_config_env',
                default=('heat_integrationtests/scenario/templates'
                         '/boot_config_none_env.yaml'),

scenario/test_neutron_loadbalancer.py

diff --git a/scenario/test_neutron_loadbalancer.py b/scenario/test_neutron_loadbalancer.py
index 3f49251..0591e5b 100644
--- a/scenario/test_neutron_loadbalancer.py
+++ b/scenario/test_neutron_loadbalancer.py
@@ -24,7 +24,7 @@
 
     def setUp(self):
         super(NeutronLoadBalancerTest, self).setUp()
-        self.public_net = self._get_network('public')
+        self.public_net = self._get_network(self.conf.floating_network_name)
         self.template_name = 'test_neutron_loadbalancer.yaml'
 
     def collect_responses(self, ip, expected_resp):