Make sdnvpn a package

- Clean up the test/functest folder and move things to lib/ & artifacts/
- Add a new top level folder for the sdnvpn python code

Change-Id: I5fdc7fa5475fb800f488a17d3481158c9c4f84e1
Signed-off-by: Romanos Skiadas <rski@intracom-telecom.com>

11 files changed, 1153 insertions, 0 deletions

diff --git a/sdnvpn/test/functest/README.md b/sdnvpn/test/functest/README.md
new file mode 100644
index 0000000..62e55d2
--- /dev/null
+++ b/sdnvpn/test/functest/README.md
@@ -0,0 +1,5 @@
+The functest directory contains the test cases implementation to be run inside the 
+Functest framework.
+
+The definition of the test cases is explained in the project Wiki page: 
+https://wiki.opnfv.org/display/sdnvpn/main
diff --git a/sdnvpn/test/functest/__init__.py b/sdnvpn/test/functest/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/sdnvpn/test/functest/__init__.py
diff --git a/sdnvpn/test/functest/config.yaml b/sdnvpn/test/functest/config.yaml
new file mode 100644
index 0000000..ccd5db7
--- /dev/null
+++ b/sdnvpn/test/functest/config.yaml
@@ -0,0 +1,122 @@
+defaults:
+  flavor: m1.tiny # adapt to your environment
+
+testcases:
+  tempest:
+      enabled: true
+      description: Neutron BGPVPN tests in tempest
+      success_criteria: 100 # all the subtests must pass
+      testname_db: functest_tempest # declared name in the test api
+      # http://testresults.opnfv.org/test/api/v1/projects/sdnvpn/cases
+
+  testcase_1:
+      enabled: true
+      description: VPN provides connectivity between subnets
+      success_criteria: 75 # we let fail 25% of the subtests
+      testname_db: functest_testcase_1
+      instance_1_name: sdnvpn-1-1
+      instance_2_name: sdnvpn-1-2
+      instance_3_name: sdnvpn-1-3
+      instance_4_name: sdnvpn-1-4
+      instance_5_name: sdnvpn-1-5
+      image_name: sdnvpn-image
+      net_1_name: sdnvpn-1-1-net
+      subnet_1_name: sdnvpn-1-1-subnet
+      subnet_1_cidr: 10.10.10.0/24
+      router_1_name: sdnvpn-1-1-router
+      net_2_name: sdnvpn-1-2-net
+      subnet_2_name: sdnvpn-1-2-subnet
+      subnet_2_cidr: 10.10.11.0/24
+      router_2_name: sdnvpn-1-2-router
+      secgroup_name: sdnvpn-sg
+      secgroup_descr: Security group for SDNVPN test cases
+      targets1: '88:88'
+      targets2: '55:55'
+      route_distinguishers: '11:11'
+
+  testcase_2:
+      enabled: true
+      description: Tenant separation
+      success_criteria: 100 # all the subtests must pass
+      testname_db: functest_testcase_2
+      instance_1_name: sdnvpn-2-1
+      instance_2_name: sdnvpn-2-2
+      instance_3_name: sdnvpn-2-3
+      instance_4_name: sdnvpn-2-4
+      instance_5_name: sdnvpn-2-5
+      instance_1_ip: 10.10.10.11
+      instance_2_ip: 10.10.10.12
+      instance_3_ip: 10.10.11.13
+      instance_4_ip: 10.10.10.12
+      instance_5_ip: 10.10.11.13
+      image_name: sdnvpn-image
+      net_1_name: sdnvpn-2-1-net
+      subnet_1a_name: sdnvpn-2-1a-subnet
+      subnet_1a_cidr: 10.10.10.0/24
+      subnet_1b_name: sdnvpn-2-1b-subnet
+      subnet_1b_cidr: 10.10.11.0/24
+      router_1_name: sdnvpn-2-1-router
+      net_2_name: sdnvpn-2-2-net
+      subnet_2a_name: sdnvpn-2-2a-subnet
+      subnet_2a_cidr: 10.10.11.0/24
+      subnet_2b_name: sdnvpn-2-2b-subnet
+      subnet_2b_cidr: 10.10.10.0/24
+      router_2_name: sdnvpn-2-2-router
+      secgroup_name: sdnvpn-sg
+      secgroup_descr: Security group for SDNVPN test cases
+      targets1: '88:88'
+      targets2: '55:55'
+      route_distinguishers1: '111:111'
+      route_distinguishers2: '222:222'
+
+  testcase_3:
+      enabled: false
+      description: Data center gateway integration
+      success_criteria: 100 # all the subtests must pass
+      testname_db: functest_testcase_3
+
+  testcase_4:
+      enabled: true
+      description: VPN provides connectivity between subnets using router association
+      success_criteria: 75 # we let fail 25% of the subtests
+      testname_db: functest_testcase_4
+      instance_1_name: sdnvpn-4-1
+      instance_2_name: sdnvpn-4-2
+      instance_3_name: sdnvpn-4-3
+      instance_4_name: sdnvpn-4-4
+      instance_5_name: sdnvpn-4-5
+      image_name: sdnvpn-image
+      net_1_name: sdnvpn-4-1-net
+      subnet_1_name: sdnvpn-4-1-subnet
+      subnet_1_cidr: 10.10.10.0/24
+      router_1_name: sdnvpn-4-1-router
+      net_2_name: sdnvpn-4-2-net
+      subnet_2_name: sdnvpn-4-2-subnet
+      subnet_2_cidr: 10.10.11.0/24
+      router_2_name: sdnvpn-4-2-router
+      secgroup_name: sdnvpn-sg
+      secgroup_descr: Security group for SDNVPN test cases
+      targets1: '88:88'
+      targets2: '55:55'
+      route_distinguishers: '12:12'
+
+  testcase_7:
+      enabled: false
+      description: Network associate VPNs with routers attached (ODL Bug 6962)
+      success_criteria: 100
+      testname_db: functest_testcase_7
+      image_name: sdnvpn-image
+      instance_1_name: sdnvpn-7-1
+      instance_2_name: sdnvpn-7-2
+      net_1_name: sdnvpn-7-1
+      subnet_1_name: sdnvpn-7-1-subnet
+      subnet_1_cidr: 10.10.10.0/24
+      router_1_name: sdnvpn-7-1-router
+      net_2_name: sdnvpn-7-2
+      subnet_2_name: sdnvpn-7-2-subnet
+      subnet_2_cidr: 10.10.20.0/24
+      router_2_name: sdnvpn-7-2-router
+      secgroup_name: sdnvpn-sg
+      secgroup_descr: Security group for SDNVPN test cases
+      targets: '77:77'
+      route_distinguishers: '11:11'
diff --git a/sdnvpn/test/functest/run_tests.py b/sdnvpn/test/functest/run_tests.py
new file mode 100644
index 0000000..15fe1d0
--- /dev/null
+++ b/sdnvpn/test/functest/run_tests.py
@@ -0,0 +1,87 @@
+#!/bin/python
+#
+# Copyright (c) 2015 All rights reserved
+# This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+
+import argparse
+import importlib
+import sys
+import time
+import yaml
+
+import functest.utils.functest_logger as ft_logger
+import functest.utils.functest_utils as ft_utils
+from sdnvpn.lib import config as sdnvpn_config
+
+
+parser = argparse.ArgumentParser()
+parser.add_argument("-r", "--report",
+                    help="Create json result file",
+                    action="store_true")
+args = parser.parse_args()
+
+TEST_DB_URL = ft_utils.get_functest_config('results.test_db_url')
+logger = ft_logger.Logger("sdnvpn-run-tests").getLogger()
+
+COMMON_CONFIG = sdnvpn_config.CommonConfig()
+
+
+def push_results(testname, start_time, end_time, criteria, details):
+    logger.info("Push testcase '%s' results into the DB...\n" % testname)
+    ft_utils.push_results_to_db("sdnvpn",
+                                testname,
+                                start_time,
+                                end_time,
+                                criteria,
+                                details)
+
+
+def main():
+
+    with open(COMMON_CONFIG.config_file) as f:
+        config_yaml = yaml.safe_load(f)
+
+    testcases = config_yaml.get("testcases")
+    overall_status = "PASS"
+    for testcase in testcases:
+        if testcases[testcase]['enabled']:
+            test_name = testcase
+            test_descr = testcases[testcase]['description']
+            test_name_db = testcases[testcase]['testname_db']
+            title = ("Running '%s - %s'" %
+                     (test_name, test_descr))
+            logger.info(title)
+            logger.info("%s\n" % ("=" * len(title)))
+            t = importlib.import_module(testcase, package=None)
+            start_time = time.time()
+            result = t.main()
+            end_time = time.time()
+            if result < 0:
+                status = "FAIL"
+                overall_status = "FAIL"
+            else:
+                status = result.get("status")
+                details = result.get("details")
+                logger.info("Results of test case '%s - %s':\n%s\n" %
+                            (test_name, test_descr, result))
+
+                if status == "FAIL":
+                    overall_status = "FAIL"
+
+            if args.report:
+                push_results(
+                    test_name_db, start_time, end_time, status, details)
+
+    if overall_status == "FAIL":
+        sys.exit(-1)
+
+    sys.exit(0)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/sdnvpn/test/functest/tempest.py b/sdnvpn/test/functest/tempest.py
new file mode 100644
index 0000000..855ec1b
--- /dev/null
+++ b/sdnvpn/test/functest/tempest.py
@@ -0,0 +1,90 @@
+#!/usr/bin/python
+#
+# Copyright (c) 2015 All rights reserved
+# This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+#
+import ConfigParser
+import os
+import re
+import shutil
+
+import functest.utils.functest_logger as ft_logger
+import functest.utils.functest_utils as ft_utils
+from sdnvpn.lib import config as sdnvpn_config
+
+logger = ft_logger.Logger("sdnvpn-tempest").getLogger()
+
+COMMON_CONFIG = sdnvpn_config.CommonConfig()
+
+SUCCESS_CRITERIA = ft_utils.get_parameter_from_yaml(
+    "testcases.testcase_1.succes_criteria", COMMON_CONFIG.config_file)
+
+
+def main():
+    src_tempest_dir = ft_utils.get_deployment_dir()
+    if not src_tempest_dir:
+        logger.error("Rally deployment not found.")
+        exit(-1)
+
+    src_tempest_conf = src_tempest_dir + '/tempest.conf'
+    bgpvpn_tempest_conf = src_tempest_dir + '/bgpvpn_tempest.conf'
+
+    if not os.path.isfile(src_tempest_conf):
+        logger.error("tempest.conf not found in %s." % src_tempest_conf)
+        exit(-1)
+    shutil.copy(src_tempest_conf, bgpvpn_tempest_conf)
+
+    logger.info("Copying tempest.conf to %s." % bgpvpn_tempest_conf)
+    config = ConfigParser.RawConfigParser()
+    config.read(bgpvpn_tempest_conf)
+    config.set('service_available', 'bgpvpn', 'True')
+    logger.debug("Updating %s with bgpvpn=True" % bgpvpn_tempest_conf)
+    with open(bgpvpn_tempest_conf, 'wb') as tempest_conf:
+        config.write(tempest_conf)
+
+    cmd_line = (src_tempest_dir +
+                "/run_tempest.sh -C %s -t -N -- "
+                "networking_bgpvpn_tempest" % bgpvpn_tempest_conf)
+    logger.info("Executing: %s" % cmd_line)
+    cmd = os.popen(cmd_line)
+    output = cmd.read()
+    logger.debug(output)
+    # Results parsing
+    error_logs = ""
+    duration = 0
+    failed = 0
+    try:
+        # Look For errors
+        error_logs = ""
+        for match in re.findall('(.*?)[. ]*FAILED', output):
+            error_logs += match
+        # look for duration
+        m = re.search('tests in(.*)sec', output)
+        duration = m.group(1)
+        # Look for num tests run
+        m = re.search('Ran:(.*)tests', output)
+        num_tests = m.group(1)
+        # Look for tests failed
+        m = re.search('Failed:(.*)', output)
+        failed = m.group(1)
+        # Look for name of the tests
+        testcases = re.findall("\{0\} (.*)", output)
+
+        results = {"duration": duration,
+                   "num_tests": num_tests, "failed": failed,
+                   "tests": testcases}
+        status = "PASS"
+        if 100 - (100 * int(failed) / int(num_tests)) < int(SUCCESS_CRITERIA):
+            status = "FAILED"
+        return {"status": status, "details": results}
+    except:
+        logger.error("Problem when parsing the results.")
+
+
+if __name__ == '__main__':
+    main()
diff --git a/sdnvpn/test/functest/tempest_blacklist.txt b/sdnvpn/test/functest/tempest_blacklist.txt
new file mode 100644
index 0000000..2e7ac55
--- /dev/null
+++ b/sdnvpn/test/functest/tempest_blacklist.txt
@@ -0,0 +1,9 @@
+tempest.api.compute.servers.test_create_server.ServersTestJSON.test_list_servers[id-9a438d88-10c6-4bcd-8b5b-5b6e25e1346f,smoke]
+tempest.api.compute.servers.test_create_server.ServersTestJSON.test_verify_server_details[id-5de47127-9977-400a-936f-abcfbec1218f,smoke]
+tempest.api.compute.servers.test_create_server.ServersTestManualDisk.test_list_servers[id-9a438d88-10c6-4bcd-8b5b-5b6e25e1346f,smoke]
+tempest.api.compute.servers.test_create_server.ServersTestManualDisk.test_verify_server_details[id-5de47127-9977-400a-936f-abcfbec1218f,smoke]
+tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON.test_reboot_server_hard[id-2cb1baf6-ac8d-4429-bf0d-ba8a0ba53e32,smoke]
+tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops[compute,id-f323b3ba-82f8-4db7-8ea6-6a895869ec49,network,smoke]
+tempest.scenario.test_server_basic_ops.TestServerBasicOps.test_server_basic_ops[compute,id-7fff3fb3-91d8-4fd0-bd7d-0204f1f180ba,network,smoke]
+tempest.scenario.test_volume_boot_pattern.TestVolumeBootPattern.test_volume_boot_pattern[compute,id-557cd2c2-4eb8-4dce-98be-f86765ff311b,image,smoke,volume]
+tempest.scenario.test_volume_boot_pattern.TestVolumeBootPatternV2.test_volume_boot_pattern[compute,id-557cd2c2-4eb8-4dce-98be-f86765ff311b,image,smoke,volume]
\ No newline at end of file
diff --git a/sdnvpn/test/functest/testcase_1.py b/sdnvpn/test/functest/testcase_1.py
new file mode 100644
index 0000000..e1a7577
--- /dev/null
+++ b/sdnvpn/test/functest/testcase_1.py
@@ -0,0 +1,209 @@
+#!/usr/bin/python
+#
+# Copyright (c) 2015 All rights reserved
+# This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+
+import argparse
+from random import randint
+
+import functest.utils.functest_logger as ft_logger
+import functest.utils.openstack_utils as os_utils
+
+from sdnvpn.lib import utils as test_utils
+from sdnvpn.lib import config as sdnvpn_config
+from sdnvpn.lib.results import Results
+
+parser = argparse.ArgumentParser()
+
+parser.add_argument("-r", "--report",
+                    help="Create json result file",
+                    action="store_true")
+
+args = parser.parse_args()
+
+logger = ft_logger.Logger("sdnvpn-testcase-1").getLogger()
+
+COMMON_CONFIG = sdnvpn_config.CommonConfig()
+TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig('testcase_1')
+
+
+def main():
+    results = Results(COMMON_CONFIG.line_length)
+
+    results.add_to_summary(0, "=")
+    results.add_to_summary(2, "STATUS", "SUBTEST")
+    results.add_to_summary(0, "=")
+
+    nova_client = os_utils.get_nova_client()
+    neutron_client = os_utils.get_neutron_client()
+    glance_client = os_utils.get_glance_client()
+
+    image_id = os_utils.create_glance_image(glance_client,
+                                            TESTCASE_CONFIG.image_name,
+                                            COMMON_CONFIG.image_path,
+                                            disk=COMMON_CONFIG.image_format,
+                                            container="bare",
+                                            public=True)
+    network_1_id = test_utils.create_net(neutron_client,
+                                         TESTCASE_CONFIG.net_1_name)
+    test_utils.create_subnet(neutron_client,
+                             TESTCASE_CONFIG.subnet_1_name,
+                             TESTCASE_CONFIG.subnet_1_cidr,
+                             network_1_id)
+
+    network_2_id = test_utils.create_net(neutron_client,
+                                         TESTCASE_CONFIG.net_2_name)
+
+    test_utils.create_subnet(neutron_client,
+                             TESTCASE_CONFIG.subnet_2_name,
+                             TESTCASE_CONFIG.subnet_2_cidr,
+                             network_2_id)
+
+    sg_id = os_utils.create_security_group_full(neutron_client,
+                                                TESTCASE_CONFIG.secgroup_name,
+                                                TESTCASE_CONFIG.secgroup_descr)
+
+    compute_nodes = test_utils.assert_and_get_compute_nodes(nova_client)
+
+    av_zone_1 = "nova:" + compute_nodes[0]
+    av_zone_2 = "nova:" + compute_nodes[1]
+
+    # boot INTANCES
+    vm_2 = test_utils.create_instance(
+        nova_client,
+        TESTCASE_CONFIG.instance_2_name,
+        image_id,
+        network_1_id,
+        sg_id,
+        secgroup_name=TESTCASE_CONFIG.secgroup_name,
+        compute_node=av_zone_1)
+    vm_2_ip = vm_2.networks.itervalues().next()[0]
+
+    vm_3 = test_utils.create_instance(
+        nova_client,
+        TESTCASE_CONFIG.instance_3_name,
+        image_id,
+        network_1_id,
+        sg_id,
+        secgroup_name=TESTCASE_CONFIG.secgroup_name,
+        compute_node=av_zone_2)
+    vm_3_ip = vm_3.networks.itervalues().next()[0]
+
+    vm_5 = test_utils.create_instance(
+        nova_client,
+        TESTCASE_CONFIG.instance_5_name,
+        image_id,
+        network_2_id,
+        sg_id,
+        secgroup_name=TESTCASE_CONFIG.secgroup_name,
+        compute_node=av_zone_2)
+    vm_5_ip = vm_5.networks.itervalues().next()[0]
+
+    # We boot vm5 first because we need vm5_ip for vm4 userdata
+    u4 = test_utils.generate_ping_userdata([vm_5_ip])
+    vm_4 = test_utils.create_instance(
+        nova_client,
+        TESTCASE_CONFIG.instance_4_name,
+        image_id,
+        network_2_id,
+        sg_id,
+        secgroup_name=TESTCASE_CONFIG.secgroup_name,
+        compute_node=av_zone_1,
+        userdata=u4)
+    vm_4_ip = vm_4.networks.itervalues().next()[0]
+
+    # We boot VM1 at the end because we need to get the IPs first to generate
+    # the userdata
+    u1 = test_utils.generate_ping_userdata([vm_2_ip,
+                                            vm_3_ip,
+                                            vm_4_ip,
+                                            vm_5_ip])
+    vm_1 = test_utils.create_instance(
+        nova_client,
+        TESTCASE_CONFIG.instance_1_name,
+        image_id,
+        network_1_id,
+        sg_id,
+        secgroup_name=TESTCASE_CONFIG.secgroup_name,
+        compute_node=av_zone_1,
+        userdata=u1)
+
+    msg = ("Create VPN with eRT<>iRT")
+    results.record_action(msg)
+    vpn_name = "sdnvpn-" + str(randint(100000, 999999))
+    kwargs = {
+        "import_targets": TESTCASE_CONFIG.targets1,
+        "export_targets": TESTCASE_CONFIG.targets2,
+        "route_distinguishers": TESTCASE_CONFIG.route_distinguishers,
+        "name": vpn_name
+    }
+    bgpvpn = os_utils.create_bgpvpn(neutron_client, **kwargs)
+    bgpvpn_id = bgpvpn['bgpvpn']['id']
+    logger.debug("VPN created details: %s" % bgpvpn)
+
+    msg = ("Associate network '%s' to the VPN." % TESTCASE_CONFIG.net_1_name)
+    results.record_action(msg)
+    results.add_to_summary(0, "-")
+
+    os_utils.create_network_association(
+        neutron_client, bgpvpn_id, network_1_id)
+
+    # Wait for VMs to get ips.
+    instances_up = test_utils.wait_for_instances_up(vm_1, vm_2,
+                                                    vm_3, vm_4,
+                                                    vm_5)
+
+    if not instances_up:
+        logger.error("One or more instances is down")
+        # TODO: Handle this appropriately
+
+    results.get_ping_status(vm_1, vm_2, expected="PASS", timeout=200)
+    results.get_ping_status(vm_1, vm_3, expected="PASS", timeout=30)
+    results.get_ping_status(vm_1, vm_4, expected="FAIL", timeout=30)
+
+    msg = ("Associate network '%s' to the VPN." % TESTCASE_CONFIG.net_2_name)
+    results.add_to_summary(0, "-")
+    results.record_action(msg)
+    results.add_to_summary(0, "-")
+    os_utils.create_network_association(
+        neutron_client, bgpvpn_id, network_2_id)
+
+    test_utils.wait_for_bgp_net_assocs(neutron_client,
+                                       bgpvpn_id,
+                                       network_1_id,
+                                       network_2_id)
+
+    logger.info("Waiting for the VMs to connect to each other using the"
+                " updated network configuration")
+    test_utils.wait_before_subtest()
+
+    results.get_ping_status(vm_4, vm_5, expected="PASS", timeout=30)
+    results.get_ping_status(vm_1, vm_4, expected="FAIL", timeout=30)
+    results.get_ping_status(vm_1, vm_5, expected="FAIL", timeout=30)
+
+    msg = ("Update VPN with eRT=iRT ...")
+    results.add_to_summary(0, "-")
+    results.record_action(msg)
+    results.add_to_summary(0, "-")
+    kwargs = {"import_targets": TESTCASE_CONFIG.targets1,
+              "export_targets": TESTCASE_CONFIG.targets1,
+              "name": vpn_name}
+    bgpvpn = os_utils.update_bgpvpn(neutron_client, bgpvpn_id, **kwargs)
+
+    logger.info("Waiting for the VMs to connect to each other using the"
+                " updated network configuration")
+    test_utils.wait_before_subtest()
+
+    results.get_ping_status(vm_1, vm_4, expected="PASS", timeout=30)
+    results.get_ping_status(vm_1, vm_5, expected="PASS", timeout=30)
+
+    return results.compile_summary(TESTCASE_CONFIG.success_criteria)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/sdnvpn/test/functest/testcase_2.py b/sdnvpn/test/functest/testcase_2.py
new file mode 100644
index 0000000..0b4e5b4
--- /dev/null
+++ b/sdnvpn/test/functest/testcase_2.py
@@ -0,0 +1,250 @@
+#!/usr/bin/python
+#
+# Copyright (c) 2015 All rights reserved
+# This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+
+import argparse
+from random import randint
+import sys
+
+import functest.utils.functest_logger as ft_logger
+import functest.utils.openstack_utils as os_utils
+
+import sdnvpn.lib.utils as test_utils
+from sdnvpn.lib.results import Results
+import sdnvpn.lib.config as sdnvpn_config
+
+parser = argparse.ArgumentParser()
+
+parser.add_argument("-r", "--report",
+                    help="Create json result file",
+                    action="store_true")
+
+args = parser.parse_args()
+
+logger = ft_logger.Logger("sdnvpn-testcase-2").getLogger()
+
+COMMON_CONFIG = sdnvpn_config.CommonConfig()
+TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig('testcase_2')
+
+
+def main():
+    results = Results(COMMON_CONFIG.line_length)
+
+    results.add_to_summary(0, "=")
+    results.add_to_summary(2, "STATUS", "SUBTEST")
+    results.add_to_summary(0, "=")
+
+    nova_client = os_utils.get_nova_client()
+    neutron_client = os_utils.get_neutron_client()
+    glance_client = os_utils.get_glance_client()
+
+    logger.debug("Using private key %s injected to the VMs."
+                 % COMMON_CONFIG.keyfile_path)
+    keyfile = open(COMMON_CONFIG.keyfile_path, 'r')
+    key = keyfile.read()
+    keyfile.close()
+    files = {"/home/cirros/id_rsa": key}
+
+    image_id = os_utils.create_glance_image(glance_client,
+                                            TESTCASE_CONFIG.image_name,
+                                            COMMON_CONFIG.image_path,
+                                            disk=COMMON_CONFIG.image_format,
+                                            container="bare",
+                                            public=True)
+    network_1_id = test_utils.create_net(
+        neutron_client,
+        TESTCASE_CONFIG.net_1_name)
+    test_utils.create_subnet(
+        neutron_client,
+        TESTCASE_CONFIG.subnet_1a_name,
+        TESTCASE_CONFIG.subnet_1a_cidr,
+        network_1_id)
+    test_utils.create_subnet(
+        neutron_client,
+        TESTCASE_CONFIG.subnet_1b_name,
+        TESTCASE_CONFIG.subnet_1b_cidr,
+        network_1_id)
+
+    network_2_id = test_utils.create_net(
+        neutron_client,
+        TESTCASE_CONFIG.net_2_name)
+    test_utils.create_subnet(
+        neutron_client,
+        TESTCASE_CONFIG.subnet_2a_name,
+        TESTCASE_CONFIG.subnet_2a_cidr,
+        network_2_id)
+    test_utils.create_subnet(
+        neutron_client,
+        TESTCASE_CONFIG.subnet_2b_name,
+        TESTCASE_CONFIG.subnet_2b_cidr,
+        network_2_id)
+
+    sg_id = os_utils.create_security_group_full(neutron_client,
+                                                TESTCASE_CONFIG.secgroup_name,
+                                                TESTCASE_CONFIG.secgroup_descr)
+
+    compute_nodes = test_utils.assert_and_get_compute_nodes(nova_client)
+
+    av_zone_1 = "nova:" + compute_nodes[0]
+    av_zone_2 = "nova:" + compute_nodes[1]
+
+    # boot INTANCES
+    userdata_common = test_utils.generate_userdata_common()
+    vm_2 = test_utils.create_instance(
+        nova_client,
+        TESTCASE_CONFIG.instance_2_name,
+        image_id,
+        network_1_id,
+        sg_id,
+        fixed_ip=TESTCASE_CONFIG.instance_2_ip,
+        secgroup_name=TESTCASE_CONFIG.secgroup_name,
+        compute_node=av_zone_1,
+        userdata=userdata_common)
+
+    vm_3 = test_utils.create_instance(
+        nova_client,
+        TESTCASE_CONFIG.instance_3_name,
+        image_id,
+        network_1_id,
+        sg_id,
+        fixed_ip=TESTCASE_CONFIG.instance_3_ip,
+        secgroup_name=TESTCASE_CONFIG.secgroup_name,
+        compute_node=av_zone_2,
+        userdata=userdata_common)
+
+    vm_5 = test_utils.create_instance(
+        nova_client,
+        TESTCASE_CONFIG.instance_5_name,
+        image_id,
+        network_2_id,
+        sg_id,
+        fixed_ip=TESTCASE_CONFIG.instance_5_ip,
+        secgroup_name=TESTCASE_CONFIG.secgroup_name,
+        compute_node=av_zone_2,
+        userdata=userdata_common)
+
+    # We boot vm5 first because we need vm5_ip for vm4 userdata
+    u4 = test_utils.generate_userdata_with_ssh(
+        [TESTCASE_CONFIG.instance_1_ip,
+         TESTCASE_CONFIG.instance_3_ip,
+         TESTCASE_CONFIG.instance_5_ip])
+    vm_4 = test_utils.create_instance(
+        nova_client,
+        TESTCASE_CONFIG.instance_4_name,
+        image_id,
+        network_2_id,
+        sg_id,
+        fixed_ip=TESTCASE_CONFIG.instance_4_ip,
+        secgroup_name=TESTCASE_CONFIG.secgroup_name,
+        compute_node=av_zone_1,
+        userdata=u4,
+        files=files)
+
+    # We boot VM1 at the end because we need to get the IPs first to generate
+    # the userdata
+    u1 = test_utils.generate_userdata_with_ssh(
+        [TESTCASE_CONFIG.instance_2_ip,
+         TESTCASE_CONFIG.instance_3_ip,
+         TESTCASE_CONFIG.instance_4_ip,
+         TESTCASE_CONFIG.instance_5_ip])
+    vm_1 = test_utils.create_instance(
+        nova_client,
+        TESTCASE_CONFIG.instance_1_name,
+        image_id,
+        network_1_id,
+        sg_id,
+        fixed_ip=TESTCASE_CONFIG.instance_1_ip,
+        secgroup_name=TESTCASE_CONFIG.secgroup_name,
+        compute_node=av_zone_1,
+        userdata=u1,
+        files=files)
+
+    msg = ("Create VPN1 with eRT=iRT")
+    results.record_action(msg)
+    vpn1_name = "sdnvpn-1-" + str(randint(100000, 999999))
+    kwargs = {"import_targets": TESTCASE_CONFIG.targets2,
+              "export_targets": TESTCASE_CONFIG.targets2,
+              "route_targets": TESTCASE_CONFIG.targets2,
+              "route_distinguishers": TESTCASE_CONFIG.route_distinguishers1,
+              "name": vpn1_name}
+    bgpvpn1 = os_utils.create_bgpvpn(neutron_client, **kwargs)
+    bgpvpn1_id = bgpvpn1['bgpvpn']['id']
+    logger.debug("VPN1 created details: %s" % bgpvpn1)
+
+    msg = ("Associate network '%s' to the VPN." % TESTCASE_CONFIG.net_1_name)
+    results.record_action(msg)
+    results.add_to_summary(0, "-")
+
+    os_utils.create_network_association(
+        neutron_client, bgpvpn1_id, network_1_id)
+
+    # Wait for VMs to get ips.
+    instances_up = test_utils.wait_for_instances_up(vm_1, vm_2,
+                                                    vm_3, vm_4,
+                                                    vm_5)
+
+    if not instances_up:
+        logger.error("One or more instances is down")
+        sys.exit(-1)
+
+    logger.info("Waiting for the VMs to connect to each other using the"
+                " updated network configuration")
+    test_utils.wait_before_subtest()
+
+    # 10.10.10.12 should return sdnvpn-2 to sdnvpn-1
+    results.check_ssh_output(vm_1, vm_2,
+                             expected=TESTCASE_CONFIG.instance_2_name,
+                             timeout=200)
+    # 10.10.11.13 should return sdnvpn-3 to sdnvpn-1
+    results.check_ssh_output(vm_1, vm_3,
+                             expected=TESTCASE_CONFIG.instance_3_name,
+                             timeout=30)
+
+    results.add_to_summary(0, "-")
+    msg = ("Create VPN2 with eRT=iRT")
+    results.record_action(msg)
+    vpn2_name = "sdnvpn-2-" + str(randint(100000, 999999))
+    kwargs = {"import_targets": TESTCASE_CONFIG.targets1,
+              "export_targets": TESTCASE_CONFIG.targets1,
+              "route_targets": TESTCASE_CONFIG.targets1,
+              "route_distinguishers": TESTCASE_CONFIG.route_distinguishers2,
+              "name": vpn2_name}
+    bgpvpn2 = os_utils.create_bgpvpn(neutron_client, **kwargs)
+    bgpvpn2_id = bgpvpn2['bgpvpn']['id']
+    logger.debug("VPN created details: %s" % bgpvpn2)
+
+    msg = ("Associate network '%s' to the VPN2." % TESTCASE_CONFIG.net_2_name)
+    results.record_action(msg)
+    results.add_to_summary(0, "-")
+
+    os_utils.create_network_association(
+        neutron_client, bgpvpn2_id, network_2_id)
+
+    test_utils.wait_for_bgp_net_assoc(neutron_client, bgpvpn1_id, network_1_id)
+    test_utils.wait_for_bgp_net_assoc(neutron_client, bgpvpn2_id, network_2_id)
+
+    logger.info("Waiting for the VMs to connect to each other using the"
+                " updated network configuration")
+    test_utils.wait_before_subtest()
+
+    # 10.10.11.13 should return sdnvpn-5 to sdnvpn-4
+    results.check_ssh_output(vm_4, vm_5,
+                             expected=TESTCASE_CONFIG.instance_5_name,
+                             timeout=30)
+
+    # 10.10.10.11 should return "not reachable" to sdnvpn-4
+    results.check_ssh_output(vm_4, vm_1,
+                             expected="not reachable",
+                             timeout=30)
+
+    return results.compile_summary(TESTCASE_CONFIG.success_criteria)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/sdnvpn/test/functest/testcase_3.py b/sdnvpn/test/functest/testcase_3.py
new file mode 100644
index 0000000..5a8e9b0
--- /dev/null
+++ b/sdnvpn/test/functest/testcase_3.py
@@ -0,0 +1,17 @@
+#!/usr/bin/python
+#
+# Copyright (c) 2015 All rights reserved
+# This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+
+
+def main():
+    pass
+
+
+if __name__ == '__main__':
+    main()
diff --git a/sdnvpn/test/functest/testcase_4.py b/sdnvpn/test/functest/testcase_4.py
new file mode 100644
index 0000000..65ee2ee
--- /dev/null
+++ b/sdnvpn/test/functest/testcase_4.py
@@ -0,0 +1,210 @@
+#!/usr/bin/python
+#
+# Copyright (c) 2015 All rights reserved
+# This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+
+import argparse
+from random import randint
+
+import functest.utils.functest_logger as ft_logger
+import functest.utils.openstack_utils as os_utils
+
+from sdnvpn.lib import utils as test_utils
+from sdnvpn.lib import config as sdnvpn_config
+from sdnvpn.lib.results import Results
+
+parser = argparse.ArgumentParser()
+
+parser.add_argument("-r", "--report",
+                    help="Create json result file",
+                    action="store_true")
+
+args = parser.parse_args()
+
+logger = ft_logger.Logger("sdnvpn-testcase-4").getLogger()
+
+COMMON_CONFIG = sdnvpn_config.CommonConfig()
+TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig('testcase_4')
+
+
+def main():
+    results = Results(COMMON_CONFIG.line_length)
+
+    results.add_to_summary(0, "=")
+    results.add_to_summary(2, "STATUS", "SUBTEST")
+    results.add_to_summary(0, "=")
+
+    nova_client = os_utils.get_nova_client()
+    neutron_client = os_utils.get_neutron_client()
+    glance_client = os_utils.get_glance_client()
+
+    image_id = os_utils.create_glance_image(glance_client,
+                                            TESTCASE_CONFIG.image_name,
+                                            COMMON_CONFIG.image_path,
+                                            disk=COMMON_CONFIG.image_format,
+                                            container="bare",
+                                            public=True)
+    network_1_id, _, router_1_id = test_utils.create_network(
+        neutron_client,
+        TESTCASE_CONFIG.net_1_name,
+        TESTCASE_CONFIG.subnet_1_name,
+        TESTCASE_CONFIG.subnet_1_cidr,
+        TESTCASE_CONFIG.router_1_name)
+
+    network_2_id = test_utils.create_net(
+        neutron_client,
+        TESTCASE_CONFIG.net_2_name)
+    test_utils.create_subnet(neutron_client,
+                             TESTCASE_CONFIG.subnet_2_name,
+                             TESTCASE_CONFIG.subnet_2_cidr,
+                             network_2_id)
+
+    sg_id = os_utils.create_security_group_full(neutron_client,
+                                                TESTCASE_CONFIG.secgroup_name,
+                                                TESTCASE_CONFIG.secgroup_descr)
+
+    compute_nodes = test_utils.assert_and_get_compute_nodes(nova_client)
+
+    av_zone_1 = "nova:" + compute_nodes[0]
+    av_zone_2 = "nova:" + compute_nodes[1]
+
+    # boot INTANCES
+    vm_2 = test_utils.create_instance(
+        nova_client,
+        TESTCASE_CONFIG.instance_2_name,
+        image_id,
+        network_1_id,
+        sg_id,
+        secgroup_name=TESTCASE_CONFIG.secgroup_name,
+        compute_node=av_zone_1)
+    vm_2_ip = vm_2.networks.itervalues().next()[0]
+
+    vm_3 = test_utils.create_instance(
+        nova_client,
+        TESTCASE_CONFIG.instance_3_name,
+        image_id,
+        network_1_id,
+        sg_id,
+        secgroup_name=TESTCASE_CONFIG.secgroup_name,
+        compute_node=av_zone_2)
+    vm_3_ip = vm_3.networks.itervalues().next()[0]
+
+    vm_5 = test_utils.create_instance(
+        nova_client,
+        TESTCASE_CONFIG.instance_5_name,
+        image_id,
+        network_2_id,
+        sg_id,
+        secgroup_name=TESTCASE_CONFIG.secgroup_name,
+        compute_node=av_zone_2)
+    vm_5_ip = vm_5.networks.itervalues().next()[0]
+
+    # We boot vm5 first because we need vm5_ip for vm4 userdata
+    u4 = test_utils.generate_ping_userdata([vm_5_ip])
+    vm_4 = test_utils.create_instance(
+        nova_client,
+        TESTCASE_CONFIG.instance_4_name,
+        image_id,
+        network_2_id,
+        sg_id,
+        secgroup_name=TESTCASE_CONFIG.secgroup_name,
+        compute_node=av_zone_1,
+        userdata=u4)
+    vm_4_ip = vm_4.networks.itervalues().next()[0]
+
+    # We boot VM1 at the end because we need to get the IPs first to generate
+    # the userdata
+    u1 = test_utils.generate_ping_userdata([vm_2_ip,
+                                            vm_3_ip,
+                                            vm_4_ip,
+                                            vm_5_ip])
+    vm_1 = test_utils.create_instance(
+        nova_client,
+        TESTCASE_CONFIG.instance_1_name,
+        image_id,
+        network_1_id,
+        sg_id,
+        secgroup_name=TESTCASE_CONFIG.secgroup_name,
+        compute_node=av_zone_1,
+        userdata=u1)
+
+    msg = ("Create VPN with eRT<>iRT")
+    results.record_action(msg)
+    vpn_name = "sdnvpn-" + str(randint(100000, 999999))
+    kwargs = {"import_targets": TESTCASE_CONFIG.targets1,
+              "export_targets": TESTCASE_CONFIG.targets2,
+              "route_distinguishers": TESTCASE_CONFIG.route_distinguishers,
+              "name": vpn_name}
+    bgpvpn = os_utils.create_bgpvpn(neutron_client, **kwargs)
+    bgpvpn_id = bgpvpn['bgpvpn']['id']
+    logger.debug("VPN created details: %s" % bgpvpn)
+
+    msg = ("Associate router '%s' to the VPN." % TESTCASE_CONFIG.router_1_name)
+    results.record_action(msg)
+    results.add_to_summary(0, "-")
+
+    os_utils.create_router_association(
+        neutron_client, bgpvpn_id, router_1_id)
+
+    # Wait for VMs to get ips.
+    instances_up = test_utils.wait_for_instances_up(vm_1, vm_2,
+                                                    vm_3, vm_4,
+                                                    vm_5)
+
+    if not instances_up:
+        logger.error("One or more instances is down")
+        # TODO Handle appropriately
+
+    results.get_ping_status(vm_1, vm_2, expected="PASS", timeout=200)
+    results.get_ping_status(vm_1, vm_3, expected="PASS", timeout=30)
+    results.get_ping_status(vm_1, vm_4, expected="FAIL", timeout=30)
+
+    msg = ("Associate network '%s' to the VPN." % TESTCASE_CONFIG.net_2_name)
+    results.add_to_summary(0, "-")
+    results.record_action(msg)
+    results.add_to_summary(0, "-")
+    os_utils.create_network_association(
+        neutron_client, bgpvpn_id, network_2_id)
+
+    test_utils.wait_for_bgp_router_assoc(
+        neutron_client, bgpvpn_id, router_1_id)
+    test_utils.wait_for_bgp_net_assoc(
+        neutron_client, bgpvpn_id, network_2_id)
+
+    logger.info("Waiting for the VMs to connect to each other using the"
+                " updated network configuration")
+    test_utils.wait_before_subtest()
+
+    results.get_ping_status(vm_4, vm_5, expected="PASS", timeout=30)
+    results.get_ping_status(vm_1, vm_4, expected="FAIL", timeout=30)
+    results.get_ping_status(vm_1, vm_5, expected="FAIL", timeout=30)
+
+    msg = ("Update VPN with eRT=iRT ...")
+    results.add_to_summary(0, "-")
+    results.record_action(msg)
+    results.add_to_summary(0, "-")
+    kwargs = {"import_targets": TESTCASE_CONFIG.targets1,
+              "export_targets": TESTCASE_CONFIG.targets1,
+              "name": vpn_name}
+    bgpvpn = os_utils.update_bgpvpn(neutron_client, bgpvpn_id, **kwargs)
+
+    logger.info("Waiting for the VMs to connect to each other using the"
+                " updated network configuration")
+    test_utils.wait_before_subtest()
+
+    results.get_ping_status(vm_1, vm_4, expected="PASS", timeout=30)
+    results.get_ping_status(vm_1, vm_5, expected="PASS", timeout=30)
+
+    results.add_to_summary(0, "=")
+    logger.info("\n%s" % results.summary)
+
+    return results.compile_summary(TESTCASE_CONFIG.success_criteria)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/sdnvpn/test/functest/testcase_7.py b/sdnvpn/test/functest/testcase_7.py
new file mode 100644
index 0000000..fa50888
--- /dev/null
+++ b/sdnvpn/test/functest/testcase_7.py
@@ -0,0 +1,154 @@
+#!/usr/bin/python
+#
+# Copyright (c) 2015 All rights reserved
+# This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+"""
+Testcase for router/FloatingIP & net assoc mutual exclusivity
+
+A testcase for ODL Bug 6962, testing whether a subnet with a router can be
+network associated:
+- Create two VMs, each in a subnet with a router
+- Network assoc the two networks in a VPN iRT=eRT
+- Try to ping from one VM to the other
+- Assign a floating IP to a VM
+- Ping it
+"""
+import argparse
+
+import functest.utils.functest_logger as ft_logger
+import functest.utils.openstack_utils as os_utils
+
+from sdnvpn.lib import utils as test_utils
+from sdnvpn.lib import config as sdnvpn_config
+from sdnvpn.lib.results import Results
+
+parser = argparse.ArgumentParser()
+
+parser.add_argument("-r", "--report",
+                    help="Create json result file",
+                    action="store_true")
+
+args = parser.parse_args()
+
+logger = ft_logger.Logger("sdnvpn-testcase-7").getLogger()
+
+COMMON_CONFIG = sdnvpn_config.CommonConfig()
+TESTCASE_CONFIG = sdnvpn_config.TestcaseConfig('testcase_7')
+
+
+def main():
+    results = Results(COMMON_CONFIG.line_length)
+
+    results.add_to_summary(0, "=")
+    results.add_to_summary(2, "STATUS", "SUBTEST")
+    results.add_to_summary(0, "=")
+
+    nova_client = os_utils.get_nova_client()
+    neutron_client = os_utils.get_neutron_client()
+    glance_client = os_utils.get_glance_client()
+
+    image_id = os_utils.create_glance_image(glance_client,
+                                            TESTCASE_CONFIG.image_name,
+                                            COMMON_CONFIG.image_path,
+                                            disk=COMMON_CONFIG.image_format,
+                                            container="bare",
+                                            public=True)
+    network_1_id, _, _ = test_utils.create_network(
+        neutron_client,
+        TESTCASE_CONFIG.net_1_name,
+        TESTCASE_CONFIG.subnet_1_name,
+        TESTCASE_CONFIG.subnet_1_cidr,
+        TESTCASE_CONFIG.router_1_name)
+    network_2_id, _, _ = test_utils.create_network(
+        neutron_client,
+        TESTCASE_CONFIG.net_2_name,
+        TESTCASE_CONFIG.subnet_2_name,
+        TESTCASE_CONFIG.subnet_2_cidr,
+        TESTCASE_CONFIG.router_2_name)
+
+    sg_id = os_utils.create_security_group_full(neutron_client,
+                                                TESTCASE_CONFIG.secgroup_name,
+                                                TESTCASE_CONFIG.secgroup_descr)
+    test_utils.open_icmp_ssh(neutron_client, sg_id)
+    vm_2 = test_utils.create_instance(
+        nova_client,
+        TESTCASE_CONFIG.instance_2_name,
+        image_id,
+        network_2_id,
+        sg_id,
+        secgroup_name=TESTCASE_CONFIG.secgroup_name)
+    vm_2_ip = vm_2.networks.itervalues().next()[0]
+
+    u1 = test_utils.generate_ping_userdata([vm_2_ip])
+    vm_1 = test_utils.create_instance(
+        nova_client,
+        TESTCASE_CONFIG.instance_1_name,
+        image_id,
+        network_1_id,
+        sg_id,
+        secgroup_name=TESTCASE_CONFIG.secgroup_name,
+        userdata=u1)
+
+    msg = ("Create VPN with eRT==iRT")
+    results.record_action(msg)
+    vpn_name = "sdnvpn-7"
+    kwargs = {"import_targets": TESTCASE_CONFIG.targets,
+              "export_targets": TESTCASE_CONFIG.targets,
+              "route_distinguishers": TESTCASE_CONFIG.route_distinguishers,
+              "name": vpn_name}
+    bgpvpn = os_utils.create_bgpvpn(neutron_client, **kwargs)
+    bgpvpn_id = bgpvpn['bgpvpn']['id']
+    logger.debug("VPN created details: %s" % bgpvpn)
+
+    msg = ("Associate networks '%s', '%s' to the VPN."
+           % (TESTCASE_CONFIG.net_1_name,
+              TESTCASE_CONFIG.net_2_name))
+    results.record_action(msg)
+    results.add_to_summary(0, "-")
+
+    os_utils.create_network_association(
+        neutron_client, bgpvpn_id, network_1_id)
+    os_utils.create_network_association(
+        neutron_client, bgpvpn_id, network_2_id)
+
+    test_utils.wait_for_bgp_net_assoc(
+        neutron_client, bgpvpn_id, network_1_id)
+    test_utils.wait_for_bgp_net_assoc(
+        neutron_client, bgpvpn_id, network_2_id)
+
+    instances_up = test_utils.wait_for_instances_up(vm_1, vm_2)
+    if not instances_up:
+        logger.error("One or more instances is down")
+
+    logger.info("Waiting for the VMs to connect to each other using the"
+                " updated network configuration")
+    test_utils.wait_before_subtest()
+
+    results.get_ping_status(vm_1, vm_2, expected="PASS", timeout=200)
+    results.add_to_summary(0, "=")
+
+    msg = "Assign a Floating IP to %s" % vm_2.name
+    results.record_action(msg)
+
+    fip = os_utils.create_floating_ip(neutron_client)
+    fip_added = os_utils.add_floating_ip(nova_client, vm_2.id, fip['fip_addr'])
+    if fip_added:
+        results.add_success(msg)
+    else:
+        results.add_failure(msg)
+
+    msg = "Ping %s via Floating IP" % vm_2.name
+    results.record_action(msg)
+    results.add_to_summary(0, "-")
+    results.ping_ip_test(fip['fip_addr'])
+
+    return results.compile_summary(TESTCASE_CONFIG.success_criteria)
+
+
+if __name__ == '__main__':
+    main()