"show ip bgp neighbor json" displays "Hostname: ", invalidates json

format

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by:   Donald Sharp <sharpd@cumulusnetworks.com>

Ticket: CM-9611
This commit is contained in:
Daniel Walton 2016-03-01 21:59:25 +00:00
parent 37b6ab6f00
commit d1570739d9

View File

@ -9510,11 +9510,23 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js
if (p->hostname)
{
if (p->domainname && (p->domainname[0] != '\0'))
vty_out(vty, "Hostname: %s.%s%s", p->hostname, p->domainname,
VTY_NEWLINE);
if (use_json)
{
if (p->hostname)
json_object_string_add(json_neigh, "hostname", p->hostname);
if (p->domainname)
json_object_string_add(json_neigh, "domainname", p->domainname);
}
else
vty_out(vty, "Hostname: %s%s", p->hostname, VTY_NEWLINE);
{
if (p->domainname && (p->domainname[0] != '\0'))
vty_out(vty, "Hostname: %s.%s%s", p->hostname, p->domainname,
VTY_NEWLINE);
else
vty_out(vty, "Hostname: %s%s", p->hostname, VTY_NEWLINE);
}
}
/* Peer-group */