Skip to content

Commit ff6beed

Browse files
hillol-nexthophillol-nexthop
authored
Merge branch 'main' into bgpglobal-global
2 parents 6ce6c05 + 4f7a52a commit ff6beed

193 files changed

Lines changed: 91027 additions & 15452 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/platform-mapping-verification.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ on:
44
pull_request:
55
paths:
66
- fboss/lib/platform_mapping_v2/**
7+
# Allow manually triggering the workflow
8+
workflow_dispatch:
79
jobs:
810
Platform-Mapping-Generation-Build:
911
runs-on: 32-core-ubuntu

‎CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ option(SAI_BRCM_PAI_IMPL "Build SAI api with BRCOM_PAI-SAI extensions" OFF)
8585
if ($ENV{SAI_BRCM_PAI_IMPL})
8686
message(STATUS "ENV SAI_BRCM_PAI_IMPL is set")
8787
set(SAI_BRCM_PAI_IMPL ON)
88+
add_definitions(-DSAI_BRCM_PAI_IMPL)
8889
# NOTE: Unlike agent that we use sai_impl, we directly use pre-built SDK from
8990
# local directory
9091
# Header files for libpai.a, the whole inc directory from SDK

‎buck2‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,86 +4,86 @@
44
"name": "buck2",
55
"platforms": {
66
"macos-aarch64": {
7-
"size": 33728207,
7+
"size": 33767304,
88
"hash": "blake3",
9-
"digest": "3bbd7cfe1b51d17124f5634812ae904254e01da429a61f62fe9c3d7c45e12dd9",
9+
"digest": "273310835d3d76bb89c2a1a2caf3197ec61f409ee87f85929387672a94e0db64",
1010
"format": "zst",
1111
"path": "buck2-aarch64-apple-darwin",
1212
"providers": [
1313
{
14-
"url": "https://github.com/facebook/buck2/releases/download/2026-07-01/buck2-aarch64-apple-darwin.zst"
14+
"url": "https://github.com/facebook/buck2/releases/download/2026-07-15/buck2-aarch64-apple-darwin.zst"
1515
}
1616
]
1717
},
1818
"windows-aarch64": {
19-
"size": 29333382,
19+
"size": 29431570,
2020
"hash": "blake3",
21-
"digest": "34417c30bd88b2110e00044f619aae791ec4e2d7f982aeb0fa43f01c0c2b06ac",
21+
"digest": "3ab7ee99dfc16c2b47722ea9b31dde8d385bdbe140b8c48acecc760a5e58c5f3",
2222
"format": "zst",
2323
"path": "buck2-aarch64-pc-windows-msvc.exe",
2424
"providers": [
2525
{
26-
"url": "https://github.com/facebook/buck2/releases/download/2026-07-01/buck2-aarch64-pc-windows-msvc.exe.zst"
26+
"url": "https://github.com/facebook/buck2/releases/download/2026-07-15/buck2-aarch64-pc-windows-msvc.exe.zst"
2727
}
2828
]
2929
},
3030
"linux-aarch64": {
31-
"size": 36896909,
31+
"size": 36976879,
3232
"hash": "blake3",
33-
"digest": "889091fae4410776de12ddc1ec676f019a0b9bd9bacf69298e5d0b16482f9ae6",
33+
"digest": "5b160a0c1ecad8489201a370bbf9fab684720d8d73110e75e06e72ed339dff73",
3434
"format": "zst",
3535
"path": "buck2-aarch64-unknown-linux-musl",
3636
"providers": [
3737
{
38-
"url": "https://github.com/facebook/buck2/releases/download/2026-07-01/buck2-aarch64-unknown-linux-musl.zst"
38+
"url": "https://github.com/facebook/buck2/releases/download/2026-07-15/buck2-aarch64-unknown-linux-musl.zst"
3939
}
4040
]
4141
},
4242
"linux-riscv64": {
43-
"size": 39062685,
43+
"size": 39118879,
4444
"hash": "blake3",
45-
"digest": "4c6275d204a22fe5920bbf6fadf41a04580ec79b713c2447fcc264534f78e221",
45+
"digest": "b2728337070e6da11d7bf1af29bccb51fc885d05bc2b1bb1d883a4bcf1980ea1",
4646
"format": "zst",
4747
"path": "buck2-riscv64gc-unknown-linux-gnu",
4848
"providers": [
4949
{
50-
"url": "https://github.com/facebook/buck2/releases/download/2026-07-01/buck2-riscv64gc-unknown-linux-gnu.zst"
50+
"url": "https://github.com/facebook/buck2/releases/download/2026-07-15/buck2-riscv64gc-unknown-linux-gnu.zst"
5151
}
5252
]
5353
},
5454
"macos-x86_64": {
55-
"size": 35999107,
55+
"size": 36044403,
5656
"hash": "blake3",
57-
"digest": "688c7d5da371fcb0dc8d337c37a55963e3001688e0942473c0f9897cb11170d9",
57+
"digest": "0b8eb714f509a2886ce407477b2744f3e5cff0b448487959fe71a722af56faeb",
5858
"format": "zst",
5959
"path": "buck2-x86_64-apple-darwin",
6060
"providers": [
6161
{
62-
"url": "https://github.com/facebook/buck2/releases/download/2026-07-01/buck2-x86_64-apple-darwin.zst"
62+
"url": "https://github.com/facebook/buck2/releases/download/2026-07-15/buck2-x86_64-apple-darwin.zst"
6363
}
6464
]
6565
},
6666
"windows-x86_64": {
67-
"size": 31097651,
67+
"size": 31139540,
6868
"hash": "blake3",
69-
"digest": "fae94eafc83a7e780c66775760e3ca2e92f499047299968ae7847ee3300f2970",
69+
"digest": "4943266f41e3de7848801befbd89c1ddbae61252a3042fc646e072cbe6abcea6",
7070
"format": "zst",
7171
"path": "buck2-x86_64-pc-windows-msvc.exe",
7272
"providers": [
7373
{
74-
"url": "https://github.com/facebook/buck2/releases/download/2026-07-01/buck2-x86_64-pc-windows-msvc.exe.zst"
74+
"url": "https://github.com/facebook/buck2/releases/download/2026-07-15/buck2-x86_64-pc-windows-msvc.exe.zst"
7575
}
7676
]
7777
},
7878
"linux-x86_64": {
79-
"size": 38600655,
79+
"size": 38640905,
8080
"hash": "blake3",
81-
"digest": "807fe2ba2c7aaf3a3a312de4220cee2abba9f37940c45b5a5f42ff1fd33dc089",
81+
"digest": "0f55638c3245d041cfced0e0eda5396f057007521e58cf7ab6ec3efdd0df6f49",
8282
"format": "zst",
8383
"path": "buck2-x86_64-unknown-linux-musl",
8484
"providers": [
8585
{
86-
"url": "https://github.com/facebook/buck2/releases/download/2026-07-01/buck2-x86_64-unknown-linux-musl.zst"
86+
"url": "https://github.com/facebook/buck2/releases/download/2026-07-15/buck2-x86_64-unknown-linux-musl.zst"
8787
}
8888
]
8989
}

‎build/deps/github_hashes/facebook/fb303-rev.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit 0ea4ccb73b6bd6f2b790bd06dfd63260a9d76477
1+
Subproject commit 34a52339081dc500a82a5876c424ec3ba2eae35e

‎build/deps/github_hashes/facebook/fbthrift-rev.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit fe08f6c48479e1f851390b0c88e6c5644a4e9ff6
1+
Subproject commit 70ce1ab6f58466c1fa1593e2dfac2b795a5c475a

‎build/deps/github_hashes/facebook/folly-rev.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit 83f525dc2b583925b857ac153e3befd51eb4879e
1+
Subproject commit 991360b87a55445e92524863953e905fe7a61c59

‎build/deps/github_hashes/facebook/mvfst-rev.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit 9be48c8eae089a4c542c1589882d84576499f6bb
1+
Subproject commit ec39a432fb2b0ee82c673624b1c57dea8f863d04

‎build/deps/github_hashes/facebook/wangle-rev.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit a363e47c1921f4e001de9121205f454015b256b1
1+
Subproject commit 9f8cd3d53f65b16bc15296b50614d8184c2ad3be

‎build/deps/github_hashes/facebookincubator/fizz-rev.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit 000f248ecc2fa822a720b181b03e1f3c76fd4607
1+
Subproject commit 1eea7a32e42261a5980462c0af274f1226fe0da1

‎cmake/AgentPacket.cmake‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,14 @@ target_link_libraries(xgs_psamp_mod
5757
Folly::folly
5858
)
5959

60+
add_library(tajo_punt_header
61+
fboss/agent/packet/tajo/TajoPuntHeader.cpp
62+
)
63+
64+
target_link_libraries(tajo_punt_header
65+
Folly::folly
66+
)
67+
6068
add_library(pktutil
6169
fboss/agent/packet/PktUtil.cpp
6270
)
@@ -98,3 +106,16 @@ target_link_libraries(xgs_psamp_mod_test
98106
)
99107

100108
gtest_discover_tests(xgs_psamp_mod_test)
109+
110+
add_executable(tajo_punt_header_test
111+
fboss/util/oss/TestMain.cpp
112+
fboss/agent/packet/tajo/test/TajoPuntHeaderTest.cpp
113+
)
114+
115+
target_link_libraries(tajo_punt_header_test
116+
tajo_punt_header
117+
${GTEST}
118+
${LIBGMOCK_LIBRARIES}
119+
)
120+
121+
gtest_discover_tests(tajo_punt_header_test)

0 commit comments

Comments
 (0)