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.

Sign up for GitHub

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

Stepwise refactoring of LNW definitions #134

Closed
wants to merge 5 commits into from
Closed

Stepwise refactoring of LNW definitions #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
934571e
Extract ES2K NEXTHOP_TABLE definitions
ffoulkes May 24, 2024
bd4d06a
Extract ES2K NEIGHBOR_MOD_TABLE definitions
ffoulkes May 24, 2024
05d1cff
Combine versions of switch_pd_p4_name_routing.h
ffoulkes May 24, 2024
2962676
Remove redundant definitions from header file
ffoulkes May 24, 2024
4e802cd
Minor cleanup
ffoulkes May 27, 2024
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
2 changes: 2 additions & 0 deletions switchapi/es2k/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ target_sources(switchapi_o PRIVATE
switch_pd_fdb.c
switch_pd_lag.h
switch_pd_p4_name_mapping.h
switch_pd_p4_name_routing.h
switch_pd_routing.h
switch_pd_tunnel.c
switch_pd_utils.c
switch_pd_utils.h
Expand Down
5 changes: 3 additions & 2 deletions switchapi/es2k/lnw_v2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@

target_sources(switchapi_o PRIVATE
lnw_ecmp_hash_table.h
switch_pd_p4_name_routing.h
switch_pd_routing.c
lnw_neighbor_mod_table.h
lnw_nexthop_table.h
switch_pd_lag.c
switch_pd_lag.h
switch_pd_routing.c
)
20 changes: 20 additions & 0 deletions switchapi/es2k/lnw_v2/lnw_neighbor_mod_table.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
* Copyright 2022-2024 Intel Corporation.
* SPDX-License-Identifier: Apache-2.0
*
* NEIGHBOR_MOD_TABLE for Linux Networking v2.
*/

#ifndef __LNW_NEIGHBOR_MOD_TABLE_H__
#define __LNW_NEIGHBOR_MOD_TABLE_H__

#define LNW_NEIGHBOR_MOD_TABLE "linux_networking_control.neighbor_mod_table"

#define LNW_NEIGHBOR_MOD_TABLE_KEY_VENDORMETA_MOD_DATA_PTR \
"vmeta.common.mod_blob_ptr"

#define LNW_NEIGHBOR_MOD_TABLE_ACTION_SET_OUTER_MAC \
"linux_networking_control.set_outer_mac"
#define LNW_ACTION_SET_OUTER_MAC_PARAM_DST_MAC_ADDR "dst_mac_addr"

#endif /* __LNW_NEIGHBOR_MOD_TABLE_H__ */
27 changes: 27 additions & 0 deletions switchapi/es2k/lnw_v2/lnw_nexthop_table.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
* Copyright 2022-2024 Intel Corporation.
* SPDX-License-Identifier: Apache-2.0
*
* NEXT_HOP_TABLE for Linux Networking v2.
*/

#ifndef __LNW_NEXTHOP_TABLE_H__
#define __LNW_NEXTHOP_TABLE_H__

#define LNW_NEXTHOP_TABLE "linux_networking_control.nexthop_table"

#define LNW_NEXTHOP_TABLE_KEY_NEXTHOP_ID "user_meta.cmeta.nexthop_id"

#define LNW_NEXTHOP_TABLE_ACTION_SET_NEXTHOP \
"linux_networking_control.set_nexthop"
#define LNW_ACTION_SET_NEXTHOP_PARAM_RIF "router_interface_id"
#define LNW_ACTION_SET_NEXTHOP_PARAM_NEIGHBOR_ID "neighbor_id"
#define LNW_ACTION_SET_NEXTHOP_PARAM_EGRESS_PORT "egress_port"

#define LNW_NEXTHOP_TABLE_ACTION_SET_NEXTHOP_LAG \
"linux_networking_control.set_nexthop_lag"
#define LNW_ACTION_SET_NEXTHOP_LAG_PARAM_RIF "router_interface_id"
#define LNW_ACTION_SET_NEXTHOP_LAG_PARAM_NEIGHBOR_ID "neighbor_id"
#define LNW_ACTION_SET_NEXTHOP_LAG_PARAM_LAG_ID "lag_group_id"

#endif /* __LNW_NEXTHOP_TABLE_H__ */
1 change: 1 addition & 0 deletions switchapi/es2k/lnw_v2/switch_pd_lag.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "switch_pd_lag.h"

#include "switchapi/es2k/switch_pd_p4_name_mapping.h"
#include "switchapi/es2k/switch_pd_p4_name_routing.h"
#include "switchapi/es2k/switch_pd_utils.h"
#include "switchapi/switch_internal.h"
#include "switchapi/switch_lag.h"
Expand Down
3 changes: 3 additions & 0 deletions switchapi/es2k/lnw_v2/switch_pd_routing.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@
#include "switchapi/es2k/switch_pd_routing.h"

#include "switchapi/es2k/lnw_v2/lnw_ecmp_hash_table.h"
#include "switchapi/es2k/lnw_v2/lnw_neighbor_mod_table.h"
#include "switchapi/es2k/lnw_v2/lnw_nexthop_table.h"
#include "switchapi/es2k/switch_pd_p4_name_mapping.h"
#include "switchapi/es2k/switch_pd_p4_name_routing.h"
#include "switchapi/es2k/switch_pd_utils.h"
#include "switchapi/switch_base_types.h"
#include "switchapi/switch_internal.h"
Expand Down
5 changes: 3 additions & 2 deletions switchapi/es2k/lnw_v3/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@

target_sources(switchapi_o PRIVATE
lnw_ecmp_hash_table.h
switch_pd_p4_name_routing.h
switch_pd_routing.c
lnw_ecmp_nexthop_table.h
lnw_nexthop_table.h
switch_pd_lag.c
switch_pd_lag.h
switch_pd_routing.c
)
23 changes: 23 additions & 0 deletions switchapi/es2k/lnw_v3/lnw_ecmp_nexthop_table.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*
* Copyright 2022-2024 Intel Corporation.
* SPDX-License-Identifier: Apache-2.0
*
* ECMP_NEXTHOP_TABLE for Linux Networking v3.
*/

#ifndef __LNW_ECMP_NEXTHOP_TABLE_H__
#define __LNW_ECMP_NEXTHOP_TABLE_H__

// Verified for ES2K
#define LNW_ECMP_NEXTHOP_TABLE "linux_networking_control.ecmp_nexthop_table"

#define LNW_ECMP_NEXTHOP_TABLE_KEY_ECMP_NEXTHOP_ID "user_meta.cmeta.nexthop_id"

#define LNW_ECMP_NEXTHOP_TABLE_ACTION_SET_ECMP_NEXTHOP_INFO_DMAC \
"linux_networking_control.ecmp_set_nexthop_info_dmac"
#define LNW_ACTION_SET_ECMP_NEXTHOP_PARAM_RIF "router_interface_id"
#define LNW_ACTION_SET_ECMP_NEXTHOP_PARAM_DMAC_HIGH "dmac_high"
#define LNW_ACTION_SET_ECMP_NEXTHOP_PARAM_DMAC_LOW "dmac_low"
#define LNW_ACTION_SET_ECMP_NEXTHOP_PARAM_EGRESS_PORT "egress_port"

#endif /* __LNW_ECMP_NEXTHOP_TABLE_H__ */
30 changes: 30 additions & 0 deletions switchapi/es2k/lnw_v3/lnw_nexthop_table.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/*
* Copyright 2022-2024 Intel Corporation.
* SPDX-License-Identifier: Apache-2.0
*
* NEXT_HOP_TABLE for Linux Networking v3.
*/

#ifndef __LNW_NEXTHOP_TABLE_H__
#define __LNW_NEXTHOP_TABLE_H__

// Verified for ES2K
#define LNW_NEXTHOP_TABLE "linux_networking_control.nexthop_table"

#define LNW_NEXTHOP_TABLE_KEY_NEXTHOP_ID "user_meta.cmeta.nexthop_id"

#define LNW_NEXTHOP_TABLE_ACTION_SET_NEXTHOP_INFO \
"linux_networking_control.set_nexthop_info_dmac"
#define LNW_ACTION_SET_NEXTHOP_PARAM_RIF "router_interface_id"
#define LNW_ACTION_SET_NEXTHOP_PARAM_EGRESS_PORT "egress_port"
#define LNW_ACTION_SET_NEXTHOP_PARAM_DMAC_HIGH "dmac_high"
#define LNW_ACTION_SET_NEXTHOP_PARAM_DMAC_LOW "dmac_low"

#define LNW_NEXTHOP_TABLE_ACTION_SET_NEXTHOP_LAG \
"linux_networking_control.set_nexthop_lag"
#define LNW_ACTION_SET_NEXTHOP_LAG_PARAM_RIF "router_interface_id"
#define LNW_ACTION_SET_NEXTHOP_LAG_PARAM_DMAC_HIGH "dmac_high"
#define LNW_ACTION_SET_NEXTHOP_LAG_PARAM_DMAC_LOW "dmac_low"
#define LNW_ACTION_SET_NEXTHOP_LAG_PARAM_LAG_ID "lag_group_id"

#endif /* __LNW_NEXTHOP_TABLE_H__ */
1 change: 1 addition & 0 deletions switchapi/es2k/lnw_v3/switch_pd_lag.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "switch_pd_lag.h"

#include "switchapi/es2k/switch_pd_p4_name_mapping.h"
#include "switchapi/es2k/switch_pd_p4_name_routing.h"
#include "switchapi/es2k/switch_pd_utils.h"
#include "switchapi/switch_internal.h"
#include "switchapi/switch_lag.h"
Expand Down
145 changes: 0 additions & 145 deletions switchapi/es2k/lnw_v3/switch_pd_p4_name_routing.h
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions switchapi/es2k/lnw_v3/switch_pd_routing.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@
#include "switchapi/es2k/switch_pd_routing.h"

#include "switchapi/es2k/lnw_v3/lnw_ecmp_hash_table.h"
#include "switchapi/es2k/lnw_v3/lnw_ecmp_nexthop_table.h"
#include "switchapi/es2k/lnw_v3/lnw_nexthop_table.h"
#include "switchapi/es2k/switch_pd_p4_name_mapping.h"
#include "switchapi/es2k/switch_pd_p4_name_routing.h"
#include "switchapi/es2k/switch_pd_utils.h"
#include "switchapi/switch_base_types.h"
#include "switchapi/switch_internal.h"
Expand Down
Loading