summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-04-19 10:34:10 +0200
committerChristian Poessinger <christian@poessinger.com>2020-04-19 10:34:21 +0200
commit75a382ae75e3ea5b2d0011572acc125a16dd81b1 (patch)
tree09d477647da254a8f8c3316c24beee7984759aa6 /src
parentb2af248ff2c63ac08ef7b9f01fdcec023c815086 (diff)
downloadvyos-1x-75a382ae75e3ea5b2d0011572acc125a16dd81b1.tar.gz
vyos-1x-75a382ae75e3ea5b2d0011572acc125a16dd81b1.zip
{pppoe,ipoe}-server: T2324: T2314: migrate CoA server
Diffstat (limited to 'src')
-rwxr-xr-xsrc/conf_mode/service_ipoe-server.py8
-rwxr-xr-xsrc/migration-scripts/ipoe-server/0-to-112
-rwxr-xr-xsrc/migration-scripts/pppoe-server/2-to-312
3 files changed, 28 insertions, 4 deletions
diff --git a/src/conf_mode/service_ipoe-server.py b/src/conf_mode/service_ipoe-server.py
index 860458e0e..23a2091bd 100755
--- a/src/conf_mode/service_ipoe-server.py
+++ b/src/conf_mode/service_ipoe-server.py
@@ -188,14 +188,14 @@ def get_config():
'key' : ''
}
- if conf.exists(['dynamic-author', 'ip-address']):
- dae['server'] = conf.return_value(['dynamic-author', 'ip-address'])
+ if conf.exists(['dynamic-author', 'server']):
+ dae['server'] = conf.return_value(['dynamic-author', 'server'])
if conf.exists(['dynamic-author', 'port']):
dae['port'] = conf.return_value(['dynamic-author', 'port'])
- if conf.exists(['dynamic-author', 'secret']):
- dae['key'] = conf.return_value(['dynamic-author', 'secret'])
+ if conf.exists(['dynamic-author', 'key']):
+ dae['key'] = conf.return_value(['dynamic-author', 'key'])
ipoe['radius_dynamic_author'] = dae
diff --git a/src/migration-scripts/ipoe-server/0-to-1 b/src/migration-scripts/ipoe-server/0-to-1
index 0a8b4a5c7..2e36ab378 100755
--- a/src/migration-scripts/ipoe-server/0-to-1
+++ b/src/migration-scripts/ipoe-server/0-to-1
@@ -65,6 +65,18 @@ else:
if config.exists(radius_settings):
config.rename(radius_settings, 'radius')
+ # Migrate RADIUS dynamic author / change of authorisation server
+ dae_old = base + ['authentication', 'radius', 'dae-server']
+ if config.exists(dae_old):
+ config.rename(dae_old, 'dynamic-author')
+ dae_new = base + ['authentication', 'radius', 'dynamic-author']
+
+ if config.exists(dae_new + ['ip-address']):
+ config.rename(dae_new + ['ip-address'], 'server')
+
+ if config.exists(dae_new + ['secret']):
+ config.rename(dae_new + ['secret'], 'key')
+
# Migrate RADIUS server
radius_server = base + ['authentication', 'radius-server']
if config.exists(radius_server):
diff --git a/src/migration-scripts/pppoe-server/2-to-3 b/src/migration-scripts/pppoe-server/2-to-3
index 28b1e33e4..fa6ef02da 100755
--- a/src/migration-scripts/pppoe-server/2-to-3
+++ b/src/migration-scripts/pppoe-server/2-to-3
@@ -74,6 +74,18 @@ else:
if config.exists(radius_settings):
config.rename(radius_settings, 'radius')
+ # Migrate RADIUS dynamic author / change of authorisation server
+ dae_old = base + ['authentication', 'radius', 'dae-server']
+ if config.exists(dae_old):
+ config.rename(dae_old, 'dynamic-author')
+ dae_new = base + ['authentication', 'radius', 'dynamic-author']
+
+ if config.exists(dae_new + ['ip-address']):
+ config.rename(dae_new + ['ip-address'], 'server')
+
+ if config.exists(dae_new + ['secret']):
+ config.rename(dae_new + ['secret'], 'key')
+
# Migrate RADIUS server
radius_server = base + ['authentication', 'radius-server']
if config.exists(radius_server):