pbr: fix nexthop-group json output #16949
Open
+19
−9
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
- JSON format is changed.
currently json output returns as array format,
in which we cannot add extra attributes under it.
so, we modified the JSON format into dict.
- Added nhgCount into vtysh "show pbr nexthop-groups json".
- Addressed interface-name & vrf-id issues.
currently, "vrfId" is mapped with interface name.
supported commands:
```
show pbr nexthop-groups json
show pbr nexthop-groups <nh-grp> json
```
Ticket:#3963583
Issue: 3963583
Testing:
Before fix:
leaf12# show pbr nexthop-groups json
[
{
"id":10001,
"name":"nh-grp-2",
"valid":true,
"installed":false,
"nexthops":[
{
"nexthop":"12.10.10.1",
"vrfId":"swp1", ====> wrongly mapped
"valid":true
}
]
},
{
"id":10000,
"name":"nh-grp-1",
"valid":false,
"installed":false,
"nexthops":[
{
"nexthop":"11.10.10.1",
"vrfId":"lo", ====> wrongly mapped
"valid":false
}
]
}
]
After fix:
leaf11# show pbr nexthop-groups nh-grp-1 json
{
"10000":{
"id":10000,
"name":"nh-grp-1",
"valid":false,
"installed":false,
"nexthops":[
{
"nexthop":"11.10.10.1",
"valid":false
},
{
"nexthop":"2.2.2.1",
"interfaceName":"swp1",
"vrfId":0,
"valid":false
}
]
},
"nhgCount":1
}
Signed-off-by: Sindhu Parvathi Gopinathan's <[email protected]>
chiragshah6
changed the title
mjstapp
reviewed
Sep 30, 2024
| @@ -1080,24 +1080,27 @@ void nexthop_group_json_nexthop(json_object *j, const struct nexthop *nh) | |||
|
|
|||
| switch (nh->type) { | |||
| case NEXTHOP_TYPE_IFINDEX: | |||
| json_object_string_add(j, "nexthop", | |||
| json_object_string_add(j, "interfaceName", | |||
There was a problem hiding this comment.
this is pretty clearly a fix - it should be a separate commit (and maybe even a separate PR, given the release freeze?)
| pbr_nht_json_nexthop_group(j, word); | ||
|
|
||
| pbr_nht_json_nexthop_group(j, word, &pbr_nhg_count); | ||
| json_object_int_add(j, "nhgCount", pbr_nhg_count); |
There was a problem hiding this comment.
this is a bit confusing: first, it seems like the count of objects in the collection (whether an array or a dict) should be pretty easy to find? and second, it's confusing to have a dict where some keys are the string form of nhg ids, and their objects are nhg objects, but some other keys are ... entirely different, and key entirely different objects.
ton31337
reviewed
Oct 1, 2024
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.
supported commands:
Testing:
Before fix:
After fix:
Signed-off-by: Sindhu Parvathi Gopinathan's [email protected]