Support IPv6 in TNP and edge node resources #1498
Merged
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
ksamoray
reviewed
Jan 9, 2025
| } | ||
| if sw.Ipv6AssignmentSpec != nil { | ||
| elem["ipv6_assignment"], err = setIPv6AssignmentInSchema(sw.Ipv6AssignmentSpec) | ||
| } | ||
| if err != nil { |
There was a problem hiding this comment.
I'd rather check err after 1073, 1076 lines - as err from setIPAssignmentInSchema could be overwritten by setIPv6AssignmentInSchema
| @@ -1140,6 +1368,7 @@ func getHostSwitchSpecFromSchema(d *schema.ResourceData, m interface{}, nodeType | |||
| return nil, err | |||
| } | |||
| iPAssignmentSpec, err := getIPAssignmentFromSchema(swData["ip_assignment"]) | |||
There was a problem hiding this comment.
Check err after getIPAssignmentFromSchema call
| @@ -1016,7 +1136,7 @@ func getIPAssignmentFromSchema(ipAssignmentList interface{}) (*data.StructValue, | |||
| converter := bindings.NewTypeConverter() | |||
|
|
|||
| for _, ia := range ipAssignmentList.([]interface{}) { | |||
| iaType, iaData, err := getIPAssignmentData(ia.(map[string]interface{})) | |||
| iaType, iaData, err := getIPAssignmentData(ia.(map[string]interface{}), ipAssignmentTypes) | |||
There was a problem hiding this comment.
I realized that IPAssignmentSpec also supports StaticIpMacListSpec, now we're adding it to the v6 assignementSpec, but the v4 one does not have it. Probably we should add it.
There was a problem hiding this comment.
Good point, added static_ip_mac option to ipv4, and also the missing no_ipv4 option
Signed-off-by: Anna Khmelnitsky <[email protected]>
ksamoray
approved these changes
Jan 16, 2025
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.
No description provided.