Merge "Change floating ips management from nova to neutron"

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

diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index 6d44f39..623092a 100644 (file)
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -1,17 +1,7 @@
 general:
     dir:
-        # Relative to the path where the repo is cloned:
-        vping:             functest/opnfv_tests/openstack/vping
-        dir_odl:           functest/opnfv_tests/sdn/odl
-        rally:             functest/opnfv_tests/openstack/rally
-        tempest_cases:     functest/opnfv_tests/openstack/tempest/custom_tests
-        onos:              functest/opnfv_tests/sdn/onos/teston
-        onos_sfc:          functest/opnfv_tests/sdn/onos/sfc
-
-        # Absolute path
         home:               /home/opnfv
         repos:              /home/opnfv/repos
-        repo_functest:      /home/opnfv/repos/functest
         dir_repo_rally:     /home/opnfv/repos/rally
         repo_tempest:       /home/opnfv/repos/tempest
         dir_repo_releng:    /home/opnfv/repos/releng
@@ -32,12 +22,11 @@ general:
         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.ini
         functest_conf:      /home/opnfv/functest/conf
         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
@@ -70,15 +59,12 @@ general:
         neutron_private_subnet_gateway: 192.168.120.254
         neutron_router_name: functest-router
 
-    functest:
-        testcases_yaml: /home/opnfv/repos/functest/functest/ci/testcases.yaml
-
 snaps:
     use_keystone: True
     use_floating_ips: True
-#    images:
-#      cirros:
-#        disk_url: http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img
+    images:
+      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
@@ -117,13 +103,19 @@ onos_sfc:
     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
+    image_file_name: sfc_nsh_danube.qcow2
+    image_format: qcow2
+
 tempest:
     deployment_name: opnfv-tempest
     identity:
         tenant_name: tempest
         tenant_description: Tenant for Tempest test suite
         user_name: tempest
-        user_password: tempest
+        user_password: Tempest123!
     validation:
         ssh_timeout: 130
     object_storage:
@@ -132,7 +124,7 @@ tempest:
     private_subnet_name: tempest-subnet
     private_subnet_cidr: 192.168.150.0/24
     router_name: tempest-router
-    use_custom_images: False
+    use_custom_images: True
     use_custom_flavors: False
     volume_device_name: vdc
 
@@ -143,10 +135,6 @@ rally:
     subnet_cidr: 192.168.140.0/24
     router_name: rally-router
 
-refstack:
-    tempest_conf_path: openstack/refstack_client/refstack_tempest.conf
-    defcore_list: openstack/refstack_client/defcore.txt
-
 vnf:
     aaa:
         tenant_name: aaa