X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=testcases%2Fconfig_functest.yaml;h=bab1a4b9458a372b20351aa73bbdb51c22c53ce1;hb=b0365d10fda5018721d012602077dddda948a6d9;hp=bca4f9dcd3de3a833ff3cfaa296c9634901de953;hpb=fd2d6e5b9fcfdf8cffb0aa4ea27568334cb374e8;p=functest.git

diff --git a/testcases/config_functest.yaml b/testcases/config_functest.yaml
index bca4f9dcd..bab1a4b94 100644
--- a/testcases/config_functest.yaml
+++ b/testcases/config_functest.yaml
@@ -17,6 +17,8 @@ general:
         dir_repo_bgpvpn:    /home/opnfv/repos/bgpvpn
         dir_repo_onos:      /home/opnfv/repos/onos
         dir_repo_promise:   /home/opnfv/repos/promise
+        dir_repo_doctor:    /home/opnfv/repos/doctor
+        dir_repo_ovno:      /home/opnfv/repos/ovno
         dir_functest:       /home/opnfv/functest
         dir_results:        /home/opnfv/functest/results
         dir_functest_conf:  /home/opnfv/functest/conf
@@ -27,8 +29,6 @@ general:
 
     repositories:
         # branch and commit ID to which the repos will be reset (HEAD)
-        functest_branch:    master
-        functest_commit:    latest
         releng_branch:  master
         releng_commit:  latest
         rally_branch:   master
@@ -41,6 +41,8 @@ general:
         onos_commit:   latest
         promise_branch:   master
         promise_commit:   latest
+        ovno_branch:   master
+        ovno_commit:   latest
 
     openstack:
         image_name: functest-img
@@ -139,19 +141,54 @@ ONOS:
         onoscli_password: 'root'
         runtimeout: 300
     environment:
-        OCT: '189.42.8.99'
-        OC1: '189.42.8.101'
-        OC2: '189.42.8.102'
-        OC3: '189.42.8.103'
-        OCN: '189.42.8.104'
-        OCN2: '189.42.8.105'
+        OCT: '10.20.0.1'
+        OC1: '10.20.0.7'
+        OC2: '10.20.0.7'
+        OC3: '10.20.0.7'
+        OCN: '10.20.0.4'
+        OCN2: '10.20.0.5'
+        installer_master: '10.20.0.2'
+        installer_master_username: 'root'
+        installer_master_password: 'r00tme'
+
+promise:
+    general:
+        tenant_name: promise
+        tenant_description: promise Functionality Testing
+        user_name: promiser
+        user_pwd: test
+        image_name: promise-img
+        flavor_name: promise-flavor
+        flavor_vcpus: 1
+        flavor_ram: 512
+        flavor_disk: 0
+
 results:
-    test_db_url: http://213.77.62.197
+    test_db_url: http://testresults.opnfv.org/testapi
+
+# to be maintained...
+# the execution order is important as some tests may be more destructive than others
+# and if vPing is failing is usually not needed to continue...
+test_exec_priority:
+    1: vping
+    2: vping_userdata
+    3: tempest
+    4: odl
+    5: onos
+    6: ovno
+    #7: doctor
+    8: promise
+    9: odl-vpnservice
+    10: bgpvpn
+    #11: openstack-neutron-bgpvpn-api-extension-tests
+    12: vims
+    13: rally
+
 
 ########################################################################
 # This part lists the dependencies of the tests
 #
-# it is used to managed the complexity of the possible combination
+# it is used to manage the complexity of the possible combinations
 #
 # 17 projects have been declared for Brahmaputra (D Milestone)
 # 89 testcases are associated with these 17 projects
@@ -168,51 +205,58 @@ results:
 #
 # By default we consider that all the tests can be run on any configuration
 #
-# we defined 3 constraints
+# we defined 2 constraints
 # - installer (e.g. my test can be run only with installer Compass)
 # possible values: apex, compass, fuel, joid
 #
-# - the controller (odl, onos, opencontrail) 
+# - the scenario: it described a specif installation
+#    os-<controller>-<nfvfeature>-<mode>[-<extrastuff>]
+# With parameters:
+#    controller=(nosdn|odl_l3|odl_l2|onos|ocl)
+#       No odl_l3 today
+#    nfvfeature=(kvm|ovs|dpdk|nofeature)
+#       '_' list separated.
+#    mode=(ha|noha)
+#    extrastuff=(none)
+#       Optional field - Not used today#
 #
-# - the scenario (ovs, kvm, QEMU, proc) based on Fuel proposal
-# see https://git.opnfv.org/cgit/fuel/tree/deploy/scenario/scenario.yaml
+# ref:https://gerrit.opnfv.org/gerrit/#/c/6323/7/jjb/joid/joid-deploy.sh (L72-82)
 #  e.g my test is only possible with OVS 2.3.2 on odl
-# not fully clear as the controller may be included with the scenario
 #
-# In a first step, our main need is to trigger ad hox controller suite
-# In second step we may focus with scenario parameter
-# but no so far
-# - either controller suite
-# or
-# - suites that should be runnable on any conf, any scenario
+# in functest, we indicate the regex pattern to be checked towards the scenario
+# e.g. odl-vpn_service-tests can be run if and only if
+#                                - installer is fuel
+#                                - scenario contains the name ovs and odl
 #
 #######################################################################
 test-dependencies:
     doctor:
+        installer: '(apex)|(fuel)'
     functest:
-        vping:
         vims:
+            scenario: '(ocl)|(odl)|(nosdn)'
+        vping:
+        vping_userdata:
+            scenario: '(ocl)|(odl)|(nosdn)'
         tempest:
         rally:
         odl:
-            controller: 'odl'
+            scenario: 'odl'
         onos:
-            controller: 'onos'
-        onos-ovsdb:
-            controller: 'onos'
+            scenario: 'onos'
     promise:
+        installer: '(fuel)|(joid)'
     ovno:
-        controller: 'opencontrail'
+        scenario: 'ocl'
     policy-test:
-        controller: 'odl'
+        scenario: 'odl'
     sdnvpn:
-        opnfv-yardstick-tc026-sdnvpn:
-            controller: 'nosdn'
-            scenario: 'os_ovh_ha'
-        odl-vpn_service-tests:
-            controller: 'odl'
-            scenario: 'os_ovh_ha'
-        openstack-neutron-bgpvpn-api-extension-tests:
-            controller: 'nosdn'
-            scenario: 'os_ovh_ha'
- 
+        odl-vpnservice:
+            installer: 'fuel'
+            scenario: 'bgpvpn'
+            # this execute the tests:
+            # /home/opnfv/repos/odl_integration/test/csit/suites/vpnservice
+        bgpvpn:
+            installer: 'fuel'
+            scenario: 'bgpvpn'
+            # this execute the tempest tests of networking-bgpvpn