Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging volume mgmt test cases #4375

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Merging volume mgmt test cases #4375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c4af69
Merging volume mgmt test cases
julpark-rh Jan 14, 2025
ec3335e
Merge branch 'main' into jan14
julpark-rh Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions suites/quincy/cephfs/tier-2_cephfs_test-volume-management.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,15 +343,3 @@ tests:
polarion-id: CEPH-11333
desc: File system life cycle
abort-on-fail: false
- test:
name: volume related scenarios(delete,rename)
module: cephfs_vol_management.cephfs_vol_mgmt_volume_scenarios.py
polarion-id: CEPH-83603354
desc: volume related scenarios(delete,rename)
abort-on-fail: false
- test:
name: cephfs subvolumegroup scenarios
module: cephfs_vol_management.cephfs_vol_mgmt_subvolgroup_scenarios.py
polarion-id: CEPH-83604079
desc: cephfs subvolumegroup scenarios
abort-on-fail: false
6 changes: 6 additions & 0 deletions suites/quincy/cephfs/tier-2_file-dir-lay_vol-mgmt_nfs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,3 +482,9 @@ tests:
polarion-id: CEPH-83604097
desc: Basic info validation after volume creation and deletion
abort-on-fail: true
- test:
name: volume rename, subvolume earmark, subvolumegroup idempotence scenarios
module: cephfs_vol_management.cephfs_vol_mgmt_rename_earmark_subvolume.py
polarion-id: CEPH-83604978
desc: volume rename, subvolume earmark, subvolumegroup idempotence scenarios
abort-on-fail: false
12 changes: 0 additions & 12 deletions suites/reef/cephfs/tier-2_cephfs_test-volume-management.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,15 +340,3 @@ tests:
polarion-id: CEPH-11333
desc: File system life cycle
abort-on-fail: false
- test:
name: volume related scenarios(delete,rename)
module: cephfs_vol_management.cephfs_vol_mgmt_volume_scenarios.py
polarion-id: CEPH-83603354
desc: volume related scenarios(delete,rename)
abort-on-fail: false
- test:
name: cephfs subvolumegroup scenarios
module: cephfs_vol_management.cephfs_vol_mgmt_subvolgroup_scenarios.py
polarion-id: CEPH-83604079
desc: cephfs subvolumegroup scenarios
abort-on-fail: false
6 changes: 6 additions & 0 deletions suites/reef/cephfs/tier-2_file-dir-lay_vol-mgmt_nfs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,3 +482,9 @@ tests:
polarion-id: CEPH-83604097
desc: Basic info validation after volume creation and deletion
abort-on-fail: true
- test:
name: volume rename, subvolume earmark, subvolumegroup idempotence scenarios
module: cephfs_vol_management.cephfs_vol_mgmt_rename_earmark_subvolume.py
polarion-id: CEPH-83604978
desc: volume rename, subvolume earmark, subvolumegroup idempotence scenarios
abort-on-fail: false
18 changes: 0 additions & 18 deletions suites/squid/cephfs/tier-2_cephfs_test-volume-management_arch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,21 +340,3 @@ tests:
polarion-id: CEPH-11333
desc: File system life cycle
abort-on-fail: false
- test:
name: volume related scenarios(delete,rename)
module: cephfs_vol_management.cephfs_vol_mgmt_volume_scenarios.py
polarion-id: CEPH-83603354
desc: volume related scenarios(delete,rename)
abort-on-fail: false
- test:
name: cephfs subvolumegroup scenarios
module: cephfs_vol_management.cephfs_vol_mgmt_subvolgroup_scenarios.py
polarion-id: CEPH-83604079
desc: cephfs subvolumegroup scenarios
abort-on-fail: false
- test:
name: cephfs subvolume idempoence earmark
module: cephfs_vol_management.cephfs_vol_mgmt_subvol_idempotence_earmark.py
polarion-id: CEPH-83604184
desc: cephfs subvolume idempoence earmark
abort-on-fail: false
6 changes: 6 additions & 0 deletions suites/squid/cephfs/tier-2_file-dir-lay_vol-mgmt_nfs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,4 +499,10 @@ tests:
module: cephfs_vol_management.cephfs_vol_mgmt_test_volume.py
polarion-id: CEPH-83604097
desc: Basic info validation after volume creation and deletion
abort-on-fail: true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you make this as false as other test cases will be skipped if this test fails

- test:
name: volume rename, subvolume earmark, subvolumegroup idempotence scenarios
module: cephfs_vol_management.cephfs_vol_mgmt_rename_earmark_subvolume.py
polarion-id: CEPH-83604978
desc: volume rename, subvolume earmark, subvolumegroup idempotence scenarios
abort-on-fail: false
37 changes: 37 additions & 0 deletions tests/cephfs/cephfs_utilsV1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5677,3 +5677,40 @@ def validate_dicts(self, dicts, keys_to_check):
log.error(f"Key '{key}' mismatch: Values = {values}")
return False
return True

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO, we should start splitting this file into smaller pieces. Maintenance is going to be hard if we continue to keep adding more and more methods.

def rename_volume(self, client, old_name, new_name):
log.info(f"[Fail {old_name} before renaming it]")
client.exec_command(
sudo=True, cmd=f"ceph fs fail {old_name} --yes-i-really-mean-it"
)
log.info("[Set refuse_client_session to true]")
client.exec_command(
sudo=True, cmd=f"ceph fs set {old_name} refuse_client_session true"
)
log.info("[Rename the volume]")
rename_cmd = f"ceph fs rename {old_name} {new_name} --yes-i-really-mean-it"
out, ec = client.exec_command(sudo=True, cmd=rename_cmd)
if "renamed." not in ec:
log.error(ec)
log.error(f"Failed to rename the volume: {out}")
return 1
out, ec = client.exec_command(sudo=True, cmd="ceph fs ls")
if new_name not in out:
log.error(f"Volume not renamed: {out}")
return 1
log.info(f"Volume renamed successfully: {out}")
log.info("Put it back to previous state")
client.exec_command(
sudo=True, cmd="ceph fs set " + new_name + " refuse_client_session false"
)
client.exec_command(sudo=True, cmd=f"ceph fs set {new_name} joinable true")
timer = 10
while timer > 0:
out, ec = client.exec_command(sudo=True, cmd=f"ceph fs status {new_name}")
if "active" in out:
break
time.sleep(5)
timer -= 1
log.info(f"Volume {new_name} is active now")
log.info("Renaming and verification of volume successful")
return 0
Loading