From 2370ec4da0cfa41ad0d32e6a68cee94db98e62e4 Mon Sep 17 00:00:00 2001
From: Tom Barron <tpb@dyncloud.net>
Date: Mon, 26 Dec 2016 13:24:19 -0500
Subject: [PATCH] DNM

Experiment: set creat_share_from_snapshot_support capability for
Tempest for native glusterfs driver

Change-Id: I01d266cd9c3d95e8eacd06641fa0cbb577bebe80
---
 manila/post_test_hook.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/manila/post_test_hook.sh b/manila/post_test_hook.sh
index 6fd92b5..de3914f 100755
--- a/manila/post_test_hook.sh
+++ b/manila/post_test_hook.sh
@@ -31,14 +31,18 @@ done
 if [[ "$GLUSTERFS_MANILA_DRIVER_TYPE" == "glusterfs-native" ]]; then
     local BACKEND_NAME="GLUSTERNATIVE"
     iniset $TEMPEST_CONFIG share enable_protocols glusterfs
-    iniset $TEMPEST_CONFIG share storage_protocol glusterfs
+    iniset $TEMPEST_CONFIG share capability_storage_protocol glusterfs
     # Disable tempest config option that enables creation of 'ip' type access
     # rules by default during tempest test runs.
     iniset $TEMPEST_CONFIG share enable_ip_rules_for_protocols
     iniset $TEMPEST_CONFIG share enable_cert_rules_for_protocols glusterfs
     iniset $TEMPEST_CONFIG share capability_snapshot_support True
+    iniset $TEMPEST_CONFIG share capablilty_create_share_from_snapshot_support True
     # ro access_level is not supported by the driver.
     iniset $TEMPEST_CONFIG share enable_ro_access_level_for_protocols
+    # Enable snapshot tests if they haven't been explicitly disabled
+    RUN_MANILA_SNAPSHOT_TESTS=${RUN_MANILA_SNAPSHOT_TESTS:-True}
+
 else
     case "$GLUSTERFS_MANILA_DRIVER_TYPE" in
     glusterfs|glusterfs-nfs)
@@ -56,8 +60,13 @@ else
     iniset $TEMPEST_CONFIG share storage_protocol NFS
     # ro access_level is not supported by the driver.
     iniset $TEMPEST_CONFIG share enable_ro_access_level_for_protocols
+    # Disable snapshot tests if they haven't been explicitly enabled
+    RUN_MANILA_SNAPSHOT_TESTS=${RUN_MANILA_SNAPSHOT_TESTS:-False}
+
 fi
 
+iniset $TEMPEST_CONFIG share run_snapshot_tests $RUN_MANILA_SNAPSHOT_TESTS
+
 
 iniset $TEMPEST_CONFIG share backend_names $BACKEND_NAME
 
@@ -88,9 +97,6 @@ iniset $TEMPEST_CONFIG share run_shrink_tests $RUN_MANILA_SHRINK_TESTS
 # Disable multi_tenancy tests
 iniset $TEMPEST_CONFIG share multitenancy_enabled False
 
-# Disable snapshot tests
-RUN_MANILA_SNAPSHOT_TESTS=${RUN_MANILA_SNAPSHOT_TESTS:-False}
-iniset $TEMPEST_CONFIG share run_snapshot_tests $RUN_MANILA_SNAPSHOT_TESTS
 
 # Disable consistency group tests
 RUN_MANILA_CG_TESTS=${RUN_MANILA_CG_TESTS:-False}