X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fci%2Fconfig_functest.yaml;h=5ff5c824e623722cfed5195f1d0203f900744313;hb=63cd8a0bdb80c5d2c885e5205612dcd4bb956981;hp=e775fe16f106d28379c1310b9a8db3bd1fa9e9cc;hpb=3c137f2972d4c8a64755b344f63c5492a51d78a6;p=functest.git

diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index e775fe16f..5ff5c824e 100644
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -5,19 +5,18 @@ 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_onos:          /home/opnfv/repos/onos
+        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
 
@@ -61,6 +60,25 @@ snaps:
         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
+      # All of these values are optional and will override the values retrieved
+      # by the RC file
+#    os_creds_override:
+#      username: {user}
+#      password: {password}
+#      auth_url: {auth_url}
+#      project_name: {project_name}
+#      identity_api_version: {2|3}
+#      network_api_version: {2}
+#      compute_api_version: {2}
+#      image_api_version: {1|2}
+#      user_domain_id: {user_domain_id}
+#      project_domain_id: {projects_domain_id}
+#      interface: {interface}
+#      cacert: {True|False}
+#      proxy_settings:
+#        host: {proxy_host}
+#        port: {proxy_port}
+#        ssh_proxy_cmd: {OpenSSH -o ProxyCommand value}
 
 vping:
     ping_timeout:   200
@@ -69,6 +87,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
@@ -83,11 +104,6 @@ vping:
     cleanup_objects: True
     unique_names: True
 
-onos_sfc:
-    image_base_url: http://artifacts.opnfv.org/sfc/demo
-    image_name: TestSfcVm
-    image_file_name: firewall_block_image.img
-
 odl_sfc:
     image_base_url: "http://artifacts.opnfv.org/sfc/images"
     image_name: sfc_nsh_danube
@@ -96,6 +112,11 @@ odl_sfc:
 
 tempest:
     deployment_name: opnfv-tempest
+    identity:
+        tenant_name: tempest
+        tenant_description: Tenant for Tempest test suite
+        user_name: tempest
+        user_password: Tempest123!
     validation:
         ssh_timeout: 130
     object_storage:
@@ -116,10 +137,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,27 +153,11 @@ vnf:
         tenant_name: orchestra_clearwaterims
         tenant_description: Clearwater IMS deployed with Open Baton
         config: orchestra.yaml
-    opera_ims:
-        tenant_name: opera_ims
-        tenant_description: ims deployed with open-o
+    vyos_vrouter:
+        tenant_name: vrouter
+        tenant_description: vRouter
+        config: cloudify_vrouter.yaml
 
-ONOS:
-    general:
-        onosbench_username: 'root'
-        onosbench_password: 'root'
-        onoscli_username: 'root'
-        onoscli_password: 'root'
-        runtimeout: 300
-    environment:
-        OCT: '10.20.0.1'
-        OC1: '10.20.0.7'
-        OC2: '10.20.0.7'
-        OC3: '10.20.0.7'
-        OCN: '10.20.0.4'
-        OCN2: '10.20.0.5'
-        installer_master: '10.20.0.2'
-        installer_master_username: 'root'
-        installer_master_password: 'r00tme'
 promise:
     tenant_name: promise
     tenant_description: promise Functionality Testing