X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fci%2Fconfig_functest.yaml;h=5496dd9461181da6b6cad3348b7a0c32af8a10f2;hb=5442c9738c27d0c516040410f3f651fab4b7e70a;hp=402e299999f092cae4d056615a157ce862526cd8;hpb=ccb79f369e484832deb99b989fada30c6b730697;p=functest.git

diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
old mode 100755
new mode 100644
index 402e29999..5496dd946
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -24,32 +24,40 @@ general:
         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_opera:         /home/opnfv/repos/opera
+        repo_fds:           /home/opnfv/repos/fds
         repo_securityscan:  /home/opnfv/repos/securityscanning
-        repo_vrouter:       /home/opnfv/repos/vrouter
+        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_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
 
     openstack:
         creds: /home/opnfv/functest/conf/openstack.creds
         snapshot_file: /home/opnfv/functest/conf/openstack_snapshot.yaml
 
         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_url: http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img
+        image_user: cirros
         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
@@ -66,14 +74,23 @@ general:
     functest:
         testcases_yaml: /home/opnfv/repos/functest/functest/ci/testcases.yaml
 
-healthcheck:
-    disk_image: /home/opnfv/functest/data/cirros-0.3.5-x86_64-disk.img
-    disk_format: qcow2
-    wait_time: 60
-
 snaps:
     use_keystone: True
-    use_floating_ips: False
+    use_floating_ips: True
+#    images:
+#      cirros:
+#        disk_url: http://download.cirros-cloud.net/0.3.5/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
 
 vping:
     ping_timeout:   200
@@ -87,6 +104,14 @@ vping:
     router_name: vping-router
     sg_name: vPing-sg
     sg_desc: Security group for vPing test case
+    keypair_name: vPing-keypair
+    keypair_priv_file: /tmp/vPing-keypair
+    keypair_pub_file: /tmp/vPing-keypair.pub
+    vm_boot_timeout: 180
+    vm_delete_timeout: 100
+    vm_ssh_connect_timeout: 60
+    cleanup_objects: True
+    unique_names: True
 
 onos_sfc:
     image_base_url: http://artifacts.opnfv.org/sfc/demo
@@ -110,6 +135,7 @@ tempest:
     router_name: tempest-router
     use_custom_images: False
     use_custom_flavors: False
+    volume_device_name: vdc
 
 rally:
     deployment_name: opnfv-rally
@@ -118,6 +144,10 @@ 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
@@ -191,4 +221,11 @@ example:
     sg_desc: Example Security group
 
 results:
-    test_db_url: http://testresults.opnfv.org/test/api/v1
+    # you can also set a file (e.g. /home/opnfv/functest/results/dump.txt) to dump results
+    # test_db_url: file:///home/opnfv/functest/results/dump.txt
+    test_db_url: http://testresults.opnfv.org/test/api/v1/results
+
+energy_recorder:
+    api_url: http://161.105.253.100:8888/resources
+    api_user: ""
+    api_password: ""