901e2efb4f5c6a1179068b43e6a837dfff19d9d9 (HEAD -> 201911, origin/201911) [fpmsyncd] Skip routes to eth0 or docker0 (sonic-net#1606)
6c6f4fbbeb24b6e16a2bffdee760ba6a95e2ceb3 configure extra inc/lib directory for build (sonic-net#1247)
cccb59efa031b817c1936a74db969debbb9b2775 [201911][Cherry-pick] [acl mirror action] Mirror session ref count fix at acl rule attachment (sonic-net#1896)
62dc36d9da988807c7a397fd90ac2859a5a07699 [ci]: Support Azure pipelines on 201911 branch (sonic-net#1806)

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

…nic-vpp

Re-enable the three previously skipped tunnel-hashing tests for the
vpp asic_type now that VPP has inner-aware ECMP / LAG flow hashing
(see sonic-platform-vpp sonic-net#234 / patch 0010-sonic-inner-aware-flow-hash
and sonic-sairedis sonic-net#1896 vslib/vpp opt-in that wires the new
VPP_IP_API_FLOW_HASH_PEEK_INNER bit into the default + non-default
VRFs for both IPv4 and IPv6 hash tables).

Changes:

  * tests/common/plugins/conditional_mark/tests_mark_conditions_sonic_vpp.yaml
      Remove the unconditional skip for fib/test_fib.py::test_ipinip_hash,
      test_nvgre_hash and test_vxlan_hash.  Replace with an explanatory
      comment block that points to issue #25762 and lists the prereqs
      (VPP patch + vslib/vpp opt-in + the test_nvgre_hash hash-key
      override below).

  * tests/fib/test_fib.py
      In test_nvgre_hash, add a vpp asic_type branch that sets
      hash_keys to the inner 5-tuple
      ['src-ip', 'dst-ip', 'src-port', 'dst-port'].  VPP's hash-eth-l34
      bond LB peeks into the inner IP/L4 of NVGRE encap but does not
      mix in the inner Ethernet src/dst MAC, identical to the
      marvell-teralynx and mellanox behavioural carve-outs already in
      this test.  Without this override, NvgreHashTest treats inner
      MAC variations as additional hash keys and incorrectly flags the
      run as deviating > 5 %.

Run on vms-kvm-vpp-t1-lag, full tests/fib/test_fib.py is now 16/16
PASS in 2:01:36 (test_basic_fib, test_hash[ipv4/ipv6],
test_ipinip_hash[ipv4/ipv6], test_ipinip_hash_negative[ipv4/ipv6],
test_vxlan_hash x4, test_nvgre_hash x4, test_ecmp_group_member_flap).
Re-validated after the 0011 to 0010 patch squash on 2026-05-19.

Depends on:
  - sonic-net/sonic-platform-vpp sonic-net#234 (VPP patch
    0010-sonic-inner-aware-flow-hash)
  - sonic-net/sonic-sairedis sonic-net#1896 (vslib/vpp opt-in)
  - sonic-buildimage submodule bump for sonic-sairedis carrying the
    above two changes (separate routine PR once sonic-net#1896 lands).

Issue: #25762

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: Jianquan Ye <jianquanye@microsoft.com>

…nic-vpp

Re-enable the three previously skipped tunnel-hashing tests for the
vpp asic_type now that VPP has inner-aware ECMP / LAG flow hashing
(see sonic-platform-vpp sonic-net#234 / patch 0010-sonic-inner-aware-flow-hash
and sonic-sairedis sonic-net#1896 vslib/vpp opt-in that wires the new
VPP_IP_API_FLOW_HASH_PEEK_INNER bit into the default + non-default
VRFs for both IPv4 and IPv6 hash tables).

Changes:

  * tests/common/plugins/conditional_mark/tests_mark_conditions_sonic_vpp.yaml
      Remove the unconditional skip for fib/test_fib.py::test_ipinip_hash,
      test_nvgre_hash and test_vxlan_hash.  Replace with an explanatory
      comment block that points to issue #25762 and lists the prereqs
      (VPP patch + vslib/vpp opt-in + the test_nvgre_hash hash-key
      override below).

  * tests/fib/test_fib.py
      In test_nvgre_hash, add a vpp asic_type branch that sets
      hash_keys to the inner 5-tuple
      ['src-ip', 'dst-ip', 'src-port', 'dst-port'].  VPP's hash-eth-l34
      bond LB peeks into the inner IP/L4 of NVGRE encap but does not
      mix in the inner Ethernet src/dst MAC, identical to the
      marvell-teralynx and mellanox behavioural carve-outs already in
      this test.  Without this override, NvgreHashTest treats inner
      MAC variations as additional hash keys and incorrectly flags the
      run as deviating > 5 %.

Run on vms-kvm-vpp-t1-lag, full tests/fib/test_fib.py is now 16/16
PASS in 2:01:36 (test_basic_fib, test_hash[ipv4/ipv6],
test_ipinip_hash[ipv4/ipv6], test_ipinip_hash_negative[ipv4/ipv6],
test_vxlan_hash x4, test_nvgre_hash x4, test_ecmp_group_member_flap).
Re-validated after the 0011 to 0010 patch squash on 2026-05-19.

Depends on:
  - sonic-net/sonic-platform-vpp sonic-net#234 (VPP patch
    0010-sonic-inner-aware-flow-hash)
  - sonic-net/sonic-sairedis sonic-net#1896 (vslib/vpp opt-in)
  - sonic-buildimage submodule bump for sonic-sairedis carrying the
    above two changes (separate routine PR once sonic-net#1896 lands).

Issue: #25762

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: Jianquan Ye <jianquanye@microsoft.com>