From 0a59d949b74ed509542dbe454de8d0fc4314ac27 Mon Sep 17 00:00:00 2001 From: xudan Date: Mon, 29 Oct 2018 22:41:53 -0400 Subject: Update BGPVPN and VNF test cases Due to change to Functest Gambia, bgpvpn and vnf test cases failed. Update the testcases.yaml according to Functest's new format. Change-Id: Ia5d9ba291161f7da84a0aadf241e9ab81d83cfa9 Signed-off-by: xudan --- .../functest.bgpvpn.router_association.yml | 2 + ...ctest.bgpvpn.router_association_floating_ip.yml | 2 + .../functest.bgpvpn.subnet_connectivity.yml | 2 + etc/testcase/functest.bgpvpn.tenant_separation.yml | 2 + etc/testcase/functest.vnf.vepc.yml | 2 + etc/testcase/functest.vnf.vims.yml | 2 + etc/userconfig/bgpvpn_testcases.yaml | 18 +++++++ etc/userconfig/testcases.yaml | 60 ---------------------- etc/userconfig/vnf_testcases.yaml | 30 +++++++++++ 9 files changed, 60 insertions(+), 60 deletions(-) create mode 100644 etc/userconfig/bgpvpn_testcases.yaml create mode 100644 etc/userconfig/vnf_testcases.yaml (limited to 'etc') diff --git a/etc/testcase/functest.bgpvpn.router_association.yml b/etc/testcase/functest.bgpvpn.router_association.yml index 6b30315b..0922fb01 100644 --- a/etc/testcase/functest.bgpvpn.router_association.yml +++ b/etc/testcase/functest.bgpvpn.router_association.yml @@ -9,6 +9,8 @@ functest.bgpvpn.router_association: pre_copy: exist_src_file: sdnvpn_config_testcase4.yaml dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml + pre_condition: + - 'cp /home/opnfv/userconfig/pre_config/bgpvpn_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.bgpvpn.router_association_floating_ip.yml b/etc/testcase/functest.bgpvpn.router_association_floating_ip.yml index d6d0355c..d27400fb 100644 --- a/etc/testcase/functest.bgpvpn.router_association_floating_ip.yml +++ b/etc/testcase/functest.bgpvpn.router_association_floating_ip.yml @@ -9,6 +9,8 @@ functest.bgpvpn.router_association_floating_ip: pre_copy: exist_src_file: sdnvpn_config_testcase8.yaml dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml + pre_condition: + - 'cp /home/opnfv/userconfig/pre_config/bgpvpn_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.bgpvpn.subnet_connectivity.yml b/etc/testcase/functest.bgpvpn.subnet_connectivity.yml index 296cafd0..7260ccd8 100644 --- a/etc/testcase/functest.bgpvpn.subnet_connectivity.yml +++ b/etc/testcase/functest.bgpvpn.subnet_connectivity.yml @@ -9,6 +9,8 @@ functest.bgpvpn.subnet_connectivity: pre_copy: exist_src_file: sdnvpn_config_testcase1.yaml dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml + pre_condition: + - 'cp /home/opnfv/userconfig/pre_config/bgpvpn_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.bgpvpn.tenant_separation.yml b/etc/testcase/functest.bgpvpn.tenant_separation.yml index 91a3b571..efc34fb8 100644 --- a/etc/testcase/functest.bgpvpn.tenant_separation.yml +++ b/etc/testcase/functest.bgpvpn.tenant_separation.yml @@ -9,6 +9,8 @@ functest.bgpvpn.tenant_separation: pre_copy: exist_src_file: sdnvpn_config_testcase2.yaml dest_path: /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml + pre_condition: + - 'cp /home/opnfv/userconfig/pre_config/bgpvpn_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.vnf.vepc.yml b/etc/testcase/functest.vnf.vepc.yml index 7cf09f6e..63a48358 100644 --- a/etc/testcase/functest.vnf.vepc.yml +++ b/etc/testcase/functest.vnf.vepc.yml @@ -6,6 +6,8 @@ functest.vnf.vepc: type: functest testcase: juju_epc image_name: opnfv/functest-vnf + pre_condition: + - 'cp /home/opnfv/userconfig/pre_config/vnf_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' report: source_archive_files: - functest.log diff --git a/etc/testcase/functest.vnf.vims.yml b/etc/testcase/functest.vnf.vims.yml index 3e95e9d7..8217972c 100644 --- a/etc/testcase/functest.vnf.vims.yml +++ b/etc/testcase/functest.vnf.vims.yml @@ -6,6 +6,8 @@ functest.vnf.vims: type: functest testcase: cloudify_ims image_name: opnfv/functest-vnf + pre_condition: + - 'cp /home/opnfv/userconfig/pre_config/vnf_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' report: source_archive_files: - functest.log diff --git a/etc/userconfig/bgpvpn_testcases.yaml b/etc/userconfig/bgpvpn_testcases.yaml new file mode 100644 index 00000000..cadfe025 --- /dev/null +++ b/etc/userconfig/bgpvpn_testcases.yaml @@ -0,0 +1,18 @@ +--- +tiers: + - + name: features + order: 2 + description: >- + Test suites from feature projects + integrated in functest + testcases: + - + case_name: bgpvpn + project_name: sdnvpn + criteria: 100 + blocking: false + description: >- + Test suite from SDNVPN project. + run: + name: bgpvpn diff --git a/etc/userconfig/testcases.yaml b/etc/userconfig/testcases.yaml index 529e1162..44b99bb1 100644 --- a/etc/userconfig/testcases.yaml +++ b/etc/userconfig/testcases.yaml @@ -24,63 +24,3 @@ tiers: run: module: 'functest.opnfv_tests.openstack.tempest.tempest' class: 'TempestCustom' - - - - name: features - order: 2 - ci_loop: '(daily)|(weekly)' - description: >- - Test suites from feature projects - integrated in functest - testcases: - - - case_name: bgpvpn - project_name: sdnvpn - criteria: 100 - blocking: false - description: >- - Test suite from SDNVPN project. - dependencies: - installer: '' - scenario: '' - run: - module: 'sdnvpn.test.functest.run_sdnvpn_tests' - class: 'SdnvpnFunctest' - - - - name: vnf - order: 4 - ci_loop: '(daily)|(weekly)' - description: >- - Collection of VNF test cases. - testcases: - - - case_name: cloudify_ims - project_name: functest - criteria: 80 - blocking: false - description: >- - This test case deploys an OpenSource vIMS solution from - Clearwater using the Cloudify orchestrator. It also runs - some signaling traffic. - dependencies: - installer: '' - scenario: '' - run: - module: 'functest.opnfv_tests.vnf.ims.cloudify_ims' - class: 'CloudifyIms' - - - - case_name: juju_epc - project_name: functest - criteria: 100 - blocking: false - description: >- - vEPC validation with Juju as VNF manager and ABoT as test - executor. - dependencies: - installer: '' - scenario: '' - run: - module: 'functest.opnfv_tests.vnf.epc.juju_epc' - class: 'JujuEpc' diff --git a/etc/userconfig/vnf_testcases.yaml b/etc/userconfig/vnf_testcases.yaml new file mode 100644 index 00000000..fbf91ca6 --- /dev/null +++ b/etc/userconfig/vnf_testcases.yaml @@ -0,0 +1,30 @@ +--- +tiers: + - + name: vnf + order: 5 + description: >- + Collection of VNF test cases. + testcases: + - + case_name: cloudify_ims + project_name: functest + criteria: 100 + blocking: false + description: >- + This test case deploys an OpenSource vIMS solution from + Clearwater using the Cloudify orchestrator. It also runs + some signaling traffic. + run: + name: cloudify_ims + + - + case_name: juju_epc + project_name: functest + criteria: 100 + blocking: false + description: >- + vEPC validation with Juju as VNF manager and ABoT as test + executor. + run: + name: juju_epc -- cgit 1.2.3-korg