Fix CephFS snapshot cloning scenario test
When unmounting a share with the kernel
client, the target directory must be what
we used during the mount operation.
This patch adds a create-share-from-snapshot
scenario test for the ceph-fuse client, and
drops the redundant 'ip_version' attribute
to test classes that was added in the
test reorganization patch earlier [1]
[1] I7e63434e745cc1c2a5e8aaccc20f7c31404742d9
Change-Id: I9e373c658bf8aefa5763b7bb58637969e5253312
Closes-Bug: #1921369
Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com>
diff --git a/manila_tempest_tests/tests/scenario/manager_share.py b/manila_tempest_tests/tests/scenario/manager_share.py
index e828b0a..0f55d6e 100644
--- a/manila_tempest_tests/tests/scenario/manager_share.py
+++ b/manila_tempest_tests/tests/scenario/manager_share.py
@@ -820,4 +820,5 @@
if getattr(self, 'mount_client', None):
return remote_client.exec_command(
"sudo fusermount -uz %s" % target_dir)
- super(BaseShareScenarioCEPHFSTest, self).unmount_share(remote_client)
+ super(BaseShareScenarioCEPHFSTest, self).unmount_share(
+ remote_client, target_dir=target_dir)
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 29fa9a8..9f0ec70 100644
--- a/manila_tempest_tests/tests/scenario/test_share_basic_ops.py
+++ b/manila_tempest_tests/tests/scenario/test_share_basic_ops.py
@@ -412,7 +412,7 @@
class TestShareBasicOpsNFS(manager.BaseShareScenarioNFSTest,
ShareBasicOpsBase):
- ip_version = 4
+ pass
class TestShareBasicOpsCIFS(manager.BaseShareScenarioCIFSTest,
@@ -461,6 +461,14 @@
super(TestBaseShareBasicOpsScenarioCEPHFS,
self).test_read_write_two_vms()
+ @decorators.idempotent_id('5bd64c46-05f4-4891-a08f-e146d1a76437')
+ @tc.attr(base.TAG_POSITIVE, base.TAG_BACKEND)
+ def test_write_data_to_share_created_from_snapshot_with_ceph_fuse_client(
+ self):
+ self.mount_client = 'fuse'
+ super(TestBaseShareBasicOpsScenarioCEPHFS,
+ self).test_write_data_to_share_created_from_snapshot()
+
class TestShareBasicOpsNFSIPv6(TestShareBasicOpsNFS):
ip_version = 6
diff --git a/manila_tempest_tests/tests/scenario/test_share_extend.py b/manila_tempest_tests/tests/scenario/test_share_extend.py
index e5ecf3b..76cfd2a 100644
--- a/manila_tempest_tests/tests/scenario/test_share_extend.py
+++ b/manila_tempest_tests/tests/scenario/test_share_extend.py
@@ -147,7 +147,7 @@
class TestShareExtendNFS(manager.BaseShareScenarioNFSTest, ShareExtendBase):
- ip_version = 4
+ pass
class TestShareExtendCIFS(manager.BaseShareScenarioCIFSTest, ShareExtendBase):
diff --git a/manila_tempest_tests/tests/scenario/test_share_manage_unmanage.py b/manila_tempest_tests/tests/scenario/test_share_manage_unmanage.py
index 65fce38..aa164ea 100644
--- a/manila_tempest_tests/tests/scenario/test_share_manage_unmanage.py
+++ b/manila_tempest_tests/tests/scenario/test_share_manage_unmanage.py
@@ -179,7 +179,7 @@
class ShareManageUnmanageNFS(manager.BaseShareScenarioNFSTest,
ShareManageUnmanageBase):
- ip_version = 4
+ pass
class ShareManageUnmanageCIFS(manager.BaseShareScenarioCIFSTest,
diff --git a/manila_tempest_tests/tests/scenario/test_share_shrink.py b/manila_tempest_tests/tests/scenario/test_share_shrink.py
index 1ba860f..241dbb3 100644
--- a/manila_tempest_tests/tests/scenario/test_share_shrink.py
+++ b/manila_tempest_tests/tests/scenario/test_share_shrink.py
@@ -163,7 +163,7 @@
class TestShareShrinkNFS(manager.BaseShareScenarioNFSTest, ShareShrinkBase):
- ip_version = 4
+ pass
class TestShareShrinkCIFS(manager.BaseShareScenarioCIFSTest, ShareShrinkBase):