Merge pull request #1331 from jestabro/configtest-errors

configtest: T4382: errors exposed by revision of load-config

2 files changed, 11 insertions, 1 deletions

diff --git a/src/migration-scripts/ipsec/5-to-6 b/src/migration-scripts/ipsec/5-to-6
index e9adee01b..3a8b3926d 100755
--- a/src/migration-scripts/ipsec/5-to-6
+++ b/src/migration-scripts/ipsec/5-to-6
@@ -78,7 +78,7 @@ if config.exists(log_mode):
 base_interfaces = base + ['ipsec-interfaces', 'interface']
 if config.exists(base_interfaces):
     config.copy(base_interfaces, base + ['interface'])
-    config.delete(base_interfaces)
+    config.delete(base + ['ipsec-interfaces'])
 
 # Remove deprecated "auto-update" option
 tmp = base + ['auto-update']
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())