From d32f69d116e1f773871053cfc41c1b5e0d622745 Mon Sep 17 00:00:00 2001 From: Tommaso Caiazzi Date: Tue, 29 Oct 2024 16:33:53 +0100 Subject: [PATCH 1/9] Fix imports --- src/kathara_lab_checker/__main__.py | 48 +++++++++---------- src/kathara_lab_checker/checks/CheckResult.py | 2 +- src/kathara_lab_checker/checks/DaemonCheck.py | 2 +- .../checks/InterfaceIPCheck.py | 2 +- .../checks/ReachabilityCheck.py | 2 +- .../applications/dns/DNSAuthorityCheck.py | 6 +-- .../checks/applications/dns/DNSRecordCheck.py | 6 +-- .../checks/applications/dns/LocalNSCheck.py | 6 +-- .../checks/protocols/AnnouncedNetworkCheck.py | 6 +-- .../protocols/ProtocolRedistributionCheck.py | 6 +-- .../checks/protocols/bgp/BGPPeeringCheck.py | 6 +-- .../protocols/evpn/AnnouncedVNICheck.py | 6 +-- .../checks/protocols/evpn/EVPNSessionCheck.py | 6 +-- .../checks/protocols/evpn/VTEPCheck.py | 6 +-- src/main.py | 4 ++ 15 files changed, 59 insertions(+), 55 deletions(-) create mode 100644 src/main.py diff --git a/src/kathara_lab_checker/__main__.py b/src/kathara_lab_checker/__main__.py index e9c0858..30453b9 100644 --- a/src/kathara_lab_checker/__main__.py +++ b/src/kathara_lab_checker/__main__.py @@ -16,30 +16,30 @@ from Kathara.setting.Setting import Setting from tqdm import tqdm -from kathara_lab_checker.TestCollector import TestCollector -from kathara_lab_checker.checks.BridgeCheck import BridgeCheck -from kathara_lab_checker.checks.CheckResult import CheckResult -from kathara_lab_checker.checks.CollisionDomainCheck import CollisionDomainCheck -from kathara_lab_checker.checks.CustomCommandCheck import CustomCommandCheck -from kathara_lab_checker.checks.DaemonCheck import DaemonCheck -from kathara_lab_checker.checks.DeviceExistenceCheck import DeviceExistenceCheck -from kathara_lab_checker.checks.IPv6EnabledCheck import IPv6EnabledCheck -from kathara_lab_checker.checks.InterfaceIPCheck import InterfaceIPCheck -from kathara_lab_checker.checks.KernelRouteCheck import KernelRouteCheck -from kathara_lab_checker.checks.ReachabilityCheck import ReachabilityCheck -from kathara_lab_checker.checks.StartupExistenceCheck import StartupExistenceCheck -from kathara_lab_checker.checks.SysctlCheck import SysctlCheck -from kathara_lab_checker.checks.applications.dns.DNSAuthorityCheck import DNSAuthorityCheck -from kathara_lab_checker.checks.applications.dns.DNSRecordCheck import DNSRecordCheck -from kathara_lab_checker.checks.applications.dns.LocalNSCheck import LocalNSCheck -from kathara_lab_checker.checks.protocols.AnnouncedNetworkCheck import AnnouncedNetworkCheck -from kathara_lab_checker.checks.protocols.ProtocolRedistributionCheck import ProtocolRedistributionCheck -from kathara_lab_checker.checks.protocols.bgp.BGPPeeringCheck import BGPPeeringCheck -from kathara_lab_checker.checks.protocols.evpn.AnnouncedVNICheck import AnnouncedVNICheck -from kathara_lab_checker.checks.protocols.evpn.EVPNSessionCheck import EVPNSessionCheck -from kathara_lab_checker.checks.protocols.evpn.VTEPCheck import VTEPCheck -from kathara_lab_checker.excel_utils import write_final_results_to_excel, write_result_to_excel -from kathara_lab_checker.utils import reverse_dictionary +from .TestCollector import TestCollector +from .checks.BridgeCheck import BridgeCheck +from .checks.CheckResult import CheckResult +from .checks.CollisionDomainCheck import CollisionDomainCheck +from .checks.CustomCommandCheck import CustomCommandCheck +from .checks.DaemonCheck import DaemonCheck +from .checks.DeviceExistenceCheck import DeviceExistenceCheck +from .checks.IPv6EnabledCheck import IPv6EnabledCheck +from .checks.InterfaceIPCheck import InterfaceIPCheck +from .checks.KernelRouteCheck import KernelRouteCheck +from .checks.ReachabilityCheck import ReachabilityCheck +from .checks.StartupExistenceCheck import StartupExistenceCheck +from .checks.SysctlCheck import SysctlCheck +from .checks.applications.dns.DNSAuthorityCheck import DNSAuthorityCheck +from .checks.applications.dns.DNSRecordCheck import DNSRecordCheck +from .checks.applications.dns.LocalNSCheck import LocalNSCheck +from .checks.protocols.AnnouncedNetworkCheck import AnnouncedNetworkCheck +from .checks.protocols.ProtocolRedistributionCheck import ProtocolRedistributionCheck +from .checks.protocols.bgp.BGPPeeringCheck import BGPPeeringCheck +from .checks.protocols.evpn.AnnouncedVNICheck import AnnouncedVNICheck +from .checks.protocols.evpn.EVPNSessionCheck import EVPNSessionCheck +from .checks.protocols.evpn.VTEPCheck import VTEPCheck +from .excel_utils import write_final_results_to_excel, write_result_to_excel +from .utils import reverse_dictionary VERSION = "0.1.5" CURRENT_LAB: Optional[Lab] = None diff --git a/src/kathara_lab_checker/checks/CheckResult.py b/src/kathara_lab_checker/checks/CheckResult.py index 4a72380..c8f075e 100644 --- a/src/kathara_lab_checker/checks/CheckResult.py +++ b/src/kathara_lab_checker/checks/CheckResult.py @@ -1,6 +1,6 @@ import logging -from kathara_lab_checker.utils import green, red +from ..utils import green, red class CheckResult: diff --git a/src/kathara_lab_checker/checks/DaemonCheck.py b/src/kathara_lab_checker/checks/DaemonCheck.py index b0e32da..95fe4cd 100644 --- a/src/kathara_lab_checker/checks/DaemonCheck.py +++ b/src/kathara_lab_checker/checks/DaemonCheck.py @@ -2,7 +2,7 @@ from Kathara.manager.Kathara import Kathara from Kathara.model.Lab import Lab -from kathara_lab_checker.utils import get_output +from ..utils import get_output from .AbstractCheck import AbstractCheck from .CheckResult import CheckResult diff --git a/src/kathara_lab_checker/checks/InterfaceIPCheck.py b/src/kathara_lab_checker/checks/InterfaceIPCheck.py index 5253f62..2a5b1c5 100644 --- a/src/kathara_lab_checker/checks/InterfaceIPCheck.py +++ b/src/kathara_lab_checker/checks/InterfaceIPCheck.py @@ -3,7 +3,7 @@ from Kathara.exceptions import MachineNotRunningError from Kathara.model.Lab import Lab -from kathara_lab_checker.utils import get_interfaces_addresses +from ..utils import get_interfaces_addresses from .AbstractCheck import AbstractCheck from .CheckResult import CheckResult diff --git a/src/kathara_lab_checker/checks/ReachabilityCheck.py b/src/kathara_lab_checker/checks/ReachabilityCheck.py index ccf9fca..27ccbc0 100644 --- a/src/kathara_lab_checker/checks/ReachabilityCheck.py +++ b/src/kathara_lab_checker/checks/ReachabilityCheck.py @@ -2,7 +2,7 @@ from Kathara.manager.Kathara import Kathara from Kathara.model.Lab import Lab -from kathara_lab_checker.utils import get_output +from ..utils import get_output from .AbstractCheck import AbstractCheck from .CheckResult import CheckResult diff --git a/src/kathara_lab_checker/checks/applications/dns/DNSAuthorityCheck.py b/src/kathara_lab_checker/checks/applications/dns/DNSAuthorityCheck.py index cf4cefd..350b0d3 100644 --- a/src/kathara_lab_checker/checks/applications/dns/DNSAuthorityCheck.py +++ b/src/kathara_lab_checker/checks/applications/dns/DNSAuthorityCheck.py @@ -6,9 +6,9 @@ from Kathara.manager.Kathara import Kathara from Kathara.model.Lab import Lab -from kathara_lab_checker.checks.AbstractCheck import AbstractCheck -from kathara_lab_checker.checks.CheckResult import CheckResult -from kathara_lab_checker.utils import get_output, find_lines_with_string, find_device_name_from_ip +from ...AbstractCheck import AbstractCheck +from ...CheckResult import CheckResult +from ....utils import get_output, find_lines_with_string, find_device_name_from_ip class DNSAuthorityCheck(AbstractCheck): diff --git a/src/kathara_lab_checker/checks/applications/dns/DNSRecordCheck.py b/src/kathara_lab_checker/checks/applications/dns/DNSRecordCheck.py index 71bf0f0..aa83be0 100644 --- a/src/kathara_lab_checker/checks/applications/dns/DNSRecordCheck.py +++ b/src/kathara_lab_checker/checks/applications/dns/DNSRecordCheck.py @@ -1,9 +1,9 @@ from Kathara.manager.Kathara import Kathara from Kathara.model.Lab import Lab -from kathara_lab_checker.checks.AbstractCheck import AbstractCheck -from kathara_lab_checker.checks.CheckResult import CheckResult -from kathara_lab_checker.utils import get_output +from ...AbstractCheck import AbstractCheck +from ...CheckResult import CheckResult +from ....utils import get_output class DNSRecordCheck(AbstractCheck): diff --git a/src/kathara_lab_checker/checks/applications/dns/LocalNSCheck.py b/src/kathara_lab_checker/checks/applications/dns/LocalNSCheck.py index 91ad489..3e5bebe 100644 --- a/src/kathara_lab_checker/checks/applications/dns/LocalNSCheck.py +++ b/src/kathara_lab_checker/checks/applications/dns/LocalNSCheck.py @@ -3,9 +3,9 @@ from Kathara.manager.Kathara import Kathara from Kathara.model.Lab import Lab -from kathara_lab_checker.checks.AbstractCheck import AbstractCheck -from kathara_lab_checker.checks.CheckResult import CheckResult -from kathara_lab_checker.utils import get_output +from ...AbstractCheck import AbstractCheck +from ...CheckResult import CheckResult +from ....utils import get_output class LocalNSCheck(AbstractCheck): diff --git a/src/kathara_lab_checker/checks/protocols/AnnouncedNetworkCheck.py b/src/kathara_lab_checker/checks/protocols/AnnouncedNetworkCheck.py index ff990e5..6be2c56 100644 --- a/src/kathara_lab_checker/checks/protocols/AnnouncedNetworkCheck.py +++ b/src/kathara_lab_checker/checks/protocols/AnnouncedNetworkCheck.py @@ -3,9 +3,9 @@ from Kathara.manager.Kathara import Kathara from Kathara.model.Lab import Lab -from kathara_lab_checker.checks.AbstractCheck import AbstractCheck -from kathara_lab_checker.checks.CheckResult import CheckResult -from kathara_lab_checker.utils import get_output +from ..AbstractCheck import AbstractCheck +from ..CheckResult import CheckResult +from ...utils import get_output class AnnouncedNetworkCheck(AbstractCheck): diff --git a/src/kathara_lab_checker/checks/protocols/ProtocolRedistributionCheck.py b/src/kathara_lab_checker/checks/protocols/ProtocolRedistributionCheck.py index 56d23d2..4c4e9f5 100644 --- a/src/kathara_lab_checker/checks/protocols/ProtocolRedistributionCheck.py +++ b/src/kathara_lab_checker/checks/protocols/ProtocolRedistributionCheck.py @@ -3,9 +3,9 @@ from Kathara.manager.Kathara import Kathara from Kathara.model.Lab import Lab -from kathara_lab_checker.checks.AbstractCheck import AbstractCheck -from kathara_lab_checker.checks.CheckResult import CheckResult -from kathara_lab_checker.utils import get_output +from ..AbstractCheck import AbstractCheck +from ..CheckResult import CheckResult +from ...utils import get_output class ProtocolRedistributionCheck(AbstractCheck): diff --git a/src/kathara_lab_checker/checks/protocols/bgp/BGPPeeringCheck.py b/src/kathara_lab_checker/checks/protocols/bgp/BGPPeeringCheck.py index 0d36952..680e518 100644 --- a/src/kathara_lab_checker/checks/protocols/bgp/BGPPeeringCheck.py +++ b/src/kathara_lab_checker/checks/protocols/bgp/BGPPeeringCheck.py @@ -4,9 +4,9 @@ from Kathara.manager.Kathara import Kathara from Kathara.model.Lab import Lab -from kathara_lab_checker.checks.AbstractCheck import AbstractCheck -from kathara_lab_checker.checks.CheckResult import CheckResult -from kathara_lab_checker.utils import get_output +from ...AbstractCheck import AbstractCheck +from ...CheckResult import CheckResult +from ....utils import get_output class BGPPeeringCheck(AbstractCheck): diff --git a/src/kathara_lab_checker/checks/protocols/evpn/AnnouncedVNICheck.py b/src/kathara_lab_checker/checks/protocols/evpn/AnnouncedVNICheck.py index dedcec4..af4df0b 100644 --- a/src/kathara_lab_checker/checks/protocols/evpn/AnnouncedVNICheck.py +++ b/src/kathara_lab_checker/checks/protocols/evpn/AnnouncedVNICheck.py @@ -3,9 +3,9 @@ from Kathara.manager.Kathara import Kathara from Kathara.model.Lab import Lab -from kathara_lab_checker.checks.AbstractCheck import AbstractCheck -from kathara_lab_checker.checks.CheckResult import CheckResult -from kathara_lab_checker.utils import get_output +from ...AbstractCheck import AbstractCheck +from ...CheckResult import CheckResult +from ....utils import get_output class AnnouncedVNICheck(AbstractCheck): diff --git a/src/kathara_lab_checker/checks/protocols/evpn/EVPNSessionCheck.py b/src/kathara_lab_checker/checks/protocols/evpn/EVPNSessionCheck.py index b020960..2cce2c3 100644 --- a/src/kathara_lab_checker/checks/protocols/evpn/EVPNSessionCheck.py +++ b/src/kathara_lab_checker/checks/protocols/evpn/EVPNSessionCheck.py @@ -4,9 +4,9 @@ from Kathara.manager.Kathara import Kathara from Kathara.model.Lab import Lab -from kathara_lab_checker.checks.AbstractCheck import AbstractCheck -from kathara_lab_checker.checks.CheckResult import CheckResult -from kathara_lab_checker.utils import get_output +from ...AbstractCheck import AbstractCheck +from ...CheckResult import CheckResult +from ....utils import get_output class EVPNSessionCheck(AbstractCheck): diff --git a/src/kathara_lab_checker/checks/protocols/evpn/VTEPCheck.py b/src/kathara_lab_checker/checks/protocols/evpn/VTEPCheck.py index e6b00e1..ab09a0b 100644 --- a/src/kathara_lab_checker/checks/protocols/evpn/VTEPCheck.py +++ b/src/kathara_lab_checker/checks/protocols/evpn/VTEPCheck.py @@ -4,9 +4,9 @@ from Kathara.manager.Kathara import Kathara from Kathara.model.Lab import Lab -from kathara_lab_checker.checks.AbstractCheck import AbstractCheck -from kathara_lab_checker.checks.CheckResult import CheckResult -from kathara_lab_checker.utils import get_output +from ...AbstractCheck import AbstractCheck +from ...CheckResult import CheckResult +from ....utils import get_output class VTEPCheck(AbstractCheck): diff --git a/src/main.py b/src/main.py new file mode 100644 index 0000000..f0eb0ec --- /dev/null +++ b/src/main.py @@ -0,0 +1,4 @@ +from kathara_lab_checker.__main__ import main + +if __name__ == '__main__': + main() \ No newline at end of file From 08b4a5fe436d87bcdebdfbf4c62ae639965ec79c Mon Sep 17 00:00:00 2001 From: Tommaso Caiazzi Date: Tue, 29 Oct 2024 16:44:49 +0100 Subject: [PATCH 2/9] Fix print error `LocalNSCheck` (fix #18) --- .../checks/applications/dns/LocalNSCheck.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/kathara_lab_checker/checks/applications/dns/LocalNSCheck.py b/src/kathara_lab_checker/checks/applications/dns/LocalNSCheck.py index 3e5bebe..a1b0465 100644 --- a/src/kathara_lab_checker/checks/applications/dns/LocalNSCheck.py +++ b/src/kathara_lab_checker/checks/applications/dns/LocalNSCheck.py @@ -27,12 +27,17 @@ def check(self, local_ns_ip: str, device_name: str, lab: Lab) -> CheckResult: reason = f"`resolv.conf` file not found for device `{device_name}`" return CheckResult(self.description, False, reason) for line in lines: - if re.search(rf"^nameserver {local_ns_ip}$", line): - return CheckResult(self.description, True, "OK") + match = re.search(rf"^nameserver (.*)$", line) + if match: + actual_ns_ip = match.group(1) + if actual_ns_ip == local_ns_ip: + return CheckResult(self.description, True, "OK") + else: + reason = f"The local name server for device `{device_name}` has ip `{actual_ns_ip}`" + return CheckResult(self.description, False, reason) else: - reason = f"The local name server for device `{device_name}` has ip `{local_ns_ip}`" + reason = f"`resolv.conf` file has the wrong format for device `{device_name}`" return CheckResult(self.description, False, reason) - def run(self, local_nameservers_to_devices: dict[str, list[str]], lab: Lab) -> list[CheckResult]: results = [] for local_ns, managed_devices in local_nameservers_to_devices.items(): From 562ac1e9bce5f67bba1e0f19995cb316ea908cb0 Mon Sep 17 00:00:00 2001 From: Tommaso Caiazzi Date: Tue, 29 Oct 2024 17:20:06 +0100 Subject: [PATCH 3/9] Fix LocalNSCheck --- .../checks/applications/dns/LocalNSCheck.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/kathara_lab_checker/checks/applications/dns/LocalNSCheck.py b/src/kathara_lab_checker/checks/applications/dns/LocalNSCheck.py index a1b0465..b710210 100644 --- a/src/kathara_lab_checker/checks/applications/dns/LocalNSCheck.py +++ b/src/kathara_lab_checker/checks/applications/dns/LocalNSCheck.py @@ -26,18 +26,18 @@ def check(self, local_ns_ip: str, device_name: str, lab: Lab) -> CheckResult: if not lines: reason = f"`resolv.conf` file not found for device `{device_name}`" return CheckResult(self.description, False, reason) + actual_ips = [] for line in lines: match = re.search(rf"^nameserver (.*)$", line) if match: actual_ns_ip = match.group(1) if actual_ns_ip == local_ns_ip: return CheckResult(self.description, True, "OK") - else: - reason = f"The local name server for device `{device_name}` has ip `{actual_ns_ip}`" - return CheckResult(self.description, False, reason) - else: - reason = f"`resolv.conf` file has the wrong format for device `{device_name}`" - return CheckResult(self.description, False, reason) + actual_ips.append(actual_ns_ip) + + reason = (f"There is no local name server for device `{device_name}` with IP `{local_ns_ip}`. " + f"Actual nameservers: {actual_ips}") + return CheckResult(self.description, False, reason) def run(self, local_nameservers_to_devices: dict[str, list[str]], lab: Lab) -> list[CheckResult]: results = [] for local_ns, managed_devices in local_nameservers_to_devices.items(): From 666ca59c7aa9f8b10f4ed6739578baa691770446 Mon Sep 17 00:00:00 2001 From: Tommaso Caiazzi Date: Tue, 29 Oct 2024 17:33:39 +0100 Subject: [PATCH 4/9] Fix CollisionDomainCheck (fix #17) --- src/kathara_lab_checker/__main__.py | 2 +- .../checks/CollisionDomainCheck.py | 38 +++++++++++-------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/src/kathara_lab_checker/__main__.py b/src/kathara_lab_checker/__main__.py index 30453b9..0dfa4b2 100644 --- a/src/kathara_lab_checker/__main__.py +++ b/src/kathara_lab_checker/__main__.py @@ -120,7 +120,7 @@ def run_on_single_network_scenario( test_collector.add_check_results(lab_name, check_results) logger.info("Checking collision domains...") - check_results = CollisionDomainCheck().run(list(lab_template.links.values()), lab) + check_results = CollisionDomainCheck().run(list(lab_template.machines.values()), lab) test_collector.add_check_results(lab_name, check_results) if "requiring_startup" in configuration["test"]: diff --git a/src/kathara_lab_checker/checks/CollisionDomainCheck.py b/src/kathara_lab_checker/checks/CollisionDomainCheck.py index afb51a9..a30b890 100644 --- a/src/kathara_lab_checker/checks/CollisionDomainCheck.py +++ b/src/kathara_lab_checker/checks/CollisionDomainCheck.py @@ -1,31 +1,37 @@ from Kathara.exceptions import LinkNotFoundError -from Kathara.model import Link from Kathara.model.Lab import Lab +from Kathara.model.Machine import Machine from .AbstractCheck import AbstractCheck from .CheckResult import CheckResult class CollisionDomainCheck(AbstractCheck): - def check(self, cd_t: Link, lab: Lab) -> CheckResult: - self.description = f"Checking collision domain `{cd_t.name}`" + def check(self, machine_t: Machine, lab: Lab) -> list[CheckResult]: + results = [] try: - cd = lab.get_link(cd_t.name) - if cd.machines.keys() != cd_t.machines.keys(): - reason = ( - f"Devices connected to collision domain {cd.name} {list(cd.machines.keys())} " - f"are different from the one in the template {list(cd_t.machines.keys())}." - ) - return CheckResult(self.description, False, reason) + machine = lab.get_machine(machine_t.name) + for iface_num, interface in machine.interfaces.items(): + self.description = f"Checking the collision domain attached to interface `eth{iface_num}` of `{machine_t.name}`" + interface_t = machine_t.interfaces[iface_num] + if interface_t.link.name != interface.link.name: + reason = ( + f"Interface `{iface_num}` of device {machine_t.name} is connected to collision domain " + f"`{interface.link.name}` instead of `{interface_t.link.name}`" + ) + results.append(CheckResult(self.description, False, reason)) + else: + results.append(CheckResult(self.description, True, "OK")) + - return CheckResult(self.description, True, "OK") except LinkNotFoundError as e: - return CheckResult(self.description, False, str(e)) + results.append(CheckResult(self.description, False, str(e))) + return results - def run(self, template_cds: list[Link], lab: Lab) -> list[CheckResult]: + def run(self, template_machines: list[Machine], lab: Lab) -> list[CheckResult]: results = [] - for cd_t in template_cds: - check_result = self.check(cd_t, lab) - results.append(check_result) + for machine_t in template_machines: + check_result = self.check(machine_t, lab) + results.extend(check_result) return results From 93b66f22a2b18642c7d72292279225eaee4b20c3 Mon Sep 17 00:00:00 2001 From: Tommaso Caiazzi Date: Tue, 29 Oct 2024 17:35:22 +0100 Subject: [PATCH 5/9] Sort network scenarios before checks (fix #16) --- src/kathara_lab_checker/__main__.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/kathara_lab_checker/__main__.py b/src/kathara_lab_checker/__main__.py index 0dfa4b2..5e28a56 100644 --- a/src/kathara_lab_checker/__main__.py +++ b/src/kathara_lab_checker/__main__.py @@ -263,10 +263,12 @@ def run_on_multiple_network_scenarios( test_collector = TestCollector() for lab_name in tqdm( - list( - filter( - lambda x: os.path.isdir(os.path.join(labs_path, x)) and x != ".DS_Store", - os.listdir(labs_path), + sorted( + list( + filter( + lambda x: os.path.isdir(os.path.join(labs_path, x)) and x != ".DS_Store", + os.listdir(labs_path), + ) ) ) ): From 9520b426b44f74cc5fb3c0814ebfe2a6fdda8ded Mon Sep 17 00:00:00 2001 From: Tommaso Caiazzi Date: Tue, 29 Oct 2024 18:28:57 +0100 Subject: [PATCH 6/9] Update gitignore --- .gitignore | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.gitignore b/.gitignore index 651f6de..9ff47bf 100644 --- a/.gitignore +++ b/.gitignore @@ -96,15 +96,10 @@ celerybeat-schedule Dockerfile~ *.py~ -# builds -/src/kathara.build/ -/src/kathara.dist/ - # Packages *.rpm *.tar.zst - /config /.vscode/ /.vs/ From 5cbcdf4e26a334b9383ff064050656b753f2af67 Mon Sep 17 00:00:00 2001 From: Tommaso Caiazzi Date: Tue, 29 Oct 2024 18:29:27 +0100 Subject: [PATCH 7/9] Fix DNSAuthorityCheck --- .../applications/dns/DNSAuthorityCheck.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/kathara_lab_checker/checks/applications/dns/DNSAuthorityCheck.py b/src/kathara_lab_checker/checks/applications/dns/DNSAuthorityCheck.py index 350b0d3..a257fc5 100644 --- a/src/kathara_lab_checker/checks/applications/dns/DNSAuthorityCheck.py +++ b/src/kathara_lab_checker/checks/applications/dns/DNSAuthorityCheck.py @@ -52,11 +52,12 @@ def check(self, domain: str, authority_ip: str, device_name: str, device_ip: str ) return CheckResult(self.description, False, reason) else: - if os.path.exists(f"{device_name}.startup"): + if lab.fs.exists(f"{device_name}.startup"): with lab.fs.open(f"{device_name}.startup", "r") as startup_file: - systemctl_lines = find_lines_with_string(startup_file.readline(), "systemctl") + lines = startup_file.readlines() - for line in systemctl_lines: + for line in lines: + line = line.strip() if re.search(rf"^\s*systemctl\s*start\s*named\s*$", line): exec_output_gen = kathara_manager.exec( machine_name=device_name, @@ -65,19 +66,22 @@ def check(self, domain: str, authority_ip: str, device_name: str, device_ip: str ) output = get_output(exec_output_gen) - date_pattern = ( r"\d{2}-[Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec]{3}-\d{4} \d{2}:\d{2}:\d{2}\.\d{3}" ) reason_list = find_lines_with_string(output, "could not") + reason_list.extend(find_lines_with_string(output, "/etc/bind/named.conf")) reason_list_no_dates = [re.sub(date_pattern, "", line) for line in reason_list] reason = "\n".join(reason_list_no_dates) - return CheckResult(self.description, False, reason) + return CheckResult(self.description, False, "Configuration Error:\n" + reason) - reason = f"named not started in the startup file of `{device_name}`" - return CheckResult(self.description, False, reason) + reason = f"named not started in `{device_name}`.startup`" + return CheckResult(self.description, False, reason) + else: + reason = f"There is no `.startup` file for device `{device_name}`" + return CheckResult(self.description, False, reason) def run( self, From 1a361ea0c997901b4f45078af937c3fc8fa965c8 Mon Sep 17 00:00:00 2001 From: Tommaso Caiazzi Date: Tue, 29 Oct 2024 18:33:57 +0100 Subject: [PATCH 8/9] Fix final excel writing --- src/kathara_lab_checker/excel_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kathara_lab_checker/excel_utils.py b/src/kathara_lab_checker/excel_utils.py index 8bebc24..e5f5d25 100644 --- a/src/kathara_lab_checker/excel_utils.py +++ b/src/kathara_lab_checker/excel_utils.py @@ -29,7 +29,7 @@ def write_final_results_to_excel(test_collector: "TestCollectorPackage.TestColle if failed_tests: failed_string = "" for idx, failed in enumerate(failed_tests): - failed_string += f"{(idx + 1)}: {failed.reason}\n" + failed_string += f"{(idx + 1)}: {failed.description}: {failed.reason}\n" if len(failed_string) >= 32767: raise Exception("ERROR: Excel cell too big") sheet["E" + str(index + 2)] = failed_string From 69f13636a970f920f50e1ecabdf4683df14f3425 Mon Sep 17 00:00:00 2001 From: Tommaso Caiazzi Date: Tue, 29 Oct 2024 19:50:26 +0100 Subject: [PATCH 9/9] Bump version (0.1.6) --- pyproject.toml | 2 +- src/kathara_lab_checker/__main__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 4780b26..c38f3e8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "kathara_lab_checker" - version = "0.1.5" + version = "0.1.6" description = "Tool to automatically check Kathará network scenarios based on a configuration file." readme = "README.md" requires-python = ">=3.11" diff --git a/src/kathara_lab_checker/__main__.py b/src/kathara_lab_checker/__main__.py index 5e28a56..747647c 100644 --- a/src/kathara_lab_checker/__main__.py +++ b/src/kathara_lab_checker/__main__.py @@ -41,7 +41,7 @@ from .excel_utils import write_final_results_to_excel, write_result_to_excel from .utils import reverse_dictionary -VERSION = "0.1.5" +VERSION = "0.1.6" CURRENT_LAB: Optional[Lab] = None