fix cinder scenario bug (bad scenario format)

[functest.git] / testcases / functest.yaml

diff --git a/testcases/functest.yaml b/testcases/functest.yaml
index 2f34949..6175e6f 100644 (file)
--- a/testcases/functest.yaml
+++ b/testcases/functest.yaml
@@ -10,18 +10,22 @@ general:
         dir_odl:        .functest/ODL/
         dir_rally_inst: .rally/
     openstack:
-        image_name: Ubuntu14.04
-        image_url:  https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img
-        image_disk_format:  raw
-        #Public network. Must exist already.
+        image_name: functest-img
+        image_url:  http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img
+        image_disk_format:  qcow2
+        #Public network. Optional
         neutron_public_net_name: net04_ext
+        neutron_public_subnet_name: net04_ext__subnet
+        neutron_public_subnet_cidr: 172.16.9.0/24
+        neutron_public_subnet_start: 172.16.9.130
+        neutron_public_subnet_end: 172.16.9.254
         #Private network for functest. Will be created by config_functest.py
-        neutron_net_name: functest-net
-        neutron_subnet_name: functest-subnet
-        neutron_subnet_range: 192.168.120.0/24
-        neutron_subnet_start: 192.168.120.2
-        neutron_subnet_end: 192.168.120.254
-        neutron_subnet_gateway: 192.168.120.254
+        neutron_private_net_name: functest-net
+        neutron_private_subnet_name: functest-subnet
+        neutron_private_subnet_cidr: 192.168.120.0/24
+        neutron_private_subnet_start: 192.168.120.2
+        neutron_private_subnet_end: 192.168.120.254
+        neutron_private_subnet_gateway: 192.168.120.254
         neutron_router_name: functest-router
 vping:
     ping_timeout:   200