X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fci%2Fconfig_functest.yaml;h=37e518e61f5415a7d77d49b59a8d3de4bcc02ac2;hb=35373ca7f27431f8dd59b45f8d2cf7618b98c699;hp=623092a53357be502a49d8685435f93beb5cd9a4;hpb=6efef3438c236ed0e522809c0c9acce5f0c81374;p=functest.git

diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index 623092a53..37e518e61 100644
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -3,22 +3,14 @@ general:
         home:               /home/opnfv
         repos:              /home/opnfv/repos
         dir_repo_rally:     /home/opnfv/repos/rally
-        repo_tempest:       /home/opnfv/repos/tempest
+        repo_tempest:       /src/tempest
         dir_repo_releng:    /home/opnfv/repos/releng
-        repo_vims_test:     /home/opnfv/repos/vnfs/vims-test
-        repo_sdnvpn:        /home/opnfv/repos/sdnvpn
-        repo_sfc:           /home/opnfv/repos/sfc
+        repo_vims_test:     /src/vims-test
         repo_onos:          /home/opnfv/repos/onos
-        repo_promise:       /home/opnfv/repos/promise
-        repo_netready:      /home/opnfv/repos/netready
         repo_barometer:     /home/opnfv/repos/barometer
         repo_doctor:        /home/opnfv/repos/doctor
-        repo_copper:        /home/opnfv/repos/copper
-        repo_parser:        /home/opnfv/repos/parser
-        repo_domino:        /home/opnfv/repos/domino
-        repo_snaps:         /home/opnfv/repos/snaps
-        repo_opera:         /home/opnfv/repos/opera
-        repo_fds:           /home/opnfv/repos/fds
+        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
@@ -27,9 +19,7 @@ general:
         functest_data:      /home/opnfv/functest/data
         ims_data:           /home/opnfv/functest/data/ims/
         functest_images:    /home/opnfv/functest/images
-        rally_inst:         /home/opnfv/.rally
-        repo_kingbird:      /home/opnfv/repos/kingbird
-        refstack_client:    /home/opnfv/repos/refstack-client
+        rally_inst:         /root/.rally
 
     openstack:
         creds: /home/opnfv/functest/conf/openstack.creds
@@ -63,19 +53,14 @@ snaps:
     use_keystone: True
     use_floating_ips: True
     images:
+      glance_tests:
+        disk_file: /home/opnfv/functest/images/cirros-0.3.5-x86_64-disk.img
       cirros:
         disk_file: /home/opnfv/functest/images/cirros-0.3.5-x86_64-disk.img
-        # ARM
-#        disk_url: http://download.cirros-cloud.net/daily/20161201/cirros-d161201-aarch64-disk.img
-#        kernel_url: http://download.cirros-cloud.net/daily/20161201/cirros-d161201-aarch64-kernel
-#        ramdisk_url: http://download.cirros-cloud.net/daily/20161201/cirros-d161201-aarch64-initramfs
-#        extra_properties:
-#            os_command_line: root=/dev/vdb1 rw rootwait console=tty0 console=ttyS0 console=ttyAMA0
-#            hw_video_model: vga
-#      ubuntu:
-#        disk_url: http://uec-images.ubuntu.com/releases/trusty/14.04/ubuntu-14.04-server-cloudimg-amd64-disk1.img
-#      centos:
-#        disk_url: http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2
+      ubuntu:
+        disk_file: /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-amd64-disk1.img
+      centos:
+        disk_file: /home/opnfv/functest/images/CentOS-7-x86_64-GenericCloud.qcow2
 
 vping:
     ping_timeout:   200
@@ -84,6 +69,9 @@ vping:
     vm_name_2: opnfv-vping-2
     image_name: functest-vping
     private_net_name: vping-net
+    # network_type: vlan
+    # physical_network: physnet2
+    # segmentation_id: 2366
     private_subnet_name: vping-subnet
     private_subnet_cidr: 192.168.130.0/24
     router_name: vping-router
@@ -136,10 +124,6 @@ rally:
     router_name: rally-router
 
 vnf:
-    aaa:
-        tenant_name: aaa
-        tenant_description: Freeradius server
-        tenant_images: {}
     juju_epc:
         tenant_name: epc
         tenant_description: OAI EPC deployed with Juju
@@ -148,13 +132,14 @@ vnf:
         tenant_name: cloudify_ims
         tenant_description: vIMS
         config: cloudify_ims.yaml
-    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
+    orchestra_openims:
+        tenant_name: orchestra_openims
+        tenant_description: OpenIMS deployed with Open Baton
+        config: orchestra.yaml
+    orchestra_clearwaterims:
+        tenant_name: orchestra_clearwaterims
+        tenant_description: Clearwater IMS deployed with Open Baton
+        config: orchestra.yaml
 
 ONOS:
     general:
@@ -173,14 +158,6 @@ ONOS:
         installer_master: '10.20.0.2'
         installer_master_username: 'root'
         installer_master_password: 'r00tme'
-multisite:
-    fuel:
-        installer_username: 'root'
-        installer_password: 'r00tme'
-    compass:
-        installer_username: 'root'
-        installer_password: 'root'
-        multisite_controller_ip: '10.1.0.50'
 promise:
     tenant_name: promise
     tenant_description: promise Functionality Testing
@@ -213,6 +190,7 @@ results:
     test_db_url: http://testresults.opnfv.org/test/api/v1/results
 
 energy_recorder:
-    api_url: http://161.105.253.100:8888/resources
+    api_url: http://energy.opnfv.fr/resources
     api_user: ""
     api_password: ""
+