KevinMidboe/mktxp-no-cli
1
0
Fork 0
mirror of https://github.com/KevinMidboe/mktxp-no-cli.git synced 2026-02-10 10:19:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dual-CAPsMAN support, routerOS 7.13

Browse Source
This commit is contained in:
Arseniy Kuznetsov
2023-12-11 12:25:24 +01:00
parent aea9ce2855
commit 39ec208ff8
6 changed files with 93 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
mktxp/datasource/capsman_ds.py
View File

@@ -14,24 +14,29 @@
from mktxp.datasource.base_ds import BaseDSProcessor
from mktxp.datasource.wireless_ds import WirelessMetricsDataSource
from mktxp.flow.router_entry import RouterEntryWirelessType
class CapsmanInfo:
@staticmethod
def capsman_path(router_entry):
if WirelessMetricsDataSource.is_legacy(router_entry):
return '/caps-man'
else:
def capsman_paths(router_entry):
if router_entry.wireless_type == RouterEntryWirelessType.DUAL:
return ['/caps-man', f'/interface/wifi/capsman']
elif router_entry.wireless_type == RouterEntryWirelessType.WIRELESS:
return ['/caps-man']
else:
wireless_package = WirelessMetricsDataSource.wireless_package(router_entry)
return f'/interface/{wireless_package}/capsman'
return [f'/interface/{wireless_package}/capsman']
@staticmethod
def registration_table_path(router_entry):
if WirelessMetricsDataSource.is_legacy(router_entry):
return '/caps-man/registration-table'
else:
def registration_table_paths(router_entry):
if router_entry.wireless_type == RouterEntryWirelessType.DUAL:
return ['/caps-man/registration-table', f'/interface/wifi/registration-table']
elif router_entry.wireless_type == RouterEntryWirelessType.WIRELESS:
return ['/caps-man/registration-table']
else:
wireless_package = WirelessMetricsDataSource.wireless_package(router_entry)
return f'/interface/{wireless_package}/registration-table'
return [f'/interface/{wireless_package}/registration-table']
class CapsmanCapsMetricsDataSource:
''' Caps Metrics data provider
@@ -41,8 +46,9 @@ class CapsmanCapsMetricsDataSource:
if metric_labels is None:
metric_labels = []
try:
capsman_path = CapsmanInfo.capsman_path(router_entry)
remote_caps_records = router_entry.api_connection.router_api().get_resource(f'{capsman_path}/remote-cap').get()
remote_caps_records = []
for capsman_path in CapsmanInfo.capsman_paths(router_entry):
remote_caps_records.extend(router_entry.api_connection.router_api().get_resource(f'{capsman_path}/remote-cap').get())
return BaseDSProcessor.trimmed_records(router_entry, router_records = remote_caps_records, metric_labels = metric_labels)
except Exception as exc:
print(f'Error getting CAPsMAN remote caps info from router{router_entry.router_name}@{router_entry.config_entry.hostname}: {exc}')
@@ -57,8 +63,9 @@ class CapsmanRegistrationsMetricsDataSource:
if metric_labels is None:
metric_labels = []
try:
registration_table_path = CapsmanInfo.registration_table_path(router_entry)
registration_table_records = router_entry.api_connection.router_api().get_resource(f'{registration_table_path}').get()
registration_table_records = []
for registration_table_path in CapsmanInfo.registration_table_paths(router_entry):
registration_table_records.extend(router_entry.api_connection.router_api().get_resource(f'{registration_table_path}').get())
# With wifiwave2, Mikrotik renamed the field 'rx-signal' to 'signal'
# For backward compatibility, including both variants
@@ -75,10 +82,9 @@ class CapsmanRegistrationsMetricsDataSource:
class CapsmanInterfacesDatasource:
''' Data provider for CAPsMaN interfaces
'''
@staticmethod
def metric_records(router_entry, *, metric_labels = None):
if not WirelessMetricsDataSource.is_legacy(router_entry):
if not router_entry.wireless_type in (RouterEntryWirelessType.DUAL, RouterEntryWirelessType.WIRELESS):
return None
if metric_labels is None:
metric_labels = []