Merge pull request #1331 from jestabro/configtest-errors

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

11 files changed, 18 insertions, 5 deletions

diff --git a/interface-definitions/interfaces-openvpn.xml.in b/interface-definitions/interfaces-openvpn.xml.in
index edcf7b37f..bfad6d70f 100644
--- a/interface-definitions/interfaces-openvpn.xml.in
+++ b/interface-definitions/interfaces-openvpn.xml.in
@@ -167,6 +167,7 @@
               </leafNode>
             </children>
           </node>
+          #include <include/interface/ipv4-options.xml.i>
           #include <include/interface/ipv6-options.xml.i>
           #include <include/interface/mirror.xml.i>
           <leafNode name="hash">
diff --git a/python/vyos/migrator.py b/python/vyos/migrator.py
index a2e0daabd..c6e3435ca 100644
--- a/python/vyos/migrator.py
+++ b/python/vyos/migrator.py
@@ -105,6 +105,11 @@ class Migrator(object):
         sys_keys = list(sys_versions.keys())
         sys_keys.sort()
 
+        # XXX 'bgp' needs to follow 'quagga':
+        if 'bgp' in sys_keys and 'quagga' in sys_keys:
+            sys_keys.insert(sys_keys.index('quagga'),
+                            sys_keys.pop(sys_keys.index('bgp')))
+
         rev_versions = {}
 
         for key in sys_keys:
diff --git a/smoketest/configs/bgp-small-as b/smoketest/configs.no-load/bgp-small-as
index 6b953a3f6..6b953a3f6 100644
--- a/smoketest/configs/bgp-small-as
+++ b/smoketest/configs.no-load/bgp-small-as
diff --git a/smoketest/configs/pki-ipsec b/smoketest/configs.no-load/pki-ipsec
index 6fc239d27..6fc239d27 100644
--- a/smoketest/configs/pki-ipsec
+++ b/smoketest/configs.no-load/pki-ipsec
diff --git a/smoketest/configs/vrf-bgp b/smoketest/configs.no-load/vrf-bgp
index 4ad372a36..4ad372a36 100644
--- a/smoketest/configs/vrf-bgp
+++ b/smoketest/configs.no-load/vrf-bgp
diff --git a/smoketest/configs/bgp-dmvpn-spoke b/smoketest/configs/bgp-dmvpn-spoke
index 3d7503a9b..39b64b935 100644
--- a/smoketest/configs/bgp-dmvpn-spoke
+++ b/smoketest/configs/bgp-dmvpn-spoke
@@ -32,7 +32,7 @@ interfaces {
 nat {
     source {
         rule 10 {
-            log enable
+            log
             outbound-interface pppoe1
             source {
                 address 172.17.0.0/16
diff --git a/smoketest/configs/isis-small b/smoketest/configs/isis-small
index 247ae32b5..5a4201988 100644
--- a/smoketest/configs/isis-small
+++ b/smoketest/configs/isis-small
@@ -74,7 +74,6 @@ system {
                 encrypted-password $6$2Ta6TWHd/U$NmrX0x9kexCimeOcYK1MfhMpITF9ELxHcaBU/znBq.X2ukQOj61fVI2UYP/xBzP4QtiTcdkgs7WOQMHWsRymO/
                 plaintext-password ""
             }
-            level admin
         }
     }
     ntp {
diff --git a/smoketest/configs/vrf-basic b/smoketest/configs/vrf-basic
index ded33f683..20ac7a92f 100644
--- a/smoketest/configs/vrf-basic
+++ b/smoketest/configs/vrf-basic
@@ -196,7 +196,6 @@ system {
             }
         }
     }
-    nt
     ntp {
         server 0.pool.ntp.org {
         }
diff --git a/smoketest/configs/vrf-ospf b/smoketest/configs/vrf-ospf
index 7855e86bf..aae6afb6b 100644
--- a/smoketest/configs/vrf-ospf
+++ b/smoketest/configs/vrf-ospf
@@ -51,7 +51,6 @@ system {
             }
         }
     }
-    nt
     ntp {
         server 0.pool.ntp.org {
         }
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())