aboutsummaryrefslogtreecommitdiffstats
path: root/testcases/vPing/CI/libraries/vPing_ssh.py
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2016-02-16 22:54:06 +0100
committerjose.lausuch <jose.lausuch@ericsson.com>2016-02-16 23:48:44 +0100
commit81892929f7fc0949b08eb79c93583658a2b87c50 (patch)
tree06b499c8b7b9452419e721721dee2a7719ede5f8 /testcases/vPing/CI/libraries/vPing_ssh.py
parent12c1b110e91b2c062b378561f3fb271fe0626aec (diff)
Create vPing_userdata instances with dynamic ports created by nova/neutron
Change-Id: I1808763f6ccf1ac90b8a696c48ecdfba03d782fb Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
Diffstat (limited to 'testcases/vPing/CI/libraries/vPing_ssh.py')
-rw-r--r--testcases/vPing/CI/libraries/vPing_ssh.py13
1 files changed, 5 insertions, 8 deletions
diff --git a/testcases/vPing/CI/libraries/vPing_ssh.py b/testcases/vPing/CI/libraries/vPing_ssh.py
index 369e6a1b6..85b5abad6 100644
--- a/testcases/vPing/CI/libraries/vPing_ssh.py
+++ b/testcases/vPing/CI/libraries/vPing_ssh.py
@@ -98,18 +98,18 @@ FLAVOR = functest_yaml.get("vping").get("vm_flavor")
NEUTRON_PRIVATE_NET_NAME = functest_yaml.get("vping"). \
get("vping_private_net_name")
-
NEUTRON_PRIVATE_SUBNET_NAME = functest_yaml.get("vping"). \
get("vping_private_subnet_name")
-
NEUTRON_PRIVATE_SUBNET_CIDR = functest_yaml.get("vping"). \
get("vping_private_subnet_cidr")
-
NEUTRON_ROUTER_NAME = functest_yaml.get("vping"). \
get("vping_router_name")
-SECGROUP_NAME = "vPing-sg"
-SECGROUP_DESCR = "Security group for vPing test case"
+SECGROUP_NAME = functest_yaml.get("vping"). \
+ get("vping_sg_name")
+SECGROUP_DESCR = functest_yaml.get("vping"). \
+ get("vping_sg_descr")
+
def pMsg(value):
@@ -372,8 +372,6 @@ def main():
network_dic = create_private_neutron_net(neutron_client)
-
-
if not network_dic:
logger.error(
"There has been a problem when creating the neutron network")
@@ -394,7 +392,6 @@ def main():
return(EXIT_CODE)
# Deleting instances if they exist
-
servers = nova_client.servers.list()
for server in servers:
if server.name == NAME_VM_1 or server.name == NAME_VM_2: