migration: T548: Rename quagga scripts for correct seq

Rename quagga migration scripts for correct sequences
between 1.3 and 1.4 branches
7-to-8 in 1.3 uses the same migration as 8-to-9 in 1.4
This PR fix it

2 files changed, 114 insertions, 114 deletions

diff --git a/src/migration-scripts/quagga/7-to-8 b/src/migration-scripts/quagga/7-to-8
index 38507bd3d..15c44924f 100755
--- a/src/migration-scripts/quagga/7-to-8
+++ b/src/migration-scripts/quagga/7-to-8
@@ -14,76 +14,14 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# - T2450: drop interface-route and interface-route6 from "protocols static"
+# - T3391: Migrate "maximum-paths" setting from "protocols bgp asn maximum-paths"
+#   under the IPv4 address-family tree. Reason is we currently have no way in
+#   configuring this for IPv6 address-family. This mimics the FRR configuration.
 
 from sys import argv
 from sys import exit
-
 from vyos.configtree import ConfigTree
 
-def migrate_interface_route(config, base, path, route_route6):
-    """ Generic migration function which can be called on every instance of
-    interface-route, beeing it ipv4, ipv6 or nested under the "static table" nodes.
-
-    What we do?
-      - Drop 'interface-route' or 'interface-route6' and migrate the route unter the
-        'route' or 'route6' tag node.
-    """
-    if config.exists(base + path):
-        for route in config.list_nodes(base + path):
-            interface = config.list_nodes(base + path + [route, 'next-hop-interface'])
-
-            tmp = base + path + [route, 'next-hop-interface']
-            for interface in config.list_nodes(tmp):
-                new_base = base + [route_route6, route, 'interface']
-                config.set(new_base)
-                config.set_tag(base + [route_route6])
-                config.set_tag(new_base)
-                config.copy(tmp + [interface], new_base + [interface])
-
-        config.delete(base + path)
-
-def migrate_route(config, base, path, route_route6):
-    """ Generic migration function which can be called on every instance of
-    route, beeing it ipv4, ipv6 or even nested under the static table nodes.
-
-    What we do?
-      - for consistency reasons rename next-hop-interface to interface
-      - for consistency reasons rename next-hop-vrf to vrf
-    """
-    if config.exists(base + path):
-        for route in config.list_nodes(base + path):
-            next_hop = base + path + [route, 'next-hop']
-            if config.exists(next_hop):
-                for gateway in config.list_nodes(next_hop):
-                    # IPv4 routes calls it next-hop-interface, rename this to
-                    # interface instead so it's consitent with IPv6
-                    interface_path = next_hop + [gateway, 'next-hop-interface']
-                    if config.exists(interface_path):
-                        config.rename(interface_path, 'interface')
-
-                    # When VRFs got introduced, I (c-po) named it next-hop-vrf,
-                    # we can also call it vrf which is simply shorter.
-                    vrf_path = next_hop + [gateway, 'next-hop-vrf']
-                    if config.exists(vrf_path):
-                        config.rename(vrf_path, 'vrf')
-
-            next_hop = base + path + [route, 'interface']
-            if config.exists(next_hop):
-                for interface in config.list_nodes(next_hop):
-                    # IPv4 routes calls it next-hop-interface, rename this to
-                    # interface instead so it's consitent with IPv6
-                    interface_path = next_hop + [interface, 'next-hop-interface']
-                    if config.exists(interface_path):
-                        config.rename(interface_path, 'interface')
-
-                    # When VRFs got introduced, I (c-po) named it next-hop-vrf,
-                    # we can also call it vrf which is simply shorter.
-                    vrf_path = next_hop + [interface, 'next-hop-vrf']
-                    if config.exists(vrf_path):
-                        config.rename(vrf_path, 'vrf')
-
-
 if (len(argv) < 2):
     print("Must specify file name!")
     exit(1)
@@ -93,41 +31,27 @@ file_name = argv[1]
 with open(file_name, 'r') as f:
     config_file = f.read()
 
-base = ['protocols', 'static']
-
+base = ['protocols', 'bgp']
 config = ConfigTree(config_file)
+
 if not config.exists(base):
     # Nothing to do
     exit(0)
 
-# Migrate interface-route into route
-migrate_interface_route(config, base, ['interface-route'], 'route')
-
-# Migrate interface-route6 into route6
-migrate_interface_route(config, base, ['interface-route6'], 'route6')
-
-# Cleanup nodes inside route
-migrate_route(config, base, ['route'], 'route')
-
-# Cleanup nodes inside route6
-migrate_route(config, base, ['route6'], 'route6')
-
-#
-# PBR table cleanup
-table_path = base + ['table']
-if config.exists(table_path):
-    for table in config.list_nodes(table_path):
-        # Migrate interface-route into route
-        migrate_interface_route(config, table_path + [table], ['interface-route'], 'route')
-
-        # Migrate interface-route6 into route6
-        migrate_interface_route(config, table_path + [table], ['interface-route6'], 'route6')
-
-        # Cleanup nodes inside route
-        migrate_route(config, table_path + [table], ['route'], 'route')
-
-        # Cleanup nodes inside route6
-        migrate_route(config, table_path + [table], ['route6'], 'route6')
+# Check if BGP is actually configured and obtain the ASN
+asn_list = config.list_nodes(base)
+if asn_list:
+    # There's always just one BGP node, if any
+    bgp_base = base + [asn_list[0]]
+
+    maximum_paths = bgp_base + ['maximum-paths']
+    if config.exists(maximum_paths):
+        for bgp_type in ['ebgp', 'ibgp']:
+            if config.exists(maximum_paths + [bgp_type]):
+                new_base =  bgp_base + ['address-family', 'ipv4-unicast', 'maximum-paths']
+                config.set(new_base)
+                config.copy(maximum_paths + [bgp_type], new_base + [bgp_type])
+        config.delete(maximum_paths)
 
 try:
     with open(file_name, 'w') as f:
diff --git a/src/migration-scripts/quagga/8-to-9 b/src/migration-scripts/quagga/8-to-9
index 15c44924f..38507bd3d 100755
--- a/src/migration-scripts/quagga/8-to-9
+++ b/src/migration-scripts/quagga/8-to-9
@@ -14,14 +14,76 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# - T3391: Migrate "maximum-paths" setting from "protocols bgp asn maximum-paths"
-#   under the IPv4 address-family tree. Reason is we currently have no way in
-#   configuring this for IPv6 address-family. This mimics the FRR configuration.
+# - T2450: drop interface-route and interface-route6 from "protocols static"
 
 from sys import argv
 from sys import exit
+
 from vyos.configtree import ConfigTree
 
+def migrate_interface_route(config, base, path, route_route6):
+    """ Generic migration function which can be called on every instance of
+    interface-route, beeing it ipv4, ipv6 or nested under the "static table" nodes.
+
+    What we do?
+      - Drop 'interface-route' or 'interface-route6' and migrate the route unter the
+        'route' or 'route6' tag node.
+    """
+    if config.exists(base + path):
+        for route in config.list_nodes(base + path):
+            interface = config.list_nodes(base + path + [route, 'next-hop-interface'])
+
+            tmp = base + path + [route, 'next-hop-interface']
+            for interface in config.list_nodes(tmp):
+                new_base = base + [route_route6, route, 'interface']
+                config.set(new_base)
+                config.set_tag(base + [route_route6])
+                config.set_tag(new_base)
+                config.copy(tmp + [interface], new_base + [interface])
+
+        config.delete(base + path)
+
+def migrate_route(config, base, path, route_route6):
+    """ Generic migration function which can be called on every instance of
+    route, beeing it ipv4, ipv6 or even nested under the static table nodes.
+
+    What we do?
+      - for consistency reasons rename next-hop-interface to interface
+      - for consistency reasons rename next-hop-vrf to vrf
+    """
+    if config.exists(base + path):
+        for route in config.list_nodes(base + path):
+            next_hop = base + path + [route, 'next-hop']
+            if config.exists(next_hop):
+                for gateway in config.list_nodes(next_hop):
+                    # IPv4 routes calls it next-hop-interface, rename this to
+                    # interface instead so it's consitent with IPv6
+                    interface_path = next_hop + [gateway, 'next-hop-interface']
+                    if config.exists(interface_path):
+                        config.rename(interface_path, 'interface')
+
+                    # When VRFs got introduced, I (c-po) named it next-hop-vrf,
+                    # we can also call it vrf which is simply shorter.
+                    vrf_path = next_hop + [gateway, 'next-hop-vrf']
+                    if config.exists(vrf_path):
+                        config.rename(vrf_path, 'vrf')
+
+            next_hop = base + path + [route, 'interface']
+            if config.exists(next_hop):
+                for interface in config.list_nodes(next_hop):
+                    # IPv4 routes calls it next-hop-interface, rename this to
+                    # interface instead so it's consitent with IPv6
+                    interface_path = next_hop + [interface, 'next-hop-interface']
+                    if config.exists(interface_path):
+                        config.rename(interface_path, 'interface')
+
+                    # When VRFs got introduced, I (c-po) named it next-hop-vrf,
+                    # we can also call it vrf which is simply shorter.
+                    vrf_path = next_hop + [interface, 'next-hop-vrf']
+                    if config.exists(vrf_path):
+                        config.rename(vrf_path, 'vrf')
+
+
 if (len(argv) < 2):
     print("Must specify file name!")
     exit(1)
@@ -31,27 +93,41 @@ file_name = argv[1]
 with open(file_name, 'r') as f:
     config_file = f.read()
 
-base = ['protocols', 'bgp']
-config = ConfigTree(config_file)
+base = ['protocols', 'static']
 
+config = ConfigTree(config_file)
 if not config.exists(base):
     # Nothing to do
     exit(0)
 
-# Check if BGP is actually configured and obtain the ASN
-asn_list = config.list_nodes(base)
-if asn_list:
-    # There's always just one BGP node, if any
-    bgp_base = base + [asn_list[0]]
-
-    maximum_paths = bgp_base + ['maximum-paths']
-    if config.exists(maximum_paths):
-        for bgp_type in ['ebgp', 'ibgp']:
-            if config.exists(maximum_paths + [bgp_type]):
-                new_base =  bgp_base + ['address-family', 'ipv4-unicast', 'maximum-paths']
-                config.set(new_base)
-                config.copy(maximum_paths + [bgp_type], new_base + [bgp_type])
-        config.delete(maximum_paths)
+# Migrate interface-route into route
+migrate_interface_route(config, base, ['interface-route'], 'route')
+
+# Migrate interface-route6 into route6
+migrate_interface_route(config, base, ['interface-route6'], 'route6')
+
+# Cleanup nodes inside route
+migrate_route(config, base, ['route'], 'route')
+
+# Cleanup nodes inside route6
+migrate_route(config, base, ['route6'], 'route6')
+
+#
+# PBR table cleanup
+table_path = base + ['table']
+if config.exists(table_path):
+    for table in config.list_nodes(table_path):
+        # Migrate interface-route into route
+        migrate_interface_route(config, table_path + [table], ['interface-route'], 'route')
+
+        # Migrate interface-route6 into route6
+        migrate_interface_route(config, table_path + [table], ['interface-route6'], 'route6')
+
+        # Cleanup nodes inside route
+        migrate_route(config, table_path + [table], ['route'], 'route')
+
+        # Cleanup nodes inside route6
+        migrate_route(config, table_path + [table], ['route6'], 'route6')
 
 try:
     with open(file_name, 'w') as f: