Allow overriding default storage protocol

It adds a new env var STORAGE_PROTOCOL to override storage_protocol
in tempest. The default value is unchanged [1].

[1] https://docs.openstack.org/tempest/latest/sampleconf.html

Co-Authored-By: Viktor Tikkanen <viktor.tikkanen@nokia.com>
Change-Id: I19e4e25212b6f6176e3b967e01eb634c15e4d474
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit a561c6ca316feb1a203327aa729ac0317f70df48)

diff --git a/ci/globals.yaml b/ci/globals.yaml
index 47a1a89..7b307c8 100644 (file)
--- a/ci/globals.yaml
+++ b/ci/globals.yaml
@@ -10,3 +10,4 @@
     prefix: '/home/opnfv/functest'
     nameserver: '8.8.8.8'
     external_network: 'ext-net'
+    storage_protocol: 'iSCSI'

diff --git a/ci/run.yaml b/ci/run.yaml
index 385d38f..c7e27ec 100644 (file)
--- a/ci/run.yaml
+++ b/ci/run.yaml
@@ -7,6 +7,7 @@
           docker run \
             -e NAMESERVER={nameserver} \
             -e EXTERNAL_NETWORK={external_network} \
+            -e STORAGE_PROTOCOL={storage_protocol} \
             -v \
             {prefix}/results/$JOB_NAME-$BUILD_ID:/home/opnfv/functest/results \
             -v {prefix}/openstack.creds:/home/opnfv/functest/conf/env_file \

diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index 4cb8bd8..8eaf609 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -225,7 +225,9 @@ 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/utils/env.py b/functest/utils/env.py
index 1f64983..3d8154c 100644 (file)
--- a/functest/utils/env.py
+++ b/functest/utils/env.py
@@ -34,7 +34,8 @@ INPUTS = {
     'VOLUME_DEVICE_NAME': 'vdb',
     'NAMESERVER': '8.8.8.8',
     'NEW_USER_ROLE': 'Member',
-    'USE_DYNAMIC_CREDENTIALS': 'True'
+    'USE_DYNAMIC_CREDENTIALS': 'True',
+    'STORAGE_PROTOCOL': 'iSCSI'
 }