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

diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index 8da1d6172..37e518e61 100644
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -5,13 +5,10 @@ general:
         dir_repo_rally:     /home/opnfv/repos/rally
         repo_tempest:       /src/tempest
         dir_repo_releng:    /home/opnfv/repos/releng
-        repo_vims_test:     /home/opnfv/repos/vnfs/vims-test
+        repo_vims_test:     /src/vims-test
         repo_onos:          /home/opnfv/repos/onos
-        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_domino:        /home/opnfv/repos/domino
         repo_odl_test:      /src/odl_test
         repo_fds:           /src/fds
         repo_securityscan:  /home/opnfv/repos/securityscanning
@@ -72,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
@@ -124,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
@@ -136,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:
@@ -161,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
@@ -204,3 +193,4 @@ energy_recorder:
     api_url: http://energy.opnfv.fr/resources
     api_user: ""
     api_password: ""
+