From 481019fb4c3181592dabe10eba7c143ec401230b Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Thu, 20 Jun 2019 07:42:31 +0000
Subject: [PATCH] Add capability of adding additional network API extensions

Currently, devstack has NETWORK_API_EXTENSIONS var to define
the network API extensions. NETWORK_API_EXTENSIONS is defaulted
to 'all' for master and hard coded list of extensions per release.
Zuul jobs of network extensions (for example neutron-fwaas) need
add the some extra extensions in the default list. To do so, they
need to duplicate all the defaults extensions and then add the extra
extensions. Much difficult situation is when defaults extensions list
vary from release to release so they have to keep updating the
NETWORK_API_EXTENSIONS per release.

This commit defines a new var ADDITIONAL_NETWORK_API_EXTENSIONS which
will take extra extensions and append into the default list. This way
Zuul jobs do not need to duplicate the default extensions.

Change-Id: I7270c9b9e047a851970439522c0356c9089a5b74
(cherry picked from commit 52c2886f7ede0e47f53b65fd1fd30f7d6ca7c086)
(cherry picked from commit 6154153699ef99e9fc2df5208898b42be596efb0)
---
 lib/tempest | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/tempest b/lib/tempest
index b1d9daace4..c298511bdc 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -645,6 +645,9 @@ function configure_tempest {
         # Remove disabled extensions
         network_api_extensions=$(remove_disabled_extensions $network_api_extensions $DISABLE_NETWORK_API_EXTENSIONS)
     fi
+    if [[ -n "$ADDITIONAL_NETWORK_API_EXTENSIONS" ]] && [[ "$network_api_extensions" != "all" ]]; then
+        network_api_extensions+=",$ADDITIONAL_NETWORK_API_EXTENSIONS"
+    fi
     iniset $TEMPEST_CONFIG network-feature-enabled api_extensions $network_api_extensions
     # Swift API Extensions
     DEFAULT_SWIFT_OPT="account_quotas,bulk_delete,bulk_upload,container_quotas"