X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fci%2Fconfig_functest.yaml;h=67ecc3424c687f54357c58d69f4b040de4e20a77;hb=979161874ba837f55a53aba391966c52433123e6;hp=2f108a1d0a9ebe6fba49e07563b0e371a8ba27bc;hpb=2644c12741147863f1be718e7f2d221651bd7ac4;p=functest.git

diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index 2f108a1d0..67ecc3424 100644
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -11,18 +11,16 @@ general:
         functest_conf: /home/opnfv/functest/conf
         functest_data: /home/opnfv/functest/data
         ims_data: /home/opnfv/functest/data/ims/
+        refstack_data: /home/opnfv/functest/data/refstack
         router_data: /home/opnfv/functest/data/router/
         functest_images: /home/opnfv/functest/images
         rally_inst: /root/.rally
 
     openstack:
-        creds: /home/opnfv/functest/conf/openstack.creds
-
         image_name: Cirros-0.4.0
         image_name_alt: Cirros-0.4.0-1
         image_file_name: cirros-0.4.0-x86_64-disk.img
-        image_url:
-            http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img
+        image_url: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.img
         image_user: cirros
         image_disk_format: qcow2
         image_username: cirros
@@ -46,6 +44,7 @@ general:
 snaps:
     use_keystone: 'True'
     use_floating_ips: 'True'
+    flavor_extra_specs: {}
     images:
         glance_tests:
             disk_file: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.img
@@ -57,6 +56,11 @@ snaps:
         centos:
             disk_file:
                 /home/opnfv/functest/images/CentOS-7-x86_64-GenericCloud.qcow2
+#   netconf_override:
+#       network_type: vlan
+#       physical_network: physnet2
+#       segmentation_id: 2366
+
 # All of these values are optional and will override the values retrieved
 # by the RC file
 #    os_creds_override:
@@ -77,6 +81,7 @@ snaps:
 #        port: {proxy_port}
 #        ssh_proxy_cmd: {OpenSSH -o ProxyCommand value}
 
+
 vping:
     ping_timeout: 200
     vm_flavor: m1.tiny   # adapt to your environment
@@ -90,9 +95,9 @@ vping:
     private_subnet_name: vping-subnet
     private_subnet_cidr: 192.168.130.0/24
     router_name: vping-router
-    sg_name: vPing-sg
+    sg_name: vping-sg
     sg_desc: Security group for vPing test case
-    keypair_name: vPing-keypair
+    keypair_name: vping-keypair
     keypair_priv_file: /tmp/vPing-keypair
     keypair_pub_file: /tmp/vPing-keypair.pub
     vm_boot_timeout: 180
@@ -100,6 +105,24 @@ vping:
     vm_ssh_connect_timeout: 60
     cleanup_objects: 'True'
 
+cinder:
+    vm_name_1: opnfv-cinder-1
+    vm_name_2: opnfv-cinder-2
+    image_name: functest-cinder
+    private_net_name: cinder-net
+    private_subnet_name: cinder-subnet
+    private_subnet_cidr: 192.168.130.0/24
+    router_name: cinder-router
+    sg_name: cinder-sg
+    sg_desc: Security group for CinderCheck test case
+    keypair_name: cinder-keypair
+    keypair_priv_file: /tmp/CinderCheck-keypair
+    keypair_pub_file: /tmp/CinderCheck-keypair.pub
+    vm_boot_timeout: 180
+    vm_delete_timeout: 100
+    vm_ssh_connect_timeout: 60
+    cleanup_objects: 'True'
+
 odl_sfc:
     image_base_url: "http://artifacts.opnfv.org/sfc/images"
     image_name: sfc_nsh_danube
@@ -117,16 +140,20 @@ tempest:
         ssh_timeout: 130
     object_storage:
         operator_role: SwiftOperator
+    # network_type: vlan
+    # physical_network: physnet2
+    # segmentation_id: 2366
     private_net_name: tempest-net
     private_subnet_name: tempest-subnet
     private_subnet_cidr: 192.168.150.0/24
     router_name: tempest-router
-    use_custom_flavors: 'False'
-    volume_device_name: vdc
 
 rally:
     deployment_name: opnfv-rally
     network_name: rally-net
+    # network_type: vlan
+    # physical_network: physnet2
+    # segmentation_id: 2366
     subnet_name: rally-subnet
     subnet_cidr: 192.168.140.0/24
     router_name: rally-router
@@ -142,9 +169,6 @@ vnf:
         private_subnet_cidr: 172.16.0.0/24
         private_subnet_name: abot-subnet
         external_router: abot-router
-        external_network_name: ext-net
-        dns_nameserver: ['8.8.8.8']
-
     cloudify_ims:
         tenant_name: cloudify_ims
         tenant_description: vIMS
@@ -176,14 +200,3 @@ example:
     router_name: example-router
     sg_name: example-sg
     sg_desc: Example Security group
-
-results:
-    # 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://energy.opnfv.fr/resources
-    api_user: ""
-    api_password: ""