Skip to content

Fix ipfwd/test_dip_sip.py for v6 topo#23315

Merged
StormLiangMS merged 1 commit intosonic-net:masterfrom
markx-arista:fix-test-dip-sip-for-v6-topo
Mar 26, 2026
Merged

Fix ipfwd/test_dip_sip.py for v6 topo#23315
StormLiangMS merged 1 commit intosonic-net:masterfrom
markx-arista:fix-test-dip-sip-for-v6-topo

Conversation

@markx-arista
Copy link
Contributor

Description of PR

Summary:
Skip test_ipv4_forwarding for v6 topo
Fix test_ipv6_forwarding by skipping IPv4 operations in setup and teardown fixtures
Fixes # (issue)

Type of change

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

Back port request

  • 202205
  • 202305
  • 202311
  • 202405
  • 202411
  • 202505
  • 202511

Approach

What is the motivation for this PR?

How did you do it?

How did you verify/test it?

Any platform specific information?

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

Documentation

Skip test_ipv4_forwarding for v6 topo
Fix test_ipv6_forwarding by skipping IPv4 operations in setup and
teardown fixtures

Signed-off-by: markxiao <[email protected]>
@mssonicbld
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@markx-arista
Copy link
Contributor Author

Note that 202412 has a fix that is not compatible with master/202511: Azure/sonic-mgmt.msft#707

Copy link
Collaborator

@yxieca yxieca left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AI agent on behalf of Ying. Reviewed; no issues found.

Copy link
Collaborator

@StormLiangMS StormLiangMS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@markx-arista — Reviewed. LGTM overall ✅

All 18 CI checks pass, DCO/CLA clean. The fix correctly guards IPv4 code paths for v6-only topologies and populates _host_mac for IPv6 interfaces (was missing before).

Minor nits (non-blocking):

  1. Approach section blank in PR description — would be helpful to briefly note the fix strategy for future reference.
  2. Trailing whitespace on line 97 of test_dip_sip.py (after the closing ").
  3. Style inconsistency: setup_static_route caches is_v6_topo = is_ipv6_only_topology(tbinfo) while setup_teardown calls it inline — minor but worth making consistent.

None of these block merge. Approve.

Copy link
Collaborator

@StormLiangMS StormLiangMS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@StormLiangMS StormLiangMS merged commit c861445 into sonic-net:master Mar 26, 2026
18 checks passed
@StormLiangMS StormLiangMS added Request for 202511 branch Request to backport a change to 202511 branch Approved for 202511 branch labels Mar 26, 2026
@mssonicbld
Copy link
Collaborator

@markx-arista PR conflicts with 202511 branch

@markx-arista
Copy link
Contributor Author

@StormLiangMS There is PR conflict on 202511 because this PR #19931 is not on 202511 yet, can you cherry-pick that one to 202511 first? Thanks.

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