summaryrefslogtreecommitdiff
path: root/src/migration-scripts/vrf
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2022-05-25 15:33:46 -0500
committerGitHub <noreply@github.com>2022-05-25 15:33:46 -0500
commit7c1cb045ebbfb84668c703dba6c48af60fdcc788 (patch)
tree2d99d9089e3ad4e1121ab5552ab40ddaae893146 /src/migration-scripts/vrf
parentec3a05d3dfda497910d42ad99d28d977312ea7a4 (diff)
parentac9d01365a9fd41003b4b8427348a3c3102341f5 (diff)
downloadvyos-1x-7c1cb045ebbfb84668c703dba6c48af60fdcc788.tar.gz
vyos-1x-7c1cb045ebbfb84668c703dba6c48af60fdcc788.zip
Merge pull request #1331 from jestabro/configtest-errors
configtest: T4382: errors exposed by revision of load-config
Diffstat (limited to 'src/migration-scripts/vrf')
-rwxr-xr-xsrc/migration-scripts/vrf/0-to-110
1 files changed, 10 insertions, 0 deletions
diff --git a/src/migration-scripts/vrf/0-to-1 b/src/migration-scripts/vrf/0-to-1
index 2b41ef3c7..5df751113 100755
--- a/src/migration-scripts/vrf/0-to-1
+++ b/src/migration-scripts/vrf/0-to-1
@@ -114,6 +114,16 @@ for vrf in config.list_nodes(base):
if config.exists(vrf_path):
config.rename(vrf_path, 'vrf')
+ next_hop = route_path + [route, 'interface']
+ if config.exists(next_hop):
+ for interface in config.list_nodes(next_hop):
+ interface_path = next_hop + [interface, 'next-hop-interface']
+ if config.exists(interface_path):
+ config.rename(interface_path, 'interface')
+ vrf_path = next_hop + [interface, 'next-hop-vrf']
+ if config.exists(vrf_path):
+ config.rename(vrf_path, 'vrf')
+
try:
with open(file_name, 'w') as f:
f.write(config.to_string())