API: deprecated IPSEC APIs

Jira: CSIT-1597

+ add ipsec_sa tear down action

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

1 files changed, 9 insertions, 6 deletions

diff --git a/GPL/traffic_scripts/ipsec_interface.py b/GPL/traffic_scripts/ipsec_interface.py
index 29b18a4fa2..1254388b13 100644
--- a/GPL/traffic_scripts/ipsec_interface.py
+++ b/GPL/traffic_scripts/ipsec_interface.py
@@ -76,7 +76,7 @@ def check_ipsec(
 
     if not pkt_recv.haslayer(ip_layer):
         raise RuntimeError(
-            f"Not an {ip_layer.name} packet received: {pkt_recv!r}"
+            f"Not an {ip_layer.__name__} packet received: {pkt_recv!r}"
         )
 
     if pkt_recv[ip_layer].src != src_tun:
@@ -96,6 +96,9 @@ def check_ipsec(
 
     ip_pkt = pkt_recv[ip_layer]
     d_pkt = sa_in.decrypt(ip_pkt)
+    print(u"Decrypted packet:")
+    d_pkt.show2()
+    print()
 
     if d_pkt[ip_layer].dst != dst_ip:
         raise RuntimeError(
@@ -147,19 +150,19 @@ def check_ip(pkt_recv, ip_layer, src_mac, dst_mac, src_ip, dst_ip):
 
     if not pkt_recv.haslayer(ip_layer):
         raise RuntimeError(
-            f"Not an {ip_layer.name} packet received: {pkt_recv!r}"
+            f"Not an {ip_layer.__name__} packet received: {pkt_recv!r}"
         )
 
     if pkt_recv[ip_layer].dst != dst_ip:
         raise RuntimeError(
             f"Received packet has invalid destination address: "
-            f"{pkt_recv[ip_layer.name].dst} should be: {dst_ip}"
+            f"{pkt_recv[ip_layer.__name__].dst} should be: {dst_ip}"
         )
 
     if pkt_recv[ip_layer].src != src_ip:
         raise RuntimeError(
             f"Received packet has invalid destination address: "
-            f"{pkt_recv[ip_layer.name].dst} should be: {src_ip}"
+            f"{pkt_recv[ip_layer.__name__].dst} should be: {src_ip}"
         )
 
     if ip_layer == IP and pkt_recv[ip_layer].proto != 61:
@@ -234,7 +237,7 @@ def main():
         rx_pkt_recv = rx_rxq.recv(2)
 
         if rx_pkt_recv is None:
-            raise RuntimeError(f"{ip_layer.name} packet Rx timeout")
+            raise RuntimeError(f"{ip_layer.__name__} packet Rx timeout")
 
         if rx_pkt_recv.haslayer(ICMPv6ND_NS):
             # read another packet in the queue if the current one is ICMPv6ND_NS
@@ -262,7 +265,7 @@ def main():
         tx_pkt_recv = tx_rxq.recv(2, ignore=sent_packets)
 
         if tx_pkt_recv is None:
-            raise RuntimeError(f"{ip_layer.name} packet Rx timeout")
+            raise RuntimeError(f"{ip_layer.__name__} packet Rx timeout")
 
         if tx_pkt_recv.haslayer(ICMPv6ND_NS):
             # read another packet in the queue if the current one is ICMPv6ND_NS