Merge "Move tempest logics in tempest_conf.yaml" into stable/hunter

4 files changed, 16 insertions, 31 deletions

diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index e9443d6b3..6d301a624 100644
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -195,7 +195,6 @@ def configure_tempest_update_params(
         # enable multinode tests
         rconfig.set('compute', 'min_compute_nodes', compute_cnt)
         rconfig.set('compute-feature-enabled', 'live_migration', True)
-    rconfig.set('compute-feature-enabled', 'shelve', False)
     filters = ['RetryFilter', 'AvailabilityZoneFilter', 'ComputeFilter',
                'ComputeCapabilitiesFilter', 'ImagePropertiesFilter',
                'ServerGroupAntiAffinityFilter', 'ServerGroupAffinityFilter']
@@ -219,18 +218,6 @@ def configure_tempest_update_params(
     rconfig.set('identity', 'admin_role', admin_role_name)
     rconfig.set('identity', 'admin_domain_scope', True)
     rconfig.set('identity', 'default_domain_id', domain_id)
-    rconfig.set('identity-feature-enabled', 'api_v2', False)
-    rconfig.set('identity-feature-enabled', 'api_v2_admin', False)
-    if not rconfig.has_section('compute-feature-enabled'):
-        rconfig.add_section('compute-feature-enabled')
-    rconfig.set('compute-feature-enabled', 'vnc_console', False)
-    if not rconfig.has_section('image-feature-enabled'):
-        rconfig.add_section('image-feature-enabled')
-    rconfig.set('image-feature-enabled', 'api_v2', True)
-    rconfig.set('image-feature-enabled', 'api_v1', False)
-    if not rconfig.has_section('volume-feature-enabled'):
-        rconfig.add_section('volume-feature-enabled')
-    rconfig.set('volume-feature-enabled', 'backup', False)
     if not rconfig.has_section('network'):
         rconfig.add_section('network')
     rconfig.set('network', 'default_network', cidr)
@@ -241,9 +228,6 @@ def configure_tempest_update_params(
         getattr(config.CONF, 'tempest_validation_ssh_timeout'))
     rconfig.set('object-storage', 'operator_role',
                 getattr(config.CONF, 'tempest_object_storage_operator_role'))
-    if not rconfig.has_section('volume'):
-        rconfig.add_section('volume')
-    rconfig.set('volume', 'storage_protocol', env.get('STORAGE_PROTOCOL'))
     rconfig.set(
         'identity', 'v3_endpoint_type',
         os.environ.get('OS_INTERFACE', 'public'))
diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
index b47a9736a..baf7db60a 100644
--- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
+++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
@@ -1,13 +1,14 @@
-# This is an empty configuration file to be filled up with the desired options
-# to generate a custom tempest.conf
-# Examples:
-# network-feature-enabled:
-#     port_security: True
-
-# volume-feature-enabled:
-#     api_v1: False
-
-# validation:
-#     image_ssh_user: root
-#     ssh_timeout: 300
-
+---
+compute-feature-enabled:
+    shelve: false
+    vnc_console: false
+identity-feature-enabled:
+    api_v2: false
+    api_v2_admin: false
+image-feature-enabled:
+    api_v2: true
+    api_v1: false
+volume:
+    storage_protocol: iSCSI
+volume-feature-enabled:
+    backup: false
diff --git a/functest/utils/env.py b/functest/utils/env.py
index 41d1a4d86..e202f45b9 100644
--- a/functest/utils/env.py
+++ b/functest/utils/env.py
@@ -36,8 +36,7 @@ INPUTS = {
     'FLAVOR_EXTRA_SPECS': '',
     'NAMESERVER': '8.8.8.8',
     'NEW_USER_ROLE': 'Member',
-    'USE_DYNAMIC_CREDENTIALS': 'True',
-    'STORAGE_PROTOCOL': 'iSCSI'
+    'USE_DYNAMIC_CREDENTIALS': 'True'
 }
 
 
diff --git a/tox.ini b/tox.ini
index 48daab5c3..5f474380b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -81,6 +81,7 @@ files =
   docker
   functest/ci
   functest/opnfv_tests/openstack/rally/rally_jobs.yaml
+  functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
   functest/opnfv_tests/vnf
 commands =
   yamllint -s {[testenv:yamllint]files}