summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2015-05-19 18:29:19 -0700
committerDonald Sharp <sharpd@cumulusnetworks.com>2015-05-19 18:29:19 -0700
commit1c36cb2e2268f8a9bd09faed38777a1073ba84a6 (patch)
treef79fc15f62ddd9a61ff8f669f7fae26b17962671
parent2a3fa5d7c4cc59be995c1767870ac70403730da2 (diff)
Rename BGP's "peer-id" to "peer-router-id" and "peer-ip" to "peer-id"
-rw-r--r--bgpd/bgp_route.c8
-rw-r--r--bgpd/bgp_vty.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index aaba609924..1fb8b9623c 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -7074,9 +7074,9 @@ route_vty_out_detail (struct vty *vty, struct bgp *bgp, struct prefix *p,
if (json_paths)
{
- json_object_object_add(json_path, "peer-ip", json_string);
- json_string = json_object_new_string(inet_ntoa(bgp->router_id));
json_object_object_add(json_path, "peer-id", json_string);
+ json_string = json_object_new_string(inet_ntoa(bgp->router_id));
+ json_object_object_add(json_path, "peer-router-id", json_string);
}
else
{
@@ -7114,7 +7114,7 @@ route_vty_out_detail (struct vty *vty, struct bgp *bgp, struct prefix *p,
if (json_paths)
{
json_string = json_object_new_string(sockunion2str (&binfo->peer->su, buf, SU_ADDRSTRLEN));
- json_object_object_add(json_path, "peer-ip", json_string);
+ json_object_object_add(json_path, "peer-id", json_string);
if (binfo->peer->hostname)
{
json_string = json_object_new_string(binfo->peer->hostname);
@@ -7164,7 +7164,7 @@ route_vty_out_detail (struct vty *vty, struct bgp *bgp, struct prefix *p,
if (json_paths)
{
json_string = json_object_new_string(inet_ntop (AF_INET, &binfo->peer->remote_id, buf1, BUFSIZ));
- json_object_object_add(json_path, "peer-id", json_string);
+ json_object_object_add(json_path, "peer-router-id", json_string);
}
}
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index c5e6444360..fefbba1ad9 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -8591,7 +8591,7 @@ bgp_show_summary (struct vty *vty, struct bgp *bgp, int afi, int safi,
json_object_object_add(json_peer, "dynamic-peer", json_boolean_true);
json_string = json_object_new_string(peer->host);
- json_object_object_add(json_peer, "ip", json_string);
+ json_object_object_add(json_peer, "peer-id", json_string);
if (peer->hostname)
{