summaryrefslogtreecommitdiffstats
path: root/testcases
diff options
context:
space:
mode:
authorNikolas Hermanns <nikolas.hermanns@ericsson.com>2016-01-15 16:25:50 +0100
committerNikolas Hermanns <nikolas.hermanns@ericsson.com>2016-01-25 15:44:19 +0100
commitea4c222b385c93442a8d3cb4c5cf8747c21efdad (patch)
tree7a43ca4e417f9ddd3cc5063eabd9bcde3d8b68ad /testcases
parent71e688eee322a1d6a697d4328783eff5254918d0 (diff)
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>
Diffstat (limited to 'testcases')
-rw-r--r--testcases/config_functest.yaml14
-rw-r--r--testcases/tests/TestFunctestUtils.py16
2 files changed, 7 insertions, 23 deletions
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):