xfail decap related cases for 202412 by sdszhang · Pull Request #22831 · sonic-net/sonic-mgmt

sdszhang · 2026-03-10T02:56:25Z

Description of PR

Summary:
subnet decap tunnel is disabled on 202412 in Azure/sonic-swss.msft#209. xfail related cases.

qos/test_qos_dscp_mapping.py::TestQoSSaiDSCPQueueMapping_IPIP_Base::test_dscp_to_queue_mapping[uniform]
srv6/test_srv6_dataplane:py::TestSRv6DataPlaneBase::test_srv6_full_func

Type of change

Back port request

Approach

What is the motivation for this PR?

xfail decap related cases in 202412.

How did you do it?

add marked condition

How did you verify/test it?

Any platform specific information?

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

Documentation

mssonicbld · 2026-03-10T02:56:33Z

/azp run

azure-pipelines · 2026-03-10T02:56:47Z

Azure Pipelines successfully started running 1 pipeline(s).

Signed-off-by: Dashuai Zhang <[email protected]>

mssonicbld · 2026-03-10T02:57:50Z

/azp run

azure-pipelines · 2026-03-10T02:58:04Z

Azure Pipelines successfully started running 1 pipeline(s).

banidoru

One blocking issue: typo in test case key uses : instead of ., which will silently prevent the xfail from matching. The rest looks correct.

tests/common/plugins/conditional_mark/tests_mark_conditions.yaml

banidoru

One bug: typo :py instead of .py on the new srv6/test_srv6_dataplane entry (line 4732) — will silently prevent the xfail from matching. Already noted inline. Rest of the changes look correct: YAML structure is valid, conditions_logical_operator: or is appropriate for the multi-condition xfail, and condition expressions are consistent with existing patterns.

tests/common/plugins/conditional_mark/tests_mark_conditions.yaml

banidoru

One blocking issue (already noted by others): srv6/test_srv6_dataplane:py has a colon instead of a dot — must be srv6/test_srv6_dataplane.py or the xfail will never match.

Otherwise the changes look correct:

conditions_logical_operator: or is properly added for the first hunk since the two conditions are independent.
The condition expressions are syntactically valid and consistent with existing entries.
Minor suggestion: consider referencing a tracking issue in the xfail reasons so it's clear when these can be removed.

linux-foundation-easycla · 2026-03-10T11:51:08Z

The committers listed above are authorized under a signed CLA.

✅ login: sdszhang / name: Dashuai Zhang (03caf74, 7c512c3)

mssonicbld · 2026-03-10T11:51:29Z

/azp run

azure-pipelines · 2026-03-10T11:51:43Z

Azure Pipelines successfully started running 1 pipeline(s).

mssonicbld · 2026-03-10T11:54:42Z

/azp run

azure-pipelines · 2026-03-10T11:54:57Z

Azure Pipelines successfully started running 1 pipeline(s).

Signed-off-by: Dashuai Zhang <[email protected]>

mssonicbld · 2026-03-10T11:56:19Z

/azp run

azure-pipelines · 2026-03-10T11:56:35Z

Azure Pipelines successfully started running 1 pipeline(s).

banidoru

Iteration 2: The :py typo is fixed. Changes look correct — conditions_logical_operator: or is properly added for the QoS test (two independent conditions), and the new SRv6 xfail block is well-formed. No further issues found.

banidoru

LGTM. The colon typo (:py → .py) from the first iteration is fixed. Both xfail entries correctly target the 202412 release on isolated topologies with appropriate conditions. Minor nit: the reason string says "vlan decap" for SRv6 but "decap tunnel" for QoS — consider aligning terminology, but not blocking.

banidoru

The :py typo on srv6/test_srv6_dataplane:py (should be .py) flagged in the previous iteration is still unfixed. This will silently prevent the xfail from matching. Please fix before merge.

Otherwise the changes are correct: the conditions_logical_operator: or addition for the QoS test and the new 202412 isolated-topo conditions are appropriate.

sdszhang · 2026-03-11T00:09:38Z

test log:

XFAIL qos/test_qos_dscp_mapping.py::TestQoSSaiDSCPQueueMapping_IPIP_Base::test_dscp_to_queue_mapping_uniform_mode - Test case has issue on the 202412 branch as decap tunnel is disabled.

XPASS srv6/test_srv6_dataplane.py::TestSRv6DataPlaneBase::test_srv6_full_func[pipe-srh-None] vlan decap is disabled in 202412 image, which causes the test case failure.
XPASS srv6/test_srv6_dataplane.py::TestSRv6DataPlaneBase::test_srv6_full_func[pipe-no_srh-None] vlan decap is disabled in 202412 image, which causes the test case failure.

banidoru

Iteration 3 review: All previous concerns addressed. The :py typo is fixed. Both xfail entries correctly target 202412 release on isolated topologies with appropriate reasons. conditions_logical_operator: or is properly added for the QoS test case (two independent conditions). Minor nit: the PR description still references test_srv6_dataplane:py with a colon instead of .py, but this is cosmetic only — the actual YAML is correct. LGTM.

banidoru

This PR cannot be approved. The change is intended to xfail two tests, but it has multiple issues that prevent it from working correctly:

Typo in Test Path: The path for the SRv6 test contains a typo (:py instead of .py). This will cause the xfail condition to be ignored, and the test will continue to fail. This was pointed out in a previous review comment but has not been addressed.
Missing Test Case: The PR description mentions xfail-ing qos/test_qos_dscp_mapping.py::TestQoSSaiDSCPQueueMapping_IPIP_Base::test_dscp_to_queue_mapping[uniform], but the corresponding entry is missing from tests_mark_conditions.yaml.

These issues must be fixed before the PR can be merged.

tests/common/plugins/conditional_mark/tests_mark_conditions.yaml

banidoru

Iteration 3: All previous concerns are addressed — the :py typo is fixed, and both xfail entries are correct.

Verdict: LGTM

YAML is syntactically valid.
conditions_logical_operator: or is correctly added to the QoS xfail (two independent conditions that should be OR'd).
The new SRv6 xfail block is well-structured with a single condition (no conditions_logical_operator needed).
Condition expressions ('isolated' in topo_name and release in ['202412']) follow established patterns in this file.
Reason strings are clear and descriptive.
Minor cosmetic note: the PR description still references test_srv6_dataplane:py with a colon, but the actual YAML is correct — not blocking.

banidoru

The changes look reasonable to temporarily unblock CI by xfailing tests that are failing due to disabled features in the 202412 release.

banidoru

All reviewers approved. LGTM.

r12f

lgtm!

StormLiangMS

LGTM

mssonicbld · 2026-03-13T00:48:29Z

Cherry-pick PR to msft-202412: Azure/sonic-mgmt.msft#1069

Description of PR Summary: subnet decap tunnel is disabled on 202412 in Azure/sonic-swss.msft#209. xfail related cases. qos/test_qos_dscp_mapping.py::TestQoSSaiDSCPQueueMapping_IPIP_Base::test_dscp_to_queue_mapping[uniform] srv6/test_srv6_dataplane:py::TestSRv6DataPlaneBase::test_srv6_full_func Signed-off-by: Dashuai Zhang <[email protected]> --------- Signed-off-by: Dashuai Zhang <[email protected]> Signed-off-by: mssonicbld <[email protected]>

mssonicbld · 2026-03-13T21:21:16Z

Cherry-pick PR to 202511: #22955

Description of PR Summary: subnet decap tunnel is disabled on 202412 in Azure/sonic-swss.msft#209. xfail related cases. qos/test_qos_dscp_mapping.py::TestQoSSaiDSCPQueueMapping_IPIP_Base::test_dscp_to_queue_mapping[uniform] srv6/test_srv6_dataplane:py::TestSRv6DataPlaneBase::test_srv6_full_func Signed-off-by: Dashuai Zhang <[email protected]> --------- Signed-off-by: Dashuai Zhang <[email protected]> Signed-off-by: mssonicbld <[email protected]>

Description of PR Summary: subnet decap tunnel is disabled on 202412 in Azure/sonic-swss.msft#209. xfail related cases. qos/test_qos_dscp_mapping.py::TestQoSSaiDSCPQueueMapping_IPIP_Base::test_dscp_to_queue_mapping[uniform] srv6/test_srv6_dataplane:py::TestSRv6DataPlaneBase::test_srv6_full_func Signed-off-by: Dashuai Zhang <[email protected]> --------- Signed-off-by: Dashuai Zhang <[email protected]> Signed-off-by: selldinesh <[email protected]>

Description of PR Summary: subnet decap tunnel is disabled on 202412 in Azure/sonic-swss.msft#209. xfail related cases. qos/test_qos_dscp_mapping.py::TestQoSSaiDSCPQueueMapping_IPIP_Base::test_dscp_to_queue_mapping[uniform] srv6/test_srv6_dataplane:py::TestSRv6DataPlaneBase::test_srv6_full_func Signed-off-by: Dashuai Zhang <[email protected]> --------- Signed-off-by: Dashuai Zhang <[email protected]> Signed-off-by: Abhishek <[email protected]>

Description of PR Summary: subnet decap tunnel is disabled on 202412 in Azure/sonic-swss.msft#209. xfail related cases. qos/test_qos_dscp_mapping.py::TestQoSSaiDSCPQueueMapping_IPIP_Base::test_dscp_to_queue_mapping[uniform] srv6/test_srv6_dataplane:py::TestSRv6DataPlaneBase::test_srv6_full_func Signed-off-by: Dashuai Zhang <[email protected]> --------- Signed-off-by: Dashuai Zhang <[email protected]> Signed-off-by: Venkata Gouri Rajesh Etla <[email protected]>

Description of PR Summary: subnet decap tunnel is disabled on 202412 in Azure/sonic-swss.msft#209. xfail related cases. qos/test_qos_dscp_mapping.py::TestQoSSaiDSCPQueueMapping_IPIP_Base::test_dscp_to_queue_mapping[uniform] srv6/test_srv6_dataplane:py::TestSRv6DataPlaneBase::test_srv6_full_func Signed-off-by: Dashuai Zhang <[email protected]> --------- Signed-off-by: Dashuai Zhang <[email protected]>

sdszhang added the Request for msft-202412 Branch label Mar 10, 2026

github-actions bot requested review from BYGX-wcr, xwjiang-ms and yutongzhang-microsoft March 10, 2026 02:56

xfail decap related cases.

03caf74

Signed-off-by: Dashuai Zhang <[email protected]>

sdszhang force-pushed the skip_decap_srv6 branch from 9871048 to 03caf74 Compare March 10, 2026 02:57

banidoru suggested changes Mar 10, 2026

View reviewed changes

tests/common/plugins/conditional_mark/tests_mark_conditions.yaml Outdated Show resolved Hide resolved

banidoru suggested changes Mar 10, 2026

View reviewed changes

tests/common/plugins/conditional_mark/tests_mark_conditions.yaml Outdated Show resolved Hide resolved

banidoru suggested changes Mar 10, 2026

View reviewed changes

sdszhang force-pushed the skip_decap_srv6 branch from 7880e8d to 28710d2 Compare March 10, 2026 11:54

xfail decap related cases.

7c512c3

Signed-off-by: Dashuai Zhang <[email protected]>

sdszhang force-pushed the skip_decap_srv6 branch from 28710d2 to 7c512c3 Compare March 10, 2026 11:55

banidoru reviewed Mar 10, 2026

View reviewed changes

banidoru suggested changes Mar 10, 2026

View reviewed changes

r12f mentioned this pull request Mar 11, 2026

fix default route for t0-isolated topo #22565

Merged

12 tasks

banidoru reviewed Mar 11, 2026

View reviewed changes

banidoru suggested changes Mar 11, 2026

View reviewed changes

tests/common/plugins/conditional_mark/tests_mark_conditions.yaml Show resolved Hide resolved

tests/common/plugins/conditional_mark/tests_mark_conditions.yaml Show resolved Hide resolved

banidoru reviewed Mar 11, 2026

View reviewed changes

banidoru approved these changes Mar 11, 2026

View reviewed changes

r12f approved these changes Mar 11, 2026

View reviewed changes

r12f added the Request for 202511 branch Request to backport a change to 202511 branch label Mar 11, 2026

StormLiangMS approved these changes Mar 13, 2026

View reviewed changes

StormLiangMS merged commit ac79ea9 into sonic-net:master Mar 13, 2026
22 of 23 checks passed

StormLiangMS added the Approved for msft-202412 Branch label Mar 13, 2026

mssonicbld mentioned this pull request Mar 13, 2026

[action] [PR:22831] xfail decap related cases for 202412 Azure/sonic-mgmt.msft#1069

Merged

12 tasks

mssonicbld added the Created PR to msft-202412 Branch label Mar 13, 2026

mssonicbld added Included in msft-202412 Branch and removed Created PR to msft-202412 Branch labels Mar 13, 2026

vmittal-msft added the Approved for 202511 branch label Mar 13, 2026

mssonicbld added the Created PR to 202511 branch label Mar 13, 2026

mssonicbld mentioned this pull request Mar 13, 2026

[action] [PR:22831] xfail decap related cases for 202412 #22955

Merged

12 tasks

mssonicbld added Included in 202511 branch and removed Created PR to 202511 branch labels Mar 14, 2026

Conversation

sdszhang commented Mar 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of PR

Type of change

Back port request

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

Uh oh!

mssonicbld commented Mar 10, 2026

Uh oh!

azure-pipelines bot commented Mar 10, 2026

Uh oh!

mssonicbld commented Mar 10, 2026

Uh oh!

azure-pipelines bot commented Mar 10, 2026

Uh oh!

banidoru left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

banidoru left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

banidoru left a comment

Choose a reason for hiding this comment

Uh oh!

linux-foundation-easycla bot commented Mar 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mssonicbld commented Mar 10, 2026

Uh oh!

azure-pipelines bot commented Mar 10, 2026

Uh oh!

mssonicbld commented Mar 10, 2026

Uh oh!

azure-pipelines bot commented Mar 10, 2026

Uh oh!

mssonicbld commented Mar 10, 2026

Uh oh!

azure-pipelines bot commented Mar 10, 2026

Uh oh!

banidoru left a comment

Choose a reason for hiding this comment

Uh oh!

banidoru left a comment

Choose a reason for hiding this comment

Uh oh!

banidoru left a comment

Choose a reason for hiding this comment

Uh oh!

sdszhang commented Mar 11, 2026

Uh oh!

banidoru left a comment

Choose a reason for hiding this comment

Uh oh!

banidoru left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

banidoru left a comment

Choose a reason for hiding this comment

Uh oh!

banidoru left a comment

Choose a reason for hiding this comment

Uh oh!

banidoru left a comment

Choose a reason for hiding this comment

Uh oh!

r12f left a comment

Choose a reason for hiding this comment

Uh oh!

StormLiangMS left a comment

sdszhang commented Mar 10, 2026 •

edited

Loading

linux-foundation-easycla bot commented Mar 10, 2026 •

edited

Loading