nhrpd: fix show ip nhrp output #16700
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
ton31337
reviewed
Aug 31, 2024
nhrpd/nhrp_vty.c
Outdated
| @@ -1023,9 +1023,7 @@ DEFUN(show_ip_nhrp, show_ip_nhrp_cmd, | |||
| } else if (argv[3]->text[0] == 's') { | |||
| nhrp_shortcut_foreach(ctx.afi, show_ip_nhrp_shortcut, &ctx); | |||
| } else { | |||
| if (!ctx.json) | |||
| vty_out(vty, "Status: ok\n\n"); | |||
There was a problem hiding this comment.
So, this is nonsense at all (writing this status as OK) if I understand it correctly?
There was a problem hiding this comment.
Yes. It is nonsense to always write it as OK.
|
why dont we just drop the third commit. i fail to see a reason to change the output unless its right |
ton31337
approved these changes
Sep 3, 2024
The problem is that we are always displaying "status: OK" even if shortcut failed |
"show ip nhrp opennhrp json" counter is incorrect.
> root@nhs1:/# vtysh -c 'sh ip nhrp opennhrp json' | jq .
> {
> "attr": {
> "status": "ok",
> "entriesCount": 1 <=== NOK
> },
> "table": [
> {
> "type": "dynamic",
> "up": true,
> "used": false,
> "protocolAddress": "172.16.1.4",
> "protocolAddressSize": 32,
> "nbmaAddress": "192.168.2.4"
> },
> {
> "type": "dynamic",
> "up": true,
> "used": false,
> "protocolAddress": "172.16.1.5",
> "protocolAddressSize": 32,
> "nbmaAddress": "192.168.2.5"
> }
> ]
> }
>
Fixes: 87b9e98 ("nhrpd: add json support to show nhrp vty commands")
Signed-off-by: Louis Scalbert <[email protected]>
The command outputs too much "\n". Normalize it. Signed-off-by: Louis Scalbert <[email protected]>
louis-6wind
force-pushed
the
fix-nhrp-output
branch
from
92938b0 to
e2db455
Compare
|
ci:rerun |
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.
See individual commits