From 9e39e5c2de0df2c54c30cb994fc2fe3339922562 Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Tue, 6 May 2025 17:35:34 +0530 Subject: [PATCH] qa/cephfs: add a helper method to construct the snapshot path Signed-off-by: Rishabh Dave --- qa/tasks/cephfs/test_volumes.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/qa/tasks/cephfs/test_volumes.py b/qa/tasks/cephfs/test_volumes.py index 6fb829b913b..b53dbea9f84 100644 --- a/qa/tasks/cephfs/test_volumes.py +++ b/qa/tasks/cephfs/test_volumes.py @@ -6504,6 +6504,11 @@ class TestSubvolumeSnapshotGetpath(TestVolumesHelper): subvol_uuid = os.path.basename(subvol_path) return subvol_uuid + def construct_snap_path(self, subvol_name, snap_name, uuid, + group_name='_nogroup'): + return os.path.join('/volumes', group_name, subvol_name, '.snap', + snap_name, uuid) + def test_snapshot_getpath(self): ''' Test that "ceph fs subvolume snapshot getpath" command returns path to @@ -6520,9 +6525,8 @@ class TestSubvolumeSnapshotGetpath(TestVolumesHelper): snap_path = self.get_ceph_cmd_stdout(f'fs subvolume snapshot getpath ' f'{self.volname} {subvol_name} ' f'{snap_name}').strip() - # expected snapshot path - exp_snap_path = os.path.join('/volumes', '_nogroup', subvol_name, - '.snap', snap_name, sv_uuid) + exp_snap_path = self.construct_snap_path(subvol_name, snap_name, + sv_uuid) self.assertEqual(snap_path, exp_snap_path) def test_snapshot_getpath_in_group(self): @@ -6546,9 +6550,8 @@ class TestSubvolumeSnapshotGetpath(TestVolumesHelper): f'{self.volname} {subvol_name} ' f'{snap_name} {group_name}')\ .strip() - # expected snapshot path - exp_snap_path = os.path.join('/volumes', group_name, subvol_name, - '.snap', snap_name, sv_uuid) + exp_snap_path = self.construct_snap_path(subvol_name, snap_name, + sv_uuid, group_name) self.assertEqual(snap_path, exp_snap_path) def test_snapshot_getpath_on_retained_subvol(self): @@ -6570,10 +6573,8 @@ class TestSubvolumeSnapshotGetpath(TestVolumesHelper): snap_path = self.get_ceph_cmd_stdout(f'fs subvolume snapshot getpath ' f'{self.volname} {subvol_name} ' f'{snap_name}').strip() - - # expected snapshot path - exp_snap_path = os.path.join('/volumes', '_nogroup', subvol_name, - '.snap', snap_name, sv_uuid) + exp_snap_path = self.construct_snap_path(subvol_name, snap_name, + sv_uuid) self.assertEqual(snap_path, exp_snap_path) def test_snapshot_getpath_on_retained_subvol_in_group(self): @@ -6600,9 +6601,8 @@ class TestSubvolumeSnapshotGetpath(TestVolumesHelper): f'{self.volname} {subvol_name} ' f'{snap_name} {group_name}')\ .strip() - # expected snapshot path - exp_snap_path = os.path.join('/volumes', group_name, subvol_name, - '.snap', snap_name, sv_uuid) + exp_snap_path = self.construct_snap_path(subvol_name, snap_name, + sv_uuid, group_name) self.assertEqual(snap_path, exp_snap_path) -- 2.47.3