X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fci%2Fconfig_functest.yaml;h=15e0d3a1a608a176c36f3c91d5f8614ea91bd836;hb=fec5f179377a891117c4f3f3665df47063a1e1bd;hp=11ff7fdb5cca9d3c254e3c48bdcf2d4a5da38f4a;hpb=e9062a334bf73c19f3de74465209eaf099c46a26;p=functest.git

diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index 11ff7fdb5..15e0d3a1a 100755
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -1,39 +1,39 @@
 general:
-    directories:
+    dir:
         # Relative to the path where the repo is cloned:
-        dir_vping:         functest/opnfv_tests/openstack/vping
+        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
+        rally:             functest/opnfv_tests/openstack/rally
+        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
+        home:               /home/opnfv
+        repos:              /home/opnfv/repos
+        repo_functest:      /home/opnfv/repos/functest
         dir_repo_rally:     /home/opnfv/repos/rally
-        dir_repo_tempest:   /home/opnfv/repos/tempest
+        repo_tempest:       /home/opnfv/repos/tempest
         dir_repo_releng:    /home/opnfv/repos/releng
         dir_repo_vims_test: /home/opnfv/repos/vims-test
-        dir_repo_sdnvpn:    /home/opnfv/repos/sdnvpn
-        dir_repo_sfc:       /home/opnfv/repos/sfc
+        repo_sdnvpn:        /home/opnfv/repos/sdnvpn
+        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
-        dir_repo_copper:    /home/opnfv/repos/copper
+        repo_copper:        /home/opnfv/repos/copper
         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_functest_data:  /home/opnfv/functest/data
+        repo_parser:        /home/opnfv/repos/parser
+        repo_domino:        /home/opnfv/repos/domino
+        repo_snaps:         /home/opnfv/repos/snaps
+        functest:           /home/opnfv/functest
+        functest_test:      /home/opnfv/repos/functest/functest/opnfv_tests
+        results:            /home/opnfv/functest/results
+        functest_conf:      /home/opnfv/functest/conf
+        functest_data:      /home/opnfv/functest/data
         dir_vIMS_data:      /home/opnfv/functest/data/vIMS/
-        dir_rally_inst:     /home/opnfv/.rally
+        rally_inst:         /home/opnfv/.rally
 
     openstack:
         creds: /home/opnfv/functest/conf/openstack.creds
@@ -75,12 +75,12 @@ vping:
     vm_name_1: opnfv-vping-1
     vm_name_2: opnfv-vping-2
     image_name: functest-vping
-    vping_private_net_name: vping-net
-    vping_private_subnet_name: vping-subnet
-    vping_private_subnet_cidr: 192.168.130.0/24
-    vping_router_name: vping-router
-    vping_sg_name: vPing-sg
-    vping_sg_descr: Security group for vPing test case
+    private_net_name: vping-net
+    private_subnet_name: vping-subnet
+    private_subnet_cidr: 192.168.130.0/24
+    router_name: vping-router
+    sg_name: vPing-sg
+    sg_desc: Security group for vPing test case
 
 onos_sfc:
     image_base_url: http://artifacts.opnfv.org/sfc/demo
@@ -174,10 +174,10 @@ ONOS:
         installer_master_username: 'root'
         installer_master_password: 'r00tme'
 multisite:
-    fuel_environment:
+    fuel:
         installer_username: 'root'
         installer_password: 'r00tme'
-    compass_environment:
+    compass:
         installer_username: 'root'
         installer_password: 'root'
         multisite_controller_ip: '10.1.0.50'
@@ -197,15 +197,15 @@ promise:
     router_name: promise-router
 
 example:
-    example_vm_name: example-vm
-    example_flavor: m1.small
-    example_image_name: functest-example-vm
-    example_private_net_name: example-net
-    example_private_subnet_name: example-subnet
-    example_private_subnet_cidr: 192.168.170.0/24
-    example_router_name: example-router
-    example_sg_name: example-sg
-    example_sg_descr: Example Security group
+    vm_name: example-vm
+    flavor: m1.small
+    image_name: functest-example-vm
+    private_net_name: example-net
+    private_subnet_name: example-subnet
+    private_subnet_cidr: 192.168.170.0/24
+    router_name: example-router
+    sg_name: example-sg
+    sg_desc: Example Security group
 
 results:
     test_db_url: http://testresults.opnfv.org/test/api/v1