[itskittycisco]

Pre-submission checklist

• I've ran the linters locally and fixed lint errors related to the files I modified in this PR. You can install the linters by running pip install -r requirements-dev.txt && pre-commit install
• pre-commit run
  clang-format.............................................................Passed
  shellcheck...........................................(no files to check)Skipped
  shfmt................................................(no files to check)Skipped
  trim trailing whitespace.................................................Passed
  fix end of files.........................................................Passed
  check yaml...............................................................Passed
  check json...........................................(no files to check)Skipped
  check for merge conflicts................................................Passed
  ruff check...........................................(no files to check)Skipped
  ruff format..........................................(no files to check)Skipped
  Check copyright headers in new FBOSS C/C++ files.........................Passed
  Prevent sai_impl in fboss manifest.......................................Passed

Summary

AGGREGATE_PORT_ROUTER_INTERFACE is enabled to resolve the SAI error: create LAG_MEMBER on the member port returned OBJECT IN USE because that port still had a PORT RIF. This flag makes unlinkPortsForLagIfNeeded() run, which removes those member PORT RIFs in a separate config apply before the LAG members are created.

HASH_FIELDS_CUSTOMIZATION
G200 did program was one hash object with source IP, destination IP, and L4 ports, attached to SAI_SWITCH_ATTR_ECMP_HASH_IPV4 and ECMP_HASH_IPV6. Enabling the same for P200 as well.

Test Plan

Manually verified these tests:
AgentTrunkLoadBalancerTest.ECMPFullTrunkHalf4X2WideTrunksFrontPanelTraffic
AgentTrunkLoadBalancerTest.ECMPFullTrunkHalf4X3WideTrunksFrontPanelTraffic
AgentTrunkLoadBalancerTest.ECMPFullTrunkHalfHash4X2WideTrunksCpuTraffic
AgentTrunkLoadBalancerTest.ECMPFullTrunkHalfHash4X3WideTrunksCpuTraffic
AgentTrunkLoadBalancerTest.ECMPHalfTrunkFull4X2WideTrunksFrontPanelTraffic
AgentTrunkLoadBalancerTest.ECMPHalfTrunkFull4X3WideTrunksFrontPanelTraffic
AgentTrunkLoadBalancerTest.ECMPHalfTrunkFullHash4X2WideTrunksCpuTraffic
AgentTrunkLoadBalancerTest.ECMPHalfTrunkFullHash4X3WideTrunksCpuTraffic
AgentV6FlowLabelEcmpLoadBalancerTest.EcmpFlowLabelHashEnabledViaConfigChange
AgentV6FlowLabelTrunkLoadBalancerTest.V6FlowLabelEcmpTrunk4X3WideTrunksCpuTraffic
AgentV6FlowLabelTrunkLoadBalancerTest.V6FlowLabelEcmpTrunk4X3WideTrunksFrontPanelTraffic

[facebook-github-tools]

@itskittycisco has updated the pull request. You must reimport the pull request before landing.

[meta-codesync]

@Tianyu-Meta has imported this pull request. If you are a Meta employee, you can view this in D131447346.