[dualtor-io] Fix duplication merge condition (sonic-net#18828)

What is the motivation for this PR?
Work Item: 33161844

Actually, there is only one disruption, but due to the vlan flooding behavior, packet with id 70 is flooded in the vlan and received; so two disruptions are detected.
So for this case, the following two disruptions should be merged into one.

How did you do it?
Change the merge condition to allow merge in this case.

How did you verify/test it?
Run on Cisco dualtor testbed and pass.

Signed-off-by: Longxiang Lyu <[email protected]>
Signed-off-by: Aharon Malkin <[email protected]>

Author: lolyu

tests/common/dualtor/data_plane_utils.py

@@ -87,7 +87,7 @@ def validate_traffic_results(tor_IO, allowed_disruption, delay,
         # The dualtor I/O flow examine logic will regard those duplications as packet delivery,
         # so multiple disruptions will be reported. So we need to reassemble the true disruption
         # with the duplications here.
-        if merge_duplications_into_disruptions and result['disruptions'] and result['duplications']:
+        if merge_duplications_into_disruptions and result['disruptions']:
             logger.debug("Server %s disruptions before merge:\n%s",
                          server_ip, json.dumps(result['disruptions'], indent=4))
             logger.debug("Server %s duplications before merge:\n%s",