X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fci%2Ftestcases.yaml;h=b1d824f6c9e1de1c2996eb2839b230277629ee10;hb=c860e5488c5a1ebe69fe6dbe734372a67304f301;hp=12d791f08b3aa8d7880b125b489eb48ecf4e0d50;hpb=9ed4cad5955d0b8815a5e0c3b10be715de82197a;p=functest.git

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 12d791f08..b1d824f6c 100755
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -18,7 +18,57 @@ tiers:
                 dependencies:
                     installer: ''
                     scenario: '^((?!lxd).)*$'
+            -
+                name: snaps_health_check
+                criteria: 'status == "PASS"'
+                blocking: false
+                description: >-
+                    This test case creates executes the SimpleHealthCheck
+                    Python test class which creates an, image, flavor, network,
+                    and Cirros VM instance and observes the console output to
+                    validate the single port obtains the correct IP address.
 
+                dependencies:
+                    installer: ''
+                    scenario: '^((?!lxd).)*$'
+                run:
+                    module: 'functest.opnfv_tests.openstack.snaps.health_check'
+                    class: 'HealthCheck'
+            -
+                name: connection_check
+                criteria: 'status == "PASS"'
+                blocking: true
+                description: >-
+                    This test case verifies the retrieval of OpenStack clients:
+                    Keystone, Glance, Neutron and Nova and may perform some
+                    simple queries. When the config value of
+                    snaps.use_keystone is True, functest must have access to
+                    the cloud's private network.
+
+                dependencies:
+                    installer: '^((?!netvirt).)*$'
+                    scenario: ''
+                run:
+                    module: 'functest.opnfv_tests.openstack.snaps.connection_check'
+                    class: 'ConnectionCheck'
+
+            -
+                name: api_check
+                criteria: 'status == "PASS"'
+                blocking: true
+                description: >-
+                    This test case verifies the retrieval of OpenStack clients:
+                    Keystone, Glance, Neutron and Nova and may perform some
+                    simple queries. When the config value of
+                    snaps.use_keystone is True, functest must have access to
+                    the cloud's private network.
+
+                dependencies:
+                    installer: '^((?!netvirt).)*$'
+                    scenario: ''
+                run:
+                    module: 'functest.opnfv_tests.openstack.snaps.api_check'
+                    class: 'ApiCheck'
     -
         name: smoke
         order: 1
@@ -90,9 +140,9 @@ tiers:
                 criteria: 'success_rate == 100%'
                 blocking: true
                 description: >-
-                    Test Suite for the OpenDaylight SDN Controller. It integrates
-                    some test suites from upstream using Robot as the test
-                    framework.
+                    Test Suite for the OpenDaylight SDN Controller. It
+                    integrates some test suites from upstream using
+                    Robot as the test framework.
                 dependencies:
                     installer: ''
                     scenario: 'odl'
@@ -104,6 +154,27 @@ tiers:
                             -  /home/opnfv/repos/odl_test/csit/suites/integration/basic
                             -  /home/opnfv/repos/odl_test/csit/suites/openstack/neutron
 
+            -
+                name: odl_netvirt
+                criteria: 'success_rate == 100%'
+                blocking: true
+                description: >-
+                    Test Suite for the OpenDaylight SDN Controller when
+                    the NetVirt features are installed. It integrates
+                    some test suites from upstream using Robot as the
+                    test framework.
+                dependencies:
+                    installer: ''
+                    scenario: 'netvirt'
+                run:
+                    module: 'functest.opnfv_tests.sdn.odl.odl'
+                    class: 'ODLTests'
+                    args:
+                        suites:
+                            -  /home/opnfv/repos/odl_test/csit/suites/integration/basic
+                            -  /home/opnfv/repos/odl_test/csit/suites/openstack/neutron
+                            -  /home/opnfv/repos/odl_test/csit/suites/openstack/connectivity
+
             -
                 name: onos
                 criteria: 'status == "PASS"'
@@ -116,41 +187,6 @@ tiers:
                     installer: ''
                     scenario: 'onos'
 
-            -
-                name: connection_check
-                criteria: 'status == "PASS"'
-                blocking: false
-                description: >-
-                    This test case verifies the retrieval of OpenStack clients:
-                    Keystone, Glance, Neutron and Nova and may perform some
-                    simple queries. When the config value of
-                    snaps.use_keystone is True, functest must have access to
-                    the cloud's private network.
-
-                dependencies:
-                    installer: '^((?!netvirt).)*$'
-                    scenario: ''
-                run:
-                    module: 'functest.opnfv_tests.openstack.snaps.connection_check'
-                    class: 'ConnectionCheck'
-
-            -
-                name: api_check
-                criteria: 'status == "PASS"'
-                blocking: false
-                description: >-
-                    This test case verifies the retrieval of OpenStack clients:
-                    Keystone, Glance, Neutron and Nova and may perform some
-                    simple queries. When the config value of
-                    snaps.use_keystone is True, functest must have access to
-                    the cloud's private network.
-
-                dependencies:
-                    installer: '^((?!netvirt).)*$'
-                    scenario: ''
-                run:
-                    module: 'functest.opnfv_tests.openstack.snaps.api_check'
-                    class: 'ApiCheck'
 
             -
                 name: snaps_smoke
@@ -224,10 +260,13 @@ tiers:
                 criteria: 'status == "PASS"'
                 blocking: false
                 description: >-
-                    Simple security Scan
+                    Simple Security Scan
                 dependencies:
                     installer: 'apex'
                     scenario: '^((?!fdio).)*$'
+                run:
+                    module: 'functest.opnfv_tests.features.security_scan'
+                    class: 'SecurityScan'
 #            -
 #                name: copper
 #                criteria: 'status == "PASS"'
@@ -240,15 +279,6 @@ tiers:
 #                run:
 #                    module: 'functest.opnfv_tests.features.copper'
 #                    class: 'Copper'
-            -
-                name: moon
-                criteria: 'status == "PASS"'
-                blocking: false
-                description: >-
-                    Security management system for OPNFV
-                dependencies:
-                    installer: 'compass'
-                    scenario: '(odl)*(moon)'
             -
                 name: multisite
                 criteria: 'success_rate == 100%'
@@ -306,6 +336,18 @@ tiers:
                 run:
                     module: 'functest.opnfv_tests.features.orchestrator.orchestra'
                     class: 'OpenbatonOrchestrator'
+            -
+                name: netready
+                criteria: 'status == "PASS"'
+                blocking: false
+                description: >-
+                    Test suite from Netready project.
+                dependencies:
+                    installer: 'apex'
+                    scenario: 'gluon'
+                run:
+                     module: 'functest.opnfv_tests.features.netready'
+                     class: 'GluonVping'
     -
         name: components
         order: 3