proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 13:33:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5502 from ton31337/fix/rr_do_not_show_fqdn

Browse Source 
bgpd: Show `ip` and `fqdn` in json output for `show [ip] bgp json`
This commit is contained in:
Sri Mohana Singamsetty 2019-12-16 09:43:01 -08:00 committed by GitHub
commit 8887295390
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 144 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

212
bgpd/bgp_route.c
View File

@ -7148,9 +7148,10 @@ static void route_vty_short_status_out(struct vty *vty,
vty_out(vty, " "); vty_out(vty, " ");
} }
static char *bgp_nexthop_fqdn(struct peer *peer) static char *bgp_nexthop_hostname(struct peer *peer, struct attr *attr)
{ {
if (peer->hostname && bgp_flag_check(peer->bgp, BGP_FLAG_SHOW_HOSTNAME)) if (peer->hostname && bgp_flag_check(peer->bgp, BGP_FLAG_SHOW_HOSTNAME)
&& !(attr->flag & ATTR_FLAG_BIT(BGP_ATTR_ORIGINATOR_ID)))
return peer->hostname; return peer->hostname;
return NULL; return NULL;
} }
@ -7160,7 +7161,7 @@ void route_vty_out(struct vty *vty, struct prefix *p,
struct bgp_path_info *path, int display, safi_t safi, struct bgp_path_info *path, int display, safi_t safi,
json_object *json_paths) json_object *json_paths)
{ {
struct attr *attr; struct attr *attr = path->attr;
json_object *json_path = NULL; json_object *json_path = NULL;
json_object *json_nexthops = NULL; json_object *json_nexthops = NULL;
json_object *json_nexthop_global = NULL; json_object *json_nexthop_global = NULL;
@ -7172,7 +7173,7 @@ void route_vty_out(struct vty *vty, struct prefix *p,
bool nexthop_othervrf = false; bool nexthop_othervrf = false;
vrf_id_t nexthop_vrfid = VRF_DEFAULT; vrf_id_t nexthop_vrfid = VRF_DEFAULT;
const char *nexthop_vrfname = VRF_DEFAULT_NAME; const char *nexthop_vrfname = VRF_DEFAULT_NAME;
char *nexthop_fqdn = bgp_nexthop_fqdn(path->peer); char *nexthop_hostname = bgp_nexthop_hostname(path->peer, attr);
if (json_paths) if (json_paths)
json_path = json_object_new_object(); json_path = json_object_new_object();
@ -7190,9 +7191,6 @@ void route_vty_out(struct vty *vty, struct prefix *p,
route_vty_out_route(p, vty, json_path); route_vty_out_route(p, vty, json_path);
} }
/* Print attribute */
attr = path->attr;
/* /*
* If vrf id of nexthop is different from that of prefix, * If vrf id of nexthop is different from that of prefix,
* set up printable string to append * set up printable string to append
@ -7260,57 +7258,67 @@ void route_vty_out(struct vty *vty, struct prefix *p,
if (json_paths) { if (json_paths) {
json_nexthop_global = json_object_new_object(); json_nexthop_global = json_object_new_object();
json_object_string_add( json_object_string_add(json_nexthop_global, "ip",
json_nexthop_global, "afi", nexthop);
nexthop_fqdn ? "fqdn"
: (af == AF_INET) ? "ip" : "ipv6"); if (nexthop_hostname)
json_object_string_add( json_object_string_add(json_nexthop_global,
json_nexthop_global, "hostname",
nexthop_fqdn ? "fqdn" nexthop_hostname);
: (af == AF_INET) ? "ip" : "ipv6",
nexthop_fqdn ? nexthop_fqdn : nexthop); json_object_string_add(json_nexthop_global, "afi",
(af == AF_INET) ? "ipv4"
: "ipv6");
json_object_boolean_true_add(json_nexthop_global, json_object_boolean_true_add(json_nexthop_global,
"used"); "used");
} else } else
vty_out(vty, "%s%s", vty_out(vty, "%s%s",
nexthop_fqdn ? nexthop_fqdn : nexthop, nexthop_hostname ? nexthop_hostname : nexthop,
vrf_id_str); vrf_id_str);
} else if (safi == SAFI_EVPN) { } else if (safi == SAFI_EVPN) {
if (json_paths) { if (json_paths) {
json_nexthop_global = json_object_new_object(); json_nexthop_global = json_object_new_object();
json_object_string_add( json_object_string_add(json_nexthop_global, "ip",
json_nexthop_global, inet_ntoa(attr->nexthop));
nexthop_fqdn ? "fqdn" : "ip",
nexthop_fqdn ? nexthop_fqdn if (nexthop_hostname)
: inet_ntoa(attr->nexthop)); json_object_string_add(json_nexthop_global,
"hostname",
nexthop_hostname);
json_object_string_add(json_nexthop_global, "afi", json_object_string_add(json_nexthop_global, "afi",
"ipv4"); "ipv4");
json_object_boolean_true_add(json_nexthop_global, json_object_boolean_true_add(json_nexthop_global,
"used"); "used");
} else } else
vty_out(vty, "%-16s%s", vty_out(vty, "%-16s%s",
nexthop_fqdn ?: inet_ntoa(attr->nexthop), nexthop_hostname ? nexthop_hostname
: inet_ntoa(attr->nexthop),
vrf_id_str); vrf_id_str);
} else if (safi == SAFI_FLOWSPEC) { } else if (safi == SAFI_FLOWSPEC) {
if (attr->nexthop.s_addr != 0) { if (attr->nexthop.s_addr != 0) {
if (json_paths) { if (json_paths) {
json_nexthop_global = json_object_new_object(); json_nexthop_global = json_object_new_object();
json_object_string_add(
json_nexthop_global,
nexthop_fqdn ? "fqdn" : "ip",
nexthop_fqdn
? nexthop_fqdn
: inet_ntoa(attr->nexthop));
json_object_string_add(json_nexthop_global, json_object_string_add(json_nexthop_global,
"afi", "ipv4"); "afi", "ipv4");
json_object_string_add(
json_nexthop_global, "ip",
inet_ntoa(attr->nexthop));
if (nexthop_hostname)
json_object_string_add(
json_nexthop_global, "hostname",
nexthop_hostname);
json_object_boolean_true_add( json_object_boolean_true_add(
json_nexthop_global, json_nexthop_global,
"used"); "used");
} else { } else {
vty_out(vty, "%-16s", vty_out(vty, "%-16s",
nexthop_fqdn nexthop_hostname
? nexthop_fqdn ? nexthop_hostname
: inet_ntoa(attr->nexthop)); : inet_ntoa(attr->nexthop));
} }
} }
@ -7318,11 +7326,13 @@ void route_vty_out(struct vty *vty, struct prefix *p,
if (json_paths) { if (json_paths) {
json_nexthop_global = json_object_new_object(); json_nexthop_global = json_object_new_object();
json_object_string_add(json_nexthop_global, json_object_string_add(json_nexthop_global, "ip",
nexthop_fqdn ? "fqdn" : "ip", inet_ntoa(attr->nexthop));
nexthop_fqdn
? nexthop_fqdn if (nexthop_hostname)
: inet_ntoa(attr->nexthop)); json_object_string_add(json_nexthop_global,
"hostname",
nexthop_hostname);
json_object_string_add(json_nexthop_global, "afi", json_object_string_add(json_nexthop_global, "afi",
"ipv4"); "ipv4");
@ -7332,8 +7342,8 @@ void route_vty_out(struct vty *vty, struct prefix *p,
char buf[BUFSIZ]; char buf[BUFSIZ];
snprintf(buf, sizeof(buf), "%s%s", snprintf(buf, sizeof(buf), "%s%s",
nexthop_fqdn ? nexthop_fqdn nexthop_hostname ? nexthop_hostname
: inet_ntoa(attr->nexthop), : inet_ntoa(attr->nexthop),
vrf_id_str); vrf_id_str);
vty_out(vty, "%-16s", buf); vty_out(vty, "%-16s", buf);
} }
@ -7347,13 +7357,15 @@ void route_vty_out(struct vty *vty, struct prefix *p,
if (json_paths) { if (json_paths) {
json_nexthop_global = json_object_new_object(); json_nexthop_global = json_object_new_object();
json_object_string_add( json_object_string_add(
json_nexthop_global, json_nexthop_global, "ip",
nexthop_fqdn ? "fqdn" : "ip", inet_ntop(AF_INET6, &attr->mp_nexthop_global,
nexthop_fqdn buf, BUFSIZ));
? nexthop_fqdn
: inet_ntop(AF_INET6, if (nexthop_hostname)
&attr->mp_nexthop_global, json_object_string_add(json_nexthop_global,
buf, BUFSIZ)); "hostname",
nexthop_hostname);
json_object_string_add(json_nexthop_global, "afi", json_object_string_add(json_nexthop_global, "afi",
"ipv6"); "ipv6");
json_object_string_add(json_nexthop_global, "scope", json_object_string_add(json_nexthop_global, "scope",
@ -7366,14 +7378,16 @@ void route_vty_out(struct vty *vty, struct prefix *p,
|| (path->peer->conf_if)) { || (path->peer->conf_if)) {
json_nexthop_ll = json_object_new_object(); json_nexthop_ll = json_object_new_object();
json_object_string_add( json_object_string_add(
json_nexthop_ll, json_nexthop_ll, "ip",
nexthop_fqdn ? "fqdn" : "ip", inet_ntop(AF_INET6,
nexthop_fqdn &attr->mp_nexthop_local, buf,
? nexthop_fqdn BUFSIZ));
: inet_ntop(
AF_INET6, if (nexthop_hostname)
&attr->mp_nexthop_local, json_object_string_add(
buf, BUFSIZ)); json_nexthop_ll, "hostname",
nexthop_hostname);
json_object_string_add(json_nexthop_ll, "afi", json_object_string_add(json_nexthop_ll, "afi",
"ipv6"); "ipv6");
json_object_string_add(json_nexthop_ll, "scope", json_object_string_add(json_nexthop_ll, "scope",
@ -7413,8 +7427,8 @@ void route_vty_out(struct vty *vty, struct prefix *p,
} else { } else {
len = vty_out( len = vty_out(
vty, "%s%s", vty, "%s%s",
nexthop_fqdn nexthop_hostname
? nexthop_fqdn ? nexthop_hostname
: inet_ntop( : inet_ntop(
AF_INET6, AF_INET6,
&attr->mp_nexthop_local, &attr->mp_nexthop_local,
@ -7430,8 +7444,8 @@ void route_vty_out(struct vty *vty, struct prefix *p,
} else { } else {
len = vty_out( len = vty_out(
vty, "%s%s", vty, "%s%s",
nexthop_fqdn nexthop_hostname
? nexthop_fqdn ? nexthop_hostname
: inet_ntop( : inet_ntop(
AF_INET6, AF_INET6,
&attr->mp_nexthop_global, &attr->mp_nexthop_global,
@ -8262,7 +8276,7 @@ void route_vty_out_detail(struct vty *vty, struct bgp *bgp,
char buf[INET6_ADDRSTRLEN]; char buf[INET6_ADDRSTRLEN];
char buf1[BUFSIZ]; char buf1[BUFSIZ];
char buf2[EVPN_ROUTE_STRLEN]; char buf2[EVPN_ROUTE_STRLEN];
struct attr *attr; struct attr *attr = path->attr;
int sockunion_vty_out(struct vty *, union sockunion *); int sockunion_vty_out(struct vty *, union sockunion *);
time_t tbuf; time_t tbuf;
json_object *json_bestpath = NULL; json_object *json_bestpath = NULL;
@ -8287,7 +8301,7 @@ void route_vty_out_detail(struct vty *vty, struct bgp *bgp,
bool nexthop_self = bool nexthop_self =
CHECK_FLAG(path->flags, BGP_PATH_ANNC_NH_SELF) ? true : false; CHECK_FLAG(path->flags, BGP_PATH_ANNC_NH_SELF) ? true : false;
int i; int i;
char *nexthop_fqdn = bgp_nexthop_fqdn(path->peer); char *nexthop_hostname = bgp_nexthop_hostname(path->peer, attr);
if (json_paths) { if (json_paths) {
json_path = json_object_new_object(); json_path = json_object_new_object();
@ -8340,8 +8354,6 @@ void route_vty_out_detail(struct vty *vty, struct bgp *bgp,
} }
} }
attr = path->attr;
/* Line1 display AS-path, Aggregator */ /* Line1 display AS-path, Aggregator */
if (attr->aspath) { if (attr->aspath) {
if (json_paths) { if (json_paths) {
@ -8429,32 +8441,35 @@ void route_vty_out_detail(struct vty *vty, struct bgp *bgp,
|| !BGP_ATTR_NEXTHOP_AFI_IP6(attr))) { || !BGP_ATTR_NEXTHOP_AFI_IP6(attr))) {
if (safi == SAFI_MPLS_VPN || safi == SAFI_ENCAP if (safi == SAFI_MPLS_VPN || safi == SAFI_ENCAP
|| safi == SAFI_EVPN) { || safi == SAFI_EVPN) {
if (json_paths) if (json_paths) {
json_object_string_add( json_object_string_add(
json_nexthop_global, json_nexthop_global, "ip",
nexthop_fqdn ? "fqdn" : "ip", inet_ntoa(attr->mp_nexthop_global_in));
nexthop_fqdn
? nexthop_fqdn if (nexthop_hostname)
: inet_ntoa( json_object_string_add(
attr->mp_nexthop_global_in)); json_nexthop_global, "hostname",
else nexthop_hostname);
} else
vty_out(vty, " %s", vty_out(vty, " %s",
nexthop_fqdn nexthop_hostname
? nexthop_fqdn ? nexthop_hostname
: inet_ntoa( : inet_ntoa(
attr->mp_nexthop_global_in)); attr->mp_nexthop_global_in));
} else { } else {
if (json_paths) if (json_paths) {
json_object_string_add( json_object_string_add(
json_nexthop_global, json_nexthop_global, "ip",
nexthop_fqdn ? "fqdn" : "ip", inet_ntoa(attr->nexthop));
nexthop_fqdn
? nexthop_fqdn if (nexthop_hostname)
: inet_ntoa(attr->nexthop)); json_object_string_add(
else json_nexthop_global, "hostname",
nexthop_hostname);
} else
vty_out(vty, " %s", vty_out(vty, " %s",
nexthop_fqdn nexthop_hostname
? nexthop_fqdn ? nexthop_hostname
: inet_ntoa(attr->nexthop)); : inet_ntoa(attr->nexthop));
} }
@ -8464,21 +8479,23 @@ void route_vty_out_detail(struct vty *vty, struct bgp *bgp,
} else { } else {
if (json_paths) { if (json_paths) {
json_object_string_add( json_object_string_add(
json_nexthop_global, json_nexthop_global, "ip",
nexthop_fqdn ? "fqdn" : "ip", inet_ntop(AF_INET6, &attr->mp_nexthop_global,
nexthop_fqdn buf, INET6_ADDRSTRLEN));
? nexthop_fqdn
: inet_ntop(AF_INET6, if (nexthop_hostname)
&attr->mp_nexthop_global, json_object_string_add(json_nexthop_global,
buf, INET6_ADDRSTRLEN)); "hostname",
nexthop_hostname);
json_object_string_add(json_nexthop_global, "afi", json_object_string_add(json_nexthop_global, "afi",
"ipv6"); "ipv6");
json_object_string_add(json_nexthop_global, "scope", json_object_string_add(json_nexthop_global, "scope",
"global"); "global");
} else { } else {
vty_out(vty, " %s", vty_out(vty, " %s",
nexthop_fqdn nexthop_hostname
? nexthop_fqdn ? nexthop_hostname
: inet_ntop(AF_INET6, : inet_ntop(AF_INET6,
&attr->mp_nexthop_global, &attr->mp_nexthop_global,
buf, INET6_ADDRSTRLEN)); buf, INET6_ADDRSTRLEN));
@ -8650,12 +8667,15 @@ void route_vty_out_detail(struct vty *vty, struct bgp *bgp,
if (json_paths) { if (json_paths) {
json_nexthop_ll = json_object_new_object(); json_nexthop_ll = json_object_new_object();
json_object_string_add( json_object_string_add(
json_nexthop_ll, nexthop_fqdn ? "fqdn" : "ip", json_nexthop_ll, "ip",
nexthop_fqdn inet_ntop(AF_INET6, &attr->mp_nexthop_local,
? nexthop_fqdn buf, INET6_ADDRSTRLEN));
: inet_ntop(AF_INET6,
&attr->mp_nexthop_local, if (nexthop_hostname)
buf, INET6_ADDRSTRLEN)); json_object_string_add(json_nexthop_ll,
"hostname",
nexthop_hostname);
json_object_string_add(json_nexthop_ll, "afi", "ipv6"); json_object_string_add(json_nexthop_ll, "afi", "ipv6");
json_object_string_add(json_nexthop_ll, "scope", json_object_string_add(json_nexthop_ll, "scope",
"link-local"); "link-local");

48
tests/topotests/bgp_show_ip_bgp_fqdn/test_bgp_show_ip_bgp_fqdn.py
View File

@ -5,7 +5,7 @@
# Part of NetDEF Topology Tests # Part of NetDEF Topology Tests
# #
# Copyright (c) 2019 by # Copyright (c) 2019 by
# Network Device Education Foundation, Inc. ("NetDEF") # Donatas Abraitis <donatas.abraitis@gmail.com>
# #
# Permission to use, copy, modify, and/or distribute this software # Permission to use, copy, modify, and/or distribute this software
# for any purpose with or without fee is hereby granted, provided # for any purpose with or without fee is hereby granted, provided
@ -33,6 +33,7 @@ import sys
import json import json
import time import time
import pytest import pytest
import functools
CWD = os.path.dirname(os.path.realpath(__file__)) CWD = os.path.dirname(os.path.realpath(__file__))
sys.path.append(os.path.join(CWD, '../')) sys.path.append(os.path.join(CWD, '../'))
@ -76,33 +77,40 @@ def teardown_module(mod):
tgen = get_topogen() tgen = get_topogen()
tgen.stop_topology() tgen.stop_topology()
def test_bgp_maximum_prefix_invalid(): def test_bgp_show_ip_bgp_hostname():
tgen = get_topogen() tgen = get_topogen()
if tgen.routers_have_failure(): if tgen.routers_have_failure():
pytest.skip(tgen.errors) pytest.skip(tgen.errors)
def _bgp_converge(router, neighbor): router = tgen.gears['r2']
cmd = "show ip bgp neighbor {0} json".format(neighbor)
while True: def _bgp_converge(router):
output = json.loads(tgen.gears[router].vtysh_cmd(cmd)) output = json.loads(router.vtysh_cmd("show ip bgp neighbor 192.168.255.1 json"))
if output[neighbor]['bgpState'] == 'Established': expected = {
time.sleep(3) '192.168.255.1': {
'bgpState': 'Established',
'addressFamilyInfo': {
'ipv4Unicast': {
'acceptedPrefixCounter': 2
}
}
}
}
return topotest.json_cmp(output, expected)
def _bgp_show_nexthop_hostname_and_ip(router):
output = json.loads(router.vtysh_cmd("show ip bgp json"))
for nh in output['routes']['172.16.255.253/32'][0]['nexthops']:
if 'hostname' in nh and 'ip' in nh:
return True return True
return False
def _bgp_show_nexthop(router, prefix): test_func = functools.partial(_bgp_converge, router)
cmd = "show ip bgp json" success, result = topotest.run_and_expect(test_func, None, count=60, wait=0.5)
output = json.loads(tgen.gears[router].vtysh_cmd(cmd))
for nh in output['routes'][prefix][0]['nexthops']:
if 'fqdn' in nh:
return 'fqdn'
return 'ip'
if _bgp_converge('r2', '192.168.255.1'): assert result is None, 'Failed bgp convergence in "{}"'.format(router)
assert _bgp_show_nexthop('r2', '172.16.255.254/32') == 'fqdn' assert _bgp_show_nexthop_hostname_and_ip(router) == True
if _bgp_converge('r1', '192.168.255.2'):
assert _bgp_show_nexthop('r1', '172.16.255.253/32') == 'ip'
if __name__ == '__main__': if __name__ == '__main__':
args = ["-s"] + sys.argv[1:] args = ["-s"] + sys.argv[1:]