Merge "Fix rally db issue"

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

diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index a04a599..e2746cf 100644 (file)
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -7,16 +7,15 @@ general:
         dir_repo_releng:    /home/opnfv/repos/releng
         repo_vims_test:     /src/vims-test
         repo_barometer:     /home/opnfv/repos/barometer
-        repo_doctor:        /home/opnfv/repos/doctor
         repo_odl_test:      /src/odl_test
         repo_fds:           /src/fds
         repo_securityscan:  /home/opnfv/repos/securityscanning
-        repo_vrouter:       /home/opnfv/repos/vnfs/vrouter
         functest:           /home/opnfv/functest
         results:            /home/opnfv/functest/results
         functest_conf:      /home/opnfv/functest/conf
         functest_data:      /home/opnfv/functest/data
         ims_data:           /home/opnfv/functest/data/ims/
+        router_data:        /home/opnfv/functest/data/router/
         functest_images:    /home/opnfv/functest/images
         rally_inst:         /root/.rally
 
@@ -111,7 +110,8 @@ odl_sfc:
     image_format: qcow2
 
 tempest:
-    deployment_name: opnfv-tempest
+    unique_names: True
+    verifier_name: opnfv-tempest
     identity:
         tenant_name: tempest
         tenant_description: Tenant for Tempest test suite
@@ -130,11 +130,14 @@ tempest:
     volume_device_name: vdc
 
 rally:
+    unique_names: True
     deployment_name: opnfv-rally
     network_name: rally-net
     subnet_name: rally-subnet
     subnet_cidr: 192.168.140.0/24
     router_name: rally-router
+    flavor_name: rally-tiny
+    flavor_alt_name: rally-mini
 
 vnf:
     juju_epc:
@@ -145,6 +148,10 @@ vnf:
         tenant_name: cloudify_ims
         tenant_description: vIMS
         config: cloudify_ims.yaml
+    cloudify_ims_perf:
+        tenant_name: cloudify_ims_perf
+        tenant_description: vIMS
+        config: cloudify_ims_perf.yaml
     orchestra_openims:
         tenant_name: orchestra_openims
         tenant_description: OpenIMS deployed with Open Baton
@@ -153,6 +160,10 @@ vnf:
         tenant_name: orchestra_clearwaterims
         tenant_description: Clearwater IMS deployed with Open Baton
         config: orchestra.yaml
+    vyos_vrouter:
+        tenant_name: vrouter
+        tenant_description: vRouter
+        config: cloudify_vrouter.yaml
 
 promise:
     tenant_name: promise
@@ -189,4 +200,3 @@ energy_recorder:
     api_url: http://energy.opnfv.fr/resources
     api_user: ""
     api_password: ""
-