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.

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

bgpd: fix version attribute is an int, not a string (backport #17506) #17514

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 26, 2024

The json display of the version attribute is originally an integer. It has changed, most probably mistakenly.

{
"vrfId": 7,
"vrfName": "vrf1",
"tableVersion": 3,
"routerId": "192.0.2.1",
"defaultLocPrf": 100,
"localAS": 65500,
"routes": {
"172.31.0.1/32": {
"prefix": "172.31.0.1/32",
"version": "1", <--- int or string ??

Let us fix it, by using the integer display instead.

Fixes: f9f2d18 ("bgpd: fix 'json detail' output structure")


This is an automatic backport of pull request #17506 done by Mergify.

The json display of the version attribute is originally an
integer. It has changed, most probably mistakenly.

> {
>   "vrfId": 7,
>   "vrfName": "vrf1",
>   "tableVersion": 3,
>   "routerId": "192.0.2.1",
>   "defaultLocPrf": 100,
>   "localAS": 65500,
>   "routes": {
>     "172.31.0.1/32": {
>       "prefix": "172.31.0.1/32",
>       "version": "1",		<--- int or string ??

Let us fix it, by using the integer display instead.

Fixes: f9f2d18 ("bgpd: fix 'json detail' output structure")

Signed-off-by: Philippe Guibert <[email protected]>
(cherry picked from commit c5d7815)

# Conflicts:
#	bgpd/bgp_route.c
Copy link
Author

mergify bot commented Nov 26, 2024

Cherry-pick of c5d7815 has failed:

On branch mergify/bp/stable/9.1/pr-17506
Your branch is up to date with 'origin/stable/9.1'.

You are currently cherry-picking commit c5d7815ccc.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   bgpd/bgp_route.c

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Nov 26, 2024
@ton31337 ton31337 closed this Nov 26, 2024
@ton31337 ton31337 deleted the mergify/bp/stable/9.1/pr-17506 branch November 26, 2024 13:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants