summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxudan <xudan16@huawei.com>2018-03-14 03:58:07 -0400
committerGeorg Kunz <georg.kunz@ericsson.com>2018-03-15 08:16:16 +0000
commitb2c513d028451cc142e1647bf749f245020bf15b (patch)
tree772f4020b22408a80121e7e39d36898433dd0345
parent6de223dad312a4fac4a410fc4a4a21f457c06f27 (diff)
Disable restricts of sdnvpn test cases
1. The original testcases.yaml file of Functest restricts sdnvpn test cases to run on Fuel, Apex or Netvirt on bgpvpn scenario. https://github.com/opnfv/functest/blob/master/functest/ci/testcases.yaml#L278 2. Dovetail has a testcases.yaml file to allow sdnvpn test cases run on any commercial SUTs. https://github.com/opnfv/dovetail/blob/master/etc/userconfig/testcases.yaml#L113 Change-Id: I0d5ed5b22e55dc3dc0fe584dc57b28239334b7de Signed-off-by: xudan <xudan16@huawei.com>
-rw-r--r--dovetail/container.py7
-rw-r--r--etc/testcase/sdnvpn.tc000.yml3
-rw-r--r--etc/testcase/sdnvpn.tc001.yml2
-rw-r--r--etc/testcase/sdnvpn.tc002.yml2
-rw-r--r--etc/testcase/sdnvpn.tc003.yml2
-rw-r--r--etc/testcase/sdnvpn.tc004.yml2
-rw-r--r--etc/testcase/sdnvpn.tc008.yml2
7 files changed, 12 insertions, 8 deletions
diff --git a/dovetail/container.py b/dovetail/container.py
index 9a90a48b..66923e6a 100644
--- a/dovetail/container.py
+++ b/dovetail/container.py
@@ -73,13 +73,6 @@ class Container(object):
scenario = ''.join([" -e DEPLOY_SCENARIO=", scenario])
ins_ip = os.getenv('INSTALLER_IP', "192.168.0.0")
ins_ip = " -e INSTALLER_IP={}".format(ins_ip)
- # vpn testcase only runs when scenario name includes bgpvpn
- # functest requirements
- if 'sdnvpn' in testcase_name:
- ins_type = os.getenv('INSTALLER_TYPE', "netvirt")
- ins_type = " -e INSTALLER_TYPE={}".format(ins_type)
- scenario = os.getenv('DEPLOY_SCENARIO', "bgpvpn")
- scenario = " -e DEPLOY_SCENARIO={}".format(scenario)
envs = "%s %s %s" % (ins_type, scenario, ins_ip)
dovetail_config = dt_cfg.dovetail_config
diff --git a/etc/testcase/sdnvpn.tc000.yml b/etc/testcase/sdnvpn.tc000.yml
index 6294e1e4..8a4d6bfa 100644
--- a/etc/testcase/sdnvpn.tc000.yml
+++ b/etc/testcase/sdnvpn.tc000.yml
@@ -6,7 +6,8 @@ dovetail.sdnvpn.tc000:
type: functest
testcase: bgpvpn
pre_condition:
- - "sed -i 's/networking_bgpvpn_tempest/networking_bgpvpn_tempest-r networking_bgpvpn_tempest.tests.api.test_bgpvpn.BgpvpnTest*/' /usr/lib/python2.7/site-packages/sdnvpn/test/functest/tempest.py"
+ - "sed -i 's/networking_bgpvpn_tempest/networking_bgpvpn_tempest-r networking_bgpvpn_tempest.tests.api.test_bgpvpn.BgpvpnTest*/' /usr/lib/python2.7/site-packages/sdnvpn/test/functest/tempest.py"
+ - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
pre_copy:
exist_src_file: sdnvpn_config_tc000.yaml
dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml
diff --git a/etc/testcase/sdnvpn.tc001.yml b/etc/testcase/sdnvpn.tc001.yml
index 698b0d2e..56d73708 100644
--- a/etc/testcase/sdnvpn.tc001.yml
+++ b/etc/testcase/sdnvpn.tc001.yml
@@ -5,6 +5,8 @@ dovetail.sdnvpn.tc001:
validate:
type: functest
testcase: bgpvpn
+ pre_condition:
+ - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
pre_copy:
exist_src_file: sdnvpn_config_testcase1.yaml
dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml
diff --git a/etc/testcase/sdnvpn.tc002.yml b/etc/testcase/sdnvpn.tc002.yml
index 4823ee55..70926c4c 100644
--- a/etc/testcase/sdnvpn.tc002.yml
+++ b/etc/testcase/sdnvpn.tc002.yml
@@ -5,6 +5,8 @@ dovetail.sdnvpn.tc002:
validate:
type: functest
testcase: bgpvpn
+ pre_condition:
+ - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
pre_copy:
exist_src_file: sdnvpn_config_testcase2.yaml
dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml
diff --git a/etc/testcase/sdnvpn.tc003.yml b/etc/testcase/sdnvpn.tc003.yml
index fbf13ca3..ea74db38 100644
--- a/etc/testcase/sdnvpn.tc003.yml
+++ b/etc/testcase/sdnvpn.tc003.yml
@@ -5,6 +5,8 @@ dovetail.sdnvpn.tc003:
validate:
type: functest
testcase: bgpvpn
+ pre_condition:
+ - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
pre_copy:
exist_src_file: sdnvpn_config_testcase3.yaml
dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml
diff --git a/etc/testcase/sdnvpn.tc004.yml b/etc/testcase/sdnvpn.tc004.yml
index 5f44f12d..a4cfe21e 100644
--- a/etc/testcase/sdnvpn.tc004.yml
+++ b/etc/testcase/sdnvpn.tc004.yml
@@ -5,6 +5,8 @@ dovetail.sdnvpn.tc004:
validate:
type: functest
testcase: bgpvpn
+ pre_condition:
+ - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
pre_copy:
exist_src_file: sdnvpn_config_testcase4.yaml
dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml
diff --git a/etc/testcase/sdnvpn.tc008.yml b/etc/testcase/sdnvpn.tc008.yml
index d818bf10..838136da 100644
--- a/etc/testcase/sdnvpn.tc008.yml
+++ b/etc/testcase/sdnvpn.tc008.yml
@@ -5,6 +5,8 @@ dovetail.sdnvpn.tc008:
validate:
type: functest
testcase: bgpvpn
+ pre_condition:
+ - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml'
pre_copy:
exist_src_file: sdnvpn_config_testcase8.yaml
dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml