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

diff --git a/testcases/config_functest.yaml b/testcases/config_functest.yaml
index be7687ac4..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:    stable/brahmaputra
-        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,33 +141,49 @@ 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: tempest
-    3: odl
-    #4: onos
-    #5: ovno
-    #6: doctor
-    #7: promise
-    #8: policy-test
-    #9: odl-vpn_service-tests
-    #10: opnfv-yardstick-tc026-sdnvpn
+    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
@@ -213,10 +231,13 @@ test_exec_priority:
 #######################################################################
 test-dependencies:
     doctor:
-        installer: 'fuel'
+        installer: '(apex)|(fuel)'
     functest:
         vims:
+            scenario: '(ocl)|(odl)|(nosdn)'
         vping:
+        vping_userdata:
+            scenario: '(ocl)|(odl)|(nosdn)'
         tempest:
         rally:
         odl:
@@ -230,12 +251,12 @@ test-dependencies:
     policy-test:
         scenario: 'odl'
     sdnvpn:
-        opnfv-yardstick-tc026-sdnvpn:
-            installer: 'fuel'
-            scenario: '(ovs)*(nosdn)'
-        odl-vpn_service-tests:
+        odl-vpnservice:
             installer: 'fuel'
-            scenario: '(ovs)*(odl)'
-        openstack-neutron-bgpvpn-api-extension-tests:
+            scenario: 'bgpvpn'
+            # this execute the tests:
+            # /home/opnfv/repos/odl_integration/test/csit/suites/vpnservice
+        bgpvpn:
             installer: 'fuel'
-            scenario: '(ovs)*(nosdn)'
+            scenario: 'bgpvpn'
+            # this execute the tempest tests of networking-bgpvpn