From da81f51fc1fcfccaf46338ca7c4163a72227183c Mon Sep 17 00:00:00 2001
From: hagbard <vyosdev@derith.de>
Date: Wed, 14 Nov 2018 16:39:36 -0800
Subject: Bugfix: T835 - verify radius server settings

---
 src/conf_mode/accel_pppoe.py | 81 ++++++++++++++++++++++----------------------
 1 file changed, 40 insertions(+), 41 deletions(-)

(limited to 'src/conf_mode/accel_pppoe.py')

diff --git a/src/conf_mode/accel_pppoe.py b/src/conf_mode/accel_pppoe.py
index e2f0658a1..51a121eaf 100755
--- a/src/conf_mode/accel_pppoe.py
+++ b/src/conf_mode/accel_pppoe.py
@@ -367,50 +367,49 @@ def get_config():
     config_data['snmp'] = 'enable-ma'
 
   #### authentication mode local
-  if c.exists('authentication'):
-    if c.return_value('authentication mode') == 'local':
-      if c.exists('authentication local-users username'):
-        for usr in c.list_nodes('authentication local-users username'):
-          config_data['authentication']['local-users'].update(
-            {
-              usr : {
-                'passwd' : '',
-                'state'  : 'enabled',
-                'ip'     : '*'
-              }
-            }
-          )
-          if c.exists('authentication local-users username ' + usr + ' password'):
-            config_data['authentication']['local-users'][usr]['passwd'] = c.return_value('authentication local-users username ' + usr + ' password')
-          if c.exists('authentication local-users username ' + usr + ' disable'):
-            config_data['authentication']['local-users'][usr]['state'] = 'disable'
-          if c.exists('authentication local-users username ' + usr + ' static-ip'):
-            config_data['authentication']['local-users'][usr]['ip'] = c.return_value('authentication local-users username ' + usr + ' static-ip')
-   
-    ### authentication mode radius servers and settings
-    if c.return_value('authentication mode') == 'radius':
-      config_data['authentication']['mode'] = 'radius'
-      rsrvs = c.list_nodes('authentication radius-server')
-      for rsrv in rsrvs:
-        if c.return_value('authentication radius-server ' + rsrv + ' fail-time') == None:
-          ftime = '0'
-        else:
-          ftime = str(c.return_value('authentication radius-server ' + rsrv + ' fail-time'))
-        if c.return_value('authentication radius-server ' + rsrv + ' req-limit') == None:
-          reql = '0'
-        else:
-          reql = str(c.return_value('authentication radius-server ' + rsrv + ' req-limit'))
-
-        config_data['authentication']['radiussrv'].update(
+
+  if c.exists('authentication mode local'):
+    if c.exists('authentication local-users username'):
+      for usr in c.list_nodes('authentication local-users username'):
+        config_data['authentication']['local-users'].update(
           {
-            rsrv  : {
-              'secret'  : c.return_value('authentication radius-server ' + rsrv + ' secret'),
-              'fail-time' : ftime,
-              'req-limit' : reql 
-              }
-          
+            usr : {
+              'passwd' : '',
+              'state'  : 'enabled',
+              'ip'     : '*'
+            }
           }
         )
+        if c.exists('authentication local-users username ' + usr + ' password'):
+          config_data['authentication']['local-users'][usr]['passwd'] = c.return_value('authentication local-users username ' + usr + ' password')
+        if c.exists('authentication local-users username ' + usr + ' disable'):
+          config_data['authentication']['local-users'][usr]['state'] = 'disable'
+        if c.exists('authentication local-users username ' + usr + ' static-ip'):
+          config_data['authentication']['local-users'][usr]['ip'] = c.return_value('authentication local-users username ' + usr + ' static-ip')
+   
+    ### authentication mode radius servers and settings
+
+  if c.exists('authentication mode radius'):
+    config_data['authentication']['mode'] = 'radius'
+    rsrvs = c.list_nodes('authentication radius-server')
+    for rsrv in rsrvs:
+      if c.return_value('authentication radius-server ' + rsrv + ' fail-time') == None:
+        ftime = '0'
+      else:
+        ftime = str(c.return_value('authentication radius-server ' + rsrv + ' fail-time'))
+      if c.return_value('authentication radius-server ' + rsrv + ' req-limit') == None:
+        reql = '0'
+      else:
+        reql = str(c.return_value('authentication radius-server ' + rsrv + ' req-limit'))
+      config_data['authentication']['radiussrv'].update(
+        {
+          rsrv  : {
+            'secret'  : c.return_value('authentication radius-server ' + rsrv + ' secret'),
+            'fail-time' : ftime,
+            'req-limit' : reql 
+            }
+        }
+      )
 
   #### advanced radius-setting
       if c.exists('authentication radius-settings'): 
-- 
cgit v1.2.3