summaryrefslogtreecommitdiff
path: root/src/migration-scripts
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-12-05 14:06:54 +0100
committerGitHub <noreply@github.com>2023-12-05 14:06:54 +0100
commit24b9ceb04049694a13d1fe23c76e267e335b948e (patch)
treeb1b8de3df444bef6663d24ba06cab71ea5e4cd29 /src/migration-scripts
parent8d3e287d028d3fc92256cc86988c06ca5301c7c1 (diff)
parent17722f3ee1151d2e4ccf23655f7079615bf61e24 (diff)
downloadvyos-1x-24b9ceb04049694a13d1fe23c76e267e335b948e.tar.gz
vyos-1x-24b9ceb04049694a13d1fe23c76e267e335b948e.zip
Merge pull request #2575 from aapostoliuk/T5688-fixes
accel-ppp: T5688: Fixed migration script for pppoe-server
Diffstat (limited to 'src/migration-scripts')
-rwxr-xr-xsrc/migration-scripts/pppoe-server/6-to-736
1 files changed, 19 insertions, 17 deletions
diff --git a/src/migration-scripts/pppoe-server/6-to-7 b/src/migration-scripts/pppoe-server/6-to-7
index 8b5482705..34996d8fe 100755
--- a/src/migration-scripts/pppoe-server/6-to-7
+++ b/src/migration-scripts/pppoe-server/6-to-7
@@ -76,23 +76,25 @@ if config.exists(base + ['gateway-address']):
#named pool migration
namedpools_base = pool_base + ['name']
-if config.return_value(base + ['authentication', 'mode']) == 'local':
- if config.list_nodes(namedpools_base):
- default_pool = config.list_nodes(namedpools_base)[0]
-
-for pool_name in config.list_nodes(namedpools_base):
- pool_path = namedpools_base + [pool_name]
- if config.exists(pool_path + ['subnet']):
- subnet = config.return_value(pool_path + ['subnet'])
- config.set(pool_base + [pool_name, 'range'], value=subnet)
- if config.exists(pool_path + ['next-pool']):
- next_pool = config.return_value(pool_path + ['next-pool'])
- config.set(pool_base + [pool_name, 'next-pool'], value=next_pool)
- if not gateway:
- if config.exists(pool_path + ['gateway-address']):
- gateway = config.return_value(pool_path + ['gateway-address'])
-
-config.delete(namedpools_base)
+if config.exists(namedpools_base):
+ if config.exists(base + ['authentication', 'mode']):
+ if config.return_value(base + ['authentication', 'mode']) == 'local':
+ if config.list_nodes(namedpools_base):
+ default_pool = config.list_nodes(namedpools_base)[0]
+
+ for pool_name in config.list_nodes(namedpools_base):
+ pool_path = namedpools_base + [pool_name]
+ if config.exists(pool_path + ['subnet']):
+ subnet = config.return_value(pool_path + ['subnet'])
+ config.set(pool_base + [pool_name, 'range'], value=subnet)
+ if config.exists(pool_path + ['next-pool']):
+ next_pool = config.return_value(pool_path + ['next-pool'])
+ config.set(pool_base + [pool_name, 'next-pool'], value=next_pool)
+ if not gateway:
+ if config.exists(pool_path + ['gateway-address']):
+ gateway = config.return_value(pool_path + ['gateway-address'])
+
+ config.delete(namedpools_base)
if gateway:
config.set(base + ['gateway-address'], value=gateway)