X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=testcases%2Fconfig_functest.yaml;h=5fe6a23ebfbdfe6c62af475237eea6ad09030789;hb=060c49f1d7d63c7cf662a6f61e033385e76e8a3c;hp=ab59de2ed5c46e89e2ec605310975d541932d149;hpb=3a562b1ebabfe4d6f032bb4287624a2fe146de59;p=functest.git

diff --git a/testcases/config_functest.yaml b/testcases/config_functest.yaml
index ab59de2ed..5fe6a23eb 100644
--- a/testcases/config_functest.yaml
+++ b/testcases/config_functest.yaml
@@ -12,6 +12,7 @@ general:
         dir_repos:          /home/opnfv/repos
         dir_repo_functest:  /home/opnfv/repos/functest
         dir_repo_rally:     /home/opnfv/repos/rally
+        dir_repo_tempest:   /home/opnfv/repos/tempest
         dir_repo_releng:    /home/opnfv/repos/releng
         dir_repo_vims_test: /home/opnfv/repos/vims-test
         dir_repo_bgpvpn:    /home/opnfv/repos/bgpvpn
@@ -25,14 +26,14 @@ general:
         dir_rally_res:      /home/opnfv/functest/results/rally/
         dir_functest_data:  /home/opnfv/functest/data
         dir_vIMS_data:      /home/opnfv/functest/data/vIMS
-        dir_rally_inst:     ~/.rally
+        dir_rally_inst:     /home/opnfv/.rally
 
     repositories:
         # branch and commit ID to which the repos will be reset (HEAD)
         releng_branch:  master
         releng_commit:  latest
         rally_branch:   master
-        rally_commit:   57efc5327530a34d139b5a1fd1f480195de0aadb
+        rally_commit:   1b6e9e9219b143c685a2af134ab025dddd72ed27
         vims_test_branch:   stable
         vims_test_commit:   latest
         bgpvpn_branch:   master
@@ -43,18 +44,14 @@ general:
         promise_commit:   latest
         ovno_branch:   master
         ovno_commit:   latest
+        doctor_branch: stable/brahmaputra
+        doctor_commit: latest
 
     openstack:
         image_name: functest-img
         image_file_name:  cirros-0.3.4-x86_64-disk.img
         image_disk_format:  qcow2
 
-        #Public network. Optional
-        neutron_public_net_name: net04_ext
-        neutron_public_subnet_name: net04_ext__subnet
-        neutron_public_subnet_cidr: 172.16.9.0/24
-        neutron_public_subnet_start: 172.16.9.130
-        neutron_public_subnet_end: 172.16.9.254
         #Private network for functest. Will be created by config_functest.py
         neutron_private_net_name: functest-net
         neutron_private_subnet_name: functest-subnet
@@ -65,7 +62,7 @@ general:
         neutron_router_name: functest-router
 
 vping:
-    ping_timeout:   300
+    ping_timeout:   200
     vm_flavor: m1.small #adapt to your environment
     vm_name_1: opnfv-vping-1
     vm_name_2: opnfv-vping-2
@@ -73,8 +70,8 @@ vping:
     vping_private_subnet_name: vping-subnet
     vping_private_subnet_cidr: 192.168.130.0/24
     vping_router_name: vping-router
-    ip_1: 192.168.130.30
-    ip_2: 192.168.130.40
+    vping_sg_name: vPing-sg
+    vping_sg_descr: Security group for vPing test case
 
 tempest:
     identity:
@@ -82,6 +79,8 @@ tempest:
         tenant_description: Tenant for Tempest test suite
         user_name: tempest
         user_password: tempest
+    input-scenario:
+        ssh_user_regex: '[["^.*[Cc]irros.*$", "cirros"], ["^.*[Tt]est[VvMm].*$", "cirros"], ["^.*rally_verify.*$", "cirros"]]'
 
 rally:
     deployment_name: opnfv-rally
@@ -170,16 +169,16 @@ results:
 # 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
+    1: vping_ssh
     2: vping_userdata
     3: tempest
     4: odl
     5: onos
     6: ovno
-    #7: doctor
+    7: doctor
     8: promise
-    #9: odl-vpn_service-tests
-    #10: opnfv-yardstick-tc026-sdnvpn
+    9: odl-vpnservice
+    10: bgpvpn
     #11: openstack-neutron-bgpvpn-api-extension-tests
     12: vims
     13: rally
@@ -231,11 +230,11 @@ test_exec_priority:
 #######################################################################
 test-dependencies:
     doctor:
-        installer: '(apex)|(fuel)'
+        installer: 'apex'
     functest:
         vims:
             scenario: '(ocl)|(odl)|(nosdn)'
-        vping:
+        vping_ssh:
         vping_userdata:
             scenario: '(ocl)|(odl)|(nosdn)'
         tempest: