Skip to content

[M1] Collect all upstream ports for ACL test#18516

Merged
Blueve merged 2 commits intosonic-net:masterfrom
lizhijianrd:fix-m1-acl-test-public
May 22, 2025
Merged

[M1] Collect all upstream ports for ACL test#18516
Blueve merged 2 commits intosonic-net:masterfrom
lizhijianrd:fix-m1-acl-test-public

Conversation

@lizhijianrd
Copy link
Contributor

Description of PR

Summary:
In M1 topo, we have 2 upstream neighbor types: MA and MB.
We need to collect all upstream ports to avoid packet capture flaky failure.

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • New Test case
    • Skipped for non-supported platforms
  • Test case improvement

Back port request

  • 202012
  • 202205
  • 202305
  • 202311
  • 202405
  • 202411
  • 202505

Approach

What is the motivation for this PR?

In M1 topo, we have 2 upstream neighbor types: MA and MB.
We need to collect all upstream ports to avoid packet capture flaky failure.

How did you do it?

Add function to read all up/down stream neighbor types.

How did you verify/test it?

Verified by ACL test on M1.

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

@lizhijianrd lizhijianrd requested a review from Blueve May 21, 2025 07:49
@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@Blueve Blueve merged commit 1f70a24 into sonic-net:master May 22, 2025
17 checks passed
mssonicbld pushed a commit to mssonicbld/sonic-mgmt that referenced this pull request May 22, 2025
What is the motivation for this PR?
In M1 topo, we have 2 upstream neighbor types: MA and MB.
We need to collect all upstream ports to avoid packet capture flaky failure.

How did you do it?
Add function to read all up/down stream neighbor types.

How did you verify/test it?
Verified by ACL test on M1.
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202505: #18543

@lizhijianrd lizhijianrd deleted the fix-m1-acl-test-public branch May 22, 2025 04:12
mssonicbld pushed a commit that referenced this pull request May 23, 2025
What is the motivation for this PR?
In M1 topo, we have 2 upstream neighbor types: MA and MB.
We need to collect all upstream ports to avoid packet capture flaky failure.

How did you do it?
Add function to read all up/down stream neighbor types.

How did you verify/test it?
Verified by ACL test on M1.
@mssonicbld
Copy link
Collaborator

@lizhijianrd PR conflicts with 202411 branch

StormLiangMS pushed a commit that referenced this pull request Jun 5, 2025
Summary:
Fixes # (issue)
In the topology with service ports, like t0-d18u8s4, t0-isolated-d16u16s1, t0-isolated-d32u32s2. we should include the PT0 neighbor port in the upstream neighbor list. With the enhancement in #18516, we can achieve this by adding pt0 in UPSTREAM_ALL_NEIGHBOR_MAP.
Gfrom2016 added a commit to Gfrom2016/sonic-mgmt that referenced this pull request Jun 6, 2025
Summary:
Fixes # (issue)
In the topology with service ports, like t0-d18u8s4, t0-isolated-d16u16s1, t0-isolated-d32u32s2. we should include the PT0 neighbor port in the upstream neighbor list. With the enhancement in sonic-net#18516, we can achieve this by adding pt0 in UPSTREAM_ALL_NEIGHBOR_MAP.

Signed-off-by: zitingguo-ms <[email protected]>
Gfrom2016 pushed a commit to Gfrom2016/sonic-mgmt that referenced this pull request Jun 6, 2025
What is the motivation for this PR?
In M1 topo, we have 2 upstream neighbor types: MA and MB.
We need to collect all upstream ports to avoid packet capture flaky failure.

How did you do it?
Add function to read all up/down stream neighbor types.

How did you verify/test it?
Verified by ACL test on M1.
Gfrom2016 added a commit to Gfrom2016/sonic-mgmt that referenced this pull request Jun 6, 2025
Summary:
Fixes # (issue)
In the topology with service ports, like t0-d18u8s4, t0-isolated-d16u16s1, t0-isolated-d32u32s2. we should include the PT0 neighbor port in the upstream neighbor list. With the enhancement in sonic-net#18516, we can achieve this by adding pt0 in UPSTREAM_ALL_NEIGHBOR_MAP.
yejianquan pushed a commit that referenced this pull request Jun 6, 2025
Summary:
Fixes # (issue)
In the topology with service ports, like t0-d18u8s4, t0-isolated-d16u16s1, t0-isolated-d32u32s2. we should include the PT0 neighbor port in the upstream neighbor list. With the enhancement in #18516, we can achieve this by adding pt0 in UPSTREAM_ALL_NEIGHBOR_MAP.

Signed-off-by: zitingguo-ms <[email protected]>
StormLiangMS pushed a commit that referenced this pull request Jun 9, 2025
…t into upstream neighbors in ACL tests (#18847)

* [M1] Collect all upstream ports for ACL test (#18516)

What is the motivation for this PR?
In M1 topo, we have 2 upstream neighbor types: MA and MB.
We need to collect all upstream ports to avoid packet capture flaky failure.

How did you do it?
Add function to read all up/down stream neighbor types.

How did you verify/test it?
Verified by ACL test on M1.

* [ACL] Include service port into upstream neighbors (#18671)

Summary:
Fixes # (issue)
In the topology with service ports, like t0-d18u8s4, t0-isolated-d16u16s1, t0-isolated-d32u32s2. we should include the PT0 neighbor port in the upstream neighbor list. With the enhancement in #18516, we can achieve this by adding pt0 in UPSTREAM_ALL_NEIGHBOR_MAP.

---------

Co-authored-by: Zhijian Li <[email protected]>
opcoder0 pushed a commit to opcoder0/sonic-mgmt that referenced this pull request Dec 8, 2025
What is the motivation for this PR?
In M1 topo, we have 2 upstream neighbor types: MA and MB.
We need to collect all upstream ports to avoid packet capture flaky failure.

How did you do it?
Add function to read all up/down stream neighbor types.

How did you verify/test it?
Verified by ACL test on M1.

Signed-off-by: opcoder0 <[email protected]>
opcoder0 pushed a commit to opcoder0/sonic-mgmt that referenced this pull request Dec 8, 2025
Summary:
Fixes # (issue)
In the topology with service ports, like t0-d18u8s4, t0-isolated-d16u16s1, t0-isolated-d32u32s2. we should include the PT0 neighbor port in the upstream neighbor list. With the enhancement in sonic-net#18516, we can achieve this by adding pt0 in UPSTREAM_ALL_NEIGHBOR_MAP.

Signed-off-by: opcoder0 <[email protected]>
AharonMalkin pushed a commit to AharonMalkin/sonic-mgmt that referenced this pull request Dec 16, 2025
What is the motivation for this PR?
In M1 topo, we have 2 upstream neighbor types: MA and MB.
We need to collect all upstream ports to avoid packet capture flaky failure.

How did you do it?
Add function to read all up/down stream neighbor types.

How did you verify/test it?
Verified by ACL test on M1.

Signed-off-by: Aharon Malkin <[email protected]>
AharonMalkin pushed a commit to AharonMalkin/sonic-mgmt that referenced this pull request Dec 16, 2025
Summary:
Fixes # (issue)
In the topology with service ports, like t0-d18u8s4, t0-isolated-d16u16s1, t0-isolated-d32u32s2. we should include the PT0 neighbor port in the upstream neighbor list. With the enhancement in sonic-net#18516, we can achieve this by adding pt0 in UPSTREAM_ALL_NEIGHBOR_MAP.

Signed-off-by: Aharon Malkin <[email protected]>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Dec 21, 2025
What is the motivation for this PR?
In M1 topo, we have 2 upstream neighbor types: MA and MB.
We need to collect all upstream ports to avoid packet capture flaky failure.

How did you do it?
Add function to read all up/down stream neighbor types.

How did you verify/test it?
Verified by ACL test on M1.

Signed-off-by: Guy Shemesh <[email protected]>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Dec 21, 2025
Summary:
Fixes # (issue)
In the topology with service ports, like t0-d18u8s4, t0-isolated-d16u16s1, t0-isolated-d32u32s2. we should include the PT0 neighbor port in the upstream neighbor list. With the enhancement in sonic-net#18516, we can achieve this by adding pt0 in UPSTREAM_ALL_NEIGHBOR_MAP.

Signed-off-by: Guy Shemesh <[email protected]>
venu-nexthop pushed a commit to venu-nexthop/sonic-mgmt that referenced this pull request Jan 13, 2026
Summary:
Fixes # (issue)
In the topology with service ports, like t0-d18u8s4, t0-isolated-d16u16s1, t0-isolated-d32u32s2. we should include the PT0 neighbor port in the upstream neighbor list. With the enhancement in sonic-net#18516, we can achieve this by adding pt0 in UPSTREAM_ALL_NEIGHBOR_MAP.
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Jan 26, 2026
What is the motivation for this PR?
In M1 topo, we have 2 upstream neighbor types: MA and MB.
We need to collect all upstream ports to avoid packet capture flaky failure.

How did you do it?
Add function to read all up/down stream neighbor types.

How did you verify/test it?
Verified by ACL test on M1.

Signed-off-by: Guy Shemesh <[email protected]>
gshemesh2 pushed a commit to gshemesh2/sonic-mgmt that referenced this pull request Jan 26, 2026
Summary:
Fixes # (issue)
In the topology with service ports, like t0-d18u8s4, t0-isolated-d16u16s1, t0-isolated-d32u32s2. we should include the PT0 neighbor port in the upstream neighbor list. With the enhancement in sonic-net#18516, we can achieve this by adding pt0 in UPSTREAM_ALL_NEIGHBOR_MAP.

Signed-off-by: Guy Shemesh <[email protected]>
ytzur1 pushed a commit to ytzur1/sonic-mgmt that referenced this pull request Feb 2, 2026
Summary:
Fixes # (issue)
In the topology with service ports, like t0-d18u8s4, t0-isolated-d16u16s1, t0-isolated-d32u32s2. we should include the PT0 neighbor port in the upstream neighbor list. With the enhancement in sonic-net#18516, we can achieve this by adding pt0 in UPSTREAM_ALL_NEIGHBOR_MAP.

Signed-off-by: Yael Tzur <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants