summaryrefslogtreecommitdiff
path: root/src/migration-scripts/interfaces/3-to-4
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-11-18 21:07:07 +0100
committerChristian Poessinger <christian@poessinger.com>2019-11-23 20:44:02 +0100
commitdfa2f0e8ecd8a117bf47b64d7099d613f487d799 (patch)
tree2a4151ea45a833abcc2854f313aed41bb19c38be /src/migration-scripts/interfaces/3-to-4
parente6b269980faaaa2b3529cdb34e8f83c9f3c41b64 (diff)
downloadvyos-1x-dfa2f0e8ecd8a117bf47b64d7099d613f487d799.tar.gz
vyos-1x-dfa2f0e8ecd8a117bf47b64d7099d613f487d799.zip
wireless: T1627: change RADIUS CLI syntax
Adopt RADIUS configuration and harmonize it with the rest of VyOS. Move the following configuration block: security { wpa { cipher CCMP mode wpa2 radius-server 172.16.100.10 { port 1812 secret secretkey } radius-server 172.16.100.11 { port 1812 secret secretkey } } } to the harmonized version of: security { wpa { cipher CCMP mode wpa2 radius { server 172.16.100.10 { port 1812 secret secretkey } server 172.16.100.11 { port 1812 secret secretkey } } } } And add the new "set interfaces wireless wlan0 security wpa radius source-address" CLI command to specify the origin of any RADIUS query on systems having multiple IP addresses.
Diffstat (limited to 'src/migration-scripts/interfaces/3-to-4')
-rwxr-xr-xsrc/migration-scripts/interfaces/3-to-433
1 files changed, 33 insertions, 0 deletions
diff --git a/src/migration-scripts/interfaces/3-to-4 b/src/migration-scripts/interfaces/3-to-4
index 8b9bf7f96..e3bd25a68 100755
--- a/src/migration-scripts/interfaces/3-to-4
+++ b/src/migration-scripts/interfaces/3-to-4
@@ -53,9 +53,42 @@ else:
# not supported in the new backend. Convert all to lower-case
config.set(base + [wifi, node.lower()])
+ # Remove debug node
if config.exists(base + [wifi, 'debug']):
config.delete(base + [wifi, 'debug'])
+ # RADIUS servers
+ if config.exists(base + [wifi, 'security', 'wpa', 'radius-server']):
+ for server in config.list_nodes(base + [wifi, 'security', 'wpa', 'radius-server']):
+ base_server = base + [wifi, 'security', 'wpa', 'radius-server', server]
+
+ # Migrate RADIUS shared secret
+ if config.exists(base_server + ['secret']):
+ key = config.return_value(base_server + ['secret'])
+ # write new configuration node
+ config.set(base + [wifi, 'security', 'wpa', 'radius', 'server', server, 'key'], value=key)
+ # format as tag node
+ config.set_tag(base + [wifi, 'security', 'wpa', 'radius', 'server'])
+
+ # Migrate RADIUS port
+ if config.exists(base_server + ['port']):
+ port = config.return_value(base_server + ['port'])
+ # write new configuration node
+ config.set(base + [wifi, 'security', 'wpa', 'radius', 'server', server, 'port'], value=port)
+ # format as tag node
+ config.set_tag(base + [wifi, 'security', 'wpa', 'radius', 'server'])
+
+ # Migrate RADIUS accounting
+ if config.exists(base_server + ['accounting']):
+ port = config.return_value(base_server + ['accounting'])
+ # write new configuration node
+ config.set(base + [wifi, 'security', 'wpa', 'radius', 'server', server, 'accounting'])
+ # format as tag node
+ config.set_tag(base + [wifi, 'security', 'wpa', 'radius', 'server'])
+
+ # delete old radius-server nodes
+ config.delete(base + [wifi, 'security', 'wpa', 'radius-server'])
+
try:
with open(file_name, 'w') as f:
f.write(config.to_string())