diff options
| author |   Klement Sekera <ksekera@cisco.com> | 2018-04-17 11:36:55 +0200 |
|---|---|---|
| committer |   Damjan Marion <dmarion.lists@gmail.com> | 2018-04-17 17:09:28 +0000 |
| commit | 28fb03fc3931d355d8a63de59b6415b7aaf3c88b (patch) | |
| tree | 5868f3fa255b18c169107310a91ef69113283bb0 | |
| parent | 583f158b44d9644855441280e09afbf85a4557df (diff) | |
make test: ipsec test cleanup
Change-Id: If813346b665468b25aaf5d95629bcad87212aa3e
Signed-off-by: Klement Sekera <ksekera@cisco.com>
| -rw-r--r-- | test/test_ipsec_ah.py | 12 | ||||
| -rw-r--r-- | test/test_ipsec_esp.py | 10 |
2 files changed, 9 insertions, 13 deletions
diff --git a/test/test_ipsec_ah.py b/test/test_ipsec_ah.py index e1259deb91a..042bb88f5be 100644 --- a/test/test_ipsec_ah.py +++ b/test/test_ipsec_ah.py @@ -1,13 +1,11 @@ import socket +import unittest from scapy.layers.inet import IP, ICMP -from scapy.layers.l2 import Ether -from scapy.layers.ipsec import * +from scapy.layers.l2 import Ether, Raw +from scapy.layers.ipsec import SecurityAssociation, AH -from framework import VppTestCase -from vpp_ip_route import VppIpRoute - -from util import ppp +from framework import VppTestCase, VppTestRunner class TestIpsecAh(VppTestCase): @@ -265,7 +263,7 @@ class TestIpsecAh(VppTestCase): for Pkts in recv_pkts: Pkts[AH].padding = Pkts[AH].icv[12:] Pkts[AH].icv = Pkts[AH].icv[:12] - decrypt_pkt = self.local_tra_sa.decrypt(Pkts[IP]) + self.local_tra_sa.decrypt(Pkts[IP]) finally: self.logger.info(self.vapi.ppcli("show error")) self.logger.info(self.vapi.ppcli("show ipsec")) diff --git a/test/test_ipsec_esp.py b/test/test_ipsec_esp.py index 78f51501f9b..f6782749148 100644 --- a/test/test_ipsec_esp.py +++ b/test/test_ipsec_esp.py @@ -1,13 +1,11 @@ import socket +import unittest from scapy.layers.inet import IP, ICMP from scapy.layers.l2 import Ether -from scapy.layers.ipsec import * +from scapy.layers.ipsec import SecurityAssociation, ESP -from framework import VppTestCase -from vpp_ip_route import VppIpRoute - -from util import ppp +from framework import VppTestCase, VppTestRunner class TestIpsecEsp(VppTestCase): @@ -283,7 +281,7 @@ class TestIpsecEsp(VppTestCase): self.pg2, send_pkts, self.pg2, count=count) # ESP TRA VPP encryption/decryption verification for Pkts in recv_pkts: - decrypt_pkt = self.local_tra_sa.decrypt(Pkts[IP]) + self.local_tra_sa.decrypt(Pkts[IP]) finally: self.logger.info(self.vapi.ppcli("show error")) self.logger.info(self.vapi.ppcli("show ipsec")) |