From d6c3c6ac77bb78e1f7bad6f4d9ce499791fa1cf9 Mon Sep 17 00:00:00 2001 From: "jose.lausuch" Date: Wed, 9 Dec 2015 12:07:40 +0100 Subject: Create a common network for functest for all the tests Some installers provide a private network by default, if that is the case, it will not create another one. This is needed for Rally/Tempest to work. Removed from vPing test case, since it will use that network as well. Change-Id: Iaff8a9e18026fe5aba31e567a4a8d5faf4a0bb6b Signed-off-by: jose.lausuch --- testcases/vPing/CI/libraries/vPing.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'testcases/vPing/CI/libraries') diff --git a/testcases/vPing/CI/libraries/vPing.py b/testcases/vPing/CI/libraries/vPing.py index e9f8ad19c..e85948b22 100644 --- a/testcases/vPing/CI/libraries/vPing.py +++ b/testcases/vPing/CI/libraries/vPing.py @@ -89,17 +89,17 @@ FLAVOR = functest_yaml.get("vping").get("vm_flavor") # NEUTRON Private Network parameters -NEUTRON_PRIVATE_NET_NAME = functest_yaml.get("general"). \ - get("openstack").get("neutron_private_net_name") +NEUTRON_PRIVATE_NET_NAME = functest_yaml.get("vping"). \ + get("vping_private_net_name") -NEUTRON_PRIVATE_SUBNET_NAME = functest_yaml.get("general"). \ - get("openstack").get("neutron_private_subnet_name") +NEUTRON_PRIVATE_SUBNET_NAME = functest_yaml.get("vping"). \ + get("vping_private_subnet_name") -NEUTRON_PRIVATE_SUBNET_CIDR = functest_yaml.get("general"). \ - get("openstack").get("neutron_private_subnet_cidr") +NEUTRON_PRIVATE_SUBNET_CIDR = functest_yaml.get("vping"). \ + get("vping_private_subnet_cidr") -NEUTRON_ROUTER_NAME = functest_yaml.get("general"). \ - get("openstack").get("neutron_router_name") +NEUTRON_ROUTER_NAME = functest_yaml.get("vping"). \ + get("vping_router_name") def pMsg(value): -- cgit 1.2.3-korg