DS refactor, fixes/optimizations

mktxp/cli/output/base_out.py

@@ -21,16 +21,17 @@ 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', 'comment', 'address', 'active_address', 'mac_address', 'server', 'expires_after'])
 
     @staticmethod
-    def augment_record(router_metric, registration_record, dhcp_lease_records):
+    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 = 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_metric.router_entry.use_comments_over_names else 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:
@@ -49,9 +50,12 @@ class BaseOutputProcessor:
             registration_record['rx_bytes'] = registration_record['bytes'].split(',')[1]
             del registration_record['bytes']
 
-        registration_record['tx_rate'] = BaseOutputProcessor.parse_rates(registration_record['tx_rate'])
-        registration_record['rx_rate'] = BaseOutputProcessor.parse_rates(registration_record['rx_rate'])
-        registration_record['uptime'] = naturaldelta(BaseOutputProcessor.parse_timedelta_seconds(registration_record['uptime']), months=True, minimum_unit='seconds', when=None)
+        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'])

mktxp/cli/output/capsman_out.py

@@ -11,27 +11,31 @@
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU General Public License for more details.
 
+
 from tabulate import tabulate   
 from mktxp.cli.output.base_out import BaseOutputProcessor
+from mktxp.datasources.dhcp_ds import DHCPMetricsDataSource
+from mktxp.datasources.capsman_ds import CapsmanRegistrationsMetricsDataSource
+
 
 class CapsmanOutput:
     ''' CAPsMAN CLI Output
     '''    
     @staticmethod
-    def clients_summary(router_metric):
+    def clients_summary(router_entry):
         registration_labels = ['interface', 'ssid', 'mac_address', 'rx_signal', 'uptime', 'tx_rate', 'rx_rate']
-        registration_records = router_metric.capsman_registration_table_records(registration_labels, False)
+        registration_records = CapsmanRegistrationsMetricsDataSource.metric_records(router_entry, metric_labels = registration_labels, add_router_id = False)
         if not registration_records:
             print('No CAPsMAN registration records')
             return 
 
         # translate / trim / augment registration records
         dhcp_lease_labels = ['host_name', 'comment', 'address', 'mac_address']
-        dhcp_lease_records = router_metric.dhcp_lease_records(dhcp_lease_labels, False)
+        dhcp_lease_records = DHCPMetricsDataSource.metric_records(router_entry, metric_labels = dhcp_lease_labels, add_router_id = False)   
 
         dhcp_rt_by_interface = {}
         for registration_record in sorted(registration_records, key = lambda rt_record: rt_record['rx_signal'], reverse=True):
-            BaseOutputProcessor.augment_record(router_metric, registration_record, dhcp_lease_records)
+            BaseOutputProcessor.augment_record(router_entry, registration_record, dhcp_lease_records)
 
             interface = registration_record['interface']
             if interface in dhcp_rt_by_interface.keys():

mktxp/cli/output/dhcp_out.py

@@ -0,0 +1,48 @@
+# 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.
+
+
+from tabulate import tabulate   
+from mktxp.cli.output.base_out import BaseOutputProcessor
+from mktxp.datasources.dhcp_ds import DHCPMetricsDataSource
+
+
+class DHCPOutput:
+    ''' DHCP Clients CLI Output
+    '''    
+    @staticmethod
+    def clients_summary(router_entry):
+        dhcp_lease_labels = ['host_name', 'comment', 'active_address', 'address', 'mac_address', 'server', 'expires_after']
+        dhcp_lease_records = DHCPMetricsDataSource.metric_records(router_entry, metric_labels = dhcp_lease_labels, add_router_id = False)
+        if not dhcp_lease_records:
+            print('No DHCP registration records')
+            return 
+
+        dhcp_by_server = {}
+        for dhcp_lease_record in sorted(dhcp_lease_records, key = lambda dhcp_record: dhcp_record['active_address'], reverse=True):
+            server = dhcp_lease_record['server']
+            if server in dhcp_by_server.keys():
+                dhcp_by_server[server].append(dhcp_lease_record)
+            else:
+                dhcp_by_server[server] = [dhcp_lease_record]         
+
+        num_records = 0
+        output_table = []
+        for key in dhcp_by_server.keys():
+            for record in dhcp_by_server[key]:
+                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"))

mktxp/cli/output/wifi_out.py

@@ -11,27 +11,31 @@
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU General Public License for more details.
 
+
 from tabulate import tabulate   
 from mktxp.cli.output.base_out import BaseOutputProcessor
+from mktxp.datasources.dhcp_ds import DHCPMetricsDataSource
+from mktxp.datasources.wireless_ds import WirelessMetricsDataSource
+
 
 class WirelessOutput:
     ''' Wireless Clients CLI Output
     '''    
     @staticmethod
-    def clients_summary(router_metric):
+    def clients_summary(router_entry):
         registration_labels = ['interface', 'mac_address', 'signal_strength', 'uptime', 'tx_rate', 'rx_rate', 'signal_to_noise']
-        registration_records = router_metric.wireless_registration_table_records(registration_labels, False)
+        registration_records = WirelessMetricsDataSource.metric_records(router_entry, metric_labels = registration_labels, add_router_id = False)
         if not registration_records:
             print('No wireless registration records')
             return 
 
         # translate / trim / augment registration records
         dhcp_lease_labels = ['host_name', 'comment', 'address', 'mac_address']
-        dhcp_lease_records = router_metric.dhcp_lease_records(dhcp_lease_labels, False)
+        dhcp_lease_records = DHCPMetricsDataSource.metric_records(router_entry, metric_labels = dhcp_lease_labels, add_router_id = False)   
 
         dhcp_rt_by_interface = {}
         for registration_record in sorted(registration_records, key = lambda rt_record: rt_record['signal_strength'], reverse=True):
-            BaseOutputProcessor.augment_record(router_metric, registration_record, dhcp_lease_records)
+            BaseOutputProcessor.augment_record(router_entry, registration_record, dhcp_lease_records)
 
             interface = registration_record['interface']
             if interface in dhcp_rt_by_interface.keys():