Merge "Unified way to provide configurations and env variables(proposal 1)"

[functest.git] / functest / ci / config_functest.yaml

diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
old mode 100644 (file)
new mode 100755 (executable)
index cca4959..11ff7fd
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -1,22 +1,24 @@
 general:
     directories:
         # Relative to the path where the repo is cloned:
-        dir_vping:         functest/opnfv_tests/OpenStack/vPing/
-        dir_odl:           functest/opnfv_tests/Controllers/ODL/
-        dir_rally:         functest/opnfv_tests/OpenStack/rally/
-        dir_tempest_cases: functest/opnfv_tests/OpenStack/tempest/custom_tests/
-        dir_vIMS:          functest/opnfv_tests/vnf/vIMS/
-        dir_onos:          functest/opnfv_tests/Controllers/ONOS/Teston/
-        dir_onos_sfc:      functest/opnfv_tests/Controllers/ONOS/Sfc/
+        dir_vping:         functest/opnfv_tests/openstack/vping
+        dir_odl:           functest/opnfv_tests/sdn/odl
+        dir_rally:         functest/opnfv_tests/openstack/rally
+        dir_tempest_cases: functest/opnfv_tests/openstack/tempest/custom_tests
+        dir_vIMS:          functest/opnfv_tests/vnf/ims
+        dir_onos:          functest/opnfv_tests/sdn/onos/teston
+        dir_onos_sfc:      functest/opnfv_tests/sdn/onos/sfc
 
         # Absolute path
+        dir_home:           /home/opnfv
         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
+        dir_repo_sdnvpn:    /home/opnfv/repos/sdnvpn
+        dir_repo_sfc:       /home/opnfv/repos/sfc
         dir_repo_onos:      /home/opnfv/repos/onos
         dir_repo_promise:   /home/opnfv/repos/promise
         dir_repo_doctor:    /home/opnfv/repos/doctor
@@ -24,15 +26,17 @@ general:
         dir_repo_ovno:      /home/opnfv/repos/ovno
         dir_repo_parser:    /home/opnfv/repos/parser
         dir_repo_domino:    /home/opnfv/repos/domino
+        dir_repo_snaps:     /home/opnfv/repos/snaps
         dir_functest:       /home/opnfv/functest
+        dir_functest_test:  /home/opnfv/repos/functest/functest/opnfv_tests
         dir_results:        /home/opnfv/functest/results
         dir_functest_conf:  /home/opnfv/functest/conf
-        dir_rally_res:      /home/opnfv/functest/results/rally/
         dir_functest_data:  /home/opnfv/functest/data
-        dir_vIMS_data:      /home/opnfv/functest/data/vIMS
+        dir_vIMS_data:      /home/opnfv/functest/data/vIMS/
         dir_rally_inst:     /home/opnfv/.rally
 
     openstack:
+        creds: /home/opnfv/functest/conf/openstack.creds
         snapshot_file: /home/opnfv/functest/conf/openstack_snapshot.yaml
 
         image_name: Cirros-0.3.4
@@ -53,9 +57,17 @@ general:
         neutron_private_subnet_gateway: 192.168.120.254
         neutron_router_name: functest-router
 
+    functest:
+        testcases_yaml: /home/opnfv/repos/functest/functest/ci/testcases.yaml
+
 healthcheck:
     disk_image: /home/opnfv/functest/data/cirros-0.3.4-x86_64-disk.img
     disk_format: qcow2
+    wait_time: 60
+
+snaps:
+    use_keystone: True
+    use_floating_ips: False
 
 vping:
     ping_timeout:   200
@@ -71,6 +83,7 @@ vping:
     vping_sg_descr: Security group for vPing test case
 
 onos_sfc:
+    image_base_url: http://artifacts.opnfv.org/sfc/demo
     image_name: TestSfcVm
     image_file_name: firewall_block_image.img
 
@@ -102,10 +115,10 @@ vIMS:
         tenant_description: vIMS Functionality Testing
         images:
             ubuntu:
-                image_url: 'http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img'
+                image_url: http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img
                 image_name: ubuntu_14.04
             centos:
-                image_url: 'http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1510.qcow2'
+                image_url: http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1510.qcow2
                 image_name: centos_7
     cloudify:
         blueprint:
@@ -131,7 +144,7 @@ vIMS:
             file_name: 'openstack-blueprint.yaml'
             name: "clearwater-opnfv"
             destination_folder: "opnfv-cloudify-clearwater"
-            url: 'https://github.com/Orange-OpenSource/opnfv-cloudify-clearwater.git'
+            url: https://github.com/Orange-OpenSource/opnfv-cloudify-clearwater.git
             branch: "stable"
         deployment-name: 'clearwater-opnfv'
         requierments: