Skip to content

backup writer: update the list of lvm udev files to be deleted #437

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

Open
petrutlucian94 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

backup writer: update the list of lvm udev files to be deleted #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion coriolis/providers/backup_writers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,10 @@ def _disable_lvm_metad_udev_rule(ssh):
"""
rule_paths = [
"/lib/udev/rules.d/69-lvm-metad.rules",
"/lib/udev/rules.d/69-dm-lvm.rules"]
"/lib/udev/rules.d/69-dm-lvm.rules",
"/lib/udev/rules.d/69-lvm.rules",
"/lib/udev/rules.d/56-lvm.rules",
]
for path in rule_paths:
if utils.test_ssh_path(ssh, path):
utils.exec_ssh_cmd(ssh, "sudo rm %s" % path, get_pty=True)
Expand Down
19 changes: 11 additions & 8 deletions coriolis/tests/providers/test_backup_writers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,21 +49,24 @@ def test__disable_lvm2_lvmetad(self, mock_exec_ssh_cmd,
@mock.patch('coriolis.utils.exec_ssh_cmd')
def test__disable_lvm_metad_udev_rule(self, mock_exec_ssh_cmd,
mock_test_ssh_path):
rule_path = ["/lib/udev/rules.d/69-lvm-metad.rules",
"/lib/udev/rules.d/69-dm-lvm.rules"]
rule_paths = [
"/lib/udev/rules.d/69-lvm-metad.rules",
"/lib/udev/rules.d/69-dm-lvm.rules",
"/lib/udev/rules.d/69-lvm.rules",
"/lib/udev/rules.d/56-lvm.rules",
]
mock_test_ssh_path.return_value = True

backup_writers._disable_lvm_metad_udev_rule(self.mock_ssh)

mock_test_ssh_path.assert_has_calls(
[mock.call(self.mock_ssh, rule_path[0]),
mock.call(self.mock_ssh, rule_path[1])])
[mock.call(self.mock_ssh, rule_path)
for rule_path in rule_paths])

expected_calls = [
mock.call(self.mock_ssh, 'sudo rm %s' % rule_path[0],
get_pty=True),
mock.call(self.mock_ssh, 'sudo rm %s' % rule_path[1],
get_pty=True)]
mock.call(self.mock_ssh, 'sudo rm %s' % rule_path,
get_pty=True)
for rule_path in rule_paths]
mock_exec_ssh_cmd.assert_has_calls(expected_calls)

def test__check_deserialize_key(self):
Expand Down
Loading