From e7fa7cd158327afcc99b6d97f62429cdbf2b1c7a Mon Sep 17 00:00:00 2001
From: Goutham Pacha Ravi <gouthampravi@gmail.com>
Date: Wed, 15 Aug 2018 16:21:35 -0700
Subject: [PATCH] Fix functional tests

Manila's ci scripts disable configuring the
default share and share group types if testing
with the dummy driver.

We want to continue using the the default types
mechanism in python-manilaclient, until we decide
not to.

Change-Id: I14544bea728286eeb33461e724d991fe556a4269
Closes-Bug: #1787292
---
 contrib/ci/pre_test_hook.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/contrib/ci/pre_test_hook.sh b/contrib/ci/pre_test_hook.sh
index 20804816a..e115f3c85 100644
--- a/contrib/ci/pre_test_hook.sh
+++ b/contrib/ci/pre_test_hook.sh
@@ -17,12 +17,16 @@
 # Run manila's pre_test_hook.sh script first
 source $BASE/new/manila/contrib/ci/pre_test_hook.sh True dummy multibackend
 
+sudo -H pip install virtualenv
+virtualenv /tmp/devstack-tools
+/tmp/devstack-tools/bin/pip install -U devstack-tools==0.4.0
+
 localconf=$BASE/new/devstack/local.conf
+DSCONF=/tmp/devstack-tools/bin/dsconf
 
-echo "[[local|localrc]]" >> $localconf
 # Set big quota for share networks to avoid limit exceedances
-echo "MANILA_OPTGROUP_DEFAULT_quota_share_networks=50" >> $localconf
-
+$DSCONF setlc $localconf MANILA_OPTGROUP_DEFAULT_quota_share_networks 50
+$DSCONF setlc $localconf MANILA_CONFIGURE_DEFAULT_TYPES True
 # Enable and use only v3 of Identity API
-echo "IDENTITY_API_VERSION=3" >> $localconf
-echo "ENABLE_IDENTITY_V2=False" >> $localconf
+$DSCONF setlc $localconf IDENTITY_API_VERSION 3
+$DSCONF setlc $localconf ENABLE_IDENTITY_V2 False