Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[orchagent] Add separate next hop table and orch #1702

Merged
merged 51 commits into from
Oct 15, 2021
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
a90c122
[orchagent] Add separate next hop table and orch
TACappleman Aug 6, 2021
0b3e040
Fix up following review
TACappleman Sep 10, 2021
c631af9
More fixes
TACappleman Sep 10, 2021
dfb10fc
Remove ipKey method
TACappleman Sep 10, 2021
c9320bf
Remove ipKey method
TACappleman Sep 10, 2021
06b496f
Add neighbor resolution to nhgorch
TACappleman Sep 14, 2021
4031ad7
Fix LGTM alerts
TACappleman Sep 16, 2021
5a17257
Remove unnecessary log and add clarifying comment
abanu-ms Sep 21, 2021
a05c58a
Update code after review
abanu-ms Sep 24, 2021
ccb7c6c
Minor UT updates
abanu-ms Sep 30, 2021
af2ec27
Move NHG count back to routeorch
TACappleman Sep 30, 2021
0d9ea95
Use NHG for all sizes of group
TACappleman Sep 30, 2021
00fce94
Fix temp NH handling
TACappleman Oct 1, 2021
747fa54
Refactor UT structure
abanu-ms Oct 1, 2021
e25e6a4
Split test cases and remove redundant checks
abanu-ms Oct 2, 2021
56878db
Rename sub-test cases for easier filtering
abanu-ms Oct 2, 2021
77da6fa
Minor fixes
TACappleman Oct 4, 2021
0aac13f
Pipeline fix
TACappleman Oct 5, 2021
0b46048
Pipeline fix
TACappleman Oct 5, 2021
60b4793
Revert "Pipeline fix"
TACappleman Oct 5, 2021
fbae029
Revert "Pipeline fix"
TACappleman Oct 5, 2021
0f7a3f8
Pipeline fix
TACappleman Oct 5, 2021
7d4cfa8
Revert "Pipeline fix"
TACappleman Oct 5, 2021
8caed56
Pipeline fix
TACappleman Oct 5, 2021
5f8d52e
Revert "Pipeline fix"
TACappleman Oct 5, 2021
240bc43
Pipeline fix
TACappleman Oct 5, 2021
cc7fd15
Revert "Pipeline fix"
TACappleman Oct 5, 2021
cbc36ff
Pipeline fix
TACappleman Oct 5, 2021
e5331e5
Revert "Pipeline fix"
TACappleman Oct 5, 2021
cb5d3ad
Pipeline fix
TACappleman Oct 5, 2021
77818c8
Revert "Pipeline fix"
TACappleman Oct 5, 2021
1b69823
Pipeline fix
TACappleman Oct 5, 2021
4315d7c
Revert "Pipeline fix"
TACappleman Oct 5, 2021
b8b19e8
Pipeline fix
TACappleman Oct 5, 2021
5d8ed46
Revert "Pipeline fix"
TACappleman Oct 5, 2021
c64b8cf
Fix removed code
TACappleman Oct 7, 2021
207e4c0
Fix removed code
TACappleman Oct 7, 2021
5f14a7c
Minor fix
TACappleman Oct 8, 2021
e670d6f
Minor fix
TACappleman Oct 8, 2021
bed44e3
Pipeline fix
TACappleman Oct 5, 2021
5961551
Revert "Pipeline fix"
TACappleman Oct 5, 2021
260abf1
Pipeline fix
TACappleman Oct 5, 2021
54234b4
Revert "Pipeline fix"
TACappleman Oct 5, 2021
2b0a533
Fixes
TACappleman Oct 12, 2021
792a4bd
Fixes
TACappleman Oct 12, 2021
660bc90
Fixes
TACappleman Oct 12, 2021
dbd96f4
Fixes
TACappleman Oct 12, 2021
979d349
Fixes
TACappleman Oct 12, 2021
13ef025
Fixes
TACappleman Oct 12, 2021
3789b5b
Fixes
TACappleman Oct 12, 2021
a0c982e
Fixes
TACappleman Oct 12, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion doc/swss-schema.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,35 @@ and reflects the LAG ports into the redis under: `LAG_TABLE:<team0>:port`
;Status: Mandatory
key = ROUTE_TABLE:prefix
nexthop = *prefix, ;IP addresses separated “,” (empty indicates no gateway)
intf = ifindex? PORT_TABLE.key ; zero or more separated by “,” (zero indicates no interface)
ifname = ifindex? PORT_TABLE.key ; zero or more separated by “,” (zero indicates no interface)
mpls_nh = STRING ; Comma-separated list of MPLS NH info.
blackhole = BIT ; Set to 1 if this route is a blackhole (or null0)
weight = weight_list ; List of weights.
nexthop_group = string ; index within the NEXTHOP_GROUP_TABLE, used instead of nexthop and intf fields

---------------------------------------------

###### LABEL_ROUTE_TABLE
; Defines schema for MPLS label route table attributes
key = LABEL_ROUTE_TABLE:mpls_label ; MPLS label
; field = value
nexthop = STRING ; Comma-separated list of nexthops.
ifname = STRING ; Comma-separated list of interfaces.
mpls_nh = STRING ; Comma-separated list of MPLS NH info.
mpls_pop = STRING ; Number of ingress MPLS labels to POP
weight = STRING ; Comma-separated list of weights.
blackhole = BIT ; Set to 1 if this route is a blackhole (or null0)
nexthop_group = string ; index within the NEXTHOP_GROUP_TABLE, used instead of nexthop and intf fields

---------------------------------------------
### NEXTHOP_GROUP_TABLE
;Stores a list of groups of one or more next hops
;Status: Mandatory
key = NEXTHOP_GROUP_TABLE:string ; arbitrary index for the next hop group
nexthop = *prefix, ;IP addresses separated “,” (empty indicates no gateway)
ifname = ifindex? PORT_TABLE.key ; zero or more separated by “,” (zero indicates no interface)
mpls_nh = STRING ; Comma-separated list of MPLS NH info.
weight = weight_list ; List of weights.

---------------------------------------------
### NEIGH_TABLE
Expand Down
1 change: 1 addition & 0 deletions orchagent/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ orchagent_SOURCES = \
orchdaemon.cpp \
orch.cpp \
notifications.cpp \
nhgorch.cpp \
routeorch.cpp \
mplsrouteorch.cpp \
neighorch.cpp \
Expand Down
Loading