Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[sonic-mgmt-docker-image] Support ptf dataplane packet poll with multiple ptf nn agents connection #21070

Merged
merged 7 commits into from
Jan 19, 2025
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Create 0004-extend-dataplane-poll-method-to-support-multi-ptf-nn.patch
w1nda authored Dec 6, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit dcd0ed81f3660b403d5a2868367314f94d1fcde5
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
From c46fb401ab3d90c1829071b4b0933defbc6135dc Mon Sep 17 00:00:00 2001
From: wenda <[email protected]>
Date: Fri, 6 Dec 2024 07:25:30 +0000
Subject: [PATCH] extend dataplane poll method to support multi ptf nn agents
connections

---
src/ptf/dataplane.py | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/ptf/dataplane.py b/src/ptf/dataplane.py
index a1c1b3f..df9f39f 100644
--- a/src/ptf/dataplane.py
+++ b/src/ptf/dataplane.py
@@ -738,40 +738,42 @@ class DataPlane(Thread):
)
return bytes

- def oldest_port_number(self, device):
+ def get_oldest(self, device):
"""
- Returns the port number with the oldest packet,
+ Returns the device number and port number with the oldest packet,
or None if no packets are queued.
+ When device is specified, only returns the oldest packet from that device.
"""
- min_port_number = None
+ min_device_number, min_port_number = None, None
min_time = float("inf")
for port_id, queue in list(self.packet_queues.items()):
- if port_id[0] != device:
+ if device and port_id[0] != device:
continue
if queue and queue[0][1] < min_time:
min_time = queue[0][1]
+ min_device_number = port_id[0]
min_port_number = port_id[1]
- return min_port_number
+ return min_device_number, min_port_number

# Dequeues and yields packets in the order they were received.
# Yields (port, packet, received time).
# If port is not specified yields packets from all ports.
def packets(self, device, port=None):
while True:
- if port is None:
- rcv_port = self.oldest_port_number(device)
- else:
+ if device is None:
+ rcv_device, rcv_port = self.get_oldest(None)
+ if port is not None:
rcv_port = port

if rcv_port == None:
self.logger.debug("Out of packets on all ports")
break

- queue = self.packet_queues[(device, rcv_port)]
+ queue = self.packet_queues[(rcv_device, rcv_port)]

if len(queue) == 0:
self.logger.debug(
- "Out of packets on device %d, port %d", device, rcv_port
+ "Out of packets on device %d, port %d", rcv_device, rcv_port
)
break

--
2.47.0