Remove obsolete public network definitions

[functest.git] / testcases / config_functest.yaml

diff --git a/testcases/config_functest.yaml b/testcases/config_functest.yaml
index ab59de2..2f034f9 100644 (file)
--- 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
@@ -65,7 +59,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
@@ -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
@@ -176,10 +172,10 @@ test_exec_priority:
     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,7 +227,7 @@ test_exec_priority:
 #######################################################################
 test-dependencies:
     doctor:
-        installer: '(apex)|(fuel)'
+        installer: 'apex'
     functest:
         vims:
             scenario: '(ocl)|(odl)|(nosdn)'