Hey Luca, Thanks for the patch! I think this change makes a lot of sense in general, and I like the idea of removing the duplication between capturing traffic generators and the test suite. I just had one thought that I left below, but otherwise:
Reviewed-by: Jeremy Spewock <jspew...@iol.unh.edu> On Tue, Aug 6, 2024 at 8:49 AM Luca Vizzarro <luca.vizza...@arm.com> wrote: > > The framework allows only to send one packet at once via Scapy. This > change adds the ability to send multiple packets, and also introduces a > new fast way to verify if we received several expected packets. > > Moreover, it reduces code duplication by keeping a single packet sending > method only at the test suite level. > > Signed-off-by: Luca Vizzarro <luca.vizza...@arm.com> > Reviewed-by: Paul Szczepanek <paul.szczepa...@arm.com> > Reviewed-by: Alex Chapman <alex.chap...@arm.com> > --- <snip> > + def match_all_packets( > + self, expected_packets: list[Packet], received_packets: list[Packet] > + ) -> None: This is a very interesting approach to comparing what you expect to what you received. I hadn't seen counters used before but they seem useful for this purpose. This method reminds me a lot of the filtering process that was discussed in bugzilla ticket 1438 (https://bugs.dpdk.org/show_bug.cgi?id=1438) where there was some talk about how to handle the noise vs what you received. This is different in a few ways though of course in that it allows you to specify multiple different criteria that are acceptable rather than just getting the payload and really only concerns itself with matching lists instead of doing any filtering. The main reason I mention this is it brought up a question for me: Do you think, in the future when the payload filtering method is implemented, these two methods will co-exist or it would make more sense to just let test suites get their noise-free list of packets and then check that what they care about is present? I think a method like this might be useful in some more niche cases where you have multiple packet structures to look for, so I don't doubt there are some reasons to have both, I was just wondering if you had thought about it or had an opinion. > + """Matches all the expected packets against the received ones. > + > + Matching is performed by counting down the occurrences in a > dictionary which keys are the > + raw packet bytes. No deep packet comparison is performed. All the > unexpected packets (noise) > + are automatically ignored. > + > + Args: > + expected_packets: The packets we are expecting to receive. > + received_packets: All the packets that were received. > + > + Raises: > + TestCaseVerifyError: if and not all the `expected_packets` were > found in > + `received_packets`. > + """ > + expected_packets_counters = Counter(map(raw, expected_packets)) > + received_packets_counters = Counter(map(raw, received_packets)) > + # The number of expected packets is subtracted by the number of > received packets, ignoring > + # any unexpected packets and capping at zero. > + missing_packets_counters = expected_packets_counters - > received_packets_counters > + missing_packets_count = missing_packets_counters.total() > + self._logger.debug( > + f"match_all_packets: expected {len(expected_packets)}, " > + f"received {len(received_packets)}, missing > {missing_packets_count}" > + ) > + > + if missing_packets_count != 0: > + self._fail_test_case_verify( > + f"Not all packets were received, expected > {len(expected_packets)} " > + f"but {missing_packets_count} were missing." > + ) > + <snip> > -- > 2.34.1 >
