From b2da6d6602876ce7338a4585f14330895e6bf672 Mon Sep 17 00:00:00 2001 From: Klement Sekera Date: Wed, 24 Mar 2021 17:25:14 +0100 Subject: [PATCH] nat: fix test for multi-worker scenario Type: fix Change-Id: I170f9d8c685f59b7ccf6f9ee7fdc1dcdf2a54fe1 Signed-off-by: Klement Sekera --- src/plugins/nat/test/test_nat44_ei.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/plugins/nat/test/test_nat44_ei.py b/src/plugins/nat/test/test_nat44_ei.py index 04ed9a33e01..f3eb6c78793 100644 --- a/src/plugins/nat/test/test_nat44_ei.py +++ b/src/plugins/nat/test/test_nat44_ei.py @@ -3778,22 +3778,35 @@ class TestNAT44EI(MethodHolder): pkts = [] for i in range(x): + info = self.create_packet_info(self.pg0, self.pg1) + payload = self.info_to_payload(info) p = (Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) / IP(src=self.pg0.remote_hosts[i].ip4, dst=self.pg1.remote_ip4) / - UDP(sport=7000+i, dport=80+i)) + UDP(sport=7000+i, dport=8000+i) / + Raw(payload)) + info.data = p pkts.append(p) self.pg0.add_stream(pkts) self.pg_enable_capture(self.pg_interfaces) self.pg_start() recvd = self.pg1.get_capture(len(pkts)) - for (p_sent, p_recvd) in zip(pkts, recvd): + for p_recvd in recvd: + payload_info = self.payload_to_info(p_recvd[Raw]) + packet_index = payload_info.index + info = self._packet_infos[packet_index] + self.assertTrue(info is not None) + self.assertEqual(packet_index, info.index) + p_sent = info.data packed = socket.inet_aton(p_sent[IP].src) numeric = struct.unpack("!L", packed)[0] numeric = socket.htonl(numeric) a = nat_addresses[(numeric-1) % len(nat_addresses)] - self.assertEqual(a, p_recvd[IP].src, "Packet not translated") + self.assertEqual( + a, p_recvd[IP].src, + "Invalid packet (src IP %s translated to %s, but expected %s)" + % (p_sent[IP].src, p_recvd[IP].src, a)) class TestNAT44Out2InDPO(MethodHolder): -- 2.16.6