KevinMidboe/mktxp-no-cli
1
0
Fork 0
mirror of https://github.com/KevinMidboe/mktxp-no-cli.git synced 2025-10-29 17:50:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

connections stats collector / cmd output, remote dhcp resolver, fixes / optimizations

Browse Source
This commit is contained in:
Arseniy Kuznetsov
2023-02-04 20:48:51 +01:00
parent 18ddbe3311
commit 9a381d028c
21 changed files with 351 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
mktxp/flow/router_entry.py
View File

@@ -12,7 +12,8 @@
## GNU General Public License for more details.
from mktxp.cli.config.config import config_handler, MKTXPConfigKeys
from collections import namedtuple
from mktxp.cli.config.config import config_handler, MKTXPConfigKeys, CollectorKeys
from mktxp.flow.router_connection import RouterAPIConnection
@@ -29,39 +30,71 @@ class RouterEntry:
}
self.wifi_package = None
self.dhcp_entry = None
self.time_spent = { CollectorKeys.IDENTITY_COLLECTOR: 0,
CollectorKeys.SYSTEM_RESOURCE_COLLECTOR: 0,
CollectorKeys.HEALTH_COLLECTOR: 0,
CollectorKeys.PUBLIC_IP_ADDRESS_COLLECTOR: 0,
CollectorKeys.IPV6_NEIGHBOR_COLLECTOR: 0,
CollectorKeys.PACKAGE_COLLECTOR: 0,
CollectorKeys.DHCP_COLLECTOR: 0,
CollectorKeys.POOL_COLLECTOR: 0,
CollectorKeys.IP_CONNECTION_COLLECTOR: 0,
CollectorKeys.INTERFACE_COLLECTOR: 0,
CollectorKeys.FIREWALL_COLLECTOR: 0,
CollectorKeys.MONITOR_COLLECTOR: 0,
CollectorKeys.POE_COLLECTOR: 0,
CollectorKeys.NETWATCH_COLLECTOR: 0,
CollectorKeys.ROUTE_COLLECTOR: 0,
CollectorKeys.WLAN_COLLECTOR: 0,
CollectorKeys.CAPSMAN_COLLECTOR: 0,
CollectorKeys.QUEUE_TREE_COLLECTOR: 0,
CollectorKeys.QUEUE_SIMPLE_COLLECTOR: 0,
CollectorKeys.USER_COLLECTOR: 0,
CollectorKeys.MKTXP_COLLECTOR: 0
}
self._dhcp_entry = None
self._dhcp_records = {}
@property
def dhcp_entry(self):
if self._dhcp_entry:
return self._dhcp_entry
return self
@dhcp_entry.setter
def dhcp_entry(self, dhcp_entry):
self._dhcp_entry = dhcp_entry
self.time_spent = { 'IdentityCollector': 0,
'SystemResourceCollector': 0,
'HealthCollector': 0,
'PublicIPAddressCollector': 0,
'IPv6NeighborCollector': 0,
'PackageCollector': 0,
'DHCPCollector': 0,
'PoolCollector': 0,
'IPConnectionCollector': 0,
'InterfaceCollector': 0,
'FirewallCollector': 0,
'MonitorCollector': 0,
'POECollector': 0,
'NetwatchCollector': 0,
'RouteCollector': 0,
'WLANCollector': 0,
'CapsmanCollector': 0,
'QueueTreeCollector': 0,
'QueueSimpleCollector': 0,
'UserCollector': 0,
'MKTXPCollector': 0
}
@property
def dhcp_records(self):
return (entry.record for key, entry in self._dhcp_records.items() if entry.type == 'mac_address') \
if self._dhcp_records else None
@dhcp_records.setter
def dhcp_records(self, dhcp_records):
for dhcp_record in dhcp_records:
if dhcp_record.get('mac_address'):
self._dhcp_records[dhcp_record.get('mac_address')] = DHCPCacheEntry('mac_address', dhcp_record)
if dhcp_record.get('address'):
dhcp_record['type'] = 'address'
self._dhcp_records[dhcp_record.get('address')] = DHCPCacheEntry('address', dhcp_record)
def dhcp_record(self, key):
if self._dhcp_records and self._dhcp_records.get(key):
return self._dhcp_records[key].record
return None
def is_ready(self):
self.is_done() #flush caches, just in case
is_ready = True
self.wifi_package = None
if not self.api_connection.is_connected():
is_ready = False
# let's get connected now
self.api_connection.connect()
if self.dhcp_entry:
self.dhcp_entry.api_connection.connect()
if self._dhcp_entry:
self._dhcp_entry.api_connection.connect()
return is_ready
def is_done(self):
self.wifi_package = None
self._dhcp_records = {}
DHCPCacheEntry = namedtuple('DHCPCacheEntry', ['type', 'record'])