Rename BGP's "peer-id" to "peer-router-id" and "peer-ip" to "peer-id"

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index aaba609924fbdddfecfee2b69de064dd8d2279a7..1fb8b9623c3ae457bfefa52247d8fb03094b08b7 100644 (file)
--- 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 c5e64443609c1f1b936486364daa8ac90ee56bec..fefbba1ad9379823a6ff8e4702e57c84a5d00fa0 100644 (file)
--- 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)
                {