vpp: pass hashconfig to vpp for service annotations #635
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hedibouattour
force-pushed
the
pass-ECMP-hashConfig-to-VPP-from-annotations
branch
3 times, most recently
from
5c38b8d to
7dae114
Compare
sknat
reviewed
Sep 19, 2023
calico-vpp-agent/services/service.go
Outdated
Comment on lines
36
to
45
| var hashConfigMap = map[hashConfig]types.IPFlowHash{ | ||
| hashConfigDstaddr: types.FlowHashDstIP, | ||
| hashConfigDstport: types.FlowHashDstPort, | ||
| hashConfigIproto: types.FlowHashProto, | ||
| hashConfigReverse: types.FlowHashReverse, | ||
| hashConfigSrcaddr: types.FlowHashSrcIP, | ||
| hashConfigSrcport: types.FlowHashSrcPort, | ||
| hashConfigSymmetric: types.FlowHashSymetric, | ||
| } | ||
|
|
There was a problem hiding this comment.
Instead of doing an extra layer of mangling here, we could directly build the bitmap in ParseServiceAnnotations() as we already are doing a switch statement there
vpplink/types/cnat.go
Outdated
| @@ -34,6 +35,18 @@ const ( | |||
| MaglevLB = CnatLbType(cnat.CNAT_LB_TYPE_MAGLEV) | |||
| ) | |||
|
|
|||
| type CnatHashConfig uint8 | |||
There was a problem hiding this comment.
Maybe worth adding a String() function on the CnatHashConfig type
There was a problem hiding this comment.
I think no need for that as we already have [0] and we can cast to it when logging.
There was a problem hiding this comment.
Right, there is this, but the output will probably be really ugly...
e.g. usually "IP_API_FLOW_HASH_SRC_IP|IP_API_FLOW_HASH_DST_IP|IP_API_FLOW_HASH_SRC_PORT|IP_API_FLOW_HASH_DST_PORT|IP_API_FLOW_HASH_PROTO" ...
hedibouattour
force-pushed
the
pass-ECMP-hashConfig-to-VPP-from-annotations
branch
2 times, most recently
from
276bcd0 to
e3aee78
Compare
hedibouattour
force-pushed
the
pass-ECMP-hashConfig-to-VPP-from-annotations
branch
from
e3aee78 to
b5d0f00
Compare
sknat
approved these changes
Oct 9, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patch uses the newly introduced field in cnat translation vpp api to pass ecmp hashconfig defined by annotations in services.