Merge "Cast block count to integer"
diff --git a/manila_tempest_tests/config.py b/manila_tempest_tests/config.py
index 9c734f4..3d29db1 100644
--- a/manila_tempest_tests/config.py
+++ b/manila_tempest_tests/config.py
@@ -125,15 +125,24 @@
default="",
help="Some backend drivers requires share network "
"for share creation. Share network id, that will be "
- "used for shares. If not set, it won't be used."),
+ "used for shares. If not set, it won't be used. Setting "
+ "this option to a valid share network ID will mean that "
+ "the value of create_networks_when_multitenancy_enabled "
+ "should be False."),
cfg.StrOpt("alt_share_network_id",
default="",
help="Share network id, that will be used for shares"
- " in alt tenant. If not set, it won't be used"),
+ " in alt tenant. If not set, it won't be used. Setting "
+ "this option to a valid share network ID will mean that "
+ "the value of create_networks_when_multitenancy_enabled "
+ "should be False."),
cfg.StrOpt("admin_share_network_id",
default="",
help="Share network id, that will be used for shares"
- " in admin tenant. If not set, it won't be used"),
+ " in admin tenant. If not set, it won't be used. Setting "
+ "this option to a valid share network ID will mean that "
+ "the value of create_networks_when_multitenancy_enabled "
+ "should be False."),
cfg.BoolOpt("multi_backend",
default=False,
help="Runs Manila multi-backend tests."),
diff --git a/manila_tempest_tests/tests/scenario/manager_share.py b/manila_tempest_tests/tests/scenario/manager_share.py
index 871deaf..fd02db0 100644
--- a/manila_tempest_tests/tests/scenario/manager_share.py
+++ b/manila_tempest_tests/tests/scenario/manager_share.py
@@ -311,11 +311,7 @@
client=None):
share = share or self.share
client = client or self.shares_v2_client
- if self.protocol.lower() == 'cifs':
- self.allow_access_ip(
- share['id'], instance=instance, cleanup=False,
- snapshot=snapshot, access_level=access_level, client=client)
- elif not CONF.share.multitenancy_enabled:
+ if not CONF.share.multitenancy_enabled:
if self.ipv6_enabled:
server_ip = self._get_ipv6_server_ip(instance)
else:
@@ -326,8 +322,7 @@
share['id'], ip=server_ip,
instance=instance, cleanup=False, snapshot=snapshot,
access_level=access_level, client=client)
- elif (CONF.share.multitenancy_enabled and
- self.protocol.lower() == 'nfs'):
+ else:
return self.allow_access_ip(
share['id'], instance=instance, cleanup=False,
snapshot=snapshot, access_level=access_level, client=client)
diff --git a/manila_tempest_tests/tests/scenario/test_share_basic_ops.py b/manila_tempest_tests/tests/scenario/test_share_basic_ops.py
index 1e23b82..6b54bdb 100644
--- a/manila_tempest_tests/tests/scenario/test_share_basic_ops.py
+++ b/manila_tempest_tests/tests/scenario/test_share_basic_ops.py
@@ -116,6 +116,11 @@
@tc.attr(base.TAG_NEGATIVE, base.TAG_BACKEND)
def test_write_with_ro_access(self):
'''Test if an instance with ro access can write on the share.'''
+ if self.protocol.upper() == 'CIFS':
+ msg = ("Skipped for CIFS protocol because RO access is not "
+ "supported for shares by IP.")
+ raise self.skipException(msg)
+
test_data = "Some test data to write"
instance = self.boot_instance(wait_until="BUILD")