Publish tenantnetwork scenarios

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

diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index 48322a6..67ecc34 100644 (file)
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -3,35 +3,28 @@ general:
     dir:
         home: /home/opnfv
         repos: /home/opnfv/repos
-        dir_repo_rally: /home/opnfv/repos/rally
         repo_tempest: /src/tempest
-        dir_repo_releng: /home/opnfv/repos/releng
         repo_vims_test: /src/vims-test
-        repo_barometer: /home/opnfv/repos/barometer
         repo_odl_test: /src/odl_test
-        repo_fds: /src/fds
-        repo_securityscan: /home/opnfv/repos/securityscanning
         functest: /home/opnfv/functest
         results: /home/opnfv/functest/results
         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.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_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: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.img
         image_user: cirros
         image_disk_format: qcow2
         image_username: cirros
-        image_password: cubswin:)
+        image_password: gocubsgo
 
         flavor_name: opnfv_flavor
         flavor_name_alt: opnfv_flavor_1
@@ -51,17 +44,23 @@ general:
 snaps:
     use_keystone: 'True'
     use_floating_ips: 'True'
+    flavor_extra_specs: {}
     images:
         glance_tests:
-            disk_file: /home/opnfv/functest/images/cirros-0.3.5-x86_64-disk.img
+            disk_file: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.img
         cirros:
-            disk_file: /home/opnfv/functest/images/cirros-0.3.5-x86_64-disk.img
+            disk_file: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.img
         ubuntu:
             disk_file:
                 /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-amd64-disk1.img
         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:
@@ -82,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
@@ -95,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
@@ -105,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
@@ -122,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
@@ -147,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
@@ -181,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: ""