From 9e2e1700c9ea6b9f7fe5662f45672943380b3905 Mon Sep 17 00:00:00 2001
From: Viacheslav Hletenko <v.gletenko@vyos.io>
Date: Sat, 18 Feb 2023 09:38:51 +0000
Subject: T5013: Extend accelppp op-mode script to get statistic

Extend accelppp.py op-mode script to get
subnet/start/stop/gateway/client_ip_pool/ etc
info from the configuration
---
 src/op_mode/accelppp.py | 38 ++++++++++++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/op_mode/accelppp.py b/src/op_mode/accelppp.py
index 2fd045dc3..87a25bb96 100755
--- a/src/op_mode/accelppp.py
+++ b/src/op_mode/accelppp.py
@@ -27,29 +27,51 @@ from vyos.util import rc_cmd
 accel_dict = {
     'ipoe': {
         'port': 2002,
-        'path': 'service ipoe-server'
+        'path': 'service ipoe-server',
+        'base_path': 'service ipoe-server'
     },
     'pppoe': {
         'port': 2001,
-        'path': 'service pppoe-server'
+        'path': 'service pppoe-server',
+        'base_path': 'service pppoe-server'
     },
     'pptp': {
         'port': 2003,
-        'path': 'vpn pptp'
+        'path': 'vpn pptp',
+        'base_path': 'vpn pptp'
     },
     'l2tp': {
         'port': 2004,
-        'path': 'vpn l2tp'
+        'path': 'vpn l2tp',
+        'base_path': 'vpn l2tp remote-access'
     },
     'sstp': {
         'port': 2005,
-        'path': 'vpn sstp'
+        'path': 'vpn sstp',
+        'base_path': 'vpn sstp'
     }
 }
 
 
-def _get_raw_statistics(accel_output, pattern):
-    return vyos.accel_ppp.get_server_statistics(accel_output, pattern, sep=':')
+def _get_config_settings(protocol):
+    '''Get config dict from VyOS configuration'''
+    conf = ConfigTreeQuery()
+    base_path = accel_dict[protocol]['base_path']
+    data = conf.get_config_dict(base_path,
+                                key_mangling=('-', '_'),
+                                get_first_key=True,
+                                no_tag_node_value_mangle=True)
+    if conf.exists(f'{base_path} authentication local-users'):
+        # Delete sensitive data
+        del data['authentication']['local_users']
+    return {'config_option': data}
+
+
+def _get_raw_statistics(accel_output, pattern, protocol):
+    return {
+        **vyos.accel_ppp.get_server_statistics(accel_output, pattern, sep=':'),
+        **_get_config_settings(protocol)
+    }
 
 
 def _get_raw_sessions(port):
@@ -103,7 +125,7 @@ def show_statistics(raw: bool, protocol: str):
     rc, output = rc_cmd(f'/usr/bin/accel-cmd -p {port} show stat')
 
     if raw:
-        return _get_raw_statistics(output, pattern)
+        return _get_raw_statistics(output, pattern, protocol)
 
     return output
 
-- 
cgit v1.2.3


From 4298941471eb35605dbe002f8e33b26617f02586 Mon Sep 17 00:00:00 2001
From: Viacheslav Hletenko <v.gletenko@vyos.io>
Date: Sat, 18 Feb 2023 13:36:39 +0000
Subject: T5013: accelppp replace cpu key to cpu_load_percentage op-mode

Change op-mode raw statistics for accel_ppp.py
dict key 'cpu' to 'cpu_load_percentage' and value to integer
---
 python/vyos/accel_ppp.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/python/vyos/accel_ppp.py b/python/vyos/accel_ppp.py
index bfc8ee5a9..0af311e57 100644
--- a/python/vyos/accel_ppp.py
+++ b/python/vyos/accel_ppp.py
@@ -38,6 +38,9 @@ def get_server_statistics(accel_statistics, pattern, sep=':') -> dict:
             if key in ['starting', 'active', 'finishing']:
                 stat_dict['sessions'][key] = value.strip()
                 continue
+            if key == 'cpu':
+                stat_dict['cpu_load_percentage'] = int(re.sub(r'%', '', value.strip()))
+                continue
             stat_dict[key] = value.strip()
     return stat_dict
 
-- 
cgit v1.2.3