X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_reassembly.py;h=124fec0a820e4ec6ca1b81a201cbd02f01fa4b6e;hb=1bc46cd6e3df29996e528c754bc574c57182cf61;hp=797fb527415ea9b1669ede4ede5d75b77e06d0b6;hpb=090096bff365b4ad69c061303c0852bf214b4f03;p=vpp.git diff --git a/test/test_reassembly.py b/test/test_reassembly.py index 797fb527415..124fec0a820 100644 --- a/test/test_reassembly.py +++ b/test/test_reassembly.py @@ -21,9 +21,6 @@ from vpp_papi import VppEnum # 35 is enough to have >257 400-byte fragments test_packet_count = 35 -# number of workers used for multi-worker test cases -worker_count = 3 - class TestIPv4Reassembly(VppTestCase): """ IPv4 Reassembly """ @@ -170,6 +167,21 @@ class TestIPv4Reassembly(VppTestCase): self.verify_capture(packets) self.src_if.assert_nothing_captured() + def test_verify_clear_trace_mid_reassembly(self): + """ verify clear trace works mid-reassembly """ + + self.pg_enable_capture() + self.src_if.add_stream(self.fragments_200[0:-1]) + self.pg_start() + + self.logger.debug(self.vapi.cli("show trace")) + self.vapi.cli("clear trace") + + self.src_if.add_stream(self.fragments_200[-1]) + self.pg_start() + packets = self.dst_if.get_capture(len(self.pkt_infos)) + self.verify_capture(packets) + def test_reversed(self): """ reverse order reassembly """ @@ -588,6 +600,42 @@ class TestIPv4SVReassembly(VppTestCase): self.assertEqual(sent[IP].dst, recvd[IP].dst) self.assertEqual(sent[Raw].payload, recvd[Raw].payload) + def test_verify_clear_trace_mid_reassembly(self): + """ verify clear trace works mid-reassembly """ + payload_len = 1000 + payload = "" + counter = 0 + while len(payload) < payload_len: + payload += "%u " % counter + counter += 1 + + p = (Ether(dst=self.src_if.local_mac, src=self.src_if.remote_mac) / + IP(id=1, src=self.src_if.remote_ip4, + dst=self.dst_if.remote_ip4) / + UDP(sport=1234, dport=5678) / + Raw(payload)) + fragments = fragment_rfc791(p, payload_len/4) + + self.pg_enable_capture() + self.src_if.add_stream(fragments[1]) + self.pg_start() + + self.logger.debug(self.vapi.cli("show trace")) + self.vapi.cli("clear trace") + + self.pg_enable_capture() + self.src_if.add_stream(fragments[0]) + self.pg_start() + self.dst_if.get_capture(2) + + self.logger.debug(self.vapi.cli("show trace")) + self.vapi.cli("clear trace") + + self.pg_enable_capture() + self.src_if.add_stream(fragments[2:]) + self.pg_start() + self.dst_if.get_capture(len(fragments[2:])) + def test_timeout(self): """ reassembly timeout """ payload_len = 1000 @@ -738,13 +786,13 @@ class TestIPv4SVReassembly(VppTestCase): class TestIPv4MWReassembly(VppTestCase): """ IPv4 Reassembly (multiple workers) """ - worker_config = "workers %d" % worker_count + vpp_worker_count = 3 @classmethod def setUpClass(cls): super(TestIPv4MWReassembly, cls).setUpClass() - cls.create_pg_interfaces(range(worker_count+1)) + cls.create_pg_interfaces(range(cls.vpp_worker_count+1)) cls.src_if = cls.pg0 cls.send_ifs = cls.pg_interfaces[:-1] cls.dst_if = cls.pg_interfaces[-1] @@ -857,7 +905,7 @@ class TestIPv4MWReassembly(VppTestCase): "Packet with packet_index %d not received" % index) def send_packets(self, packets): - for counter in range(worker_count): + for counter in range(self.vpp_worker_count): if 0 == len(packets[counter]): continue send_if = self.send_ifs[counter] @@ -873,19 +921,19 @@ class TestIPv4MWReassembly(VppTestCase): # in first wave we send fragments which don't start at offset 0 # then we send fragments with offset 0 on a different thread # then the rest of packets on a random thread - first_packets = [[] for n in range(worker_count)] - second_packets = [[] for n in range(worker_count)] - rest_of_packets = [[] for n in range(worker_count)] + first_packets = [[] for n in range(self.vpp_worker_count)] + second_packets = [[] for n in range(self.vpp_worker_count)] + rest_of_packets = [[] for n in range(self.vpp_worker_count)] for (_, p) in self.pkt_infos: - wi = randrange(worker_count) + wi = randrange(self.vpp_worker_count) second_packets[wi].append(p[0]) if len(p) <= 1: continue wi2 = wi while wi2 == wi: - wi2 = randrange(worker_count) + wi2 = randrange(self.vpp_worker_count) first_packets[wi2].append(p[1]) - wi3 = randrange(worker_count) + wi3 = randrange(self.vpp_worker_count) rest_of_packets[wi3].extend(p[2:]) self.pg_enable_capture() @@ -1073,6 +1121,21 @@ class TestIPv6Reassembly(VppTestCase): self.src_if.assert_nothing_captured() self.dst_if.assert_nothing_captured() + def test_verify_clear_trace_mid_reassembly(self): + """ verify clear trace works mid-reassembly """ + + self.pg_enable_capture() + self.src_if.add_stream(self.fragments_400[0:-1]) + self.pg_start() + + self.logger.debug(self.vapi.cli("show trace")) + self.vapi.cli("clear trace") + + self.src_if.add_stream(self.fragments_400[-1]) + self.pg_start() + packets = self.dst_if.get_capture(len(self.pkt_infos)) + self.verify_capture(packets) + def test_reversed(self): """ reverse order reassembly """ @@ -1371,13 +1434,13 @@ class TestIPv6Reassembly(VppTestCase): class TestIPv6MWReassembly(VppTestCase): """ IPv6 Reassembly (multiple workers) """ - worker_config = "workers %d" % worker_count + vpp_worker_count = 3 @classmethod def setUpClass(cls): super(TestIPv6MWReassembly, cls).setUpClass() - cls.create_pg_interfaces(range(worker_count+1)) + cls.create_pg_interfaces(range(cls.vpp_worker_count+1)) cls.src_if = cls.pg0 cls.send_ifs = cls.pg_interfaces[:-1] cls.dst_if = cls.pg_interfaces[-1] @@ -1490,7 +1553,7 @@ class TestIPv6MWReassembly(VppTestCase): "Packet with packet_index %d not received" % index) def send_packets(self, packets): - for counter in range(worker_count): + for counter in range(self.vpp_worker_count): if 0 == len(packets[counter]): continue send_if = self.send_ifs[counter] @@ -1506,19 +1569,19 @@ class TestIPv6MWReassembly(VppTestCase): # in first wave we send fragments which don't start at offset 0 # then we send fragments with offset 0 on a different thread # then the rest of packets on a random thread - first_packets = [[] for n in range(worker_count)] - second_packets = [[] for n in range(worker_count)] - rest_of_packets = [[] for n in range(worker_count)] + first_packets = [[] for n in range(self.vpp_worker_count)] + second_packets = [[] for n in range(self.vpp_worker_count)] + rest_of_packets = [[] for n in range(self.vpp_worker_count)] for (_, p) in self.pkt_infos: - wi = randrange(worker_count) + wi = randrange(self.vpp_worker_count) second_packets[wi].append(p[0]) if len(p) <= 1: continue wi2 = wi while wi2 == wi: - wi2 = randrange(worker_count) + wi2 = randrange(self.vpp_worker_count) first_packets[wi2].append(p[1]) - wi3 = randrange(worker_count) + wi3 = randrange(self.vpp_worker_count) rest_of_packets[wi3].extend(p[2:]) self.pg_enable_capture() @@ -1635,6 +1698,41 @@ class TestIPv6SVReassembly(VppTestCase): self.assertEqual(sent[IPv6].dst, recvd[IPv6].dst) self.assertEqual(sent[Raw].payload, recvd[Raw].payload) + def test_verify_clear_trace_mid_reassembly(self): + """ verify clear trace works mid-reassembly """ + payload_len = 1000 + payload = "" + counter = 0 + while len(payload) < payload_len: + payload += "%u " % counter + counter += 1 + + p = (Ether(dst=self.src_if.local_mac, src=self.src_if.remote_mac) / + IPv6(src=self.src_if.remote_ip6, dst=self.dst_if.remote_ip6) / + UDP(sport=1234, dport=5678) / + Raw(payload)) + fragments = fragment_rfc8200(p, 1, payload_len/4) + + self.pg_enable_capture() + self.src_if.add_stream(fragments[1]) + self.pg_start() + + self.logger.debug(self.vapi.cli("show trace")) + self.vapi.cli("clear trace") + + self.pg_enable_capture() + self.src_if.add_stream(fragments[0]) + self.pg_start() + self.dst_if.get_capture(2) + + self.logger.debug(self.vapi.cli("show trace")) + self.vapi.cli("clear trace") + + self.pg_enable_capture() + self.src_if.add_stream(fragments[2:]) + self.pg_start() + self.dst_if.get_capture(len(fragments[2:])) + def test_timeout(self): """ reassembly timeout """ payload_len = 1000