mirror of
https://github.com/KevinMidboe/mktxp-no-cli.git
synced 2025-10-29 17:50:23 +00:00
DS refactor, fixes/optimizations
This commit is contained in:
Arseniy Kuznetsov
@@ -1,112 +0,0 @@
|
||||
# coding=utf8
|
||||
## Copyright (c) 2020 Arseniy Kuznetsov
|
||||
##
|
||||
## This program is free software; you can redistribute it and/or
|
||||
## modify it under the terms of the GNU General Public License
|
||||
## as published by the Free Software Foundation; either version 2
|
||||
## of the License, or (at your option) any later version.
|
||||
##
|
||||
## This program is distributed in the hope that it will be useful,
|
||||
## but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
## GNU General Public License for more details.
|
||||
|
||||
import re
|
||||
from datetime import timedelta
|
||||
from collections import namedtuple
|
||||
from humanize import naturaldelta
|
||||
from mktxp.cli.config.config import config_handler
|
||||
|
||||
|
||||
class BaseOutputProcessor:
|
||||
OutputCapsmanEntry = namedtuple('OutputCapsmanEntry', ['dhcp_name', 'dhcp_address', 'mac_address', 'rx_signal', 'interface', 'ssid', 'tx_rate', 'rx_rate', 'uptime'])
|
||||
OutputWiFiEntry = namedtuple('OutputWiFiEntry', ['dhcp_name', 'dhcp_address', 'mac_address', 'signal_strength', 'signal_to_noise', 'interface', 'tx_rate', 'rx_rate', 'uptime'])
|
||||
OutputDHCPEntry = namedtuple('OutputDHCPEntry', ['host_name', 'server', 'mac_address', 'address', 'active_address', 'expires_after'])
|
||||
|
||||
@staticmethod
|
||||
def augment_record(router_entry, registration_record, dhcp_lease_records):
|
||||
try:
|
||||
dhcp_lease_record = next((dhcp_lease_record for dhcp_lease_record in dhcp_lease_records if dhcp_lease_record['mac_address']==registration_record['mac_address']))
|
||||
dhcp_name = BaseOutputProcessor.dhcp_name(router_entry, dhcp_lease_record)
|
||||
dhcp_address = dhcp_lease_record.get('address', '')
|
||||
except StopIteration:
|
||||
dhcp_name = registration_record['mac_address']
|
||||
dhcp_address = 'No DHCP Record'
|
||||
|
||||
registration_record['dhcp_name'] = dhcp_name
|
||||
registration_record['dhcp_address'] = dhcp_address
|
||||
|
||||
# split out tx/rx bytes
|
||||
if registration_record.get('bytes'):
|
||||
registration_record['tx_bytes'] = registration_record['bytes'].split(',')[0]
|
||||
registration_record['rx_bytes'] = registration_record['bytes'].split(',')[1]
|
||||
del registration_record['bytes']
|
||||
|
||||
if registration_record.get('tx_rate'):
|
||||
registration_record['tx_rate'] = BaseOutputProcessor.parse_rates(registration_record['tx_rate'])
|
||||
if registration_record.get('rx_rate'):
|
||||
registration_record['rx_rate'] = BaseOutputProcessor.parse_rates(registration_record['rx_rate'])
|
||||
if registration_record.get('uptime'):
|
||||
registration_record['uptime'] = naturaldelta(BaseOutputProcessor.parse_timedelta_seconds(registration_record['uptime']), months=True, minimum_unit='seconds', when=None)
|
||||
|
||||
if registration_record.get('signal_strength'):
|
||||
registration_record['signal_strength'] = BaseOutputProcessor.parse_signal_strength(registration_record['signal_strength'])
|
||||
if registration_record.get('rx_signal'):
|
||||
registration_record['rx_signal'] = BaseOutputProcessor.parse_signal_strength(registration_record['rx_signal'])
|
||||
|
||||
@staticmethod
|
||||
def dhcp_name(router_entry, dhcp_lease_record, drop_comment = False):
|
||||
dhcp_name = dhcp_lease_record.get('host_name')
|
||||
dhcp_comment = dhcp_lease_record.get('comment')
|
||||
|
||||
if dhcp_name and dhcp_comment:
|
||||
dhcp_name = f'{dhcp_name[0:20]} ({dhcp_comment[0:20]})' if not router_entry.config_entry.use_comments_over_names else dhcp_comment
|
||||
elif dhcp_comment:
|
||||
dhcp_name = dhcp_comment
|
||||
else:
|
||||
dhcp_name = dhcp_lease_record.get('mac_address') if not dhcp_name else dhcp_name
|
||||
|
||||
if drop_comment:
|
||||
del dhcp_lease_record['comment']
|
||||
|
||||
return dhcp_name
|
||||
|
||||
@staticmethod
|
||||
def parse_rates(rate):
|
||||
wifi_rates_rgx = config_handler.re_compiled.get('wifi_rates_rgx')
|
||||
if not wifi_rates_rgx:
|
||||
wifi_rates_rgx = re.compile(r'(\d*(?:\.\d*)?)([GgMmKk]bps?)')
|
||||
config_handler.re_compiled['wifi_rates_rgx'] = wifi_rates_rgx
|
||||
rc = wifi_rates_rgx.search(rate)
|
||||
return f'{int(float(rc[1]))} {rc[2]}'
|
||||
|
||||
@staticmethod
|
||||
def parse_timedelta(time):
|
||||
duration_interval_rgx = config_handler.re_compiled.get('duration_interval_rgx')
|
||||
if not duration_interval_rgx:
|
||||
duration_interval_rgx = re.compile(r'((?P<weeks>\d+)w)?((?P<days>\d+)d)?((?P<hours>\d+)h)?((?P<minutes>\d+)m)?((?P<seconds>\d+)s)?')
|
||||
config_handler.re_compiled['duration_interval_rgx'] = duration_interval_rgx
|
||||
time_dict = duration_interval_rgx.match(time).groupdict()
|
||||
return timedelta(**{key: int(value) for key, value in time_dict.items() if value})
|
||||
|
||||
@staticmethod
|
||||
def parse_timedelta_seconds(time):
|
||||
return BaseOutputProcessor.parse_timedelta(time).total_seconds()
|
||||
|
||||
@staticmethod
|
||||
def parse_signal_strength(signal_strength):
|
||||
wifi_signal_strength_rgx = config_handler.re_compiled.get('wifi_signal_strength_rgx')
|
||||
if not wifi_signal_strength_rgx:
|
||||
# wifi_signal_strength_rgx = re.compile(r'(-?\d+(?:\.\d+)?)(dBm)?')
|
||||
wifi_signal_strength_rgx = re.compile(r'(-?\d+(?:\.\d+)?)')
|
||||
config_handler.re_compiled['wifi_signal_strength_rgx'] = wifi_signal_strength_rgx
|
||||
return wifi_signal_strength_rgx.search(signal_strength).group()
|
||||
|
||||
@staticmethod
|
||||
def parse_interface_rate(interface_rate):
|
||||
interface_rate_rgx = config_handler.re_compiled.get('interface_rate_rgx')
|
||||
if not interface_rate_rgx:
|
||||
interface_rate_rgx = re.compile(r'[^.\-\d]')
|
||||
config_handler.re_compiled['interface_rate_rgx'] = interface_rate_rgx
|
||||
rate = lambda interface_rate: 1000 if interface_rate.find('Mbps') < 0 else 1
|
||||
return(int(float(interface_rate_rgx.sub('', interface_rate)) * rate(interface_rate)))
|
||||
@@ -12,8 +12,7 @@
|
||||
## GNU General Public License for more details.
|
||||
|
||||
|
||||
from tabulate import tabulate
|
||||
from mktxp.cli.output.base_out import BaseOutputProcessor
|
||||
from mktxp.processor.output import BaseOutputProcessor
|
||||
from mktxp.datasource.dhcp_ds import DHCPMetricsDataSource
|
||||
from mktxp.datasource.capsman_ds import CapsmanRegistrationsMetricsDataSource
|
||||
|
||||
@@ -43,14 +42,23 @@ class CapsmanOutput:
|
||||
else:
|
||||
dhcp_rt_by_interface[interface] = [registration_record]
|
||||
|
||||
num_records = 0
|
||||
output_table = []
|
||||
|
||||
output_entry = BaseOutputProcessor.OutputCapsmanEntry
|
||||
output_table = BaseOutputProcessor.output_table(output_entry)
|
||||
|
||||
output_records = 0
|
||||
registration_records = len(registration_records)
|
||||
for key in dhcp_rt_by_interface.keys():
|
||||
for record in dhcp_rt_by_interface[key]:
|
||||
output_table.append(BaseOutputProcessor.OutputCapsmanEntry(**record))
|
||||
num_records += 1
|
||||
output_table.append({})
|
||||
print()
|
||||
print(tabulate(output_table, headers = "keys", tablefmt="github"))
|
||||
print(tabulate([{0:'Connected Wifi Devices:', 1:num_records}], tablefmt="text"))
|
||||
output_table.add_row(output_entry(**record))
|
||||
output_records += 1
|
||||
if output_records < registration_records:
|
||||
output_table.add_row(output_entry())
|
||||
|
||||
print (output_table.draw())
|
||||
|
||||
for server in dhcp_rt_by_interface.keys():
|
||||
print(f'{server} clients: {len(dhcp_rt_by_interface[server])}')
|
||||
print(f'Total connected CAPsMAN clients: {output_records}', '\n')
|
||||
|
||||
|
||||
|
||||
@@ -12,8 +12,7 @@
|
||||
## GNU General Public License for more details.
|
||||
|
||||
|
||||
from tabulate import tabulate
|
||||
from mktxp.cli.output.base_out import BaseOutputProcessor
|
||||
from mktxp.processor.output import BaseOutputProcessor
|
||||
from mktxp.datasource.dhcp_ds import DHCPMetricsDataSource
|
||||
|
||||
|
||||
@@ -35,17 +34,22 @@ class DHCPOutput:
|
||||
dhcp_by_server[server].append(dhcp_lease_record)
|
||||
else:
|
||||
dhcp_by_server[server] = [dhcp_lease_record]
|
||||
|
||||
output_entry = BaseOutputProcessor.OutputDHCPEntry
|
||||
output_table = BaseOutputProcessor.output_table(output_entry)
|
||||
|
||||
num_records = 0
|
||||
output_table = []
|
||||
output_records = 0
|
||||
lease_records = len(dhcp_lease_records)
|
||||
for key in dhcp_by_server.keys():
|
||||
for record in dhcp_by_server[key]:
|
||||
record['host_name'] = BaseOutputProcessor.dhcp_name(router_entry, record, drop_comment = True)
|
||||
output_table.append(BaseOutputProcessor.OutputDHCPEntry(**record))
|
||||
num_records += 1
|
||||
output_table.append({})
|
||||
print()
|
||||
print(tabulate(output_table, headers = "keys", tablefmt="github"))
|
||||
print(tabulate([{0:'DHCP Clients:', 1:num_records}], tablefmt="text"))
|
||||
|
||||
output_table.add_row(output_entry(**record))
|
||||
output_records += 1
|
||||
if output_records < lease_records:
|
||||
output_table.add_row(output_entry())
|
||||
|
||||
print (output_table.draw())
|
||||
|
||||
for server in dhcp_by_server.keys():
|
||||
print(f'{server} clients: {len(dhcp_by_server[server])}')
|
||||
print(f'Total DHCP clients: {output_records}', '\n')
|
||||
|
||||
@@ -12,8 +12,7 @@
|
||||
## GNU General Public License for more details.
|
||||
|
||||
|
||||
from tabulate import tabulate
|
||||
from mktxp.cli.output.base_out import BaseOutputProcessor
|
||||
from mktxp.processor.output import BaseOutputProcessor
|
||||
from mktxp.datasource.dhcp_ds import DHCPMetricsDataSource
|
||||
from mktxp.datasource.wireless_ds import WirelessMetricsDataSource
|
||||
|
||||
@@ -43,13 +42,21 @@ class WirelessOutput:
|
||||
else:
|
||||
dhcp_rt_by_interface[interface] = [registration_record]
|
||||
|
||||
num_records = 0
|
||||
output_table = []
|
||||
output_entry = BaseOutputProcessor.OutputWiFiEntry
|
||||
output_table = BaseOutputProcessor.output_table(output_entry)
|
||||
|
||||
output_records = 0
|
||||
registration_records = len(registration_records)
|
||||
for key in dhcp_rt_by_interface.keys():
|
||||
for record in dhcp_rt_by_interface[key]:
|
||||
output_table.append(BaseOutputProcessor.OutputWiFiEntry(**record))
|
||||
num_records += 1
|
||||
output_table.append({})
|
||||
print()
|
||||
print(tabulate(output_table, headers = "keys", tablefmt="github"))
|
||||
print(tabulate([{0:'Connected Wifi Devices:', 1:num_records}], tablefmt="text"))
|
||||
output_table.add_row(output_entry(**record))
|
||||
output_records += 1
|
||||
if output_records < registration_records:
|
||||
output_table.add_row(output_entry())
|
||||
|
||||
print (output_table.draw())
|
||||
|
||||
for server in dhcp_rt_by_interface.keys():
|
||||
print(f'{server} clients: {len(dhcp_rt_by_interface[server])}')
|
||||
print(f'Total connected WiFi devices: {output_records}', '\n')
|
||||
|
||||
|
||||
Reference in New Issue
Block a user