Support running on openstack which enabled https

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

diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index 3bad1b8..3d57631 100755 (executable)
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -5,8 +5,8 @@ general:
         dir_odl:           functest/opnfv_tests/sdn/odl
         rally:             functest/opnfv_tests/openstack/rally
         tempest_cases:     functest/opnfv_tests/openstack/tempest/custom_tests
-        dir_onos:          functest/opnfv_tests/sdn/onos/teston
-        dir_onos_sfc:      functest/opnfv_tests/sdn/onos/sfc
+        onos:              functest/opnfv_tests/sdn/onos/teston
+        onos_sfc:          functest/opnfv_tests/sdn/onos/sfc
 
         # Absolute path
         home:               /home/opnfv
@@ -18,7 +18,7 @@ general:
         repo_vims_test:     /home/opnfv/repos/vnfs/vims-test
         repo_sdnvpn:        /home/opnfv/repos/sdnvpn
         repo_sfc:           /home/opnfv/repos/sfc
-        dir_repo_onos:      /home/opnfv/repos/onos
+        repo_onos:          /home/opnfv/repos/onos
         repo_promise:       /home/opnfv/repos/promise
         repo_netready:      /home/opnfv/repos/netready
         repo_barometer:     /home/opnfv/repos/barometer
@@ -29,6 +29,7 @@ general:
         repo_domino:        /home/opnfv/repos/domino
         repo_snaps:         /home/opnfv/repos/snaps
         repo_securityscan:  /home/opnfv/repos/securityscanning
+        repo_vrouter:       /home/opnfv/repos/vnfs/vrouter
         functest:           /home/opnfv/functest
         functest_test:      /home/opnfv/repos/functest/functest/opnfv_tests
         results:            /home/opnfv/functest/results
@@ -42,9 +43,11 @@ general:
         creds: /home/opnfv/functest/conf/openstack.creds
         snapshot_file: /home/opnfv/functest/conf/openstack_snapshot.yaml
 
-        image_name: Cirros-0.3.4
-        image_file_name:  cirros-0.3.4-x86_64-disk.img
+        image_name: Cirros-0.3.5
+        image_file_name:  cirros-0.3.5-x86_64-disk.img
         image_disk_format:  qcow2
+        image_username:  cirros
+        image_password:  cubswin:)
 
         flavor_name: opnfv_flavor
         flavor_ram: 512
@@ -64,7 +67,7 @@ general:
         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_image: /home/opnfv/functest/data/cirros-0.3.5-x86_64-disk.img
     disk_format: qcow2
     wait_time: 60
 
@@ -131,6 +134,7 @@ vnf:
     orchestra_ims:
         tenant_name: orchestra_ims
         tenant_description: ims deployed with openbaton
+        config: orchestra_ims.yaml
     opera_ims:
         tenant_name: opera_ims
         tenant_description: ims deployed with open-o