From da765e5a2120f14055caa7a04f6ebb41ee630c6d Mon Sep 17 00:00:00 2001
From: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
Date: Fri, 15 Jan 2016 16:25:50 +0100
Subject: Adding BGPVPN and VPNSERVICE testcases

This commit add the testcases to the testcase filter
and makes them run able from run_test.sh

Change-Id: I489687f4f011e77da63e3630b0e70f957b3343c5
Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
(cherry picked from commit ea4c222b385c93442a8d3cb4c5cf8747c21efdad)
---
 testcases/config_functest.yaml       | 14 +++++++-------
 testcases/tests/TestFunctestUtils.py | 16 ----------------
 2 files changed, 7 insertions(+), 23 deletions(-)

(limited to 'testcases')

diff --git a/testcases/config_functest.yaml b/testcases/config_functest.yaml
index 6f257d296..729d972f9 100644
--- a/testcases/config_functest.yaml
+++ b/testcases/config_functest.yaml
@@ -249,12 +249,12 @@ test-dependencies:
     policy-test:
         scenario: 'odl'
     sdnvpn:
-        opnfv-yardstick-tc026-sdnvpn:
+        odl-vpnservice:
             installer: 'fuel'
-            scenario: '(ovs)*(nosdn)'
-        odl-vpn_service-tests:
+            scenario: 'bgpvpn'
+            # this execute the tests:
+            # /home/opnfv/repos/odl_integration/test/csit/suites/vpnservice
+        bgpvpn:
             installer: 'fuel'
-            scenario: '(ovs)*(odl)'
-        openstack-neutron-bgpvpn-api-extension-tests:
-            installer: 'fuel'
-            scenario: '(ovs)*(nosdn)'
+            scenario: 'bgpvpn'
+            # this execute the tempest tests of networking-bgpvpn
diff --git a/testcases/tests/TestFunctestUtils.py b/testcases/tests/TestFunctestUtils.py
index 6f12e603d..17bc958e3 100644
--- a/testcases/tests/TestFunctestUtils.py
+++ b/testcases/tests/TestFunctestUtils.py
@@ -45,15 +45,6 @@ class TestFunctestUtils(unittest.TestCase):
         env_test = getTestEnv('policy-test', functest_yaml)
         self.assertEqual(env_test, {'scenario': 'odl'})
 
-        env_test = getTestEnv('sdnvpn/odl-vpn_service-tests', functest_yaml)
-        self.assertEqual(env_test,
-                         {'installer': 'fuel', 'scenario': '(ovs)*(odl)'})
-
-        env_test = getTestEnv('sdnvpn/opnfv-yardstick-tc026-sdnvpn',
-                              functest_yaml)
-        self.assertEqual(env_test,
-                         {'installer': 'fuel', 'scenario': '(ovs)*(nosdn)'})
-
         env_test = getTestEnv('foo', functest_yaml)
         self.assertEqual(env_test, '')
 
@@ -86,13 +77,6 @@ class TestFunctestUtils(unittest.TestCase):
         test = isTestRunnable('functest/vims', functest_yaml)
         self.assertTrue(test)
 
-        test = isTestRunnable('sdnvpn/odl-vpn_service-tests',
-                              functest_yaml)
-        self.assertTrue(test)
-
-        test = isTestRunnable('sdnvpn/opnfv-yardstick-tc026-sdnvpn',
-                              functest_yaml)
-        self.assertFalse(test)
 
     def test_generateTestcaseList(self):
 
-- 
cgit 1.2.3-korg