FIX: ip route config for ipsec via VAT

[csit.git] / resources / libraries / python / IPsecUtil.py

diff --git a/resources/libraries/python/IPsecUtil.py b/resources/libraries/python/IPsecUtil.py
index 9237769..8f464d5 100644 (file)
--- 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,
@@ -844,7 +833,8 @@ class IPsecUtil:
                         f"local_crypto_key {ckey} remote_crypto_key {ckey} "
                         f"{integ} "
                         f"local_ip {if1_ip + i * addr_incr} "
-                        f"remote_ip {if2_ip}\n"
+                        f"remote_ip {if2_ip} "
+                        f"instance {i}\n"
                     )
                     tmp_f2.write(
                         f"ipsec_tunnel_if_add_del "
@@ -853,7 +843,8 @@ class IPsecUtil:
                         f"local_crypto_key {ckey} remote_crypto_key {ckey} "
                         f"{integ} "
                         f"local_ip {if2_ip} "
-                        f"remote_ip {if1_ip + i * addr_incr}\n"
+                        f"remote_ip {if1_ip + i * addr_incr} "
+                        f"instance {i}\n"
                     )
             vat.execute_script(
                 tmp_fn1, nodes[u"DUT1"], timeout=1800, json_out=False,
@@ -869,22 +860,21 @@ 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(
-                        f"exec set interface unnumbered ipsec{i} use {if1_n}\n"
-                        f"exec set interface state ipsec{i} up\n"
+                        f"exec set interface unnumbered ipip{i} use {if1_n}\n"
+                        f"exec set interface state ipip{i} up\n"
                         f"exec ip route add {raddr_ip2 + i}/{mask2} "
-                        f"via ipsec{i}\n"
+                        f"via ipip{i}\n"
                     )
                     tmp_f2.write(
-                        f"exec set interface unnumbered ipsec{i} use {if2_n}\n"
-                        f"exec set interface state ipsec{i} up\n"
+                        f"exec set interface unnumbered ipip{i} use {if2_n}\n"
+                        f"exec set interface state ipip{i} up\n"
                         f"exec ip route add {raddr_ip1 + i}/{mask2} "
-                        f"via ipsec{i}\n"
+                        f"via ipip{i}\n"
                     )
             vat.execute_script(
                 tmp_fn1, nodes[u"DUT1"], timeout=1800, json_out=False,