Generic Function to create a private network

This is to be used by all the tests which need a private network to work,
for example Tempest, Rally, vPing, ssh..

Added example for vPing and promise scripts.

Change-Id: I5d79e7b60b81b0f34230ea3ef2f3076697a1958c
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>

2 files changed, 23 insertions, 124 deletions

diff --git a/testcases/vPing/CI/libraries/vPing_ssh.py b/testcases/vPing/CI/libraries/vPing_ssh.py
index bd0b9b29..fa9770ba 100644
--- a/testcases/vPing/CI/libraries/vPing_ssh.py
+++ b/testcases/vPing/CI/libraries/vPing_ssh.py
@@ -78,13 +78,13 @@ FLAVOR = functest_yaml.get("vping").get("vm_flavor")
 
 # NEUTRON Private Network parameters
 
-NEUTRON_PRIVATE_NET_NAME = functest_yaml.get("vping").get(
+PRIVATE_NET_NAME = functest_yaml.get("vping").get(
     "vping_private_net_name")
-NEUTRON_PRIVATE_SUBNET_NAME = functest_yaml.get("vping").get(
+PRIVATE_SUBNET_NAME = functest_yaml.get("vping").get(
     "vping_private_subnet_name")
-NEUTRON_PRIVATE_SUBNET_CIDR = functest_yaml.get("vping").get(
+PRIVATE_SUBNET_CIDR = functest_yaml.get("vping").get(
     "vping_private_subnet_cidr")
-NEUTRON_ROUTER_NAME = functest_yaml.get("vping").get(
+ROUTER_NAME = functest_yaml.get("vping").get(
     "vping_router_name")
 
 SECGROUP_NAME = functest_yaml.get("vping").get("vping_sg_name")
@@ -136,63 +136,6 @@ def waitVmDeleted(nova, vm):
     return False
 
 
-def create_private_neutron_net(neutron):
-
-    # Check if the network already exists
-    network_id = openstack_utils.get_network_id(neutron,
-                                                NEUTRON_PRIVATE_NET_NAME)
-    subnet_id = openstack_utils.get_subnet_id(neutron,
-                                              NEUTRON_PRIVATE_SUBNET_NAME)
-    router_id = openstack_utils.get_router_id(neutron,
-                                              NEUTRON_ROUTER_NAME)
-
-    if network_id != '' and subnet_id != '' and router_id != '':
-        logger.info("Using existing network '%s'..."
-                    % NEUTRON_PRIVATE_NET_NAME)
-    else:
-        neutron.format = 'json'
-        logger.info('Creating neutron network %s...'
-                    % NEUTRON_PRIVATE_NET_NAME)
-        network_id = openstack_utils.create_neutron_net(
-            neutron, NEUTRON_PRIVATE_NET_NAME)
-
-        if not network_id:
-            return False
-        logger.debug("Network '%s' created successfully" % network_id)
-        logger.debug('Creating Subnet....')
-        subnet_id = openstack_utils.create_neutron_subnet(
-            neutron, NEUTRON_PRIVATE_SUBNET_NAME, NEUTRON_PRIVATE_SUBNET_CIDR,
-            network_id)
-        if not subnet_id:
-            return False
-        logger.debug("Subnet '%s' created successfully" % subnet_id)
-        logger.debug('Creating Router...')
-        router_id = openstack_utils.create_neutron_router(
-            neutron, NEUTRON_ROUTER_NAME)
-
-        if not router_id:
-            return False
-
-        logger.debug("Router '%s' created successfully" % router_id)
-        logger.debug('Adding router to subnet...')
-
-        if not openstack_utils.add_interface_router(neutron,
-                                                    router_id,
-                                                    subnet_id):
-            return False
-        logger.debug("Interface added successfully.")
-
-        logger.debug('Adding gateway to router...')
-        if not openstack_utils.add_gateway_router(neutron, router_id):
-            return False
-        logger.debug("Gateway added successfully.")
-
-    network_dic = {'net_id': network_id,
-                   'subnet_id': subnet_id,
-                   'router_id': router_id}
-    return network_dic
-
-
 def create_security_group(neutron_client):
     sg_id = openstack_utils.get_security_group_id(neutron_client,
                                                   SECGROUP_NAME)
@@ -291,7 +234,12 @@ def main():
         logger.debug("Image '%s' with ID=%s created successfully."
                      % (GLANCE_IMAGE_NAME, image_id))
 
-    network_dic = create_private_neutron_net(neutron_client)
+    network_dic = openstack_utils.create_network_full(logger,
+                                                      neutron_client,
+                                                      PRIVATE_NET_NAME,
+                                                      PRIVATE_SUBNET_NAME,
+                                                      ROUTER_NAME,
+                                                      PRIVATE_SUBNET_CIDR)
     if not network_dic:
         logger.error(
             "There has been a problem when creating the neutron network")
@@ -345,7 +293,7 @@ def main():
         logger.info("Instance '%s' is ACTIVE." % NAME_VM_1)
 
     # Retrieve IP of first VM
-    test_ip = vm1.networks.get(NEUTRON_PRIVATE_NET_NAME)[0]
+    test_ip = vm1.networks.get(PRIVATE_NET_NAME)[0]
     logger.debug("Instance '%s' got private ip '%s'." % (NAME_VM_1, test_ip))
 
     logger.info("Adding '%s' to security group '%s'..."
@@ -401,7 +349,7 @@ def main():
     nolease = False
     got_ip = False
     discover_count = 0
-    cidr_first_octet = NEUTRON_PRIVATE_SUBNET_CIDR.split('.')[0]
+    cidr_first_octet = PRIVATE_SUBNET_CIDR.split('.')[0]
     while timeout > 0:
         try:
             ssh.connect(floatip, username=username,
diff --git a/testcases/vPing/CI/libraries/vPing_userdata.py b/testcases/vPing/CI/libraries/vPing_userdata.py
index 473c1f82..2b296314 100644
--- a/testcases/vPing/CI/libraries/vPing_userdata.py
+++ b/testcases/vPing/CI/libraries/vPing_userdata.py
@@ -75,13 +75,13 @@ FLAVOR = functest_yaml.get("vping").get("vm_flavor")
 
 # NEUTRON Private Network parameters
 
-NEUTRON_PRIVATE_NET_NAME = functest_yaml.get("vping").get(
+PRIVATE_NET_NAME = functest_yaml.get("vping").get(
     "vping_private_net_name")
-NEUTRON_PRIVATE_SUBNET_NAME = functest_yaml.get("vping").get(
+PRIVATE_SUBNET_NAME = functest_yaml.get("vping").get(
     "vping_private_subnet_name")
-NEUTRON_PRIVATE_SUBNET_CIDR = functest_yaml.get("vping").get(
+PRIVATE_SUBNET_CIDR = functest_yaml.get("vping").get(
     "vping_private_subnet_cidr")
-NEUTRON_ROUTER_NAME = functest_yaml.get("vping").get("vping_router_name")
+ROUTER_NAME = functest_yaml.get("vping").get("vping_router_name")
 
 SECGROUP_NAME = functest_yaml.get("vping").get("vping_sg_name")
 SECGROUP_DESCR = functest_yaml.get("vping").get("vping_sg_descr")
@@ -132,60 +132,6 @@ def waitVmDeleted(nova, vm):
     return False
 
 
-def create_private_neutron_net(neutron):
-
-    # Check if the network already exists
-    network_id = openstack_utils.get_network_id(neutron,
-                                                NEUTRON_PRIVATE_NET_NAME)
-    subnet_id = openstack_utils.get_subnet_id(neutron,
-                                              NEUTRON_PRIVATE_SUBNET_NAME)
-    router_id = openstack_utils.get_router_id(neutron,
-                                              NEUTRON_ROUTER_NAME)
-
-    if network_id != '' and subnet_id != '' and router_id != '':
-        logger.info("Using existing network '%s'.." % NEUTRON_PRIVATE_NET_NAME)
-    else:
-        neutron.format = 'json'
-        logger.info('Creating neutron network %s..' % NEUTRON_PRIVATE_NET_NAME)
-        network_id = openstack_utils.create_neutron_net(
-            neutron, NEUTRON_PRIVATE_NET_NAME)
-
-        if not network_id:
-            return False
-        logger.debug("Network '%s' created successfully" % network_id)
-        logger.debug('Creating Subnet....')
-        subnet_id = openstack_utils.create_neutron_subnet(
-            neutron, NEUTRON_PRIVATE_SUBNET_NAME, NEUTRON_PRIVATE_SUBNET_CIDR,
-            network_id)
-        if not subnet_id:
-            return False
-        logger.debug("Subnet '%s' created successfully" % subnet_id)
-        logger.debug('Creating Router...')
-        router_id = openstack_utils.create_neutron_router(
-            neutron, NEUTRON_ROUTER_NAME)
-
-        if not router_id:
-            return False
-
-        logger.debug("Router '%s' created successfully" % router_id)
-        logger.debug('Adding router to subnet...')
-
-        if not openstack_utils.add_interface_router(neutron, router_id,
-                                                    subnet_id):
-            return False
-        logger.debug("Interface added successfully.")
-
-        logger.debug('Adding gateway to router...')
-        if not openstack_utils.add_gateway_router(neutron, router_id):
-            return False
-        logger.debug("Gateway added successfully.")
-
-    network_dic = {'net_id': network_id,
-                   'subnet_id': subnet_id,
-                   'router_id': router_id}
-    return network_dic
-
-
 def create_security_group(neutron_client):
     sg_id = openstack_utils.get_security_group_id(neutron_client,
                                                   SECGROUP_NAME)
@@ -286,7 +232,12 @@ def main():
         logger.debug("Image '%s' with ID=%s created successfully."
                      % (GLANCE_IMAGE_NAME, image_id))
 
-    network_dic = create_private_neutron_net(neutron_client)
+    network_dic = openstack_utils.create_network_full(logger,
+                                                      neutron_client,
+                                                      PRIVATE_NET_NAME,
+                                                      PRIVATE_SUBNET_NAME,
+                                                      ROUTER_NAME,
+                                                      PRIVATE_SUBNET_CIDR)
     if not network_dic:
         logger.error(
             "There has been a problem when creating the neutron network")
@@ -346,7 +297,7 @@ def main():
         logger.info("Instance '%s' is ACTIVE." % NAME_VM_1)
 
     # Retrieve IP of first VM
-    test_ip = vm1.networks.get(NEUTRON_PRIVATE_NET_NAME)[0]
+    test_ip = vm1.networks.get(PRIVATE_NET_NAME)[0]
     logger.debug("Instance '%s' got %s" % (NAME_VM_1, test_ip))
 
     # boot VM 2