Skip to content

Commit eb5982d

Browse files
bocekmbocekm
committed
State action in special pkg removal report msgs
Customers have been confused when seeing the messages, not knowing what should they do.
1 parent 9826704 commit eb5982d

File tree

2 files changed

+52
-45
lines changed

2 files changed

+52
-45
lines changed

‎convert2rhel/actions/pre_ponr_changes/handle_packages.py

+16-7
Original file line numberDiff line numberDiff line change
@@ -155,14 +155,22 @@ def run(self):
155155
# shows which packages were not removed, if false, all packages were removed
156156
pkgs_not_removed = sorted(frozenset(pkghandler.get_pkg_nevras(all_pkgs)).difference(pkgs_removed))
157157
if pkgs_not_removed:
158-
message = "The following packages were not removed: {}".format(", ".join(pkgs_not_removed))
158+
message = "The following packages cannot be removed: {}".format(", ".join(pkgs_not_removed))
159159
logger.warning(message)
160160
self.add_message(
161161
level="WARNING",
162162
id="SPECIAL_PACKAGES_NOT_REMOVED",
163-
title="Special packages not removed",
164-
description="Special packages which could not be removed",
163+
title="Some packages cannot be removed",
165164
diagnosis=message,
165+
description=(
166+
"The packages in diagnosis match a pre-defined list of packages that are to be removed during the"
167+
" conversion. This list includes packages that are known to cause a conversion failure."
168+
),
169+
remediations=(
170+
"Remove the packages manually before running convert2rhel again:\n" "yum remove -y {}".format(
171+
" ".join(pkgs_not_removed)
172+
)
173+
),
166174
)
167175

168176
if pkgs_removed:
@@ -171,12 +179,13 @@ def run(self):
171179
self.add_message(
172180
level="INFO",
173181
id="SPECIAL_PACKAGES_REMOVED",
174-
title="Special packages to be removed",
175-
description=(
182+
title="Packages to be removed",
183+
description=message,
184+
diagnosis=(
176185
"We have identified installed packages that match a pre-defined list of packages that are"
177-
" to be removed during the conversion"
186+
" known to cause a conversion failure."
178187
),
179-
diagnosis=message,
188+
remediations="Check that the system runs correctly without the packages after the conversion.",
180189
)
181190

182191

‎convert2rhel/unit_tests/actions/pre_ponr_changes/handle_packages_test.py

+36-38
Original file line numberDiff line numberDiff line change
@@ -173,20 +173,19 @@ def test_run_no_packages_to_remove(self, monkeypatch, remove_special_packages_in
173173
def test_run_all_removed(self, monkeypatch, remove_special_packages_instance):
174174
pkgs_to_remove = [get_centos_logos_pkg_object()]
175175
pkgs_removed = ["centos-logos-70.0.6-3.el7.centos.noarch"]
176-
expected = set(
177-
(
178-
actions.ActionMessage(
179-
level="INFO",
180-
id="SPECIAL_PACKAGES_REMOVED",
181-
title="Special packages to be removed",
182-
description="We have identified installed packages that match a pre-defined list of packages that are"
183-
" to be removed during the conversion",
184-
diagnosis="The following packages will be removed during the conversion: centos-logos-70.0.6-3.el7.centos.noarch",
185-
remediations=None,
186-
variables={},
187-
),
176+
expected = {
177+
actions.ActionMessage(
178+
level="INFO",
179+
id="SPECIAL_PACKAGES_REMOVED",
180+
title="Packages to be removed",
181+
description="The following packages will be removed during the conversion:"
182+
" centos-logos-70.0.6-3.el7.centos.noarch",
183+
diagnosis="We have identified installed packages that match a pre-defined list of packages that"
184+
" are known to cause a conversion failure.",
185+
remediations="Check that the system runs correctly without the packages after the conversion.",
186+
variables={},
188187
)
189-
)
188+
}
190189
monkeypatch.setattr(
191190
pkghandler, "get_packages_to_remove", GetPackagesToRemoveMocked(return_value=pkgs_to_remove)
192191
)
@@ -206,31 +205,30 @@ def test_run_all_removed(self, monkeypatch, remove_special_packages_instance):
206205
@centos8
207206
def test_run_packages_not_removed(self, pretend_os, monkeypatch, remove_special_packages_instance):
208207
pkgs_removed = ["kernel-core"]
209-
expected = set(
210-
(
211-
actions.ActionMessage(
212-
level="WARNING",
213-
id="SPECIAL_PACKAGES_NOT_REMOVED",
214-
title="Special packages not removed",
215-
description="Special packages which could not be removed",
216-
diagnosis="The following packages were not removed: gpg-pubkey-1.0.0-1.x86_64, pkg1-None-None.None, pkg2-None-None.None",
217-
remediations=None,
218-
variables={},
219-
),
220-
actions.ActionMessage(
221-
level="INFO",
222-
id="SPECIAL_PACKAGES_REMOVED",
223-
title="Special packages to be removed",
224-
description=(
225-
"We have identified installed packages that match a pre-defined list of packages that are"
226-
" to be removed during the conversion"
227-
),
228-
diagnosis="The following packages will be removed during the conversion: kernel-core",
229-
remediations=None,
230-
variables={},
231-
),
232-
)
233-
)
208+
expected = {
209+
actions.ActionMessage(
210+
level="WARNING",
211+
id="SPECIAL_PACKAGES_NOT_REMOVED",
212+
title="Some packages cannot be removed",
213+
description="The packages in diagnosis match a pre-defined list of packages that are to be removed"
214+
" during the conversion. This list includes packages that are known to cause a conversion failure.",
215+
diagnosis="The following packages cannot be removed: gpg-pubkey-1.0.0-1.x86_64, pkg1-None-None.None,"
216+
" pkg2-None-None.None",
217+
remediations="Remove the packages manually before running convert2rhel again:\n"
218+
"yum remove -y gpg-pubkey-1.0.0-1.x86_64 pkg1-None-None.None pkg2-None-None.None",
219+
variables={},
220+
),
221+
actions.ActionMessage(
222+
level="INFO",
223+
id="SPECIAL_PACKAGES_REMOVED",
224+
title="Packages to be removed",
225+
description="The following packages will be removed during the conversion: kernel-core",
226+
diagnosis="We have identified installed packages that match a pre-defined list of packages that"
227+
" are known to cause a conversion failure.",
228+
remediations="Check that the system runs correctly without the packages after the conversion.",
229+
variables={},
230+
),
231+
}
234232
monkeypatch.setattr(pkghandler, "get_packages_to_remove", GetPackagesToRemoveMocked(pkg_selection="key_ids"))
235233
monkeypatch.setattr(
236234
handle_packages,

0 commit comments

Comments
 (0)