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

initial wifiwave2 capsman support

Browse Source
This commit is contained in:
Arseniy Kuznetsov
2023-01-12 20:30:02 +01:00
parent 2aa942aee6
commit cefa3335c1
8 changed files with 71 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
mktxp/datasource/capsman_ds.py
View File

@@ -13,6 +13,23 @@
from mktxp.datasource.base_ds import BaseDSProcessor
from mktxp.datasource.wireless_ds import WirelessMetricsDataSource
class CapsmanInfo:
@staticmethod
def capsman_path(router_entry):
if WirelessMetricsDataSource.wireless_package(router_entry) == WirelessMetricsDataSource.WIFIWAVE2:
return '/interface/wifiwave2/capsman'
else:
return '/caps-man'
@staticmethod
def registration_table_path(router_entry):
if WirelessMetricsDataSource.wireless_package(router_entry) == WirelessMetricsDataSource.WIFIWAVE2:
return '/interface/wifiwave2/registration-table'
else:
return '/caps-man/registration-table'
class CapsmanCapsMetricsDataSource:
''' Caps Metrics data provider
@@ -22,10 +39,11 @@ class CapsmanCapsMetricsDataSource:
if metric_labels is None:
metric_labels = []
try:
remote_caps_records = router_entry.api_connection.router_api().get_resource('/caps-man/remote-cap').get()
capsman_path = CapsmanInfo.capsman_path(router_entry)
remote_caps_records = 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 caps-man remote caps info from router{router_entry.router_name}@{router_entry.config_entry.hostname}: {exc}')
print(f'Error getting CAPsMAN remote caps info from router{router_entry.router_name}@{router_entry.config_entry.hostname}: {exc}')
return None
@@ -37,10 +55,11 @@ class CapsmanRegistrationsMetricsDataSource:
if metric_labels is None:
metric_labels = []
try:
registration_table_records = router_entry.api_connection.router_api().get_resource('/caps-man/registration-table').get()
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()
return BaseDSProcessor.trimmed_records(router_entry, router_records = registration_table_records, metric_labels = metric_labels, add_router_id = add_router_id)
except Exception as exc:
print(f'Error getting caps-man registration table info from router{router_entry.router_name}@{router_entry.config_entry.hostname}: {exc}')
print(f'Error getting CAPsMAN registration table info from router{router_entry.router_name}@{router_entry.config_entry.hostname}: {exc}')
return None
@@ -50,11 +69,13 @@ class CapsmanInterfacesDatasource:
@staticmethod
def metric_records(router_entry, *, metric_labels = None):
if WirelessMetricsDataSource.wireless_package(router_entry) == WirelessMetricsDataSource.WIFIWAVE2:
return None
if metric_labels is None:
metric_labels = []
try:
caps_interfaces = router_entry.api_connection.router_api().get_resource('/caps-man/interface').get()
return BaseDSProcessor.trimmed_records(router_entry, router_records = caps_interfaces, metric_labels = metric_labels)
except Exception as exc:
print(f'Error getting caps-man interfaces info from router{router_entry.router_name}@{router_entry.config_entry.hostname}: {exc}')
print(f'Error getting CAPsMAN interfaces info from router{router_entry.router_name}@{router_entry.config_entry.hostname}: {exc}')
return None

2
mktxp/datasource/package_ds.py
View File

@@ -31,7 +31,7 @@ class PackageMetricsDataSource:
@staticmethod
def is_package_installed (router_entry, package_name = ''):
def is_package_installed (router_entry, package_name = None):
if package_name:
try:
package_records = router_entry.api_connection.router_api().get_resource('/system/package').get()

9
mktxp/datasource/wireless_ds.py
View File

@@ -19,6 +19,10 @@ from mktxp.datasource.package_ds import PackageMetricsDataSource
class WirelessMetricsDataSource:
''' Wireless Metrics data provider
'''
WIFIWAVE2 = 'wifiwave2'
WIRELESS = 'wireless'
@staticmethod
def metric_records(router_entry, *, metric_labels = None, add_router_id = True):
if metric_labels is None:
@@ -41,4 +45,7 @@ class WirelessMetricsDataSource:
@staticmethod
def wireless_package(router_entry):
return 'wifiwave2' if PackageMetricsDataSource.is_package_installed(router_entry, package_name = 'wifiwave2') else 'wireless'
if not router_entry.wifi_package:
ww2_installed = PackageMetricsDataSource.is_package_installed(router_entry, package_name = WirelessMetricsDataSource.WIFIWAVE2)
router_entry.wifi_package = WirelessMetricsDataSource.WIFIWAVE2 if ww2_installed else WirelessMetricsDataSource.WIRELESS
return router_entry.wifi_package