X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fci%2Fconfig_functest.yaml;h=4d5a62175b5b6a90e63ddb0f073cbbb8a4a442cb;hb=9ae14f931da5baf42a3b62eef49c644e762405fc;hp=25be1724045bbb85688738acce3a24e47c93e741;hpb=9bc652fe41541a05f52c09d01a2e671eae5b2965;p=functest.git

diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index 25be17240..4d5a62175 100755
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -5,9 +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_vIMS:          functest/opnfv_tests/vnf/ims
-        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
@@ -19,31 +18,42 @@ 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
-        dir_repo_promise:   /home/opnfv/repos/promise
-        dir_repo_doctor:    /home/opnfv/repos/doctor
+        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
-        dir_repo_ovno:      /home/opnfv/repos/ovno
         repo_parser:        /home/opnfv/repos/parser
         repo_domino:        /home/opnfv/repos/domino
         repo_snaps:         /home/opnfv/repos/snaps
+        repo_fds:           /home/opnfv/repos/fds
+        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
+        functest_logging_cfg:   /home/opnfv/repos/functest/functest/ci/logging.json
         functest_conf:      /home/opnfv/functest/conf
         functest_data:      /home/opnfv/functest/data
-        dir_vIMS_data:      /home/opnfv/functest/data/vIMS/
+        ims_data:           /home/opnfv/functest/data/ims/
         rally_inst:         /home/opnfv/.rally
+        repo_kingbird:      /home/opnfv/repos/kingbird
+        refstack_client:    /home/opnfv/repos/refstack-client
 
     openstack:
         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_name_alt: Cirros-0.3.5-1
+        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_name_alt: opnfv_flavor_1
         flavor_ram: 512
         flavor_disk: 1
         flavor_vcpus: 1
@@ -61,7 +71,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
 
@@ -96,12 +106,15 @@ tempest:
         user_password: tempest
     validation:
         ssh_timeout: 130
+    object_storage:
+        operator_role: SwiftOperator
     private_net_name: tempest-net
     private_subnet_name: tempest-subnet
     private_subnet_cidr: 192.168.150.0/24
     router_name: tempest-router
     use_custom_images: False
     use_custom_flavors: False
+    volume_device_name: vdc
 
 rally:
     deployment_name: opnfv-rally
@@ -110,6 +123,10 @@ rally:
     subnet_cidr: 192.168.140.0/24
     router_name: rally-router
 
+refstack:
+    tempest_conf_path: openstack/refstack_client/tempest.conf
+    defcore_list: openstack/refstack_client/defcore.txt
+
 vnf:
     aaa:
         tenant_name: aaa
@@ -122,48 +139,11 @@ vnf:
     cloudify_ims:
         tenant_name: cloudify_ims
         tenant_description: vIMS
-        tenant_images:
-            ubuntu_14.04: http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img
-            centos_7: http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1510.qcow2
-        cloudify:
-            blueprint:
-                url: https://github.com/boucherv-orange/cloudify-manager-blueprints.git
-                branch: "3.3.1-build"
-            requierments:
-                ram_min: 3000
-                os_image: centos_7
-            inputs:
-                keystone_username: ""
-                keystone_password: ""
-                keystone_tenant_name: ""
-                keystone_url: ""
-                manager_public_key_name: 'manager-kp'
-                agent_public_key_name: 'agent-kp'
-                image_id: ""
-                flavor_id: "3"
-                external_network_name: ""
-                ssh_user: centos
-                agents_user: ubuntu
-        clearwater:
-            blueprint:
-                file_name: 'openstack-blueprint.yaml'
-                name: "clearwater-opnfv"
-                destination_folder: "opnfv-cloudify-clearwater"
-                url: https://github.com/Orange-OpenSource/opnfv-cloudify-clearwater.git
-                branch: "stable"
-            deployment_name: 'clearwater-opnfv'
-            requirements:
-                ram_min: 1700
-                os_image: ubuntu_14.04
-            inputs:
-                image_id: ''
-                flavor_id: ''
-                agent_user: 'ubuntu'
-                external_network_name: ''
-                public_domain: clearwater.opnfv
+        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