Skip to content

Show the peer-group name in the output of the 'gobgp neighbor' cli command #2877

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.

Sign up for GitHub

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

Open
taitov wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −3
Open

Show the peer-group name in the output of the 'gobgp neighbor' cli command #2877

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions cmd/gobgp/neighbor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ func showNeighbors(vrf string) error {
return nil
}
maxaddrlen := 0
maxgrouplen := len("Group")
maxaslen := 2
maxtimelen := len("Up/Down")
timedelta := []string{}
Expand Down Expand Up @@ -189,6 +190,9 @@ func showNeighbors(vrf string) error {
} else if j := len(n.State.NeighborAddress); j > maxaddrlen {
maxaddrlen = j
}
if l := len(n.Conf.PeerGroup); l > maxgrouplen {
maxgrouplen = l
}
if l := len(getRemoteASN(n)); l > maxaslen {
maxaslen = l
}
Expand All @@ -206,9 +210,9 @@ func showNeighbors(vrf string) error {
timedelta = append(timedelta, timeStr)
}

format := "%-" + fmt.Sprint(maxaddrlen) + "s" + " %" + fmt.Sprint(maxaslen) + "s" + " %" + fmt.Sprint(maxtimelen) + "s"
format := "%-" + fmt.Sprint(maxaddrlen) + "s" + " %" + fmt.Sprint(maxgrouplen) + "s" + " %" + fmt.Sprint(maxaslen) + "s" + " %" + fmt.Sprint(maxtimelen) + "s"
format += " %-11s |%9s %9s\n"
fmt.Printf(format, "Peer", "AS", "Up/Down", "State", "#Received", "Accepted")
fmt.Printf(format, "Peer", "Group", "AS", "Up/Down", "State", "#Received", "Accepted")
formatFsm := func(admin api.PeerState_AdminState, fsm api.PeerState_SessionState) string {
switch admin {
case api.PeerState_DOWN:
Expand Down Expand Up @@ -244,7 +248,7 @@ func showNeighbors(vrf string) error {
neigh = n.Conf.NeighborInterface
}
received, accepted, _, _ := counter(n)
fmt.Printf(format, neigh, getRemoteASN(n), timedelta[i], formatFsm(n.State.AdminState, n.State.SessionState), fmt.Sprint(received), fmt.Sprint(accepted))
fmt.Printf(format, neigh, n.Conf.PeerGroup, getRemoteASN(n), timedelta[i], formatFsm(n.State.AdminState, n.State.SessionState), fmt.Sprint(received), fmt.Sprint(accepted))
}

return nil
Expand Down