Merge pull request #1418 from zdc/T4546-sagitta

nhrp: T4546: Fixed route add command if MTU presented

1 files changed, 59 insertions, 7 deletions

diff --git a/src/etc/opennhrp/opennhrp-script.py b/src/etc/opennhrp/opennhrp-script.py
index f7487ee5f..5a64dade8 100755
--- a/src/etc/opennhrp/opennhrp-script.py
+++ b/src/etc/opennhrp/opennhrp-script.py
@@ -14,16 +14,17 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from pprint import pprint
 import os
 import re
 import sys
 import vici
+from json import loads
 
 from vyos.util import cmd
 from vyos.util import process_named_running
 
-NHRP_CONFIG="/run/opennhrp/opennhrp.conf"
+NHRP_CONFIG = "/run/opennhrp/opennhrp.conf"
+
 
 def parse_type_ipsec(interface):
     with open(NHRP_CONFIG, 'r') as f:
@@ -35,6 +36,50 @@ def parse_type_ipsec(interface):
                 return m[1], m[2]
     return None, None
 
+
+def add_peer_route(nbma_src: str, nbma_dst: str, mtu: str) -> None:
+    """Add a route to a NBMA peer
+
+    Args:
+        nmba_src (str): a local IP address
+        nbma_dst (str): a remote IP address
+        mtu (str): a MTU for a route
+    """
+    # Find routes to a peer
+    route_get_cmd = f'sudo ip -j route get {nbma_dst} from {nbma_src}'
+    try:
+        route_info_data = loads(cmd(route_get_cmd))
+    except Exception as err:
+        print(f'Unable to find a route to {nbma_dst}: {err}')
+
+    # Check if an output has an expected format
+    if not isinstance(route_info_data, list):
+        print(f'Garbage returned from the "{route_get_cmd}" command: \
+            {route_info_data}')
+        return
+
+    # Add static routes to a peer
+    for route_item in route_info_data:
+        route_dev = route_item.get('dev')
+        route_dst = route_item.get('dst')
+        route_gateway = route_item.get('route_gateway')
+        # Prepare a command to add a route
+        route_add_cmd = 'sudo ip route add'
+        if route_dst:
+            route_add_cmd = f'{route_add_cmd} {route_dst}'
+        if route_gateway:
+            route_add_cmd = f'{route_add_cmd} via {route_gateway}'
+        if route_dev:
+            route_add_cmd = f'{route_add_cmd} dev {route_dev}'
+        route_add_cmd = f'{route_add_cmd} proto 42 mtu {mtu}'
+        # Add a route
+        try:
+            cmd(route_add_cmd)
+        except Exception as err:
+            print(f'Unable to add a route using command "{route_add_cmd}": \
+                    {err}')
+
+
 def vici_initiate(conn, child_sa, src_addr, dest_addr):
     try:
         session = vici.Session()
@@ -52,6 +97,7 @@ def vici_initiate(conn, child_sa, src_addr, dest_addr):
     except:
         return None
 
+
 def vici_terminate(conn, child_sa, src_addr, dest_addr):
     try:
         session = vici.Session()
@@ -69,25 +115,27 @@ def vici_terminate(conn, child_sa, src_addr, dest_addr):
     except:
         return None
 
+
 def iface_up(interface):
     cmd(f'sudo ip route flush proto 42 dev {interface}')
     cmd(f'sudo ip neigh flush dev {interface}')
 
+
 def peer_up(dmvpn_type, conn):
-    src_addr = os.getenv('NHRP_SRCADDR')
+    # src_addr = os.getenv('NHRP_SRCADDR')
     src_nbma = os.getenv('NHRP_SRCNBMA')
-    dest_addr = os.getenv('NHRP_DESTADDR')
+    # dest_addr = os.getenv('NHRP_DESTADDR')
     dest_nbma = os.getenv('NHRP_DESTNBMA')
     dest_mtu = os.getenv('NHRP_DESTMTU')
 
     if dest_mtu:
-        args = cmd(f'sudo ip route get {dest_nbma} from {src_nbma}')
-        cmd(f'sudo ip route add {args} proto 42 mtu {dest_mtu}')
+        add_peer_route(src_nbma, dest_nbma, dest_mtu)
 
     if conn and dmvpn_type == 'spoke' and process_named_running('charon'):
         vici_terminate(conn, 'dmvpn', src_nbma, dest_nbma)
         vici_initiate(conn, 'dmvpn', src_nbma, dest_nbma)
 
+
 def peer_down(dmvpn_type, conn):
     src_nbma = os.getenv('NHRP_SRCNBMA')
     dest_nbma = os.getenv('NHRP_DESTNBMA')
@@ -97,14 +145,17 @@ def peer_down(dmvpn_type, conn):
 
     cmd(f'sudo ip route del {dest_nbma} src {src_nbma} proto 42')
 
+
 def route_up(interface):
     dest_addr = os.getenv('NHRP_DESTADDR')
     dest_prefix = os.getenv('NHRP_DESTPREFIX')
     next_hop = os.getenv('NHRP_NEXTHOP')
 
-    cmd(f'sudo ip route replace {dest_addr}/{dest_prefix} proto 42 via {next_hop} dev {interface}')
+    cmd(f'sudo ip route replace {dest_addr}/{dest_prefix} proto 42 \
+        via {next_hop} dev {interface}')
     cmd('sudo ip route flush cache')
 
+
 def route_down(interface):
     dest_addr = os.getenv('NHRP_DESTADDR')
     dest_prefix = os.getenv('NHRP_DESTPREFIX')
@@ -112,6 +163,7 @@ def route_down(interface):
     cmd(f'sudo ip route del {dest_addr}/{dest_prefix} proto 42')
     cmd('sudo ip route flush cache')
 
+
 if __name__ == '__main__':
     action = sys.argv[1]
     interface = os.getenv('NHRP_INTERFACE')