diff --git a/daemon/core/configservices/nrlservices/services.py b/daemon/core/configservices/nrlservices/services.py index a67fac53..3dddf1ba 100644 --- a/daemon/core/configservices/nrlservices/services.py +++ b/daemon/core/configservices/nrlservices/services.py @@ -48,7 +48,7 @@ class NrlNhdp(ConfigService): has_smf = "SMF" in self.node.config_services ifnames = [] for ifc in self.node.netifs(): - if hasattr(ifc, "control") and ifc.control is True: + if getattr(ifc, "control", False): continue ifnames.append(ifc.name) return dict(has_smf=has_smf, ifnames=ifnames) @@ -75,7 +75,7 @@ class NrlSmf(ConfigService): ifnames = [] ip4_prefix = None for ifc in self.node.netifs(): - if hasattr(ifc, "control") and ifc.control is True: + if getattr(ifc, "control", False): continue ifnames.append(ifc.name) if ip4_prefix: @@ -113,7 +113,7 @@ class NrlOlsr(ConfigService): has_zebra = "zebra" in self.node.config_services ifname = None for ifc in self.node.netifs(): - if hasattr(ifc, "control") and ifc.control is True: + if getattr(ifc, "control", False): continue ifname = ifc.name break @@ -138,7 +138,7 @@ class NrlOlsrv2(ConfigService): has_smf = "SMF" in self.node.config_services ifnames = [] for ifc in self.node.netifs(): - if hasattr(ifc, "control") and ifc.control is True: + if getattr(ifc, "control", False): continue ifnames.append(ifc.name) return dict(has_smf=has_smf, ifnames=ifnames) @@ -162,7 +162,7 @@ class OlsrOrg(ConfigService): has_smf = "SMF" in self.node.config_services ifnames = [] for ifc in self.node.netifs(): - if hasattr(ifc, "control") and ifc.control is True: + if getattr(ifc, "control", False): continue ifnames.append(ifc.name) return dict(has_smf=has_smf, ifnames=ifnames) @@ -200,7 +200,7 @@ class Arouted(ConfigService): def data(self) -> Dict[str, Any]: ip4_prefix = None for ifc in self.node.netifs(): - if hasattr(ifc, "control") and ifc.control is True: + if getattr(ifc, "control", False): continue if ip4_prefix: continue diff --git a/daemon/core/configservices/quaggaservices/services.py b/daemon/core/configservices/quaggaservices/services.py index ef36b932..5a2c869f 100644 --- a/daemon/core/configservices/quaggaservices/services.py +++ b/daemon/core/configservices/quaggaservices/services.py @@ -32,7 +32,7 @@ def get_router_id(node: CoreNodeBase) -> str: Helper to return the first IPv4 address of a node as its router ID. """ for ifc in node.netifs(): - if hasattr(ifc, "control") and ifc.control is True: + if getattr(ifc, "control", False): continue for a in ifc.addrlist: a = a.split("/")[0] diff --git a/daemon/core/configservices/sercurityservices/services.py b/daemon/core/configservices/sercurityservices/services.py index cc95265d..fca86373 100644 --- a/daemon/core/configservices/sercurityservices/services.py +++ b/daemon/core/configservices/sercurityservices/services.py @@ -82,7 +82,7 @@ class Nat(ConfigService): def data(self) -> Dict[str, Any]: ifnames = [] for ifc in self.node.netifs(): - if hasattr(ifc, "control") and ifc.control is True: + if getattr(ifc, "control", False): continue ifnames.append(ifc.name) return dict(ifnames=ifnames) diff --git a/daemon/core/configservices/utilservices/services.py b/daemon/core/configservices/utilservices/services.py index 1165b149..671f12f1 100644 --- a/daemon/core/configservices/utilservices/services.py +++ b/daemon/core/configservices/utilservices/services.py @@ -1,3 +1,4 @@ +import logging from typing import Any, Dict import netaddr @@ -28,6 +29,7 @@ class DefaultRouteService(ConfigService): if getattr(netif, "control", False): continue for addr in netif.addrlist: + logging.info("default route address: %s", addr) net = netaddr.IPNetwork(addr) if net[1] != net[-2]: addresses.append(net[1]) @@ -51,7 +53,7 @@ class DefaultMulticastRouteService(ConfigService): def data(self) -> Dict[str, Any]: ifname = None for ifc in self.node.netifs(): - if hasattr(ifc, "control") and ifc.control is True: + if getattr(ifc, "control", False): continue ifname = ifc.name break @@ -75,7 +77,7 @@ class StaticRouteService(ConfigService): def data(self) -> Dict[str, Any]: routes = [] for ifc in self.node.netifs(): - if hasattr(ifc, "control") and ifc.control is True: + if getattr(ifc, "control", False): continue for x in ifc.addrlist: addr = x.split("/")[0] @@ -150,7 +152,7 @@ class DhcpService(ConfigService): def data(self) -> Dict[str, Any]: subnets = [] for ifc in self.node.netifs(): - if hasattr(ifc, "control") and ifc.control is True: + if getattr(ifc, "control", False): continue for x in ifc.addrlist: addr = x.split("/")[0] @@ -181,7 +183,7 @@ class DhcpClientService(ConfigService): def data(self) -> Dict[str, Any]: ifnames = [] for ifc in self.node.netifs(): - if hasattr(ifc, "control") and ifc.control is True: + if getattr(ifc, "control", False): continue ifnames.append(ifc.name) return dict(ifnames=ifnames) @@ -219,7 +221,7 @@ class PcapService(ConfigService): def data(self) -> Dict[str, Any]: ifnames = [] for ifc in self.node.netifs(): - if hasattr(ifc, "control") and ifc.control is True: + if getattr(ifc, "control", False): continue ifnames.append(ifc.name) return dict() @@ -242,7 +244,7 @@ class RadvdService(ConfigService): def data(self) -> Dict[str, Any]: interfaces = [] for ifc in self.node.netifs(): - if hasattr(ifc, "control") and ifc.control is True: + if getattr(ifc, "control", False): continue prefixes = [] for x in ifc.addrlist: @@ -294,7 +296,7 @@ class HttpService(ConfigService): def data(self) -> Dict[str, Any]: interfaces = [] for ifc in self.node.netifs(): - if hasattr(ifc, "control") and ifc.control is True: + if getattr(ifc, "control", False): continue interfaces.append(ifc) return dict(interfaces=interfaces)