X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fci%2Ftestcases.yaml;h=cb9f21e0867e045c2393396d204dfcf897b45581;hb=8797d07d0be8309a1cdcc3c1c67b20ba064a4420;hp=fac81267fab0ff9c5374827750a4c8ce82864515;hpb=ad44bfd97555a7372269db539857fd53fffb0460;p=functest.git

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index fac81267f..cb9f21e08 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -38,7 +38,7 @@ tiers:
                     the cloud's private network.
                 dependencies:
                     installer: '^((?!netvirt).)*$'
-                    scenario: ''
+                    scenario: '^((?!lxd).)*$'
                 run:
                     module: 'functest.opnfv_tests.openstack.snaps.api_check'
                     class: 'ApiCheck'
@@ -189,7 +189,7 @@ tiers:
 
             -
                 case_name: fds
-                project_name: functest
+                project_name: fastdatastacks
                 criteria: 100
                 blocking: false
                 description: >-
@@ -206,22 +206,6 @@ tiers:
                         suites:
                             -  /src/fds/testing/robot
 
-            -
-                case_name: onos
-                project_name: functest
-                criteria: 100
-                blocking: true
-                description: >-
-                    Test Suite for the ONOS SDN Controller. It integrates
-                    some test suites from upstream using TestON as the test
-                    framework.
-                dependencies:
-                    installer: ''
-                    scenario: 'onos'
-                run:
-                    module: 'functest.opnfv_tests.sdn.onos.onos'
-                    class: 'Onos'
-
             -
                 case_name: snaps_smoke
                 project_name: functest
@@ -269,20 +253,19 @@ tiers:
 
             -
                 case_name: doctor-notification
-                enabled: false
                 project_name: doctor
                 criteria: 100
                 blocking: false
                 description: >-
                     Test suite from Doctor project.
                 dependencies:
-                    installer: '(apex)|(fuel)'
+                    installer: 'apex'
                     scenario: '^((?!fdio).)*$'
                 run:
                     module: 'functest.core.feature'
                     class: 'BashFeature'
                     args:
-                        cmd: 'cd /home/opnfv/repos/doctor/tests && ./run.sh'
+                        cmd: 'doctor-test'
 
             -
                 case_name: bgpvpn
@@ -300,75 +283,24 @@ tiers:
                     args:
                         cmd: 'run_sdnvpn_tests.py'
 
-            -
-                case_name: security_scan
-                enabled: false
-                project_name: securityscanning
-                criteria: 100
-                blocking: false
-                description: >-
-                    Simple Security Scan
-                dependencies:
-                    installer: 'apex'
-                    scenario: '^((?!fdio).)*$'
-                run:
-                    module: 'functest.core.feature'
-                    class: 'BashFeature'
-                    args:
-                        cmd: '. /home/opnfv/functest/conf/stackrc && security_scan --config /usr/local/etc/securityscanning/config.ini'
-
             -
                 case_name: functest-odl-sfc
-                enabled: false
                 project_name: sfc
                 criteria: 100
                 blocking: false
                 description: >-
-                    Test suite for odl-sfc to test two chains and two SFs
-                dependencies:
-                    installer: '(apex)|(fuel)'
-                    scenario: 'odl_l2-sfc'
-                run:
-                    module: 'functest.core.feature'
-                    class: 'BashFeature'
-                    args:
-                        cmd: 'run_sfc_tests.py'
-
-            -
-                case_name: onos_sfc
-                enabled: false
-                project_name: functest
-                criteria: 100
-                blocking: true
-                description: >-
-                    Test Suite for onos-sfc to test sfc function.
+                    Test suite for odl-sfc to test two chains with one SF and one chain with two SFs
                 dependencies:
                     installer: ''
-                    scenario: 'onos-sfc'
-                run:
-                    module: 'functest.opnfv_tests.sdn.onos.onos'
-                    class: 'OnosSfc'
-
-            -
-                case_name: parser-basics
-                enabled: false
-                project_name: parser
-                criteria: 100
-                blocking: false
-                description: >-
-                    Test suite from Parser project.
-                dependencies:
-                    installer: 'fuel'
-                    scenario: '^((?!bgpvpn|noha).)*$'
+                    scenario: 'odl.*sfc'
                 run:
                     module: 'functest.core.feature'
                     class: 'BashFeature'
                     args:
-                        cmd: 'cd /home/opnfv/repos/parser/tests && ./functest_run.sh'
+                        cmd: 'run_sfc_tests.py'
 
             -
                 case_name: domino-multinode
-                enabled: false
                 project_name: domino
                 criteria: 100
                 blocking: false
@@ -381,11 +313,10 @@ tiers:
                     module: 'functest.core.feature'
                     class: 'BashFeature'
                     args:
-                        cmd: 'cd /src/domino && ./tests/run_multinode.sh'
+                        cmd: 'run_multinode.sh'
 
             -
                 case_name: barometercollectd
-                enabled: true
                 project_name: barometer
                 criteria: 100
                 blocking: false
@@ -423,24 +354,6 @@ tiers:
                     module: 'functest.opnfv_tests.openstack.tempest.tempest'
                     class: 'TempestFullParallel'
 
-            -
-                case_name: tempest_custom
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    The test case allows running a customized list of tempest
-                    test cases defined in a file under
-                    <dir_functest_repo>/functest/opnfv_tests/openstack/
-                      /tempest/custom_tests/test_list.txt
-                    The file is empty and can be customized with the desired tests.
-                dependencies:
-                    installer: 'unknown'
-                    scenario: 'unknown'
-                run:
-                    module: 'functest.opnfv_tests.openstack.tempest.tempest'
-                    class: 'TempestCustom'
-
             -
                 case_name: rally_full
                 project_name: functest
@@ -466,7 +379,7 @@ tiers:
             -
                 case_name: cloudify_ims
                 project_name: functest
-                criteria: 100
+                criteria: 80
                 blocking: false
                 description: >-
                     This test case deploys an OpenSource vIMS solution from Clearwater
@@ -479,7 +392,7 @@ tiers:
                     class: 'CloudifyIms'
             -
                 case_name: orchestra_openims
-                project_name: functest
+                project_name: orchestra
                 criteria: 100
                 blocking: false
                 description: >-
@@ -493,7 +406,7 @@ tiers:
 
             -
                 case_name: orchestra_clearwaterims
-                project_name: functest
+                project_name: orchestra
                 criteria: 100
                 blocking: false
                 description: >-
@@ -507,15 +420,14 @@ tiers:
 
             -
                 case_name: vyos_vrouter
-                enabled: false
                 project_name: functest
                 criteria: 100
                 blocking: false
                 description: >-
                     This test case is vRouter testing.
                 dependencies:
-                    installer: 'fuel'
-                    scenario: 'nosdn-nofeature'
+                    installer: ''
+                    scenario: 'os-nosdn-nofeature-ha'
                 run:
-                    module: 'functest.opnfv_tests.vnf.router.vyos_vrouter'
-                    class: 'VrouterVnf'
+                    module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter'
+                    class: 'CloudifyVrouter'