From 004e7f3515cc2daa1a7ca72f7c8f5becb945ff17 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Mon, 19 Sep 2022 15:16:46 +0200 Subject: [PATCH 10/32] migratentp: Replace reports with log messages Reports are supposed to contain different information. --- .../actors/migratentp/libraries/migratentp.py | 27 ++++--------------- .../migratentp/tests/unit_test_migratentp.py | 10 ------- 2 files changed, 5 insertions(+), 32 deletions(-) diff --git a/repos/system_upgrade/el7toel8/actors/migratentp/libraries/migratentp.py b/repos/system_upgrade/el7toel8/actors/migratentp/libraries/migratentp.py index deeaaccd..a0ad634b 100644 --- a/repos/system_upgrade/el7toel8/actors/migratentp/libraries/migratentp.py +++ b/repos/system_upgrade/el7toel8/actors/migratentp/libraries/migratentp.py @@ -2,11 +2,8 @@ import base64 import io import tarfile -from leapp import reporting from leapp.exceptions import StopActorExecutionError -from leapp.libraries.stdlib import CalledProcessError, run - -COMMON_REPORT_TAGS = [reporting.Groups.SERVICES, reporting.Groups.TIME_MANAGEMENT] +from leapp.libraries.stdlib import api, CalledProcessError, run def extract_tgz64(s): @@ -82,21 +79,7 @@ def migrate_ntp(migrate_services, config_tgz64): ignored_lines = ntp2chrony('/', ntp_conf, step_tickers) - config_resources = [reporting.RelatedResource('file', mc) for mc in migrate_configs + [ntp_conf]] - package_resources = [reporting.RelatedResource('package', p) for p in ['ntpd', 'chrony']] - - if not ignored_lines: - reporting.create_report([ - reporting.Title('{} configuration migrated to chrony'.format(' and '.join(migrate_configs))), - reporting.Summary('ntp2chrony executed successfully'), - reporting.Severity(reporting.Severity.INFO), - reporting.Groups(COMMON_REPORT_TAGS) - ] + config_resources + package_resources) - - else: - reporting.create_report([ - reporting.Title('{} configuration partially migrated to chrony'.format(' and '.join(migrate_configs))), - reporting.Summary('Some lines in /etc/ntp.conf were ignored in migration (check /etc/chrony.conf)'), - reporting.Severity(reporting.Severity.MEDIUM), - reporting.Groups(COMMON_REPORT_TAGS) - ] + config_resources + package_resources) + api.current_logger().info('Configuration files migrated to chrony: {}'.format(' '.join(migrate_configs))) + if ignored_lines: + api.current_logger().warning('Some lines in /etc/ntp.conf were ignored in migration' + ' (check /etc/chrony.conf)') diff --git a/repos/system_upgrade/el7toel8/actors/migratentp/tests/unit_test_migratentp.py b/repos/system_upgrade/el7toel8/actors/migratentp/tests/unit_test_migratentp.py index 6ce4bb5b..fafff5e7 100644 --- a/repos/system_upgrade/el7toel8/actors/migratentp/tests/unit_test_migratentp.py +++ b/repos/system_upgrade/el7toel8/actors/migratentp/tests/unit_test_migratentp.py @@ -55,7 +55,6 @@ def test_migration(monkeypatch): (['ntp-wait'], ['chrony-wait'], 0), (['ntpd', 'ntpdate', 'ntp-wait'], ['chronyd', 'chronyd', 'chrony-wait'], 1), ]: - monkeypatch.setattr(reporting, 'create_report', create_report_mocked()) monkeypatch.setattr(migratentp, 'extract_tgz64', extract_tgz64_mocked()) monkeypatch.setattr(migratentp, 'enable_service', enable_service_mocked()) monkeypatch.setattr(migratentp, 'write_file', write_file_mocked()) @@ -64,14 +63,6 @@ def test_migration(monkeypatch): migratentp.migrate_ntp(ntp_services, 'abcdef') if ntp_services: - assert reporting.create_report.called == 1 - if ignored_lines > 0: - assert 'configuration partially migrated to chrony' in \ - reporting.create_report.report_fields['title'] - else: - assert 'configuration migrated to chrony' in \ - reporting.create_report.report_fields['title'] - assert migratentp.extract_tgz64.called == 1 assert migratentp.extract_tgz64.s == 'abcdef' assert migratentp.enable_service.called == len(chrony_services) @@ -86,7 +77,6 @@ def test_migration(monkeypatch): '/etc/ntp.conf' if 'ntpd' in ntp_services else '/etc/ntp.conf.nosources', '/etc/ntp/step-tickers' if 'ntpdate' in ntp_services else '') else: - assert reporting.create_report.called == 0 assert migratentp.extract_tgz64.called == 0 assert migratentp.enable_service.called == 0 assert migratentp.write_file.called == 0 -- 2.38.1