summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Koderer <marc@koderer.com>2016-11-17 17:02:46 +0100
committerMarc Koderer <marc@koderer.com>2016-11-17 20:27:23 +0000
commit7683f2a3ca333e40c0e18ad20a21960f82f07aac (patch)
tree2a1dd7b51b45745a5ef4223a13cc75ff2cfb4bc0
parent97c764a9ea4b9b79d6c0fae92ca6ca782ee6da88 (diff)
[Tempest] Make share size configurable in scenario tests4.0.0.0b1
The scenario tests missing a way to configure the share size created during the test. Change-Id: I58d433a39037cbdb4ad92f956cfc27c54739fe1a Closes-bug: #1642548
Notes
Notes (review): Code-Review+1: Rodrigo Barbieri <rodrigo.barbieri2010@gmail.com> Code-Review+2: Goutham Pacha Ravi <gouthampravi@gmail.com> Code-Review+2: Valeriy Ponomaryov <vponomaryov@mirantis.com> Workflow+1: Valeriy Ponomaryov <vponomaryov@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 18 Nov 2016 12:08:17 +0000 Reviewed-on: https://review.openstack.org/399116 Project: openstack/manila Branch: refs/heads/master
-rw-r--r--manila_tempest_tests/tests/scenario/manager_share.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/manila_tempest_tests/tests/scenario/manager_share.py b/manila_tempest_tests/tests/scenario/manager_share.py
index 14fb34d..50a3a8a 100644
--- a/manila_tempest_tests/tests/scenario/manager_share.py
+++ b/manila_tempest_tests/tests/scenario/manager_share.py
@@ -50,7 +50,7 @@ class ShareScenarioTest(manager.NetworkScenarioTest):
50 cls.shares_admin_v2_client = shares_v2_client.SharesV2Client( 50 cls.shares_admin_v2_client = shares_v2_client.SharesV2Client(
51 cls.os_admin.auth_provider) 51 cls.os_admin.auth_provider)
52 52
53 def _create_share(self, share_protocol=None, size=1, name=None, 53 def _create_share(self, share_protocol=None, size=None, name=None,
54 snapshot_id=None, description=None, metadata=None, 54 snapshot_id=None, description=None, metadata=None,
55 share_network_id=None, share_type_id=None, 55 share_network_id=None, share_type_id=None,
56 client=None, cleanup_in_class=True): 56 client=None, cleanup_in_class=True):
@@ -79,7 +79,7 @@ class ShareScenarioTest(manager.NetworkScenarioTest):
79 metadata = metadata or {} 79 metadata = metadata or {}
80 kwargs = { 80 kwargs = {
81 'share_protocol': share_protocol, 81 'share_protocol': share_protocol,
82 'size': size, 82 'size': size or CONF.share.share_size,
83 'name': name, 83 'name': name,
84 'snapshot_id': snapshot_id, 84 'snapshot_id': snapshot_id,
85 'description': description, 85 'description': description,