X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=testcases%2Fconfig_functest.yaml;h=7d5f213607086cc3eb586fe51d49760313aa3c12;hb=75bfd472302483a201a48eb18c69447343f83b75;hp=6a612067b6b0db452ff07d44de9896a724fcadbe;hpb=e2de45fa99475909fa6089b4aa850d4ac5546a46;p=functest.git

diff --git a/testcases/config_functest.yaml b/testcases/config_functest.yaml
index 6a612067b..7d5f21360 100644
--- a/testcases/config_functest.yaml
+++ b/testcases/config_functest.yaml
@@ -25,7 +25,7 @@ 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)
@@ -49,12 +49,6 @@ general:
         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
@@ -82,6 +76,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
@@ -150,27 +146,40 @@ ONOS:
         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
+    1: vping_ssh
+    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
@@ -218,10 +227,13 @@ test_exec_priority:
 #######################################################################
 test-dependencies:
     doctor:
-        installer: '(apex)|(fuel)'
+        installer: 'apex'
     functest:
         vims:
-        vping:
+            scenario: '(ocl)|(odl)|(nosdn)'
+        vping_ssh:
+        vping_userdata:
+            scenario: '(ocl)|(odl)|(nosdn)'
         tempest:
         rally:
         odl:
@@ -235,12 +247,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