diff options
Diffstat (limited to 'sdnvpn/test/functest')
-rw-r--r-- | sdnvpn/test/functest/config.yaml | 6 | ||||
-rw-r--r-- | sdnvpn/test/functest/tempest.py | 12 | ||||
-rw-r--r-- | sdnvpn/test/functest/testcase_1.py | 7 | ||||
-rw-r--r-- | sdnvpn/test/functest/testcase_2.py | 2 | ||||
-rw-r--r-- | sdnvpn/test/functest/testcase_4.py | 7 | ||||
-rw-r--r-- | sdnvpn/test/functest/testcase_7.py | 2 |
6 files changed, 14 insertions, 22 deletions
diff --git a/sdnvpn/test/functest/config.yaml b/sdnvpn/test/functest/config.yaml index ccd5db7..ab05ef9 100644 --- a/sdnvpn/test/functest/config.yaml +++ b/sdnvpn/test/functest/config.yaml @@ -5,14 +5,12 @@ 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 @@ -37,7 +35,6 @@ testcases: 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 @@ -72,13 +69,11 @@ testcases: 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 @@ -103,7 +98,6 @@ testcases: 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 diff --git a/sdnvpn/test/functest/tempest.py b/sdnvpn/test/functest/tempest.py index 855ec1b..1acbb42 100644 --- a/sdnvpn/test/functest/tempest.py +++ b/sdnvpn/test/functest/tempest.py @@ -15,15 +15,9 @@ 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() @@ -78,9 +72,11 @@ def main(): results = {"duration": duration, "num_tests": num_tests, "failed": failed, "tests": testcases} - status = "PASS" - if 100 - (100 * int(failed) / int(num_tests)) < int(SUCCESS_CRITERIA): + if int(failed) == 0: + status = "PASS" + else: status = "FAILED" + return {"status": status, "details": results} except: logger.error("Problem when parsing the results.") diff --git a/sdnvpn/test/functest/testcase_1.py b/sdnvpn/test/functest/testcase_1.py index e1a7577..a2817db 100644 --- a/sdnvpn/test/functest/testcase_1.py +++ b/sdnvpn/test/functest/testcase_1.py @@ -183,8 +183,9 @@ def main(): 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) + # TODO enable again when isolation in VPN with iRT != eRT works + # 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, "-") @@ -202,7 +203,7 @@ def main(): 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) + return results.compile_summary() if __name__ == '__main__': diff --git a/sdnvpn/test/functest/testcase_2.py b/sdnvpn/test/functest/testcase_2.py index 0b4e5b4..2df518c 100644 --- a/sdnvpn/test/functest/testcase_2.py +++ b/sdnvpn/test/functest/testcase_2.py @@ -243,7 +243,7 @@ def main(): expected="not reachable", timeout=30) - return results.compile_summary(TESTCASE_CONFIG.success_criteria) + return results.compile_summary() if __name__ == '__main__': diff --git a/sdnvpn/test/functest/testcase_4.py b/sdnvpn/test/functest/testcase_4.py index 65ee2ee..df3c48d 100644 --- a/sdnvpn/test/functest/testcase_4.py +++ b/sdnvpn/test/functest/testcase_4.py @@ -181,8 +181,9 @@ def main(): 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) + # TODO enable again when isolation in VPN with iRT != eRT works + # 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, "-") @@ -203,7 +204,7 @@ def main(): results.add_to_summary(0, "=") logger.info("\n%s" % results.summary) - return results.compile_summary(TESTCASE_CONFIG.success_criteria) + return results.compile_summary() if __name__ == '__main__': diff --git a/sdnvpn/test/functest/testcase_7.py b/sdnvpn/test/functest/testcase_7.py index fa50888..d7d840f 100644 --- a/sdnvpn/test/functest/testcase_7.py +++ b/sdnvpn/test/functest/testcase_7.py @@ -147,7 +147,7 @@ def main(): results.add_to_summary(0, "-") results.ping_ip_test(fip['fip_addr']) - return results.compile_summary(TESTCASE_CONFIG.success_criteria) + return results.compile_summary() if __name__ == '__main__': |