Set same dependencies for all vping test cases

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

diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index 2f108a1..1721530 100644 (file)
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -11,13 +11,12 @@ 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
@@ -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:
@@ -117,16 +121,21 @@ 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 +151,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 +182,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: ""