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>
This commit is contained in:
Goutham Pacha Ravi 2021-04-18 16:25:25 -07:00
parent 35091ce994
commit 602f101c14
5 changed files with 14 additions and 5 deletions

View File

@ -820,4 +820,5 @@ class BaseShareScenarioCEPHFSTest(ShareScenarioTest):
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)

View File

@ -412,7 +412,7 @@ class ShareBasicOpsBase(manager.ShareScenarioTest):
class TestShareBasicOpsNFS(manager.BaseShareScenarioNFSTest,
ShareBasicOpsBase):
ip_version = 4
pass
class TestShareBasicOpsCIFS(manager.BaseShareScenarioCIFSTest,
@ -461,6 +461,14 @@ class TestBaseShareBasicOpsScenarioCEPHFS(manager.BaseShareScenarioCEPHFSTest,
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

View File

@ -147,7 +147,7 @@ class ShareExtendBase(manager.ShareScenarioTest):
class TestShareExtendNFS(manager.BaseShareScenarioNFSTest, ShareExtendBase):
ip_version = 4
pass
class TestShareExtendCIFS(manager.BaseShareScenarioCIFSTest, ShareExtendBase):

View File

@ -179,7 +179,7 @@ class ShareManageUnmanageBase(manager.ShareScenarioTest):
class ShareManageUnmanageNFS(manager.BaseShareScenarioNFSTest,
ShareManageUnmanageBase):
ip_version = 4
pass
class ShareManageUnmanageCIFS(manager.BaseShareScenarioCIFSTest,

View File

@ -163,7 +163,7 @@ class ShareShrinkBase(manager.ShareScenarioTest):
class TestShareShrinkNFS(manager.BaseShareScenarioNFSTest, ShareShrinkBase):
ip_version = 4
pass
class TestShareShrinkCIFS(manager.BaseShareScenarioCIFSTest, ShareShrinkBase):