From 6cf5767524b8519f86981943ab71ff288bf77d67 Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Tue, 11 Jan 2022 01:10:59 +0100
Subject: policy: T2199: Refactor policy route script for better error handling

* Migrates all policy route references from `ipv6-route` to `route6`
* Update test config `dialup-router-medium-vpn` to test migration of `ipv6-route` to `route6`
---
 src/op_mode/policy_route.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/op_mode/policy_route.py')

diff --git a/src/op_mode/policy_route.py b/src/op_mode/policy_route.py
index e0b4ac514..95a7eadac 100755
--- a/src/op_mode/policy_route.py
+++ b/src/op_mode/policy_route.py
@@ -26,7 +26,7 @@ def get_policy_interfaces(conf, policy, name=None, ipv6=False):
     interfaces = conf.get_config_dict(['interfaces'], key_mangling=('-', '_'),
                                       get_first_key=True, no_tag_node_value_mangle=True)
 
-    routes = ['route', 'ipv6_route']
+    routes = ['route', 'route6']
 
     def parse_if(ifname, if_conf):
         if 'policy' in if_conf:
@@ -52,7 +52,7 @@ def get_policy_interfaces(conf, policy, name=None, ipv6=False):
 def get_config_policy(conf, name=None, ipv6=False, interfaces=True):
     config_path = ['policy']
     if name:
-        config_path += ['ipv6-route' if ipv6 else 'route', name]
+        config_path += ['route6' if ipv6 else 'route', name]
 
     policy = conf.get_config_dict(config_path, key_mangling=('-', '_'),
                                 get_first_key=True, no_tag_node_value_mangle=True)
@@ -64,7 +64,7 @@ def get_config_policy(conf, name=None, ipv6=False, interfaces=True):
                 for route_name, route_conf in policy['route'].items():
                     route_conf['interface'] = []
 
-            if 'ipv6_route' in policy:
+            if 'route6' in policy:
                 for route_name, route_conf in policy['ipv6_route'].items():
                     route_conf['interface'] = []
 
@@ -151,8 +151,8 @@ def show_policy(ipv6=False):
         for route, route_conf in policy['route'].items():
             output_policy_route(route, route_conf, ipv6=False)
 
-    if ipv6 and 'ipv6_route' in policy:
-        for route, route_conf in policy['ipv6_route'].items():
+    if ipv6 and 'route6' in policy:
+        for route, route_conf in policy['route6'].items():
             output_policy_route(route, route_conf, ipv6=True)
 
 def show_policy_name(name, ipv6=False):
-- 
cgit v1.2.3


From 30edcba594ebc07412c903a8e7896235cbc3d11f Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Tue, 11 Jan 2022 19:12:00 +0100
Subject: policy: T2199: Update op-mode syntax to `route6`

---
 op-mode-definitions/policy-route.xml.in | 8 ++++----
 src/op_mode/policy_route.py             | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/op_mode/policy_route.py')

diff --git a/op-mode-definitions/policy-route.xml.in b/op-mode-definitions/policy-route.xml.in
index c998e5487..bd4a61dc9 100644
--- a/op-mode-definitions/policy-route.xml.in
+++ b/op-mode-definitions/policy-route.xml.in
@@ -84,17 +84,17 @@
           <help>Show policy information</help>
         </properties>
         <children>
-          <node name="ipv6-route">
+          <node name="route6">
             <properties>
               <help>Show IPv6 policy chain</help>
             </properties>
             <command>sudo ${vyos_op_scripts_dir}/policy_route.py --action show_all --ipv6</command>
           </node>
-          <tagNode name="ipv6-route">
+          <tagNode name="route6">
             <properties>
               <help>Show IPv6 policy chains</help>
               <completionHelp>
-                <path>policy ipv6-route</path>
+                <path>policy route6</path>
               </completionHelp>
             </properties>
             <children>
@@ -102,7 +102,7 @@
                 <properties>
                   <help>Show summary of IPv6 policy rules</help>
                   <completionHelp>
-                    <path>policy ipv6-route ${COMP_WORDS[4]} rule</path>
+                    <path>policy route6 ${COMP_WORDS[4]} rule</path>
                   </completionHelp>
                 </properties>
                 <command>sudo ${vyos_op_scripts_dir}/policy_route.py --action show --name $4 --rule $6 --ipv6</command>
diff --git a/src/op_mode/policy_route.py b/src/op_mode/policy_route.py
index 95a7eadac..5be40082f 100755
--- a/src/op_mode/policy_route.py
+++ b/src/op_mode/policy_route.py
@@ -65,7 +65,7 @@ def get_config_policy(conf, name=None, ipv6=False, interfaces=True):
                     route_conf['interface'] = []
 
             if 'route6' in policy:
-                for route_name, route_conf in policy['ipv6_route'].items():
+                for route_name, route_conf in policy['route6'].items():
                     route_conf['interface'] = []
 
         get_policy_interfaces(conf, policy, name, ipv6)
-- 
cgit v1.2.3