From 75fd09ee8b863195e775e216fc4189051145b679 Mon Sep 17 00:00:00 2001 From: Lun Yue <17232861+lunyue-ms@users.noreply.github.com> Date: Thu, 30 Jul 2026 10:03:09 +0000 Subject: [PATCH] [sonic-vpp]: Enable sub_port_interfaces tests on t1-lag-vpp The sub-port data plane on sonic-vpp is now functional, so stop skipping these modules and start running them in the t1-lag-vpp test set. What changed ------------ 1. .azure-pipelines/pr_test_scripts.yaml The t1-lag-vpp test set had no sub_port_interfaces entry at all, so the modules were never collected by Elastictest. Add the same two scripts the t1-lag test set already runs. 2. tests_mark_conditions_sonic_vpp.yaml test_show_subinterface.py was skipped as a whole module, and test_sub_port_interfaces.py had all eight class-level cases marked "Failed/Errored: To be included", for asic_type == vpp. Every one of those cases passes now, so drop the vpp-specific skips entirely. test_sub_port_l2_forwarding.py is left untouched. It carries pytestmark = [pytest.mark.topology("t0")], so it can never run on a t1 testbed regardless of the conditional marks, and it is not added to the t1-lag-vpp test set. Verification ------------ Run on the vms-kvm-vpp-t1-lag KVM testbed: test_sub_port_interfaces.py 32 collected: 29 passed, 3 skipped, 0 failed test_show_subinterface.py 2 collected: 1 passed, 1 skipped, 0 failed The 4 remaining skips all come from the platform-agnostic tests_mark_conditions.yaml and apply to every platform, not just vpp: test_untagged_packet_not_routed[port_in_lag] "Not supported port type" test_routing_between_sub_ports_unaffected_by_sub_ports_removal[port_in_lag-same-*] same test_routing_between_sub_ports_unaffected_by_sub_ports_removal[port_in_lag-different-*] same test_show_subinterface.py::test_subinterface_status[port_in_lag] same The two SVI variants of test_routing_between_sub_ports_and_port were run three times on their own before being unskipped (313s, 401s, and 451s for both together); all runs passed. test_show_subinterface.py was likewise run twice with identical results. Depends on ---------- - sonic-net/sonic-sairedis#1907 (sub-port RIF/IP programming for LAG members) - sonic-net/sonic-platform-vpp#267 (glean redirect node for sub-port ARP) Without both of those in the image under test, several of the newly enabled cases will fail. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 6c4e1533-56e4-4d1d-8c98-9b000f07a580 Signed-off-by: Lun Yue <17232861+lunyue-ms@users.noreply.github.com> --- .azure-pipelines/pr_test_scripts.yaml | 2 + .../tests_mark_conditions_sonic_vpp.yaml | 80 ------------------- 2 files changed, 2 insertions(+), 80 deletions(-) diff --git a/.azure-pipelines/pr_test_scripts.yaml b/.azure-pipelines/pr_test_scripts.yaml index 527190a2124..aeb7ab96e09 100644 --- a/.azure-pipelines/pr_test_scripts.yaml +++ b/.azure-pipelines/pr_test_scripts.yaml @@ -718,6 +718,8 @@ t1-lag-vpp: - ssh/test_ssh_stress.py - srv6/test_srv6_dataplane.py - srv6/test_srv6_static_config.py + - sub_port_interfaces/test_show_subinterface.py + - sub_port_interfaces/test_sub_port_interfaces.py - vxlan/test_vxlan_ecmp.py - vxlan/test_vxlan_decap.py - vxlan/test_vnet_decap.py diff --git a/tests/common/plugins/conditional_mark/tests_mark_conditions_sonic_vpp.yaml b/tests/common/plugins/conditional_mark/tests_mark_conditions_sonic_vpp.yaml index 6751c280243..4a177e08f80 100644 --- a/tests/common/plugins/conditional_mark/tests_mark_conditions_sonic_vpp.yaml +++ b/tests/common/plugins/conditional_mark/tests_mark_conditions_sonic_vpp.yaml @@ -556,86 +556,6 @@ stress/test_stress_routes.py::test_announce_withdraw_route: ####################################### ##### Subport Interfaces ##### ####################################### -sub_port_interfaces/test_show_subinterface.py: - skip: - reason: > - Failed/Errored: To be included - conditions_logical_operator: or - conditions: - - "asic_type in ['vpp']" - -sub_port_interfaces/test_sub_port_interfaces.py::TestSubPortStress::test_max_numbers_of_sub_ports: - skip: - reason: > - Failed/Errored: To be included - conditions_logical_operator: or - conditions: - - "asic_type in ['vpp']" - -sub_port_interfaces/test_sub_port_interfaces.py::TestSubPorts::test_admin_status_down_disables_forwarding: - skip: - reason: > - Failed/Errored: To be included - conditions_logical_operator: or - conditions: - - "asic_type in ['vpp']" - -sub_port_interfaces/test_sub_port_interfaces.py::TestSubPorts::test_balancing_sub_ports: - skip: - reason: > - Failed/Errored: To be included - conditions_logical_operator: or - conditions: - - "asic_type in ['vpp']" - -sub_port_interfaces/test_sub_port_interfaces.py::TestSubPorts::test_packet_routed_with_valid_vlan: - skip: - reason: > - Failed/Errored: To be included - conditions_logical_operator: or - conditions: - - "asic_type in ['vpp']" - -sub_port_interfaces/test_sub_port_interfaces.py::TestSubPorts::test_routing_between_sub_ports: - skip: - reason: > - Failed/Errored: To be included - conditions_logical_operator: or - conditions: - - "asic_type in ['vpp']" - -sub_port_interfaces/test_sub_port_interfaces.py::TestSubPorts::test_routing_between_sub_ports_and_port: - skip: - reason: > - Failed/Errored: To be included - conditions_logical_operator: or - conditions: - - "asic_type in ['vpp']" - -sub_port_interfaces/test_sub_port_interfaces.py::TestSubPorts::test_routing_between_sub_ports_unaffected_by_sub_ports_removal: - skip: - reason: > - Failed/Errored: To be included - conditions_logical_operator: or - conditions: - - "asic_type in ['vpp']" - -sub_port_interfaces/test_sub_port_interfaces.py::TestSubPorts::test_tunneling_between_sub_ports: - skip: - reason: > - Failed/Errored: To be included - conditions_logical_operator: or - conditions: - - "asic_type in ['vpp']" - -sub_port_interfaces/test_sub_port_interfaces.py::TestSubPorts::test_vlan_config_impact: - skip: - reason: > - Failed/Errored: To be included - conditions_logical_operator: or - conditions: - - "asic_type in ['vpp']" - sub_port_interfaces/test_sub_port_l2_forwarding.py: skip: reason: >