From f98b8f8eeb140447410c669901760c2a189eff26 Mon Sep 17 00:00:00 2001
From: Sonic Build Admin <sonicbld@microsoft.com>
Date: Thu, 26 Mar 2026 05:59:51 +0000
Subject: [PATCH] vpp: Enable test_nhop_group.py

<!--
Please make sure you've read and understood our contributing guidelines;
https://github.com/sonic-net/SONiC/blob/gh-pages/CONTRIBUTING.md

Please provide following information to help code review process a bit easier:
-->
### Description of PR
<!--
- Please include a summary of the change and which issue is fixed.
- Please also include relevant motivation and context. Where should reviewer start? background context?
- List any dependencies that are required for this change.
-->

Summary:
Fixes # (issue)

### Type of change

<!--
- Fill x for your type of change.
- e.g.
- [x] Bug fix
-->

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

### Back port request
- [ ] 202205
- [ ] 202305
- [ ] 202311
- [ ] 202405
- [ ] 202411
- [ ] 202505
- [ ] 202511

### Approach
#### What is the motivation for this PR?
Properly categorize test cases in ipfwd/test_nhop_group.py.
#### How did you do it?
1. Previously some test cases are marked "to be included". This PR properly skip the ones that are not supported and give proper reason. PR https://github.com/sonic-net/sonic-sairedis/pull/1802 is submitted to report supported ecmp type in capability advertisement.
2. Enable test_nhop_group_member_count test case. This depends on PR https://github.com/sonic-net/sonic-sairedis/pull/1814 to provide CRM support in sonic-vpp.
#### How did you verify/test it?
Run sonic-mgmt test
#### Any platform specific information?
vpp
#### Supported testbed topology if it's a new test case?

### Documentation
<!--
(If it's a new feature, new test case)
Did you update documentation/Wiki relevant to your implementation?
Link to the wiki page?
-->

Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com>
---
 .../tests_mark_conditions.yaml                |  8 ++++++
 .../tests_mark_conditions_sonic_vpp.yaml      | 27 -------------------
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml
index e1efdf3e65..2abb6c6436 100644
--- a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml
+++ b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml
@@ -3101,6 +3101,10 @@ ipfwd/test_mtu.py:
       - "topo_type not in ['t1', 't2']"
 
 ipfwd/test_nhop_group.py::test_nhop_group_interface_flap:
+  skip:
+    reason: "VPP virtual platform has no fanout switch to flap interfaces"
+    conditions:
+      - "asic_type in ['vpp'] and platform in ['x86_64-kvm_x86_64-r0']"
   xfail:
     reason: "Testcase ignored due to GitHub issue https://github.com/sonic-net/sonic-mgmt/issues/16218 on mellanox platform"
     conditions:
@@ -3113,6 +3117,10 @@ ipfwd/test_nhop_group.py::test_nhop_group_member_count:
       - "https://github.com/sonic-net/sonic-mgmt/issues/20731 and '-v6-' in topo_name"
 
 ipfwd/test_nhop_group.py::test_nhop_group_member_order_capability:
+  skip:
+    reason: "VPP does not support ordered ECMP feature"
+    conditions:
+      - "asic_type in ['vpp']"
   xfail:
     reason: "xfail for IPv6-only topologies, need to add support for IPv6-only - https://github.com/sonic-net/sonic-mgmt/issues/20731"
     conditions:
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 b7ab22ba76..fa1a2c3fa5 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
@@ -707,33 +707,6 @@ ip/test_mgmt_ipv6_only.py::test_ntp_ipv6_only:
     conditions:
       - "asic_type in ['vpp']"
 
-#######################################
-#####           IPFWD             #####
-#######################################
-ipfwd/test_nhop_group.py::test_nhop_group_interface_flap:
-  skip:
-    reason: >
-            Failed/Errored: To be included
-    conditions_logical_operator: or
-    conditions:
-      - "asic_type in ['vpp']"
-
-ipfwd/test_nhop_group.py::test_nhop_group_member_count:
-  skip:
-    reason: >
-            Failed/Errored: To be included
-    conditions_logical_operator: or
-    conditions:
-      - "asic_type in ['vpp']"
-
-ipfwd/test_nhop_group.py::test_nhop_group_member_order_capability:
-  skip:
-    reason: >
-            Failed/Errored: To be included
-    conditions_logical_operator: or
-    conditions:
-      - "asic_type in ['vpp']"
-
 #######################################
 #####         LLDP                #####
 #######################################