feat(pip): Upgrade

Due to some integration changes with upcoming Ubuntu
22.04 (and mainly python) bump, upgrading the full
pip package list to latest version.

Keyword 'BuiltIn.Run Keyword Unless' is deprecated
 - will be part of subsequent change

Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: Ie3bdc424c7c0efb4fe4f1fa7c73137b916c17116

2 files changed, 45 insertions, 57 deletions

diff --git a/GPL/traffic_scripts/ipsec_interface.py b/GPL/traffic_scripts/ipsec_interface.py
index 574985f679..e6e90a2598 100644
--- a/GPL/traffic_scripts/ipsec_interface.py
+++ b/GPL/traffic_scripts/ipsec_interface.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2022 Cisco and/or its affiliates.
 #
 # SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 #
@@ -77,7 +77,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:
@@ -97,9 +97,6 @@ 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(
@@ -151,19 +148,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:
@@ -214,19 +211,18 @@ def main():
     sa_in = SecurityAssociation(
         ESP, spi=l_spi, crypt_algo=crypto_alg,
         crypt_key=crypto_key.encode(encoding=u"utf-8"), auth_algo=integ_alg,
-        auth_key=integ_key.encode(encoding=u"utf-8"),
-        tunnel_header=tunnel_in
+        auth_key=integ_key.encode(encoding=u"utf-8"), tunnel_header=tunnel_in
     )
 
     sa_out = SecurityAssociation(
         ESP, spi=r_spi, crypt_algo=crypto_alg,
         crypt_key=crypto_key.encode(encoding=u"utf-8"), auth_algo=integ_alg,
-        auth_key=integ_key.encode(encoding=u"utf-8"),
-        tunnel_header=tunnel_out
+        auth_key=integ_key.encode(encoding=u"utf-8"), tunnel_header=tunnel_out
     )
 
     sent_packets = list()
-    tx_pkt_send = (Ether(src=tx_src_mac, dst=tx_dst_mac) / ip_pkt)
+    tx_pkt_send = (
+        Ether(src=tx_src_mac, dst=tx_dst_mac) / ip_pkt)
     tx_pkt_send /= Raw()
     size_limit = 78 if ip_layer == IPv6 else 64
     if len(tx_pkt_send) < size_limit:
@@ -238,16 +234,16 @@ 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
             continue
-        elif rx_pkt_recv.haslayer(ICMPv6MLReport2):
+        if rx_pkt_recv.haslayer(ICMPv6MLReport2):
             # read another packet in the queue if the current one is
             # ICMPv6MLReport2
             continue
-        elif rx_pkt_recv.haslayer(ICMPv6ND_RA):
+        if rx_pkt_recv.haslayer(ICMPv6ND_RA):
             # read another packet in the queue if the current one is
             # ICMPv6ND_RA
             continue
@@ -260,45 +256,37 @@ def main():
         dst_ip, sa_in
     )
 
-    ip_pkt = ip_layer(src=dst_ip, dst=src_ip, proto=61) if ip_layer == IP \
+    rx_ip_pkt = ip_layer(src=dst_ip, dst=src_ip, proto=61) if ip_layer == IP \
         else ip_layer(src=dst_ip, dst=src_ip)
-    ip_pkt /= Raw()
-    if len(ip_pkt) < (size_limit - 14):
-        ip_pkt[Raw].load += (b"\0" * (size_limit - 14 - len(ip_pkt)))
-    e_pkt = sa_out.encrypt(ip_pkt)
-    rx_pkt_send = (Ether(src=rx_dst_mac, dst=rx_src_mac) /
-                   e_pkt)
+    rx_ip_pkt /= Raw()
+    if len(rx_ip_pkt) < (size_limit - 14):
+        rx_ip_pkt[Raw].load += (b"\0" * (size_limit - 14 - len(rx_ip_pkt)))
+    rx_pkt_send = (
+        Ether(src=rx_dst_mac, dst=rx_src_mac) / sa_out.encrypt(rx_ip_pkt))
     rx_txq.send(rx_pkt_send)
 
     while True:
         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
             continue
-        elif tx_pkt_recv.haslayer(ICMPv6MLReport2):
+        if tx_pkt_recv.haslayer(ICMPv6MLReport2):
             # read another packet in the queue if the current one is
             # ICMPv6MLReport2
             continue
-        elif tx_pkt_recv.haslayer(ICMPv6MLReport2):
-            # read another packet in the queue if the current one is
-            # ICMPv6MLReport2
-            continue
-        elif tx_pkt_recv.haslayer(ICMPv6ND_RA):
+        if tx_pkt_recv.haslayer(ICMPv6ND_RA):
             # read another packet in the queue if the current one is
             # ICMPv6ND_RA
             continue
 
-        # otherwise process the current packet
         break
 
     check_ip(tx_pkt_recv, ip_layer, tx_dst_mac, tx_src_mac, dst_ip, src_ip)
 
-    sys.exit(0)
-
 
 if __name__ == u"__main__":
     main()
diff --git a/GPL/traffic_scripts/ipsec_policy.py b/GPL/traffic_scripts/ipsec_policy.py
index 413f36bceb..8ba7eb488d 100644
--- a/GPL/traffic_scripts/ipsec_policy.py
+++ b/GPL/traffic_scripts/ipsec_policy.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2022 Cisco and/or its affiliates.
 #
 # SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
 #
@@ -128,7 +128,6 @@ def check_ip(pkt_recv, ip_layer, src_ip, dst_ip):
         )
 
 
-# TODO: Pylint says too-many-locals and too-many-statements. Refactor!
 def main():
     """Send and receive IPsec packet."""
 
@@ -152,16 +151,18 @@ def main():
     rx_dst_mac = args.get_arg(u"rx_dst_mac")
     src_ip = args.get_arg(u"src_ip")
     dst_ip = args.get_arg(u"dst_ip")
+    src_tun = args.get_arg(u"src_tun")
+    dst_tun = args.get_arg(u"dst_tun")
     crypto_alg = args.get_arg(u"crypto_alg")
     crypto_key = args.get_arg(u"crypto_key")
     integ_alg = args.get_arg(u"integ_alg")
     integ_key = args.get_arg(u"integ_key")
     l_spi = int(args.get_arg(u"l_spi"))
     r_spi = int(args.get_arg(u"r_spi"))
-    src_tun = args.get_arg(u"src_tun")
-    dst_tun = args.get_arg(u"dst_tun")
 
     ip_layer = IP if ip_address(src_ip).version == 4 else IPv6
+    ip_pkt = ip_layer(src=src_ip, dst=dst_ip, proto=61) if ip_layer == IP \
+        else ip_layer(src=src_ip, dst=dst_ip)
 
     tunnel_out = ip_layer(src=src_tun, dst=dst_tun) if src_tun and dst_tun \
         else None
@@ -183,16 +184,14 @@ def main():
         auth_key=integ_key.encode(encoding=u"utf-8"), tunnel_header=tunnel_out
     )
 
-    ip_pkt = ip_layer(src=src_ip, dst=dst_ip, proto=61) if ip_layer == IP \
-        else ip_layer(src=src_ip, dst=dst_ip)
-    ip_pkt = ip_layer(ip_pkt)
-
-    e_pkt = sa_out.encrypt(ip_pkt)
-    tx_pkt_send = (Ether(src=tx_src_mac, dst=tx_dst_mac) /
-                   e_pkt)
-
     sent_packets = list()
+    tx_pkt_send = (
+        Ether(src=tx_src_mac, dst=tx_dst_mac) / sa_out.encrypt(ip_pkt))
+
     tx_pkt_send /= Raw()
+    size_limit = 78 if ip_layer == IPv6 else 64
+    if len(tx_pkt_send) < (size_limit - 14):
+        tx_pkt_send[Raw].load += (b"\0" * (size_limit - 14 - len(tx_pkt_send)))
     sent_packets.append(tx_pkt_send)
     tx_txq.send(tx_pkt_send)
 
@@ -205,11 +204,11 @@ def main():
         if rx_pkt_recv.haslayer(ICMPv6ND_NS):
             # read another packet in the queue if the current one is ICMPv6ND_NS
             continue
-        elif rx_pkt_recv.haslayer(ICMPv6MLReport2):
+        if rx_pkt_recv.haslayer(ICMPv6MLReport2):
             # read another packet in the queue if the current one is
             # ICMPv6MLReport2
             continue
-        elif rx_pkt_recv.haslayer(ICMPv6ND_RA):
+        if rx_pkt_recv.haslayer(ICMPv6ND_RA):
             # read another packet in the queue if the current one is
             # ICMPv6ND_RA
             continue
@@ -217,30 +216,33 @@ def main():
         # otherwise process the current packet
         break
 
-    check_ip(rx_pkt_recv, ip_layer, src_ip, dst_ip)
+    check_ip(
+        rx_pkt_recv, ip_layer, src_ip, dst_ip
+    )
 
     rx_ip_pkt = ip_layer(src=dst_ip, dst=src_ip, proto=61) if ip_layer == IP \
         else ip_layer(src=dst_ip, dst=src_ip)
-    rx_pkt_send = (Ether(src=rx_dst_mac, dst=rx_src_mac) /
-                   rx_ip_pkt)
-
+    rx_pkt_send = (
+        Ether(src=rx_dst_mac, dst=rx_src_mac) / rx_ip_pkt)
     rx_pkt_send /= Raw()
+    if len(rx_pkt_send) < size_limit:
+        rx_pkt_send[Raw].load += (b"\0" * (size_limit - len(rx_pkt_send)))
     rx_txq.send(rx_pkt_send)
 
     while True:
-        tx_pkt_recv = tx_rxq.recv(2, sent_packets)
+        tx_pkt_recv = tx_rxq.recv(2, ignore=sent_packets)
 
         if tx_pkt_recv is None:
-            raise RuntimeError(u"ESP 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
             continue
-        elif tx_pkt_recv.haslayer(ICMPv6MLReport2):
+        if tx_pkt_recv.haslayer(ICMPv6MLReport2):
             # read another packet in the queue if the current one is
             # ICMPv6MLReport2
             continue
-        elif tx_pkt_recv.haslayer(ICMPv6ND_RA):
+        if tx_pkt_recv.haslayer(ICMPv6ND_RA):
             # read another packet in the queue if the current one is
             # ICMPv6ND_RA
             continue
@@ -249,8 +251,6 @@ def main():
 
     check_ipsec(tx_pkt_recv, ip_layer, src_tun, dst_ip, src_ip, sa_in)
 
-    sys.exit(0)
-
 
 if __name__ == u"__main__":
     main()