From: Jan Gelety <jgelety@cisco.com>
Date: Fri, 29 Nov 2019 13:29:53 +0000 (+0100)
Subject: FIX: ip route config for ipsec via VAT
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=refs%2Fchanges%2F10%2F23810%2F21

FIX: ip route config for ipsec via VAT

Change-Id: Ibf1979b87aeea0f4c195b97c8e6b59a4a23b1b77
Signed-off-by: Jan Gelety <jgelety@cisco.com>
---

diff --git a/resources/libraries/python/IPsecUtil.py b/resources/libraries/python/IPsecUtil.py
index e08b3207ac..8f464d5a05 100644
--- a/resources/libraries/python/IPsecUtil.py
+++ b/resources/libraries/python/IPsecUtil.py
@@ -261,17 +261,6 @@ class IPsecUtil:
         with PapiSocketExecutor(node) as papi_exec:
             papi_exec.add(cmd, **args).get_reply(err_msg)
 
-    @staticmethod
-    def vpp_ipsec_backend_dump(node):
-        """Dump IPsec backends.
-
-        :param node: VPP node to dump IPsec backend on.
-        :type node: dict
-        """
-        err_msg = f"Failed to dump IPsec backends on host {node[u'host']}"
-        with PapiSocketExecutor(node) as papi_exec:
-            papi_exec.add(u"ipsec_backend_dump").get_details(err_msg)
-
     @staticmethod
     def vpp_ipsec_add_sad_entry(
             node, sad_id, spi, crypto_alg, crypto_key, integ_alg=None,
@@ -871,9 +860,8 @@ class IPsecUtil:
             os.remove(tmp_fn2)
 
             with open(tmp_fn1, 'w') as tmp_f1, open(tmp_fn2, 'w') as tmp_f2:
-                raddr = ip_network(if1_ip_addr + u"/8", False)
                 tmp_f2.write(
-                    f"exec ip route add {raddr} via {if2_n} {if2_ip - 1}\n"
+                    f"exec ip route add {if1_ip}/8 via {if2_ip - 1} {if2_n}\n"
                 )
                 for i in range(n_tunnels):
                     tmp_f1.write(