From b2c513d028451cc142e1647bf749f245020bf15b Mon Sep 17 00:00:00 2001 From: xudan Date: Wed, 14 Mar 2018 03:58:07 -0400 Subject: 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 --- dovetail/container.py | 7 ------- 1 file changed, 7 deletions(-) (limited to 'dovetail') 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 -- cgit 1.2.3-korg