mirror/osrg-gobgp
1
0
Fork 0
mirror of https://github.com/osrg/gobgp.git synced 2024-05-11 05:55:10 +00:00
Code Issues Releases Activity

cli: pretty up State printing

Browse Source 
Explicitly show adminstate idle.

fujita@ubuntu:~/git/gobgp$ ./cli/gobgpcli show neighbors
Peer          AS Up/Down State       |#Advertised Received Accepted
10.0.255.1 65001 never   Idle(Admin) |          0        0        0

Signed-off-by: FUJITA Tomonori <[email protected]>
This commit is contained in:
FUJITA Tomonori
2015-02-24 18:30:56 +09:00
parent 924765a0cb
commit 81ffbdf484
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/gobgpcli
+4 -1
View File
@@ -179,7 +179,7 @@ class Show(object):
maxtimelen = len(str(t))
n["info"]["time"] = t
h = "{:%ds} {:>%ds} {:%ds} {:8s} |" % (maxaddrlen, maxaslen, maxtimelen)
h = "{:%ds} {:>%ds} {:%ds} {:11s} |" % (maxaddrlen, maxaslen, maxtimelen)
f1 = h + "#{:8s} {:8s} {:8s}"
print(f1.format("Peer", "AS", "Up/Down", "State", "Advertised", "Received", "Accepted"))
for n in sorted_neighbors:
@@ -197,6 +197,9 @@ class Show(object):
elif s == "BGP_FSM_ESTABLISHED":
state = "Establ"
if n["info"]["AdminState"] == "ADMIN_STATE_DOWN":
state = "Idle(Admin)"
f2 = h + " {:>8d} {:>8d} {:>8d}"
print f2.format(n["conf"]["remote_ip"], str(n["conf"]["remote_as"]), n["info"]["time"], state, n["info"]["Advertized"], n["info"]["Received"], n["info"]["Accepted"])
return 0
server/peer.go
+2
View File
@@ -472,6 +472,7 @@ func (peer *Peer) MarshalJSON() ([]byte, error) {
p["info"] = struct {
BgpState string `json:"bgp_state"`
AdminState string
FsmEstablishedTransitions uint32 `json:"fsm_established_transitions"`
TotalMessageOut uint32 `json:"total_message_out"`
TotalMessageIn uint32 `json:"total_message_in"`
@@ -498,6 +499,7 @@ func (peer *Peer) MarshalJSON() ([]byte, error) {
}{
BgpState: f.state.String(),
AdminState: f.adminState.String(),
FsmEstablishedTransitions: s.EstablishedCount,
TotalMessageOut: s.TotalOut,
TotalMessageIn: s.TotalIn,