Revert "fix(IPsecUtil): Delete keywords no longer used"

This reverts commit 79635f7cdfb7046230473570068f97a159cf87b4.

Peter says he is using those.

Change-Id: I47886ba0676bc74d5189a2986ac347f49fdde36c
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/resources/libraries/python/IPsecUtil.py b/resources/libraries/python/IPsecUtil.py
index bb46b49..19995e5 100644 (file)
--- a/resources/libraries/python/IPsecUtil.py
+++ b/resources/libraries/python/IPsecUtil.py
@@ -1847,6 +1847,49 @@ class IPsecUtil:
             return ckeys, ikeys, spi_d["spi_1"], spi_d["spi_2"]
         return None
 
+    @staticmethod
+    def _create_ipsec_script_files(
+        dut: str, instances: int
+    ) -> List[TextIOWrapper]:
+        """Create script files for configuring IPsec in containers
+
+        :param dut: DUT node on which to create the script files
+        :param instances: number of containers on DUT node
+        :type dut: str
+        :type instances: int
+        :returns: Created opened file handles.
+        :rtype: List[TextIOWrapper]
+        """
+        scripts = []
+        for cnf in range(0, instances):
+            script_filename = (
+                f"/tmp/ipsec_create_tunnel_cnf_{dut}_{cnf + 1}.config"
+            )
+            scripts.append(open(script_filename, "w", encoding="utf-8"))
+        return scripts
+
+    @staticmethod
+    def _close_and_copy_ipsec_script_files(
+        dut: str, nodes: dict, instances: int, scripts: Sequence[TextIOWrapper]
+    ) -> None:
+        """Close created scripts and copy them to containers
+
+        :param dut: DUT node on which to create the script files
+        :param nodes: VPP nodes
+        :param instances: number of containers on DUT node
+        :param scripts: dictionary holding the script files
+        :type dut: str
+        :type nodes: dict
+        :type instances: int
+        :type scripts: dict
+        """
+        for cnf in range(0, instances):
+            scripts[cnf].close()
+            script_filename = (
+                f"/tmp/ipsec_create_tunnel_cnf_{dut}_{cnf + 1}.config"
+            )
+            scp_node(nodes[dut], script_filename, script_filename)
+
     @staticmethod
     def vpp_ipsec_add_multiple_tunnels(
         nodes: dict,