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

DS refactor, fixes/optimizations

Browse Source
This commit is contained in:
Arseniy Kuznetsov
2021-02-07 15:46:42 +01:00
parent cb2ff3c1a5
commit ad6fc82744
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mktxp/cli/output/capsman_out.py
View File

@@ -42,19 +42,18 @@ class CapsmanOutput:
else:
dhcp_rt_by_interface[interface] = [registration_record]
output_entry = BaseOutputProcessor.OutputCapsmanEntry
output_table = BaseOutputProcessor.output_table(output_entry)
output_records = 0
registration_records = len(registration_records)
output_entry = BaseOutputProcessor.OutputCapsmanEntry
output_table = BaseOutputProcessor.output_table(output_entry)
for key in dhcp_rt_by_interface.keys():
for record in dhcp_rt_by_interface[key]:
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():

8
mktxp/cli/output/dhcp_out.py
View File

@@ -35,11 +35,11 @@ class DHCPOutput:
else:
dhcp_by_server[server] = [dhcp_lease_record]
output_entry = BaseOutputProcessor.OutputDHCPEntry
output_table = BaseOutputProcessor.output_table(output_entry)
output_records = 0
lease_records = len(dhcp_lease_records)
output_entry = BaseOutputProcessor.OutputDHCPEntry
output_table = BaseOutputProcessor.output_table(output_entry)
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)
@@ -47,7 +47,7 @@ class DHCPOutput:
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():

6
mktxp/cli/output/wifi_out.py
View File

@@ -42,11 +42,11 @@ class WirelessOutput:
else:
dhcp_rt_by_interface[interface] = [registration_record]
output_entry = BaseOutputProcessor.OutputWiFiEntry
output_table = BaseOutputProcessor.output_table(output_entry)
output_records = 0
registration_records = len(registration_records)
output_entry = BaseOutputProcessor.OutputWiFiEntry
output_table = BaseOutputProcessor.output_table(output_entry)
for key in dhcp_rt_by_interface.keys():
for record in dhcp_rt_by_interface[key]:
output_table.add_row(output_entry(**record))

1
mktxp/processor/output.py
View File

@@ -11,6 +11,7 @@
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
import re, os
from datetime import timedelta
from collections import namedtuple