Skip to content

Commit dbcd745

Browse files
bocekmbocekm
authored
[RHELC-1759] Remove zero value report messages (#1436)
* Remove unnecessary analysis messages The "SKIP" post-conversion messages give zero value to the user. The "OUTDATED_CONVERT2RHEL_VERSION" pre-conversion message was for RHEL 6 only which we do not allow converting anymore.
1 parent cce2401 commit dbcd745

File tree

8 files changed

+29
-223
lines changed

8 files changed

+29
-223
lines changed

‎convert2rhel/actions/conversion/lock_releasever.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,9 @@ def run(self):
4545
# rhsm is used, otherwise, there's no need to lock the releasever as the subscription-manager won't be
4646
# available.
4747
if not system_info.eus_system or tool_opts.no_rhsm:
48-
loggerinst.info("Skipping locking RHEL repositories to a specific EUS minor version.")
49-
self.add_message(
50-
id="SKIPPED_LOCK_RELEASEVER_IN_RHEL_REPOSITORIES",
51-
level="INFO",
52-
title="Skipped releasever lock",
53-
description="Releasever lock is needed only when converting to RHEL EUS using RHSM.",
48+
loggerinst.info(
49+
"Skipping locking RHEL repositories. Releasever lock is needed only when converting to"
50+
"RHEL EUS using RHSM."
5451
)
5552
return
5653
loggerinst.info(

‎convert2rhel/actions/conversion/preserve_only_rhel_kernel.py‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,6 @@ def run(self):
6060
return
6161

6262
loggerinst.info("RHEL kernel has been verified to be on the system.")
63-
self.add_message(
64-
level="INFO",
65-
id="RHEL_KERNEL_INSTALL_VERIFIED",
66-
title="RHEL kernel install verified",
67-
description="The RHEL kernel has been verified to be on the system.",
68-
)
6963

7064

7165
class FixInvalidGrub2Entries(actions.Action):

‎convert2rhel/actions/post_conversion/hostmetering.py‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -54,24 +54,12 @@ def run(self):
5454

5555
if system_info.version.major != 7 and tool_opts.configure_host_metering == "auto":
5656
logger.info("Did not perform host metering configuration. Only supported for RHEL 7.")
57-
self.add_message(
58-
level="INFO",
59-
id="CONFIGURE_HOST_METERING_SKIP",
60-
title="Did not perform host metering configuration.",
61-
description="Host metering is supportted only for RHEL 7.",
62-
)
6357
return False
6458

6559
is_hyperscaler = self.is_running_on_hyperscaler()
6660

6761
if not is_hyperscaler and tool_opts.configure_host_metering == "auto":
6862
logger.info("Did not perform host-metering configuration.")
69-
self.add_message(
70-
level="INFO",
71-
id="CONFIGURE_HOST_METERING_SKIP",
72-
title="Did not perform host metering configuration as not needed.",
73-
description="Host metering is not needed on the system.",
74-
)
7563
return False
7664

7765
logger.info("Installing host-metering packages.")
@@ -138,15 +126,7 @@ def _check_host_metering_configuration(self):
138126
:rtype: bool
139127
"""
140128
if tool_opts.configure_host_metering is None:
141-
logger.debug("Configuration of host metering has not been enabled. Skipping it.")
142-
self.add_message(
143-
level="INFO",
144-
id="CONFIGURE_HOST_METERING_SKIP",
145-
title="Did not perform host metering configuration.",
146-
description="Configuration of host metering has been skipped.",
147-
diagnosis="We haven't detected 'configure_host_metering' in the convert2rhel.ini config file nor"
148-
" the CONVERT2RHEL_CONFIGURE_HOST_METERING environment variable.",
149-
)
129+
logger.debug("You have not enabled configuration of host metering. Skipping it.")
150130
return False
151131

152132
if tool_opts.configure_host_metering not in ("force", "auto"):

‎convert2rhel/actions/system_checks/convert2rhel_latest.py‎

Lines changed: 12 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -192,42 +192,21 @@ def run(self):
192192
diagnosis=diagnosis,
193193
)
194194
else:
195-
if int(system_info.version.major) <= 6:
196-
logger.warning(
195+
self.set_result(
196+
level="OVERRIDABLE",
197+
id="OUT_OF_DATE",
198+
title="Outdated convert2rhel version detected",
199+
description="An outdated convert2rhel version has been detected",
200+
diagnosis=(
197201
"You are currently running {} and the latest version of convert2rhel is {}.\n"
198-
"We encourage you to update to the latest version.".format(
202+
"Only the latest version is supported for conversion.".format(
199203
formatted_convert2rhel_version, formatted_available_version
200204
)
201-
)
202-
self.add_message(
203-
level="WARNING",
204-
id="OUTDATED_CONVERT2RHEL_VERSION",
205-
title="Outdated convert2rhel version detected",
206-
description="An outdated convert2rhel version has been detected",
207-
diagnosis=(
208-
"You are currently running {} and the latest version of convert2rhel is {}.\n"
209-
"We encourage you to update to the latest version.".format(
210-
formatted_convert2rhel_version, formatted_available_version
211-
)
212-
),
213-
)
214-
215-
else:
216-
self.set_result(
217-
level="OVERRIDABLE",
218-
id="OUT_OF_DATE",
219-
title="Outdated convert2rhel version detected",
220-
description="An outdated convert2rhel version has been detected",
221-
diagnosis=(
222-
"You are currently running {} and the latest version of convert2rhel is {}.\n"
223-
"Only the latest version is supported for conversion.".format(
224-
formatted_convert2rhel_version, formatted_available_version
225-
)
226-
),
227-
remediations="If you want to disregard this check, set the allow_older_version inhibitor"
228-
" override in the /etc/convert2rhel.ini config file to true.",
229-
)
230-
return
205+
),
206+
remediations="If you want to disregard this check, set the allow_older_version inhibitor"
207+
" override in the /etc/convert2rhel.ini config file to true.",
208+
)
209+
return
231210

232211
logger.info("Latest available convert2rhel version is installed.")
233212

‎convert2rhel/unit_tests/actions/conversion/lock_releasever_test.py‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import pytest
2020
import six
2121

22-
from convert2rhel import actions, utils
22+
from convert2rhel import utils
2323
from convert2rhel.actions.conversion import lock_releasever
2424
from convert2rhel.systeminfo import Version, system_info
2525
from convert2rhel.unit_tests import RunSubprocessMocked
@@ -74,18 +74,5 @@ def test_lock_releasever_in_rhel_repositories(
7474

7575
def test_lock_releasever_in_rhel_repositories_not_eus(lock_releasever_in_rhel_repositories_instance, caplog):
7676
lock_releasever_in_rhel_repositories_instance.run()
77-
expected = set(
78-
(
79-
actions.ActionMessage(
80-
level="INFO",
81-
id="SKIPPED_LOCK_RELEASEVER_IN_RHEL_REPOSITORIES",
82-
title="Skipped releasever lock",
83-
description="Releasever lock is needed only when converting to RHEL EUS using RHSM.",
84-
diagnosis=None,
85-
remediations=None,
86-
),
87-
)
88-
)
89-
assert "Skipping locking RHEL repositories to a specific EUS minor version." in caplog.records[-1].message
90-
assert expected.issuperset(lock_releasever_in_rhel_repositories_instance.messages)
91-
assert expected.issubset(lock_releasever_in_rhel_repositories_instance.messages)
77+
78+
assert "Skipping locking RHEL repositories." in caplog.records[-1].message

‎convert2rhel/unit_tests/actions/conversion/preserve_only_rhel_kernel_test.py‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -111,27 +111,15 @@ def test_install_rhel_kernel(
111111

112112
assert handle_no_newer_rhel_kernel_available.call_count == no_newer_kernel_call
113113

114-
def test_verify_rhel_kernel_installed(self, monkeypatch, install_rhel_kernel_instance):
114+
def test_verify_rhel_kernel_installed(self, monkeypatch, install_rhel_kernel_instance, caplog):
115115
monkeypatch.setattr(
116116
pkghandler,
117117
"get_installed_pkgs_by_key_id",
118118
GetInstalledPkgsByKeyIdMocked(return_value=[create_pkg_information(name="kernel")]),
119119
)
120120
install_rhel_kernel_instance.run()
121-
expected = set(
122-
(
123-
actions.ActionMessage(
124-
level="INFO",
125-
id="RHEL_KERNEL_INSTALL_VERIFIED",
126-
title="RHEL kernel install verified",
127-
description="The RHEL kernel has been verified to be on the system.",
128-
diagnosis=None,
129-
remediations=None,
130-
),
131-
)
132-
)
133-
assert expected.issuperset(install_rhel_kernel_instance.messages)
134-
assert expected.issubset(install_rhel_kernel_instance.messages)
121+
122+
assert "RHEL kernel has been verified to be on the system." in caplog.text
135123

136124
def test_verify_rhel_kernel_installed_not_installed(self, monkeypatch, install_rhel_kernel_instance):
137125
monkeypatch.setattr(pkghandler, "get_installed_pkgs_by_key_id", mock.Mock(return_value=[]))

‎convert2rhel/unit_tests/actions/post_conversion/hostmetering_test.py‎

Lines changed: 7 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -194,16 +194,7 @@ def test_configure_host_metering(
194194
(None, 0),
195195
("", ""),
196196
False,
197-
set(
198-
(
199-
actions.ActionMessage(
200-
level="INFO",
201-
id="CONFIGURE_HOST_METERING_SKIP",
202-
title="Did not perform host metering configuration.",
203-
description="Host metering is supportted only for RHEL 7.",
204-
),
205-
),
206-
),
197+
None,
207198
actions.ActionResult(level="SUCCESS", id="SUCCESS"),
208199
),
209200
(
@@ -252,16 +243,7 @@ def test_configure_host_metering(
252243
(None, 0),
253244
("", ""),
254245
None,
255-
set(
256-
(
257-
actions.ActionMessage(
258-
level="INFO",
259-
id="CONFIGURE_HOST_METERING_SKIP",
260-
title="Did not perform host metering configuration as not needed.",
261-
description="Host metering is not needed on the system.",
262-
),
263-
),
264-
),
246+
None,
265247
actions.ActionResult(level="SUCCESS", id="SUCCESS"),
266248
),
267249
(
@@ -375,28 +357,18 @@ def test_configure_host_metering_messages_and_results(
375357
monkeypatch.setattr(toolopts, "tool_opts", global_tool_opts)
376358
hostmetering_instance.run()
377359

378-
assert action_message.issuperset(hostmetering_instance.messages)
379-
assert action_message.issubset(hostmetering_instance.messages)
360+
if action_message:
361+
assert action_message.issuperset(hostmetering_instance.messages)
362+
assert action_message.issubset(hostmetering_instance.messages)
380363
assert action_result == hostmetering_instance.result
381364

382365

383-
def test_configure_host_metering_no_env_var(monkeypatch, hostmetering_instance, global_tool_opts):
384-
expected = {
385-
actions.ActionMessage(
386-
level="INFO",
387-
id="CONFIGURE_HOST_METERING_SKIP",
388-
title="Did not perform host metering configuration.",
389-
description="Configuration of host metering has been skipped.",
390-
diagnosis="We haven't detected 'configure_host_metering' in the convert2rhel.ini config file nor"
391-
" the CONVERT2RHEL_CONFIGURE_HOST_METERING environment variable.",
392-
)
393-
}
366+
def test_configure_host_metering_no_env_var(monkeypatch, hostmetering_instance, global_tool_opts, caplog):
394367
monkeypatch.setattr(hostmetering, "tool_opts", global_tool_opts)
395368

396369
hostmetering_instance.run()
397370

398-
assert expected.issuperset(hostmetering_instance.messages)
399-
assert expected.issubset(hostmetering_instance.messages)
371+
assert "You have not enabled configuration of host metering. Skipping it." in caplog.records[-1].message
400372
assert actions.ActionResult(level="SUCCESS", id="SUCCESS") == hostmetering_instance.result
401373

402374

‎convert2rhel/unit_tests/actions/system_checks/convert2rhel_latest_test.py‎

Lines changed: 0 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -165,97 +165,6 @@ def test_convert2rhel_latest_outdated_version_inhibitor(
165165
" override in the /etc/convert2rhel.ini config file to true.",
166166
)
167167

168-
@pytest.mark.parametrize(
169-
("prepare_convert2rhel_latest_action",),
170-
(
171-
[
172-
{
173-
"local_version": "0.21",
174-
"package_version": "C2R convert2rhel-0:0.22-1.el7.noarch",
175-
"package_version_repoquery": "C2R convert2rhel-0:0.22-1.el7.noarch",
176-
"package_version_qf": "C2R convert2rhel-0:0.21-1.el7.noarch",
177-
"package_version_V": " ",
178-
"pmajor": "6",
179-
"running_version": "0.21",
180-
"latest_version": "0.22",
181-
}
182-
],
183-
[
184-
{
185-
"local_version": "0.21",
186-
"package_version": "C2R convert2rhel-0:1.10-1.el7.noarch",
187-
"package_version_repoquery": "C2R convert2rhel-0:1.10-1.el7.noarch",
188-
"package_version_qf": "C2R convert2rhel-0:0.21-1.el7.noarch",
189-
"package_version_V": " ",
190-
"pmajor": "6",
191-
"running_version": "0.21",
192-
"latest_version": "1.10",
193-
}
194-
],
195-
[
196-
{
197-
"local_version": "1.21.0",
198-
"package_version": "C2R convert2rhel-0:1.21.1-1.el7.noarch",
199-
"package_version_repoquery": "C2R convert2rhel-0:1.21.1-1.el7.noarch",
200-
"package_version_qf": "C2R convert2rhel-0:1.21.0-1.el7.noarch",
201-
"package_version_V": " ",
202-
"pmajor": "6",
203-
"running_version": "1.21.0",
204-
"latest_version": "1.21.1",
205-
}
206-
],
207-
[
208-
{
209-
"local_version": "1.21",
210-
"package_version": "C2R convert2rhel-0:1.21.1-1.el7.noarch",
211-
"package_version_repoquery": "C2R convert2rhel-0:1.21.1-1.el7.noarch",
212-
"package_version_qf": "C2R convert2rhel-0:1.21-1.el7.noarch",
213-
"package_version_V": 0,
214-
"pmajor": "6",
215-
"running_version": "1.21",
216-
"latest_version": "1.21.1",
217-
}
218-
],
219-
[
220-
{
221-
"local_version": "1.21.1",
222-
"package_version": "C2R convert2rhel-0:0.22-1.el7.noarch",
223-
"package_version_repoquery": "C2R convert2rhel-0:1.22-1.el7.noarch",
224-
"package_version_qf": "C2R convert2rhel-0:1.21.1-1.el7.noarch",
225-
"package_version_V": 0,
226-
"pmajor": "6",
227-
"running_version": "1.21.1",
228-
"latest_version": "1.22",
229-
}
230-
],
231-
),
232-
indirect=True,
233-
)
234-
def test_convert2rhel_latest_outdated_version_warning(
235-
self, convert2rhel_latest_action_instance, prepare_convert2rhel_latest_action, monkeypatch, global_tool_opts
236-
):
237-
"""When runnnig on an older unsupported major version, we issue just a warning instead of an inhibitor."""
238-
monkeypatch.setattr(convert2rhel_latest, "tool_opts", global_tool_opts)
239-
convert2rhel_latest_action_instance.run()
240-
241-
running_version, latest_version = prepare_convert2rhel_latest_action
242-
243-
expected = {
244-
actions.ActionMessage(
245-
level="WARNING",
246-
id="OUTDATED_CONVERT2RHEL_VERSION",
247-
title="Outdated convert2rhel version detected",
248-
description="An outdated convert2rhel version has been detected",
249-
diagnosis=(
250-
"You are currently running {} and the latest version of convert2rhel is {}.\n"
251-
"We encourage you to update to the latest version.".format(running_version, latest_version)
252-
),
253-
remediations=None,
254-
)
255-
}
256-
assert expected.issuperset(convert2rhel_latest_action_instance.messages)
257-
assert expected.issubset(convert2rhel_latest_action_instance.messages)
258-
259168
@pytest.mark.parametrize(
260169
("prepare_convert2rhel_latest_action",),
261170
(

0 commit comments

Comments
 (0)