diff options
446 files changed, 2349 insertions, 1951 deletions
diff --git a/bfdd/bfd.c b/bfdd/bfd.c index a4091534f5..f497480457 100644 --- a/bfdd/bfd.c +++ b/bfdd/bfd.c @@ -590,10 +590,10 @@ static struct bfd_session *bfd_find_disc(struct sockaddr_any *sa, struct bfd_session *ptm_bfd_sess_find(struct bfd_pkt *cp, struct sockaddr_any *peer, struct sockaddr_any *local, - ifindex_t ifindex, vrf_id_t vrfid, + struct interface *ifp, + vrf_id_t vrfid, bool is_mhop) { - struct interface *ifp; struct vrf *vrf; struct bfd_key key; @@ -601,21 +601,8 @@ struct bfd_session *ptm_bfd_sess_find(struct bfd_pkt *cp, if (cp->discrs.remote_discr) return bfd_find_disc(peer, ntohl(cp->discrs.remote_discr)); - /* - * Search for session without using discriminator. - * - * XXX: we can't trust `vrfid` because the VRF handling is not - * properly implemented. Meanwhile we should use the interface - * VRF to find out which one it belongs. - */ - ifp = if_lookup_by_index_all_vrf(ifindex); - if (ifp == NULL) { - if (vrfid != VRF_DEFAULT) - vrf = vrf_lookup_by_id(vrfid); - else - vrf = NULL; - } else - vrf = vrf_lookup_by_id(ifp->vrf_id); + /* Search for session without using discriminator. */ + vrf = vrf_lookup_by_id(vrfid); gen_bfd_key(&key, peer, local, is_mhop, ifp ? ifp->name : NULL, vrf ? vrf->name : VRF_DEFAULT_NAME); diff --git a/bfdd/bfd.h b/bfdd/bfd.h index 7d5b7887c7..dfe1a20303 100644 --- a/bfdd/bfd.h +++ b/bfdd/bfd.h @@ -600,7 +600,8 @@ void ptm_bfd_start_xmt_timer(struct bfd_session *bfd, bool is_echo); struct bfd_session *ptm_bfd_sess_find(struct bfd_pkt *cp, struct sockaddr_any *peer, struct sockaddr_any *local, - ifindex_t ifindex, vrf_id_t vrfid, + struct interface *ifp, + vrf_id_t vrfid, bool is_mhop); struct bfd_session *bs_peer_find(struct bfd_peer_cfg *bpc); diff --git a/bfdd/bfd_packet.c b/bfdd/bfd_packet.c index 3d6ca6ddd3..b7c1af7e71 100644 --- a/bfdd/bfd_packet.c +++ b/bfdd/bfd_packet.c @@ -546,8 +546,6 @@ int bfd_recv_cb(struct thread *t) struct interface *ifp = NULL; struct bfd_vrf_global *bvrf = THREAD_ARG(t); - vrfid = bvrf->vrf->vrf_id; - /* Schedule next read. */ bfd_sd_reschedule(bvrf, sd); @@ -573,9 +571,15 @@ int bfd_recv_cb(struct thread *t) &local, &peer); } - /* update vrf-id because when in vrf-lite mode, - * the socket is on default namespace + /* + * With netns backend, we have a separate socket in each VRF. It means + * that bvrf here is correct and we believe the bvrf->vrf->vrf_id. + * With VRF-lite backend, we have a single socket in the default VRF. + * It means that we can't believe the bvrf->vrf->vrf_id. But in + * VRF-lite, the ifindex is globally unique, so we can retrieve the + * correct vrf_id from the interface. */ + vrfid = bvrf->vrf->vrf_id; if (ifindex) { ifp = if_lookup_by_index(ifindex, vrfid); if (ifp) @@ -628,7 +632,7 @@ int bfd_recv_cb(struct thread *t) } /* Find the session that this packet belongs. */ - bfd = ptm_bfd_sess_find(cp, &peer, &local, ifindex, vrfid, is_mhop); + bfd = ptm_bfd_sess_find(cp, &peer, &local, ifp, vrfid, is_mhop); if (bfd == NULL) { cp_debug(is_mhop, &peer, &local, ifindex, vrfid, "no session found"); @@ -657,7 +661,7 @@ int bfd_recv_cb(struct thread *t) * packet came in. */ if (!is_mhop && bfd->ifp == NULL) - bfd->ifp = if_lookup_by_index(ifindex, vrfid); + bfd->ifp = ifp; /* Log remote discriminator changes. */ if ((bfd->discrs.remote_discr != 0) diff --git a/bgpd/bgp_bfd.c b/bgpd/bgp_bfd.c index 4995f9a1fd..f23e6b2e9b 100644 --- a/bgpd/bgp_bfd.c +++ b/bgpd/bgp_bfd.c @@ -150,6 +150,7 @@ void bgp_peer_config_apply(struct peer *p, struct peer_group *pg) void bgp_peer_bfd_update_source(struct peer *p) { struct bfd_session_params *session = p->bfd_config->session; + const union sockunion *source; bool changed = false; int family; union { @@ -161,44 +162,45 @@ void bgp_peer_bfd_update_source(struct peer *p) if (CHECK_FLAG(p->sflags, PEER_STATUS_GROUP)) return; + /* Figure out the correct source to use. */ + if (CHECK_FLAG(p->flags, PEER_FLAG_UPDATE_SOURCE)) + source = p->update_source; + else + source = p->su_local; + /* Update peer's source/destination addresses. */ bfd_sess_addresses(session, &family, &src.v6, &dst.v6); if (family == AF_INET) { - if ((p->su_local - && p->su_local->sin.sin_addr.s_addr != src.v4.s_addr) + if ((source && source->sin.sin_addr.s_addr != src.v4.s_addr) || p->su.sin.sin_addr.s_addr != dst.v4.s_addr) { if (BGP_DEBUG(bfd, BFD_LIB)) zlog_debug( "%s: address [%pI4->%pI4] to [%pI4->%pI4]", __func__, &src.v4, &dst.v4, - p->su_local ? &p->su_local->sin.sin_addr - : &src.v4, + source ? &source->sin.sin_addr + : &src.v4, &p->su.sin.sin_addr); bfd_sess_set_ipv4_addrs( - session, - p->su_local ? &p->su_local->sin.sin_addr : NULL, + session, source ? &source->sin.sin_addr : NULL, &p->su.sin.sin_addr); changed = true; } } else { - if ((p->su_local - && memcmp(&p->su_local->sin6, &src.v6, sizeof(src.v6))) + if ((source && memcmp(&source->sin6, &src.v6, sizeof(src.v6))) || memcmp(&p->su.sin6, &dst.v6, sizeof(dst.v6))) { if (BGP_DEBUG(bfd, BFD_LIB)) zlog_debug( "%s: address [%pI6->%pI6] to [%pI6->%pI6]", __func__, &src.v6, &dst.v6, - p->su_local - ? &p->su_local->sin6.sin6_addr - : &src.v6, + source ? &source->sin6.sin6_addr + : &src.v6, &p->su.sin6.sin6_addr); - bfd_sess_set_ipv6_addrs( - session, - p->su_local ? &p->su_local->sin6.sin6_addr - : NULL, - &p->su.sin6.sin6_addr); + bfd_sess_set_ipv6_addrs(session, + source ? &source->sin6.sin6_addr + : NULL, + &p->su.sin6.sin6_addr); changed = true; } } diff --git a/bgpd/bgp_nht.c b/bgpd/bgp_nht.c index 061fa6f087..28dd19d842 100644 --- a/bgpd/bgp_nht.c +++ b/bgpd/bgp_nht.c @@ -611,7 +611,8 @@ void bgp_nht_ifp_down(struct interface *ifp) static int bgp_nht_ifp_initial(struct thread *thread) { ifindex_t ifindex = THREAD_VAL(thread); - struct interface *ifp = if_lookup_by_index_all_vrf(ifindex); + struct bgp *bgp = THREAD_ARG(thread); + struct interface *ifp = if_lookup_by_index(ifindex, bgp->vrf_id); if (!ifp) return 0; @@ -657,7 +658,7 @@ void bgp_nht_interface_events(struct peer *peer) return; if (bnc->ifindex) - thread_add_event(bm->master, bgp_nht_ifp_initial, NULL, + thread_add_event(bm->master, bgp_nht_ifp_initial, bnc->bgp, bnc->ifindex, NULL); } diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c index ca8b1e398b..e15690835a 100644 --- a/bgpd/bgp_open.c +++ b/bgpd/bgp_open.c @@ -572,6 +572,46 @@ static int bgp_capability_restart(struct peer *peer, return 0; } +static int bgp_capability_llgr(struct peer *peer, + struct capability_header *caphdr) +{ + struct stream *s = BGP_INPUT(peer); + size_t end = stream_get_getp(s) + caphdr->length; + + SET_FLAG(peer->cap, PEER_CAP_LLGR_RCV); + + while (stream_get_getp(s) + 4 <= end) { + afi_t afi; + safi_t safi; + iana_afi_t pkt_afi = stream_getw(s); + iana_safi_t pkt_safi = stream_getc(s); + uint8_t flags = stream_getc(s); + uint32_t stale_time = stream_get3(s); + + if (bgp_map_afi_safi_iana2int(pkt_afi, pkt_safi, &afi, &safi)) { + if (bgp_debug_neighbor_events(peer)) + zlog_debug( + "%s Addr-family %s/%s(afi/safi) not supported. Ignore the Long-lived Graceful Restart capability for this AFI/SAFI", + peer->host, iana_afi2str(pkt_afi), + iana_safi2str(pkt_safi)); + } else if (!peer->afc[afi][safi] + || !CHECK_FLAG(peer->af_cap[afi][safi], + PEER_CAP_RESTART_AF_RCV)) { + if (bgp_debug_neighbor_events(peer)) + zlog_debug( + "%s Addr-family %s/%s(afi/safi) not enabled. Ignore the Long-lived Graceful Restart capability", + peer->host, iana_afi2str(pkt_afi), + iana_safi2str(pkt_safi)); + } else { + peer->llgr[afi][safi].flags = flags; + peer->llgr[afi][safi].stale_time = stale_time; + SET_FLAG(peer->af_cap[afi][safi], PEER_CAP_LLGR_AF_RCV); + } + } + + return 0; +} + /* Unlike other capability parsing routines, this one returns 0 on error */ static as_t bgp_capability_as4(struct peer *peer, struct capability_header *hdr) { @@ -954,6 +994,9 @@ static int bgp_capability_parse(struct peer *peer, size_t length, case CAPABILITY_CODE_RESTART: ret = bgp_capability_restart(peer, &caphdr); break; + case CAPABILITY_CODE_LLGR: + ret = bgp_capability_llgr(peer, &caphdr); + break; case CAPABILITY_CODE_DYNAMIC: case CAPABILITY_CODE_DYNAMIC_OLD: SET_FLAG(peer->cap, PEER_CAP_DYNAMIC_RCV); @@ -1404,6 +1447,53 @@ static void bgp_peer_send_gr_capability(struct stream *s, struct peer *peer, stream_putc_at(s, capp, len); } +static void bgp_peer_send_llgr_capability(struct stream *s, struct peer *peer, + unsigned long cp) +{ + int len; + iana_afi_t pkt_afi; + afi_t afi; + safi_t safi; + iana_safi_t pkt_safi; + unsigned long capp = 0; + unsigned long rcapp = 0; + + if (!CHECK_FLAG(peer->cap, PEER_CAP_RESTART_ADV)) + return; + + SET_FLAG(peer->cap, PEER_CAP_LLGR_ADV); + + stream_putc(s, BGP_OPEN_OPT_CAP); + capp = stream_get_endp(s); /* Set Capability Len Pointer */ + stream_putc(s, 0); /* Capability Length */ + stream_putc(s, CAPABILITY_CODE_LLGR); + + rcapp = stream_get_endp(s); + stream_putc(s, 0); + + FOREACH_AFI_SAFI (afi, safi) { + if (!peer->afc[afi][safi]) + continue; + + bgp_map_afi_safi_int2iana(afi, safi, &pkt_afi, &pkt_safi); + + stream_putw(s, pkt_afi); + stream_putc(s, pkt_safi); + stream_putc(s, LLGR_F_BIT); + stream_put3(s, peer->bgp->llgr_stale_time); + + SET_FLAG(peer->af_cap[afi][safi], PEER_CAP_LLGR_AF_ADV); + } + + /* Total Long-lived Graceful Restart capability Len. */ + len = stream_get_endp(s) - rcapp - 1; + stream_putc_at(s, rcapp, len); + + /* Total Capability Len. */ + len = stream_get_endp(s) - capp - 1; + stream_putc_at(s, capp, len); +} + /* Fill in capability open option to the packet. */ void bgp_open_capability(struct stream *s, struct peer *peer) { @@ -1632,6 +1722,7 @@ void bgp_open_capability(struct stream *s, struct peer *peer) } bgp_peer_send_gr_capability(s, peer, cp); + bgp_peer_send_llgr_capability(s, peer, cp); /* Total Opt Parm Len. */ len = stream_get_endp(s) - cp - 1; diff --git a/bgpd/bgp_open.h b/bgpd/bgp_open.h index bc6eedac85..0d616926a2 100644 --- a/bgpd/bgp_open.h +++ b/bgpd/bgp_open.h @@ -50,6 +50,7 @@ struct graceful_restart_af { #define CAPABILITY_CODE_DYNAMIC 67 /* Dynamic Capability */ #define CAPABILITY_CODE_ADDPATH 69 /* Addpath Capability */ #define CAPABILITY_CODE_ENHANCED_RR 70 /* Enhanced Route Refresh capability */ +#define CAPABILITY_CODE_LLGR 71 /* Long-lived Graceful Restart */ #define CAPABILITY_CODE_FQDN 73 /* Advertise hostname capability */ #define CAPABILITY_CODE_ENHE 5 /* Extended Next Hop Encoding */ #define CAPABILITY_CODE_REFRESH_OLD 128 /* Route Refresh Capability(cisco) */ @@ -66,6 +67,7 @@ struct graceful_restart_af { #define CAPABILITY_CODE_ENHE_LEN 6 /* NRLI AFI = 2, SAFI = 2, Nexthop AFI = 2 */ #define CAPABILITY_CODE_MIN_FQDN_LEN 2 #define CAPABILITY_CODE_ENHANCED_LEN 0 +#define CAPABILITY_CODE_LLGR_LEN 0 #define CAPABILITY_CODE_ORF_LEN 5 #define CAPABILITY_CODE_EXT_MESSAGE_LEN 0 /* Extended Message Support */ @@ -88,6 +90,9 @@ struct graceful_restart_af { #define RESTART_R_BIT 0x8000 #define RESTART_F_BIT 0x80 +/* Long-lived Graceful Restart */ +#define LLGR_F_BIT 0x80 + extern int bgp_open_option_parse(struct peer *, uint8_t, int *); extern void bgp_open_capability(struct stream *, struct peer *); extern void bgp_capability_vty_out(struct vty *vty, struct peer *peer, diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 4b798cc264..ffd8a8118c 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -12484,7 +12484,7 @@ DEFPY (show_ip_bgp_instance_all, JSON_STR "Increase table width for longer prefixes\n") { - afi_t afi = AFI_IP; + afi_t afi = AFI_IP6; safi_t safi = SAFI_UNICAST; struct bgp *bgp = NULL; int idx = 0; @@ -14086,7 +14086,7 @@ DEFUN (show_ip_bgp_flowspec_routes_detailed, "Detailed information on flowspec entries\n" JSON_STR) { - afi_t afi = AFI_IP; + afi_t afi = AFI_IP6; safi_t safi = SAFI_UNICAST; struct bgp *bgp = NULL; int idx = 0; diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 772e20dc85..65806bb5f4 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -3168,6 +3168,36 @@ DEFUN (no_bgp_graceful_restart_rib_stale_time, return CMD_SUCCESS; } +DEFUN(bgp_llgr_stalepath_time, bgp_llgr_stalepath_time_cmd, + "bgp long-lived-graceful-restart stale-time (0-4294967295)", BGP_STR + "Enable Long-lived Graceful Restart\n" + "Specifies maximum time to wait before purging long-lived stale routes\n" + "Stale time value (seconds)\n") +{ + VTY_DECLVAR_CONTEXT(bgp, bgp); + + uint32_t llgr_stale_time; + + llgr_stale_time = strtoul(argv[3]->arg, NULL, 10); + bgp->llgr_stale_time = llgr_stale_time; + + return CMD_SUCCESS; +} + +DEFUN(no_bgp_llgr_stalepath_time, no_bgp_llgr_stalepath_time_cmd, + "no bgp long-lived-graceful-restart stale-time [(0-4294967295)]", + NO_STR BGP_STR + "Enable Long-lived Graceful Restart\n" + "Specifies maximum time to wait before purging long-lived stale routes\n" + "Stale time value (seconds)\n") +{ + VTY_DECLVAR_CONTEXT(bgp, bgp); + + bgp->llgr_stale_time = BGP_DEFAULT_LLGR_STALE_TIME; + + return CMD_SUCCESS; +} + static inline void bgp_initiate_graceful_shut_unshut(struct vty *vty, struct bgp *bgp) { @@ -12838,6 +12868,61 @@ static void bgp_show_peer(struct vty *vty, struct peer *p, bool use_json, } } + /* Long-lived Graceful Restart */ + if (CHECK_FLAG(p->cap, PEER_CAP_LLGR_RCV) + || CHECK_FLAG(p->cap, PEER_CAP_LLGR_ADV)) { + json_object *json_llgr = NULL; + const char *afi_safi_str; + + if (CHECK_FLAG(p->cap, + PEER_CAP_LLGR_ADV) + && CHECK_FLAG(p->cap, + PEER_CAP_LLGR_RCV)) + json_object_string_add( + json_cap, + "longLivedGracefulRestart", + "advertisedAndReceived"); + else if (CHECK_FLAG(p->cap, + PEER_CAP_LLGR_ADV)) + json_object_string_add( + json_cap, + "longLivedGracefulRestart", + "advertised"); + else if (CHECK_FLAG(p->cap, + PEER_CAP_LLGR_RCV)) + json_object_string_add( + json_cap, + "longLivedGracefulRestart", + "received"); + + if (CHECK_FLAG(p->cap, + PEER_CAP_LLGR_RCV)) { + json_llgr = + json_object_new_object(); + + FOREACH_AFI_SAFI (afi, safi) { + if (CHECK_FLAG( + p->af_cap + [afi] + [safi], + PEER_CAP_ENHE_AF_RCV)) { + afi_safi_str = get_afi_safi_str( + afi, + safi, + true); + json_object_string_add( + json_llgr, + afi_safi_str, + "received"); + } + } + json_object_object_add( + json_cap, + "longLivedGracefulRestartByPeer", + json_llgr); + } + } + /* Route Refresh */ if (CHECK_FLAG(p->cap, PEER_CAP_REFRESH_ADV) || CHECK_FLAG(p->cap, @@ -13278,6 +13363,43 @@ static void bgp_show_peer(struct vty *vty, struct peer *p, bool use_json, } } + /* Long-lived Graceful Restart */ + if (CHECK_FLAG(p->cap, PEER_CAP_LLGR_RCV) + || CHECK_FLAG(p->cap, PEER_CAP_LLGR_ADV)) { + vty_out(vty, + " Long-lived Graceful Restart:"); + if (CHECK_FLAG(p->cap, + PEER_CAP_LLGR_ADV)) + vty_out(vty, " advertised"); + if (CHECK_FLAG(p->cap, + PEER_CAP_LLGR_RCV)) + vty_out(vty, " %sreceived", + CHECK_FLAG( + p->cap, + PEER_CAP_LLGR_ADV) + ? "and " + : ""); + vty_out(vty, "\n"); + + if (CHECK_FLAG(p->cap, + PEER_CAP_LLGR_RCV)) { + vty_out(vty, + " Address families by peer:\n"); + FOREACH_AFI_SAFI (afi, safi) + if (CHECK_FLAG( + p->af_cap + [afi] + [safi], + PEER_CAP_LLGR_AF_RCV)) + vty_out(vty, + " %s\n", + get_afi_safi_str( + afi, + safi, + false)); + } + } + /* Route Refresh */ if (CHECK_FLAG(p->cap, PEER_CAP_REFRESH_ADV) || CHECK_FLAG(p->cap, @@ -17253,6 +17375,12 @@ int bgp_config_write(struct vty *vty) if (CHECK_FLAG(bgp->flags, BGP_FLAG_GRACEFUL_SHUTDOWN)) vty_out(vty, " bgp graceful-shutdown\n"); + /* Long-lived Graceful Restart */ + if (bgp->llgr_stale_time != BGP_DEFAULT_LLGR_STALE_TIME) + vty_out(vty, + " bgp long-lived-graceful-restart stale-time %u\n", + bgp->llgr_stale_time); + /* BGP graceful-restart. */ if (bgp->stalepath_time != BGP_DEFAULT_STALEPATH_TIME) vty_out(vty, @@ -17830,6 +17958,10 @@ void bgp_vty_init(void) install_element(BGP_NODE, &bgp_graceful_shutdown_cmd); install_element(BGP_NODE, &no_bgp_graceful_shutdown_cmd); + /* "bgp long-lived-graceful-restart" commands */ + install_element(BGP_NODE, &bgp_llgr_stalepath_time_cmd); + install_element(BGP_NODE, &no_bgp_llgr_stalepath_time_cmd); + /* "bgp fast-external-failover" commands */ install_element(BGP_NODE, &bgp_fast_external_failover_cmd); install_element(BGP_NODE, &no_bgp_fast_external_failover_cmd); diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index c5a5e49a48..9316d71baf 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -3169,6 +3169,7 @@ static struct bgp *bgp_create(as_t *as, const char *name, bgp_addpath_init_bgp_data(&bgp->tx_addpath); bgp->fast_convergence = false; bgp->as = *as; + bgp->llgr_stale_time = BGP_DEFAULT_LLGR_STALE_TIME; #ifdef ENABLE_BGP_VNC if (inst_type != BGP_INSTANCE_TYPE_VRF) { @@ -4752,6 +4753,10 @@ int peer_ebgp_multihop_set(struct peer *peer, int ttl) BGP_NOTIFY_CEASE_CONFIG_CHANGE); else bgp_session_reset(peer); + + /* Reconfigure BFD peer with new TTL. */ + if (peer->bfd_config) + bgp_peer_bfd_update_source(peer); } } else { group = peer->group; @@ -4766,6 +4771,10 @@ int peer_ebgp_multihop_set(struct peer *peer, int ttl) BGP_NOTIFY_CEASE_CONFIG_CHANGE); else bgp_session_reset(peer); + + /* Reconfigure BFD peer with new TTL. */ + if (peer->bfd_config) + bgp_peer_bfd_update_source(peer); } } return 0; @@ -4799,6 +4808,10 @@ int peer_ebgp_multihop_unset(struct peer *peer) BGP_NOTIFY_CEASE_CONFIG_CHANGE); else bgp_session_reset(peer); + + /* Reconfigure BFD peer with new TTL. */ + if (peer->bfd_config) + bgp_peer_bfd_update_source(peer); } else { group = peer->group; for (ALL_LIST_ELEMENTS(group->peer, node, nnode, peer)) { @@ -4815,6 +4828,10 @@ int peer_ebgp_multihop_unset(struct peer *peer) else bgp_session_reset(peer); } + + /* Reconfigure BFD peer with new TTL. */ + if (peer->bfd_config) + bgp_peer_bfd_update_source(peer); } } return 0; @@ -4860,6 +4877,10 @@ int peer_update_source_if_set(struct peer *peer, const char *ifname) } else bgp_session_reset(peer); + /* Apply new source configuration to BFD session. */ + if (peer->bfd_config) + bgp_peer_bfd_update_source(peer); + /* Skip peer-group mechanics for regular peers. */ return 0; } @@ -4893,6 +4914,10 @@ int peer_update_source_if_set(struct peer *peer, const char *ifname) BGP_NOTIFY_CEASE_CONFIG_CHANGE); } else bgp_session_reset(member); + + /* Apply new source configuration to BFD session. */ + if (member->bfd_config) + bgp_peer_bfd_update_source(member); } return 0; @@ -4923,6 +4948,10 @@ int peer_update_source_addr_set(struct peer *peer, const union sockunion *su) } else bgp_session_reset(peer); + /* Apply new source configuration to BFD session. */ + if (peer->bfd_config) + bgp_peer_bfd_update_source(peer); + /* Skip peer-group mechanics for regular peers. */ return 0; } @@ -4955,6 +4984,10 @@ int peer_update_source_addr_set(struct peer *peer, const union sockunion *su) BGP_NOTIFY_CEASE_CONFIG_CHANGE); } else bgp_session_reset(member); + + /* Apply new source configuration to BFD session. */ + if (member->bfd_config) + bgp_peer_bfd_update_source(member); } return 0; @@ -4992,6 +5025,10 @@ int peer_update_source_unset(struct peer *peer) } else bgp_session_reset(peer); + /* Apply new source configuration to BFD session. */ + if (peer->bfd_config) + bgp_peer_bfd_update_source(peer); + /* Skip peer-group mechanics for regular peers. */ return 0; } @@ -5023,6 +5060,10 @@ int peer_update_source_unset(struct peer *peer) BGP_NOTIFY_CEASE_CONFIG_CHANGE); } else bgp_session_reset(member); + + /* Apply new source configuration to BFD session. */ + if (member->bfd_config) + bgp_peer_bfd_update_source(member); } return 0; diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h index 5e1eacbb9e..e60acecfae 100644 --- a/bgpd/bgpd.h +++ b/bgpd/bgpd.h @@ -613,6 +613,9 @@ struct bgp { struct graceful_restart_info gr_info[AFI_MAX][SAFI_MAX]; uint32_t rib_stale_time; + /* BGP Long-lived Graceful Restart */ + uint32_t llgr_stale_time; + #define BGP_ROUTE_SELECT_DELAY 1 #define BGP_MAX_BEST_ROUTE_SELECT 10000 /* Maximum-paths configuration */ @@ -1052,6 +1055,11 @@ enum bgp_fsm_status { #define PEER_HOSTNAME(peer) ((peer)->host ? (peer)->host : "(unknown peer)") +struct llgr_info { + uint32_t stale_time; + uint8_t flags; +}; + /* BGP neighbor structure. */ struct peer { /* BGP structure. */ @@ -1182,6 +1190,8 @@ struct peer { #define PEER_CAP_ENHANCED_RR_RCV (1U << 18) /* enhanced rr received */ #define PEER_CAP_EXTENDED_MESSAGE_ADV (1U << 19) #define PEER_CAP_EXTENDED_MESSAGE_RCV (1U << 20) +#define PEER_CAP_LLGR_ADV (1U << 21) +#define PEER_CAP_LLGR_RCV (1U << 22) /* Capability flags (reset in bgp_stop) */ uint32_t af_cap[AFI_MAX][SAFI_MAX]; @@ -1200,6 +1210,8 @@ struct peer { #define PEER_CAP_ENHE_AF_ADV (1U << 12) /* Extended nexthopi afi/safi advertised */ #define PEER_CAP_ENHE_AF_RCV (1U << 13) /* Extended nexthop afi/safi received */ #define PEER_CAP_ENHE_AF_NEGO (1U << 14) /* Extended nexthop afi/safi negotiated */ +#define PEER_CAP_LLGR_AF_ADV (1U << 15) +#define PEER_CAP_LLGR_AF_RCV (1U << 16) /* Global configuration flags. */ /* @@ -1657,6 +1669,9 @@ struct peer { /* set TCP max segment size */ uint32_t tcp_mss; + /* Long-lived Graceful Restart */ + struct llgr_info llgr[AFI_MAX][SAFI_MAX]; + QOBJ_FIELDS; }; DECLARE_QOBJ_TYPE(peer); @@ -1869,6 +1884,9 @@ struct bgp_nlri { #define BGP_DEFAULT_RIB_STALE_TIME 500 #define BGP_DEFAULT_UPDATE_ADVERTISEMENT_TIME 1 +/* BGP Long-lived Graceful Restart */ +#define BGP_DEFAULT_LLGR_STALE_TIME 360 + /* BGP uptime string length. */ #define BGP_UPTIME_LEN 25 diff --git a/doc/user/bgp.rst b/doc/user/bgp.rst index 1793ae3d27..68b4d74dd6 100644 --- a/doc/user/bgp.rst +++ b/doc/user/bgp.rst @@ -989,6 +989,18 @@ BGP GR Peer Mode Commands at the peer level. +Long-lived Graceful Restart +--------------------------- + +Currently, only restarter mode is supported. This capability is advertised only +if graceful restart capability is negotiated. + +.. clicmd:: bgp long-lived-graceful-restart stale-time (0-4294967295) + + Specifies the maximum time to wait before purging long-lived stale routes for + helper routers. + + .. _bgp-shutdown: Administrative Shutdown @@ -1432,9 +1444,6 @@ Configuring Peers IPv4 session addresses, see the ``neighbor PEER update-source`` command below. - This command is deprecated and may be removed in a future release. Its use - should be avoided. - .. clicmd:: neighbor PEER interface remote-as <internal|external|ASN> Configure an unnumbered BGP peer. ``PEER`` should be an interface name. The diff --git a/doc/user/rpki.rst b/doc/user/rpki.rst index 235df56528..c1308913a4 100644 --- a/doc/user/rpki.rst +++ b/doc/user/rpki.rst @@ -54,6 +54,9 @@ In a nutshell, the current implementation provides the following features Enabling RPKI ------------- +You must install ``frr-rpki-rtrlib`` additional package for RPKI support, +otherwise ``bgpd`` daemon won't startup. + .. clicmd:: rpki This command enables the RPKI configuration mode. Most commands that start @@ -66,8 +69,6 @@ Enabling RPKI to configure at least one reachable cache server. See section :ref:`configuring-rpki-rtr-cache-servers` for configuring a cache server. - -When first installing FRR with RPKI support from the pre-packaged binaries. Remember to add ``-M rpki`` to the variable ``bgpd_options`` in :file:`/etc/frr/daemons` , like so:: diff --git a/doc/user/zebra.rst b/doc/user/zebra.rst index de327dfe21..c5440ef88d 100644 --- a/doc/user/zebra.rst +++ b/doc/user/zebra.rst @@ -143,8 +143,8 @@ Standard Commands Configure an IPv4 Point-to-Point address on the interface. (The concept of PtP addressing does not exist for IPv6.) - `local-addr` has no subnet mask since the local side in PtP addressing is - always a single (/32) address. `peer-addr/prefix` can be an arbitrary subnet + ``local-addr`` has no subnet mask since the local side in PtP addressing is + always a single (/32) address. ``peer-addr/prefix`` can be an arbitrary subnet behind the other end of the link (or even on the link in Point-to-Multipoint setups), though generally /32s are used. @@ -157,7 +157,7 @@ Standard Commands .. clicmd:: multicast - Enable or disables multicast flag for the interface. + Enable or disable multicast flag for the interface. .. clicmd:: bandwidth (1-10000000) @@ -171,7 +171,7 @@ Standard Commands .. clicmd:: link-detect - Enable/disable link-detect on platforms which support this. Currently only + Enable or disable link-detect on platforms which support this. Currently only Linux, and only where network interface drivers support reporting link-state via the ``IFF_RUNNING`` flag. @@ -430,7 +430,7 @@ commands in relationship to VRF. Here is an extract of some of those commands: .. clicmd:: show ip route vrf VRF tables - This command will dump the routing tables within the vrf scope. If `vrf all` + This command will dump the routing tables within the vrf scope. If ``vrf all`` is executed, all routing tables will be dumped. .. clicmd:: show <ip|ipv6> route summary [vrf VRF] [table TABLENO] [prefix] @@ -444,7 +444,7 @@ By using the :option:`-n` option, the *Linux network namespace* will be mapped over the *Zebra* VRF. One nice feature that is possible by handling *Linux network namespace* is the ability to name default VRF. At startup, *Zebra* discovers the available *Linux network namespace* by parsing folder -`/var/run/netns`. Each file stands for a *Linux network namespace*, but not all +``/var/run/netns``. Each file stands for a *Linux network namespace*, but not all *Linux network namespaces* are available under that folder. This is the case for default VRF. It is possible to name the default VRF, by creating a file, by executing following commands. @@ -455,19 +455,19 @@ executing following commands. mount --bind /proc/self/ns/net /var/run/netns/vrf0 Above command illustrates what happens when the default VRF is visible under -`var/run/netns/`. Here, the default VRF file is `vrf0`. +``/var/run/netns``. Here, the default VRF file is ``vrf0``. At startup, FRR detects the presence of that file. It detects that the file statistics information matches the same file statistics information as -`/proc/self/ns/net` ( through stat() function). As statistics information -matches, then `vrf0` stands for the new default namespace name. -Consequently, the VRF naming `Default` will be overridden by the new discovered -namespace name `vrf0`. +``/proc/self/ns/net`` ( through stat() function). As statistics information +matches, then ``vrf0`` stands for the new default namespace name. +Consequently, the VRF naming ``Default`` will be overridden by the new discovered +namespace name ``vrf0``. For those who don't use VRF backend with *Linux network namespace*, it is possible to statically configure and recompile FRR. It is possible to choose an alternate name for default VRF. Then, the default VRF naming will automatically be updated with the new name. To illustrate, if you want to recompile with -`global` value, use the following command: +``global`` value, use the following command: .. code-block:: shell @@ -499,7 +499,7 @@ options on compilation if the end operator desires to do so. Individual protocols each have their own way of dictating ECMP policy and their respective documentation should be read. -ECMP can be inspected in zebra by doing a `show ip route X` command. +ECMP can be inspected in zebra by doing a ``show ip route X`` command. .. code-block:: shell @@ -528,11 +528,11 @@ ECMP can be inspected in zebra by doing a `show ip route X` command. * via 192.168.161.15, enp39s0, weight 1, 00:00:02 * via 192.168.161.16, enp39s0, weight 1, 00:00:02 -In this example we have 16 way ecmp for the 4.4.4.4/32 route. The `*` character +In this example we have 16 way ecmp for the 4.4.4.4/32 route. The ``*`` character tells us that the route is installed in the Data Plane, or FIB. If you are using the Linux kernel as a Data Plane, this can be inspected -via a `ip route show X` command: +via a ``ip route show X`` command: .. code-block:: shell @@ -557,7 +557,7 @@ via a `ip route show X` command: Once installed into the FIB, FRR currently has little control over what nexthops are choosen to forward packets on. Currently the Linux kernel -has a `fib_multipath_hash_policy` sysctl which dictates how the hashing +has a ``fib_multipath_hash_policy`` sysctl which dictates how the hashing algorithm is used to forward packets. .. _zebra-mpls: @@ -811,7 +811,7 @@ unicast topology! with the longer prefix length is used; if they're equal, the Multicast RIB takes precedence. - The `mrib-then-urib` setting is the default behavior if nothing is + The ``mrib-then-urib`` setting is the default behavior if nothing is configured. If this is the desired behavior, it should be explicitly configured to make the configuration immune against possible changes in what the default behavior is. @@ -904,8 +904,8 @@ that sets the preferred source address, and applies the route-map to all ip prefix-list ANY permit 0.0.0.0/0 le 32 route-map RM1 permit 10 - match ip address prefix-list ANY - set src 10.0.0.1 + match ip address prefix-list ANY + set src 10.0.0.1 ip protocol rip route-map RM1 @@ -915,8 +915,8 @@ IPv6 example for OSPFv3. ipv6 prefix-list ANY seq 10 permit any route-map RM6 permit 10 - match ipv6 address prefix-list ANY - set src 2001:db8:425:1000::3 + match ipv6 address prefix-list ANY + set src 2001:db8:425:1000::3 ipv6 protocol ospf6 route-map RM6 @@ -951,7 +951,7 @@ latter information makes up the Forwarding Information Base (FIB). Zebra feeds the FIB to the kernel, which allows the IP stack in the kernel to forward packets according to the routes computed by FRR. The kernel FIB is updated in an OS-specific way. For example, -the `Netlink` interface is used on Linux, and route sockets are +the ``Netlink`` interface is used on Linux, and route sockets are used on FreeBSD. The FIB push interface aims to provide a cross-platform mechanism to @@ -1353,6 +1353,15 @@ Optional sysctl settings When ndisc_notify is set to 0, no U-NA is sent. When ndisc_notify is set to 1, a U-NA is sent when the interface comes UP. +Useful sysctl settings +---------------------- + +.. option:: net.ipv6.conf.all.use_oif_addrs_only = 1 + + When enabled, the candidate source addresses for destinations routed via this interface are + restricted to the set of addresses configured on this interface (RFC 6724 section 4). If + an operator has hundreds of IP addresses per interface this solves the latency problem. + Debugging ========= @@ -1422,7 +1431,7 @@ Scripting .. clicmd:: zebra on-rib-process script SCRIPT Set a Lua script for :ref:`on-rib-process-dplane-results` hook call. - SCRIPT is the basename of the script, without `.lua`. + SCRIPT is the basename of the script, without ``.lua``. Data structures --------------- @@ -552,7 +552,8 @@ static bool bfd_sess_address_changed(const struct bfd_session_params *bsp, } void bfd_sess_set_ipv4_addrs(struct bfd_session_params *bsp, - struct in_addr *src, struct in_addr *dst) + const struct in_addr *src, + const struct in_addr *dst) { if (!bfd_sess_address_changed(bsp, AF_INET, (struct in6_addr *)src, (struct in6_addr *)dst)) @@ -576,10 +577,10 @@ void bfd_sess_set_ipv4_addrs(struct bfd_session_params *bsp, } void bfd_sess_set_ipv6_addrs(struct bfd_session_params *bsp, - struct in6_addr *src, struct in6_addr *dst) + const struct in6_addr *src, + const struct in6_addr *dst) { - if (!bfd_sess_address_changed(bsp, AF_INET, (struct in6_addr *)src, - (struct in6_addr *)dst)) + if (!bfd_sess_address_changed(bsp, AF_INET6, src, dst)) return; /* If already installed, remove the old setting. */ @@ -124,7 +124,8 @@ void bfd_sess_free(struct bfd_session_params **bsp); * \param dst remote address (mandatory). */ void bfd_sess_set_ipv4_addrs(struct bfd_session_params *bsp, - struct in_addr *src, struct in_addr *dst); + const struct in_addr *src, + const struct in_addr *dst); /** * Set the local and peer address of the BFD session. @@ -138,7 +139,8 @@ void bfd_sess_set_ipv4_addrs(struct bfd_session_params *bsp, * \param dst remote address (mandatory). */ void bfd_sess_set_ipv6_addrs(struct bfd_session_params *bsp, - struct in6_addr *src, struct in6_addr *dst); + const struct in6_addr *src, + const struct in6_addr *dst); /** * Configure the BFD session interface. @@ -48,6 +48,7 @@ DEFINE_MTYPE_STATIC(LIB, IF_LINK_PARAMS, "Informational Link Parameters"); static void if_set_name(struct interface *ifp, const char *name); static struct interface *if_lookup_by_ifindex(ifindex_t ifindex, vrf_id_t vrf_id); +static struct interface *if_lookup_by_index_all_vrf(ifindex_t ifindex); static int if_cmp_func(const struct interface *, const struct interface *); static int if_cmp_index_func(const struct interface *ifp1, const struct interface *ifp2); @@ -440,7 +441,7 @@ static struct interface *if_lookup_by_name_all_vrf(const char *name) return NULL; } -struct interface *if_lookup_by_index_all_vrf(ifindex_t ifindex) +static struct interface *if_lookup_by_index_all_vrf(ifindex_t ifindex) { struct vrf *vrf; struct interface *ifp; @@ -515,7 +515,6 @@ extern void if_update_to_new_vrf(struct interface *, vrf_id_t vrf_id); extern struct interface *if_lookup_by_index(ifindex_t, vrf_id_t vrf_id); extern struct interface *if_vrf_lookup_by_index_next(ifindex_t ifindex, vrf_id_t vrf_id); -extern struct interface *if_lookup_by_index_all_vrf(ifindex_t); extern struct interface *if_lookup_exact_address(const void *matchaddr, int family, vrf_id_t vrf_id); extern struct connected *if_lookup_address(const void *matchaddr, int family, @@ -256,10 +256,8 @@ void vrf_delete(struct vrf *vrf) * the ID mapping. Interfaces assigned to this VRF should've been * removed already as part of the VRF going down. */ - if (vrf_is_user_cfged(vrf)) { - vrf->ns_ctxt = NULL; + if (vrf_is_user_cfged(vrf)) return; - } /* Do not delete the VRF if it has interfaces configured in it. */ if (!RB_EMPTY(if_name_head, &vrf->ifaces_by_name)) @@ -541,10 +539,13 @@ void vrf_init(int (*create)(struct vrf *), int (*enable)(struct vrf *), static void vrf_terminate_single(struct vrf *vrf) { + int enabled = vrf_is_enabled(vrf); + /* Clear configured flag and invoke delete. */ UNSET_FLAG(vrf->status, VRF_CONFIGURED); if_terminate(vrf); - vrf_delete(vrf); + if (enabled) + vrf_delete(vrf); } /* Terminate VRF module. */ @@ -57,9 +57,12 @@ #endif DEFINE_MTYPE_STATIC(LIB, VTY, "VTY"); +DEFINE_MTYPE_STATIC(LIB, VTY_SERV, "VTY server"); DEFINE_MTYPE_STATIC(LIB, VTY_OUT_BUF, "VTY output buffer"); DEFINE_MTYPE_STATIC(LIB, VTY_HIST, "VTY history"); +DECLARE_DLIST(vtys, struct vty, itm); + /* Vty events */ enum event { VTY_SERV, @@ -73,17 +76,31 @@ enum event { #endif /* VTYSH */ }; -static void vty_event_serv(enum event event, int sock); +PREDECL_DLIST(vtyservs); + +struct vty_serv { + struct vtyservs_item itm; + + int sock; + bool vtysh; + + struct thread *t_accept; +}; + +DECLARE_DLIST(vtyservs, struct vty_serv, itm); + +static void vty_event_serv(enum event event, struct vty_serv *); static void vty_event(enum event, struct vty *); /* Extern host structure from command.c */ extern struct host host; -/* Vector which store each vty structure. */ -static vector vtyvec; +/* active listeners */ +static struct vtyservs_head vty_servs[1] = {INIT_DLIST(vty_servs[0])}; -/* Vector for vtysh connections. */ -static vector vtyshvec; +/* active connections */ +static struct vtys_head vty_sessions[1] = {INIT_DLIST(vty_sessions[0])}; +static struct vtys_head vtysh_sessions[1] = {INIT_DLIST(vtysh_sessions[0])}; /* Vty timeout value. */ static unsigned long vty_timeout_val = VTY_TIMEOUT_DEFAULT; @@ -94,9 +111,6 @@ static char *vty_accesslist_name = NULL; /* Vty access-calss for IPv6. */ static char *vty_ipv6_accesslist_name = NULL; -/* VTY server thread. */ -static vector Vvty_serv_thread; - /* Current directory. */ static char vty_cwd[MAXPATHLEN]; @@ -266,63 +280,6 @@ done: return len; } -static int vty_log_out(struct vty *vty, const char *level, - const char *proto_str, const char *msg, - struct timestamp_control *ctl) -{ - int ret; - int len; - char buf[1024]; - - if (!ctl->already_rendered) { - ctl->len = quagga_timestamp(ctl->precision, ctl->buf, - sizeof(ctl->buf)); - ctl->already_rendered = 1; - } - if (ctl->len + 1 >= sizeof(buf)) - return -1; - memcpy(buf, ctl->buf, len = ctl->len); - buf[len++] = ' '; - buf[len] = '\0'; - - if (level) - ret = snprintf(buf + len, sizeof(buf) - len, "%s: %s: ", level, - proto_str); - else - ret = snprintf(buf + len, sizeof(buf) - len, "%s: ", proto_str); - if ((ret < 0) || ((size_t)(len += ret) >= sizeof(buf))) - return -1; - - if (((ret = snprintf(buf + len, sizeof(buf) - len, "%s", msg)) < 0) - || ((size_t)((len += ret) + 2) > sizeof(buf))) - return -1; - - buf[len++] = '\r'; - buf[len++] = '\n'; - - if (write(vty->wfd, buf, len) < 0) { - if (ERRNO_IO_RETRY(errno)) - /* Kernel buffer is full, probably too much debugging - output, so just - drop the data and ignore. */ - return -1; - /* Fatal I/O error. */ - vty->monitor = - 0; /* disable monitoring to avoid infinite recursion */ - flog_err(EC_LIB_SOCKET, - "%s: write failed to vty client fd %d, closing: %s", - __func__, vty->fd, safe_strerror(errno)); - buffer_reset(vty->obuf); - buffer_reset(vty->lbuf); - /* cannot call vty_close, because a parent routine may still try - to access the vty struct */ - vty->status = VTY_CLOSE; - shutdown(vty->fd, SHUT_RDWR); - return -1; - } - return 0; -} - /* Output current time to the vty. */ void vty_time_print(struct vty *vty, int cr) { @@ -480,19 +437,12 @@ static int vty_command(struct vty *vty, char *buf) cp++; } if (cp != NULL && *cp != '\0') { - unsigned i; char vty_str[VTY_BUFSIZ]; char prompt_str[VTY_BUFSIZ]; /* format the base vty info */ - snprintf(vty_str, sizeof(vty_str), "vty[??]@%s", vty->address); - - for (i = 0; i < vector_active(vtyvec); i++) - if (vty == vector_slot(vtyvec, i)) { - snprintf(vty_str, sizeof(vty_str), "vty[%d]@%s", - i, vty->address); - break; - } + snprintf(vty_str, sizeof(vty_str), "vty[%d]@%s", vty->fd, + vty->address); /* format the prompt */ snprintf(prompt_str, sizeof(prompt_str), cmd_prompt(vty->node), @@ -1624,13 +1574,14 @@ static struct vty *vty_new_init(int vty_sock) memset(vty->xpath, 0, sizeof(vty->xpath)); vty->private_config = false; vty->candidate_config = vty_shared_candidate_config; - vector_set_index(vtyvec, vty_sock, vty); vty->status = VTY_NORMAL; vty->lines = -1; vty->iac = 0; vty->iac_sb_in_progress = 0; vty->sb_len = 0; + vtys_add_tail(vty_sessions, vty); + return vty; } @@ -1788,18 +1739,17 @@ struct vty *vty_stdio(void (*atclose)(int isexit)) /* Accept connection from the network. */ static int vty_accept(struct thread *thread) { + struct vty_serv *vtyserv = THREAD_ARG(thread); int vty_sock; union sockunion su; int ret; unsigned int on; - int accept_sock; + int accept_sock = vtyserv->sock; struct prefix p; struct access_list *acl = NULL; - accept_sock = THREAD_FD(thread); - /* We continue hearing vty socket. */ - vty_event_serv(VTY_SERV, accept_sock); + vty_event_serv(VTY_SERV, vtyserv); memset(&su, 0, sizeof(union sockunion)); @@ -1826,10 +1776,6 @@ static int vty_accept(struct thread *thread) && (access_list_apply(acl, &p) == FILTER_DENY)) { zlog_info("Vty connection refused from %pSU", &su); close(vty_sock); - - /* continue accepting connections */ - vty_event_serv(VTY_SERV, accept_sock); - return 0; } } @@ -1841,10 +1787,6 @@ static int vty_accept(struct thread *thread) && (access_list_apply(acl, &p) == FILTER_DENY)) { zlog_info("Vty connection refused from %pSU", &su); close(vty_sock); - - /* continue accepting connections */ - vty_event_serv(VTY_SERV, accept_sock); - return 0; } } @@ -1890,6 +1832,8 @@ static void vty_serv_sock_addrinfo(const char *hostname, unsigned short port) ainfo_save = ainfo; do { + struct vty_serv *vtyserv; + if (ainfo->ai_family != AF_INET && ainfo->ai_family != AF_INET6) continue; @@ -1915,7 +1859,11 @@ static void vty_serv_sock_addrinfo(const char *hostname, unsigned short port) continue; } - vty_event_serv(VTY_SERV, sock); + vtyserv = XCALLOC(MTYPE_VTY_SERV, sizeof(*vtyserv)); + vtyserv->sock = sock; + vtyservs_add_tail(vty_servs, vtyserv); + + vty_event_serv(VTY_SERV, vtyserv); } while ((ainfo = ainfo->ai_next) != NULL); freeaddrinfo(ainfo_save); @@ -1928,6 +1876,7 @@ static void vty_serv_sock_addrinfo(const char *hostname, unsigned short port) /* VTY shell UNIX domain socket. */ static void vty_serv_un(const char *path) { + struct vty_serv *vtyserv; int ret; int sock, len; struct sockaddr_un serv; @@ -1993,22 +1942,26 @@ static void vty_serv_un(const char *path) } } - vty_event_serv(VTYSH_SERV, sock); + vtyserv = XCALLOC(MTYPE_VTY_SERV, sizeof(*vtyserv)); + vtyserv->sock = sock; + vtyserv->vtysh = true; + vtyservs_add_tail(vty_servs, vtyserv); + + vty_event_serv(VTYSH_SERV, vtyserv); } /* #define VTYSH_DEBUG 1 */ static int vtysh_accept(struct thread *thread) { - int accept_sock; + struct vty_serv *vtyserv = THREAD_ARG(thread); + int accept_sock = vtyserv->sock; int sock; int client_len; struct sockaddr_un client; struct vty *vty; - accept_sock = THREAD_FD(thread); - - vty_event_serv(VTYSH_SERV, accept_sock); + vty_event_serv(VTYSH_SERV, vtyserv); memset(&client, 0, sizeof(struct sockaddr_un)); client_len = sizeof(struct sockaddr_un); @@ -2041,7 +1994,7 @@ static int vtysh_accept(struct thread *thread) vty->wfd = sock; vty->type = VTY_SHELL_SERV; vty->node = VIEW_NODE; - vector_set_index(vtyshvec, sock, vty); + vtys_add_tail(vtysh_sessions, vty); vty_event(VTYSH_READ, vty); @@ -2217,9 +2170,9 @@ void vty_close(struct vty *vty) /* Unset vector. */ if (vty->fd != -1) { if (vty->type == VTY_SHELL_SERV) - vector_unset(vtyshvec, vty->fd); + vtys_del(vtysh_sessions, vty); else - vector_unset(vtyvec, vty->fd); + vtys_del(vty_sessions, vty); } if (vty->wfd > 0 && vty->type == VTY_FILE) @@ -2533,52 +2486,6 @@ tmp_free_and_out: return read_success; } -/* Small utility function which output log to the VTY. */ -void vty_log(const char *level, const char *proto_str, const char *msg, - struct timestamp_control *ctl) -{ - unsigned int i; - struct vty *vty; - - if (!vtyvec) - return; - - for (i = 0; i < vector_active(vtyvec); i++) - if ((vty = vector_slot(vtyvec, i)) != NULL) - if (vty->monitor) - vty_log_out(vty, level, proto_str, msg, ctl); -} - -/* Async-signal-safe version of vty_log for fixed strings. */ -void vty_log_fixed(char *buf, size_t len) -{ - unsigned int i; - struct iovec iov[2]; - char crlf[4] = "\r\n"; - - /* vty may not have been initialised */ - if (!vtyvec) - return; - - iov[0].iov_base = buf; - iov[0].iov_len = len; - iov[1].iov_base = crlf; - iov[1].iov_len = 2; - - for (i = 0; i < vector_active(vtyvec); i++) { - struct vty *vty; - if (((vty = vector_slot(vtyvec, i)) != NULL) && vty->monitor) - /* N.B. We don't care about the return code, since - process is - most likely just about to die anyway. */ - if (writev(vty->wfd, iov, 2) == -1) { - fprintf(stderr, "Failure to writev: %d\n", - errno); - exit(-1); - } - } -} - static void update_xpath(struct vty *vty, const char *oldpath, const char *newpath) { @@ -2597,21 +2504,11 @@ static void update_xpath(struct vty *vty, const char *oldpath, void vty_update_xpath(const char *oldpath, const char *newpath) { struct vty *vty; - unsigned int i; - - for (i = 0; i < vector_active(vtyshvec); i++) { - if ((vty = vector_slot(vtyshvec, i)) == NULL) - continue; + frr_each (vtys, vtysh_sessions, vty) update_xpath(vty, oldpath, newpath); - } - - for (i = 0; i < vector_active(vtyvec); i++) { - if ((vty = vector_slot(vtyvec, i)) == NULL) - continue; - + frr_each (vtys, vty_sessions, vty) update_xpath(vty, oldpath, newpath); - } } int vty_config_enter(struct vty *vty, bool private_config, bool exclusive) @@ -2695,23 +2592,17 @@ int vty_config_node_exit(struct vty *vty) /* Master of the threads. */ static struct thread_master *vty_master; -static void vty_event_serv(enum event event, int sock) +static void vty_event_serv(enum event event, struct vty_serv *vty_serv) { - struct thread **vty_serv_thread_ptr = NULL; - switch (event) { case VTY_SERV: - vty_serv_thread_ptr = (struct thread **)vector_get_index( - Vvty_serv_thread, sock); - thread_add_read(vty_master, vty_accept, NULL, sock, - vty_serv_thread_ptr); + thread_add_read(vty_master, vty_accept, vty_serv, + vty_serv->sock, &vty_serv->t_accept); break; #ifdef VTYSH case VTYSH_SERV: - vty_serv_thread_ptr = (struct thread **)vector_get_index( - Vvty_serv_thread, sock); - thread_add_read(vty_master, vtysh_accept, NULL, sock, - vty_serv_thread_ptr); + thread_add_read(vty_master, vtysh_accept, vty_serv, + vty_serv->sock, &vty_serv->t_accept); break; #endif /* VTYSH */ default: @@ -2763,13 +2654,11 @@ DEFUN_NOSH (config_who, "who", "Display who is on vty\n") { - unsigned int i; struct vty *v; - for (i = 0; i < vector_active(vtyvec); i++) - if ((v = vector_slot(vtyvec, i)) != NULL) - vty_out(vty, "%svty[%d] connected from %s.\n", - v->config ? "*" : " ", i, v->address); + frr_each (vtys, vty_sessions, v) + vty_out(vty, "%svty[%d] connected from %s.\n", + v->config ? "*" : " ", v->fd, v->address); return CMD_SUCCESS; } @@ -3082,25 +2971,14 @@ struct cmd_node vty_node = { /* Reset all VTY status. */ void vty_reset(void) { - unsigned int i; struct vty *vty; - struct thread *vty_serv_thread; - - for (i = 0; i < vector_active(vtyvec); i++) - if ((vty = vector_slot(vtyvec, i)) != NULL) { - buffer_reset(vty->lbuf); - buffer_reset(vty->obuf); - vty->status = VTY_CLOSE; - vty_close(vty); - } - for (i = 0; i < vector_active(Vvty_serv_thread); i++) - if ((vty_serv_thread = vector_slot(Vvty_serv_thread, i)) - != NULL) { - THREAD_OFF(vty_serv_thread); - vector_slot(Vvty_serv_thread, i) = NULL; - close(i); - } + frr_each_safe (vtys, vty_sessions, vty) { + buffer_reset(vty->lbuf); + buffer_reset(vty->obuf); + vty->status = VTY_CLOSE; + vty_close(vty); + } vty_timeout_val = VTY_TIMEOUT_DEFAULT; @@ -3151,7 +3029,7 @@ int vty_shell_serv(struct vty *vty) void vty_init_vtysh(void) { - vtyvec = vector_init(VECTOR_MIN_SIZE); + /* currently nothing to do, but likely to have future use */ } /* Install vty's own commands like `who' command. */ @@ -3160,16 +3038,10 @@ void vty_init(struct thread_master *master_thread, bool do_command_logging) /* For further configuration read, preserve current directory. */ vty_save_cwd(); - vtyvec = vector_init(VECTOR_MIN_SIZE); - vtyshvec = vector_init(VECTOR_MIN_SIZE); - vty_master = master_thread; atexit(vty_stdio_atexit); - /* Initialize server thread vector. */ - Vvty_serv_thread = vector_init(VECTOR_MIN_SIZE); - /* Install bgp top node. */ install_node(&vty_node); @@ -3204,17 +3076,34 @@ void vty_init(struct thread_master *master_thread, bool do_command_logging) void vty_terminate(void) { + struct vty *vty; + struct vty_serv *vtyserv; + memset(vty_cwd, 0x00, sizeof(vty_cwd)); - if (vtyvec && Vvty_serv_thread) { - vty_reset(); - vector_free(vtyvec); - vector_free(Vvty_serv_thread); - vtyvec = NULL; - Vvty_serv_thread = NULL; + vty_reset(); + + /* default state of vty_sessions is initialized & empty. */ + vtys_fini(vty_sessions); + vtys_init(vty_sessions); + + /* vty_reset() doesn't close vtysh sessions */ + frr_each_safe (vtys, vtysh_sessions, vty) { + buffer_reset(vty->lbuf); + buffer_reset(vty->obuf); + vty->status = VTY_CLOSE; + vty_close(vty); } - if (vtyshvec) { - vector_free(vtyshvec); - vtyshvec = NULL; + + vtys_fini(vtysh_sessions); + vtys_init(vtysh_sessions); + + while ((vtyserv = vtyservs_pop(vty_servs))) { + THREAD_OFF(vtyserv->t_accept); + close(vtyserv->sock); + XFREE(MTYPE_VTY_SERV, vtyserv); } + + vtyservs_fini(vty_servs); + vtyservs_init(vty_servs); } @@ -56,8 +56,12 @@ struct vty_cfg_change { const char *value; }; +PREDECL_DLIST(vtys); + /* VTY struct. */ struct vty { + struct vtys_item itm; + /* File descripter of this vty. */ int fd; @@ -325,8 +329,6 @@ extern void vty_time_print(struct vty *, int); extern void vty_serv_sock(const char *, unsigned short, const char *); extern void vty_close(struct vty *); extern char *vty_get_cwd(void); -extern void vty_log(const char *level, const char *proto, const char *msg, - struct timestamp_control *); extern void vty_update_xpath(const char *oldpath, const char *newpath); extern int vty_config_enter(struct vty *vty, bool private_config, bool exclusive); @@ -341,10 +343,6 @@ extern void vty_stdio_suspend(void); extern void vty_stdio_resume(void); extern void vty_stdio_close(void); -/* Send a fixed-size message to all vty terminal monitors; this should be - an async-signal-safe function. */ -extern void vty_log_fixed(char *buf, size_t len); - #ifdef __cplusplus } #endif diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c index 64992bbcee..4205be38ba 100644 --- a/ospf6d/ospf6_interface.c +++ b/ospf6d/ospf6_interface.c @@ -675,7 +675,8 @@ uint8_t dr_election(struct ospf6_interface *oi) if (on->state < OSPF6_NEIGHBOR_TWOWAY) continue; /* Schedule AdjOK. */ - thread_add_event(master, adj_ok, on, 0, NULL); + thread_add_event(master, adj_ok, on, 0, + &on->thread_adj_ok); } } diff --git a/ospf6d/ospf6_message.c b/ospf6d/ospf6_message.c index a81c3e728f..49a379aa17 100644 --- a/ospf6d/ospf6_message.c +++ b/ospf6d/ospf6_message.c @@ -772,7 +772,8 @@ static void ospf6_dbdesc_recv_master(struct ospf6_header *oh, /* More bit check */ if (!CHECK_FLAG(dbdesc->bits, OSPF6_DBDESC_MBIT) && !CHECK_FLAG(on->dbdesc_bits, OSPF6_DBDESC_MBIT)) - thread_add_event(master, exchange_done, on, 0, NULL); + thread_add_event(master, exchange_done, on, 0, + &on->thread_exchange_done); else { thread_add_event(master, ospf6_dbdesc_send_newone, on, 0, &on->thread_send_dbdesc); @@ -2261,7 +2262,8 @@ int ospf6_dbdesc_send_newone(struct thread *thread) if (!CHECK_FLAG(on->dbdesc_bits, OSPF6_DBDESC_MSBIT) && /* Slave */ !CHECK_FLAG(on->dbdesc_last.bits, OSPF6_DBDESC_MBIT) && !CHECK_FLAG(on->dbdesc_bits, OSPF6_DBDESC_MBIT)) - thread_add_event(master, exchange_done, on, 0, NULL); + thread_add_event(master, exchange_done, on, 0, + &on->thread_exchange_done); thread_execute(master, ospf6_dbdesc_send, on, 0); return 0; diff --git a/ospf6d/ospf6_neighbor.c b/ospf6d/ospf6_neighbor.c index 36948dc0a7..3d0dde8c65 100644 --- a/ospf6d/ospf6_neighbor.c +++ b/ospf6d/ospf6_neighbor.c @@ -168,6 +168,9 @@ void ospf6_neighbor_delete(struct ospf6_neighbor *on) THREAD_OFF(on->thread_send_lsreq); THREAD_OFF(on->thread_send_lsupdate); THREAD_OFF(on->thread_send_lsack); + THREAD_OFF(on->thread_exchange_done); + THREAD_OFF(on->thread_adj_ok); + THREAD_OFF(on->gr_helper_info.t_grace_timer); bfd_sess_free(&on->bfd_session); @@ -603,6 +606,8 @@ int oneway_received(struct thread *thread) THREAD_OFF(on->thread_send_lsreq); THREAD_OFF(on->thread_send_lsupdate); THREAD_OFF(on->thread_send_lsack); + THREAD_OFF(on->thread_exchange_done); + THREAD_OFF(on->thread_adj_ok); return 0; } diff --git a/ospf6d/ospf6_neighbor.h b/ospf6d/ospf6_neighbor.h index f7735b87b9..de59a1ccf5 100644 --- a/ospf6d/ospf6_neighbor.h +++ b/ospf6d/ospf6_neighbor.h @@ -136,6 +136,8 @@ struct ospf6_neighbor { struct thread *thread_send_lsreq; struct thread *thread_send_lsupdate; struct thread *thread_send_lsack; + struct thread *thread_exchange_done; + struct thread *thread_adj_ok; /* BFD information */ struct bfd_session_params *bfd_session; diff --git a/ospf6d/ospf6_route.c b/ospf6d/ospf6_route.c index d0c8e3c970..35b567c768 100644 --- a/ospf6d/ospf6_route.c +++ b/ospf6d/ospf6_route.c @@ -1114,6 +1114,7 @@ void ospf6_route_show(struct vty *vty, struct ospf6_route *route, json_object *json_route = NULL; json_object *json_array_next_hops = NULL; json_object *json_next_hop; + vrf_id_t vrf_id = route->ospf6->vrf_id; monotime(&now); timersub(&now, &route->changed, &res); @@ -1147,16 +1148,15 @@ void ospf6_route_show(struct vty *vty, struct ospf6_route *route, else i = 0; for (ALL_LIST_ELEMENTS_RO(route->nh_list, node, nh)) { - struct interface *ifp; /* nexthop */ inet_ntop(AF_INET6, &nh->address, nexthop, sizeof(nexthop)); - ifp = if_lookup_by_index_all_vrf(nh->ifindex); if (use_json) { json_next_hop = json_object_new_object(); json_object_string_add(json_next_hop, "nextHop", nexthop); - json_object_string_add(json_next_hop, "interfaceName", - ifp->name); + json_object_string_add( + json_next_hop, "interfaceName", + ifindex2ifname(nh->ifindex, vrf_id)); json_object_array_add(json_array_next_hops, json_next_hop); } else { @@ -1168,12 +1168,14 @@ void ospf6_route_show(struct vty *vty, struct ospf6_route *route, OSPF6_PATH_TYPE_SUBSTR( route->path.type), destination, nexthop, IFNAMSIZ, - ifp->name, duration); + ifindex2ifname(nh->ifindex, vrf_id), + duration); i++; } else vty_out(vty, "%c%1s %2s %-30s %-25s %6.*s %s\n", ' ', "", "", "", nexthop, IFNAMSIZ, - ifp->name, ""); + ifindex2ifname(nh->ifindex, vrf_id), + ""); } } if (use_json) { @@ -1197,6 +1199,7 @@ void ospf6_route_show_detail(struct vty *vty, struct ospf6_route *route, json_object *json_route = NULL; json_object *json_array_next_hops = NULL; json_object *json_next_hop; + vrf_id_t vrf_id = route->ospf6->vrf_id; monotime(&now); @@ -1347,8 +1350,6 @@ void ospf6_route_show_detail(struct vty *vty, struct ospf6_route *route, vty_out(vty, "Nexthop:\n"); for (ALL_LIST_ELEMENTS_RO(route->nh_list, node, nh)) { - struct interface *ifp; - ifp = if_lookup_by_index_all_vrf(nh->ifindex); /* nexthop */ if (use_json) { inet_ntop(AF_INET6, &nh->address, nexthop, @@ -1356,13 +1357,14 @@ void ospf6_route_show_detail(struct vty *vty, struct ospf6_route *route, json_next_hop = json_object_new_object(); json_object_string_add(json_next_hop, "nextHop", nexthop); - json_object_string_add(json_next_hop, "interfaceName", - ifp->name); + json_object_string_add( + json_next_hop, "interfaceName", + ifindex2ifname(nh->ifindex, vrf_id)); json_object_array_add(json_array_next_hops, json_next_hop); } else vty_out(vty, " %pI6 %.*s\n", &nh->address, IFNAMSIZ, - ifp->name); + ifindex2ifname(nh->ifindex, vrf_id)); } if (use_json) { json_object_object_add(json_route, "nextHops", diff --git a/ospf6d/ospf6_spf.c b/ospf6d/ospf6_spf.c index a9bd7febcf..f9c47cbce5 100644 --- a/ospf6d/ospf6_spf.c +++ b/ospf6d/ospf6_spf.c @@ -461,6 +461,10 @@ void ospf6_spf_reason_string(uint32_t reason, char *buf, int size) if (!buf) return; + if (!reason) { + buf[0] = '\0'; + return; + } for (bit = 0; bit < array_size(ospf6_spf_reason_str); bit++) { if ((reason & (1 << bit)) && (len < size)) { len += snprintf((buf + len), (size - len), "%s%s", diff --git a/ospfd/ospf_dump.c b/ospfd/ospf_dump.c index b1aeefcd43..fab5b7d3cc 100644 --- a/ospfd/ospf_dump.c +++ b/ospfd/ospf_dump.c @@ -127,7 +127,9 @@ const char *ospf_area_desc_string(struct ospf_area *area) return buf; } -#define OSPF_IF_STRING_MAXLEN 40 +#define OSPF_IF_STRING_MAXLEN 40 + +/* Display both nbr and ism state of the ospf neighbor.*/ const char *ospf_if_name_string(struct ospf_interface *oi) { static char buf[OSPF_IF_STRING_MAXLEN] = ""; @@ -146,6 +148,13 @@ const char *ospf_if_name_string(struct ospf_interface *oi) return buf; } +/* Display only the nbr state.*/ +void ospf_nbr_state_message(struct ospf_neighbor *nbr, char *buf, size_t size) +{ + snprintf(buf, size, "%s", + lookup_msg(ospf_nsm_state_msg, nbr->state, NULL)); +} + int ospf_nbr_ism_state(struct ospf_neighbor *nbr) { int state; @@ -161,9 +170,23 @@ int ospf_nbr_ism_state(struct ospf_neighbor *nbr) return state; } -void ospf_nbr_state_message(struct ospf_neighbor *nbr, char *buf, size_t size) +void ospf_nbr_ism_state_message(struct ospf_neighbor *nbr, char *buf, + size_t size) { - int state = ospf_nbr_ism_state(nbr); + int state; + struct ospf_interface *oi = nbr->oi; + + if (!oi) + return; + + /* network type is point-to-point */ + if (oi->type == OSPF_IFTYPE_POINTOPOINT) { + snprintf(buf, size, "%s/-", + lookup_msg(ospf_nsm_state_msg, nbr->state, NULL)); + return; + } + + state = ospf_nbr_ism_state(nbr); snprintf(buf, size, "%s/%s", lookup_msg(ospf_nsm_state_msg, nbr->state, NULL), diff --git a/ospfd/ospf_dump.h b/ospfd/ospf_dump.h index 031ec2f428..58227d038e 100644 --- a/ospfd/ospf_dump.h +++ b/ospfd/ospf_dump.h @@ -151,7 +151,10 @@ extern const char *ospf_area_name_string(struct ospf_area *); extern const char *ospf_area_desc_string(struct ospf_area *); extern const char *ospf_if_name_string(struct ospf_interface *); extern int ospf_nbr_ism_state(struct ospf_neighbor *nbr); -extern void ospf_nbr_state_message(struct ospf_neighbor *, char *, size_t); +extern void ospf_nbr_state_message(struct ospf_neighbor *nbr, char *buf, + size_t size); +extern void ospf_nbr_ism_state_message(struct ospf_neighbor *nbr, char *buf, + size_t size); extern const char *ospf_timer_dump(struct thread *, char *, size_t); extern const char *ospf_timeval_dump(struct timeval *, char *, size_t); extern void ospf_packet_dump(struct stream *); diff --git a/ospfd/ospf_snmp.c b/ospfd/ospf_snmp.c index 432f95f9dd..a1ea4e45d7 100644 --- a/ospfd/ospf_snmp.c +++ b/ospfd/ospf_snmp.c @@ -2432,7 +2432,7 @@ static void ospfTrapNbrStateChange(struct ospf_neighbor *on) oid index[sizeof(oid) * (IN_ADDR_SIZE + 1)]; char msgbuf[16]; - ospf_nbr_state_message(on, msgbuf, sizeof(msgbuf)); + ospf_nbr_ism_state_message(on, msgbuf, sizeof(msgbuf)); if (IS_DEBUG_OSPF_EVENT) zlog_info("%s: trap sent: %pI4 now %s", __func__, &on->address.u.prefix4, msgbuf); diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c index 2239f31609..bbb458d8ef 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c @@ -4335,9 +4335,9 @@ DEFUN (show_ip_ospf_interface_traffic, static void show_ip_ospf_neighbour_header(struct vty *vty) { - vty_out(vty, "\n%-15s %3s %-15s %9s %-15s %-32s %5s %5s %5s\n", - "Neighbor ID", "Pri", "State", "Dead Time", "Address", - "Interface", "RXmtL", "RqstL", "DBsmL"); + vty_out(vty, "\n%-15s %-3s %-15s %-15s %-9s %-15s %-32s %5s %5s %5s\n", + "Neighbor ID", "Pri", "State", "Up Time", "Dead Time", + "Address", "Interface", "RXmtL", "RqstL", "DBsmL"); } static void show_ip_ospf_neighbor_sub(struct vty *vty, @@ -4350,6 +4350,9 @@ static void show_ip_ospf_neighbor_sub(struct vty *vty, char buf[PREFIX_STRLEN]; char timebuf[OSPF_TIME_DUMP_SIZE]; json_object *json_neighbor = NULL, *json_neigh_array = NULL; + struct timeval res; + long time_val = 0; + char uptime[OSPF_TIME_DUMP_SIZE]; for (rn = route_top(oi->nbrs); rn; rn = route_next(rn)) { if ((nbr = rn->info)) { @@ -4359,6 +4362,13 @@ static void show_ip_ospf_neighbor_sub(struct vty *vty, /* Down state is not shown. */ if (nbr->state == NSM_Down) continue; + + if (nbr->ts_last_progress.tv_sec + || nbr->ts_last_progress.tv_usec) + time_val = monotime_since( + &nbr->ts_last_progress, &res) + / 1000LL; + if (use_json) { char neigh_str[INET_ADDRSTRLEN]; @@ -4390,7 +4400,7 @@ static void show_ip_ospf_neighbor_sub(struct vty *vty, json_neighbor = json_object_new_object(); - ospf_nbr_state_message(nbr, msgbuf, 16); + ospf_nbr_ism_state_message(nbr, msgbuf, 16); json_object_int_add(json_neighbor, "priority", nbr->priority); @@ -4416,8 +4426,22 @@ static void show_ip_ospf_neighbor_sub(struct vty *vty, NULL) / 1000LL; json_object_int_add(json_neighbor, + "upTimeInMsec", + time_val); + json_object_int_add(json_neighbor, "deadTimeMsecs", time_store); + json_object_string_add( + json_neighbor, "upTime", + ospf_timeval_dump( + &res, uptime, + sizeof(uptime))); + json_object_string_add( + json_neighbor, "deadTime", + ospf_timer_dump( + nbr->t_inactivity, + timebuf, + sizeof(timebuf))); } else { json_object_string_add(json_neighbor, "deadTimeMsecs", @@ -4443,7 +4467,7 @@ static void show_ip_ospf_neighbor_sub(struct vty *vty, json_object_array_add(json_neigh_array, json_neighbor); } else { - ospf_nbr_state_message(nbr, msgbuf, 16); + ospf_nbr_ism_state_message(nbr, msgbuf, 16); if (nbr->state == NSM_Attempt && nbr->router_id.s_addr == INADDR_ANY) @@ -4451,8 +4475,12 @@ static void show_ip_ospf_neighbor_sub(struct vty *vty, nbr->priority, msgbuf); else vty_out(vty, "%-15pI4 %3d %-15s ", - &nbr->router_id, - nbr->priority, msgbuf); + &nbr->router_id, nbr->priority, + msgbuf); + + vty_out(vty, "%-15s ", + ospf_timeval_dump(&res, uptime, + sizeof(uptime))); vty_out(vty, "%9s ", ospf_timer_dump(nbr->t_inactivity, diff --git a/pceplib/test/pcep_msg_tools_test.c b/pceplib/test/pcep_msg_tools_test.c index e25ddb2179..05f8bfb547 100644 --- a/pceplib/test/pcep_msg_tools_test.c +++ b/pceplib/test/pcep_msg_tools_test.c @@ -35,6 +35,8 @@ #include <CUnit/CUnit.h> +#include <zebra.h> + #include "pcep_msg_encoding.h" #include "pcep_msg_messages.h" #include "pcep_msg_tools.h" @@ -143,7 +145,7 @@ const char *pcep_initiate_cisco_pcc_hexbyte_strs[] = { struct pcep_message *create_message(uint8_t msg_type, uint8_t obj1_class, uint8_t obj2_class, uint8_t obj3_class, uint8_t obj4_class); -int convert_hexstrs_to_binary(const char *hexbyte_strs[], +int convert_hexstrs_to_binary(char *filename, const char *hexbyte_strs[], uint16_t hexbyte_strs_length); int pcep_tools_test_suite_setup(void) @@ -167,18 +169,24 @@ void pcep_tools_test_teardown(void) { } +static const char BASE_TMPFILE[] = "/tmp/pceplib_XXXXXX"; +static int BASE_TMPFILE_SIZE = sizeof(BASE_TMPFILE); + /* Reads an array of hexbyte strs, and writes them to a temporary file. * The caller should close the returned file. */ -int convert_hexstrs_to_binary(const char *hexbyte_strs[], +int convert_hexstrs_to_binary(char *filename, + const char *hexbyte_strs[], uint16_t hexbyte_strs_length) { mode_t oldumask; oldumask = umask(S_IXUSR|S_IXGRP|S_IWOTH|S_IROTH|S_IXOTH); /* Set umask before anything for security */ umask(0027); - char tmpfile[] = "/tmp/pceplib_XXXXXX"; - int fd = mkstemp(tmpfile); + + strlcpy(filename, BASE_TMPFILE, BASE_TMPFILE_SIZE); + int fd = mkstemp(filename); umask(oldumask); + if (fd == -1) return -1; @@ -206,7 +214,10 @@ static bool pcep_obj_has_tlv(struct pcep_object_header *obj_hdr) void test_pcep_msg_read_pcep_initiate() { - int fd = convert_hexstrs_to_binary(pcep_initiate_hexbyte_strs, + char filename[BASE_TMPFILE_SIZE]; + + int fd = convert_hexstrs_to_binary(filename, + pcep_initiate_hexbyte_strs, pcep_initiate_hexbyte_strs_length); if(fd == -1){ CU_ASSERT_TRUE(fd>=0); @@ -302,12 +313,16 @@ void test_pcep_msg_read_pcep_initiate() pcep_msg_free_message_list(msg_list); close(fd); + unlink(filename); } void test_pcep_msg_read_pcep_initiate2() { - int fd = convert_hexstrs_to_binary(pcep_initiate2_hexbyte_strs, + char filename[BASE_TMPFILE_SIZE]; + + int fd = convert_hexstrs_to_binary(filename, + pcep_initiate2_hexbyte_strs, pcep_initiate2_hexbyte_strs_length); if(fd == -1){ CU_ASSERT_TRUE(fd>=0); @@ -392,11 +407,15 @@ void test_pcep_msg_read_pcep_initiate2() pcep_msg_free_message_list(msg_list); close(fd); + unlink(filename); } void test_pcep_msg_read_pcep_open() { - int fd = convert_hexstrs_to_binary(pcep_open_odl_hexbyte_strs, + char filename[BASE_TMPFILE_SIZE]; + + int fd = convert_hexstrs_to_binary(filename, + pcep_open_odl_hexbyte_strs, pcep_open_hexbyte_strs_length); if(fd == -1){ CU_ASSERT_TRUE(fd>=0); @@ -437,11 +456,15 @@ void test_pcep_msg_read_pcep_open() pcep_msg_free_message_list(msg_list); close(fd); + unlink(filename); } void test_pcep_msg_read_pcep_update() { - int fd = convert_hexstrs_to_binary(pcep_update_hexbyte_strs, + char filename[BASE_TMPFILE_SIZE]; + + int fd = convert_hexstrs_to_binary(filename, + pcep_update_hexbyte_strs, pcep_update_hexbyte_strs_length); if(fd == -1){ CU_ASSERT_TRUE(fd>=0); @@ -520,12 +543,15 @@ void test_pcep_msg_read_pcep_update() pcep_msg_free_message_list(msg_list); close(fd); + unlink(filename); } void test_pcep_msg_read_pcep_open_initiate() { + char filename[BASE_TMPFILE_SIZE]; + int fd = convert_hexstrs_to_binary( - pcep_open_initiate_odl_hexbyte_strs, + filename, pcep_open_initiate_odl_hexbyte_strs, pcep_open_initiate_hexbyte_strs_length); if(fd == -1){ CU_ASSERT_TRUE(fd>=0); @@ -550,12 +576,15 @@ void test_pcep_msg_read_pcep_open_initiate() pcep_msg_free_message_list(msg_list); close(fd); + unlink(filename); } void test_pcep_msg_read_pcep_open_cisco_pce() { + char filename[BASE_TMPFILE_SIZE]; + int fd = convert_hexstrs_to_binary( - pcep_open_cisco_pce_hexbyte_strs, + filename, pcep_open_cisco_pce_hexbyte_strs, pcep_open_cisco_pce_hexbyte_strs_length); if(fd == -1){ CU_ASSERT_TRUE(fd>=0); @@ -614,12 +643,15 @@ void test_pcep_msg_read_pcep_open_cisco_pce() pcep_msg_free_message_list(msg_list); close(fd); + unlink(filename); } void test_pcep_msg_read_pcep_update_cisco_pce() { + char filename[BASE_TMPFILE_SIZE]; + int fd = convert_hexstrs_to_binary( - pcep_update_cisco_pce_hexbyte_strs, + filename, pcep_update_cisco_pce_hexbyte_strs, pcep_update_cisco_pce_hexbyte_strs_length); if(fd == -1){ CU_ASSERT_TRUE(fd>=0); @@ -759,12 +791,15 @@ void test_pcep_msg_read_pcep_update_cisco_pce() pcep_msg_free_message_list(msg_list); close(fd); + unlink(filename); } void test_pcep_msg_read_pcep_report_cisco_pcc() { + char filename[BASE_TMPFILE_SIZE]; + int fd = convert_hexstrs_to_binary( - pcep_report_cisco_pcc_hexbyte_strs, + filename, pcep_report_cisco_pcc_hexbyte_strs, pcep_report_cisco_pcc_hexbyte_strs_length); if(fd == -1){ CU_ASSERT_TRUE(fd>=0); @@ -921,12 +956,15 @@ void test_pcep_msg_read_pcep_report_cisco_pcc() pcep_msg_free_message_list(msg_list); close(fd); + unlink(filename); } void test_pcep_msg_read_pcep_initiate_cisco_pcc() { + char filename[BASE_TMPFILE_SIZE]; + int fd = convert_hexstrs_to_binary( - pcep_initiate_cisco_pcc_hexbyte_strs, + filename, pcep_initiate_cisco_pcc_hexbyte_strs, pcep_initiate_cisco_pcc_hexbyte_strs_length); if(fd == -1){ CU_ASSERT_TRUE(fd>=0); @@ -1030,6 +1068,7 @@ void test_pcep_msg_read_pcep_initiate_cisco_pcc() pcep_msg_free_message_list(msg_list); close(fd); + unlink(filename); } void test_validate_message_header() diff --git a/pceplib/test/pcep_session_logic_loop_test.c b/pceplib/test/pcep_session_logic_loop_test.c index 4dfed7321f..96beceac59 100644 --- a/pceplib/test/pcep_session_logic_loop_test.c +++ b/pceplib/test/pcep_session_logic_loop_test.c @@ -191,6 +191,7 @@ void test_session_logic_msg_ready_handler() destroy_pcep_versioning(versioning); pceplib_free(PCEPLIB_INFRA, socket_event); close(fd); + unlink(tmpfile); } diff --git a/pimd/pim_join.c b/pimd/pim_join.c index c7a80ca8e0..4606aec6a1 100644 --- a/pimd/pim_join.c +++ b/pimd/pim_join.c @@ -1,3 +1,5 @@ + + /* * PIM for Quagga * Copyright (C) 2008 Everton da Silva Marques @@ -39,6 +41,7 @@ #include "pim_rp.h" #include "pim_jp_agg.h" #include "pim_util.h" +#include "pim_ssm.h" static void on_trace(const char *label, struct interface *ifp, struct in_addr src) @@ -105,6 +108,13 @@ static void recv_join(struct interface *ifp, struct pim_neighbor *neigh, return; } + if (pim_is_grp_ssm(pim_ifp->pim, sg->grp)) { + zlog_warn( + "%s: Specified Group(%pI4) in join is now in SSM, not allowed to create PIM state", + __func__, &sg->grp); + return; + } + sg->src.s_addr = INADDR_ANY; } diff --git a/pimd/pim_register.c b/pimd/pim_register.c index 9d5b864ab0..e2538da36f 100644 --- a/pimd/pim_register.c +++ b/pimd/pim_register.c @@ -381,6 +381,16 @@ int pim_register_recv(struct interface *ifp, struct in_addr dest_addr, pim_str_sg_dump(&sg), src_str, ifp->name, i_am_rp); } + if (pim_is_grp_ssm(pim_ifp->pim, sg.grp)) { + if (sg.src.s_addr == INADDR_ANY) { + zlog_warn( + "%s: Received Register message for Group(%pI4) is now in SSM, dropping the packet", + __func__, &sg.grp); + /* Drop Packet Silently */ + return 0; + } + } + if (i_am_rp && (dest_addr.s_addr == ((RP(pim, sg.grp))->rpf_addr.u.prefix4.s_addr))) { diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c index 1da33af006..0ef0ad533e 100644 --- a/pimd/pim_zebra.c +++ b/pimd/pim_zebra.c @@ -548,6 +548,7 @@ void igmp_source_forward_reevaluate_all(struct pim_instance *pim) struct pim_interface *pim_ifp = ifp->info; struct listnode *grpnode; struct igmp_group *grp; + struct pim_ifchannel *ch, *ch_temp; if (!pim_ifp) continue; @@ -562,9 +563,17 @@ void igmp_source_forward_reevaluate_all(struct pim_instance *pim) for (ALL_LIST_ELEMENTS_RO(grp->group_source_list, srcnode, src)) { igmp_source_forward_reevaluate_one(pim, src); - } /* scan group sources */ - } /* scan igmp groups */ - } /* scan interfaces */ + } /* scan group sources */ + } /* scan igmp groups */ + + RB_FOREACH_SAFE (ch, pim_ifchannel_rb, &pim_ifp->ifchannel_rb, + ch_temp) { + if (pim_is_grp_ssm(pim, ch->sg.grp)) { + if (ch->sg.src.s_addr == INADDR_ANY) + pim_ifchannel_delete(ch); + } + } + } /* scan interfaces */ } void igmp_source_forward_start(struct pim_instance *pim, diff --git a/tests/topotests/all_protocol_startup/r1/isisd.conf b/tests/topotests/all_protocol_startup/r1/isisd.conf index 413f8d15a9..8ceded894f 100644 --- a/tests/topotests/all_protocol_startup/r1/isisd.conf +++ b/tests/topotests/all_protocol_startup/r1/isisd.conf @@ -1,6 +1,6 @@ log file isisd.log ! -debug isis events +! debug isis events ! ! interface r1-eth5 diff --git a/tests/topotests/all_protocol_startup/r1/ldpd.conf b/tests/topotests/all_protocol_startup/r1/ldpd.conf index 02332a4e75..2358fb898e 100644 --- a/tests/topotests/all_protocol_startup/r1/ldpd.conf +++ b/tests/topotests/all_protocol_startup/r1/ldpd.conf @@ -1,7 +1,7 @@ log file ldpd.log ! -debug mpls ldp event -debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp zebra ! ! mpls ldp diff --git a/tests/topotests/all_protocol_startup/r1/ospf6d.conf b/tests/topotests/all_protocol_startup/r1/ospf6d.conf index 5c6f071644..2e45186653 100644 --- a/tests/topotests/all_protocol_startup/r1/ospf6d.conf +++ b/tests/topotests/all_protocol_startup/r1/ospf6d.conf @@ -1,9 +1,9 @@ log file ospf6d.log ! -debug ospf6 lsa unknown -debug ospf6 zebra -debug ospf6 interface -debug ospf6 neighbor +! debug ospf6 lsa unknown +! debug ospf6 zebra +! debug ospf6 interface +! debug ospf6 neighbor ! interface r1-eth4 ! diff --git a/tests/topotests/all_protocol_startup/r1/ospfd.conf b/tests/topotests/all_protocol_startup/r1/ospfd.conf index bac9f61620..188f810f81 100644 --- a/tests/topotests/all_protocol_startup/r1/ospfd.conf +++ b/tests/topotests/all_protocol_startup/r1/ospfd.conf @@ -1,7 +1,7 @@ log file ospfd.log ! -debug ospf event -debug ospf zebra +! debug ospf event +! debug ospf zebra ! router ospf ospf router-id 192.168.0.1 diff --git a/tests/topotests/all_protocol_startup/r1/ripd.conf b/tests/topotests/all_protocol_startup/r1/ripd.conf index ace7608873..0a06794886 100644 --- a/tests/topotests/all_protocol_startup/r1/ripd.conf +++ b/tests/topotests/all_protocol_startup/r1/ripd.conf @@ -1,7 +1,7 @@ log file ripd.log ! -debug rip events -debug rip zebra +! debug rip events +! debug rip zebra ! router rip version 2 diff --git a/tests/topotests/all_protocol_startup/r1/ripngd.conf b/tests/topotests/all_protocol_startup/r1/ripngd.conf index 2e0aef3a14..d9d900f926 100644 --- a/tests/topotests/all_protocol_startup/r1/ripngd.conf +++ b/tests/topotests/all_protocol_startup/r1/ripngd.conf @@ -1,7 +1,7 @@ log file ripngd.log ! -debug ripng events -debug ripng zebra +! debug ripng events +! debug ripng zebra ! router ripng network fc00:0:0:2::/64 diff --git a/tests/topotests/all_protocol_startup/test_all_protocol_startup.py b/tests/topotests/all_protocol_startup/test_all_protocol_startup.py index 4769a19d63..ca8c005f9e 100644 --- a/tests/topotests/all_protocol_startup/test_all_protocol_startup.py +++ b/tests/topotests/all_protocol_startup/test_all_protocol_startup.py @@ -1503,6 +1503,14 @@ def test_nexthop_group_replace(): 'vtysh -c "c t" -c "nexthop-group replace" -c "nexthop 1.1.1.1 r1-eth1 onlink" -c "nexthop 1.1.1.2 r1-eth2 onlink"' ) + # At the moment there is absolutely no real easy way to query sharpd + # for the nexthop group actually installed. If it is not installed + # sharpd will just transmit the nexthops down instead of the nexthop + # group id. Leading to a situation where the replace is not actually + # being tested. So let's just wait some time here because this + # is hard and this test fails all the time + sleep(5) + # Create with sharpd using nexthop-group net["r1"].cmd('vtysh -c "sharp install routes 3.3.3.1 nexthop-group replace 1"') diff --git a/tests/topotests/bfd_bgp_cbit_topo3/r1/bfdd.conf b/tests/topotests/bfd_bgp_cbit_topo3/r1/bfdd.conf index f35e772790..ee7144d003 100644 --- a/tests/topotests/bfd_bgp_cbit_topo3/r1/bfdd.conf +++ b/tests/topotests/bfd_bgp_cbit_topo3/r1/bfdd.conf @@ -1,5 +1,5 @@ ! -debug bfd network -debug bfd peer -debug bfd zebra +! debug bfd network +! debug bfd peer +! debug bfd zebra ! diff --git a/tests/topotests/bfd_bgp_cbit_topo3/r1/bgpd.conf b/tests/topotests/bfd_bgp_cbit_topo3/r1/bgpd.conf index 689797a5e6..d30c32043e 100644 --- a/tests/topotests/bfd_bgp_cbit_topo3/r1/bgpd.conf +++ b/tests/topotests/bfd_bgp_cbit_topo3/r1/bgpd.conf @@ -1,4 +1,4 @@ -debug bgp neighbor-events +! debug bgp neighbor-events router bgp 101 bgp router-id 10.254.254.1 no bgp ebgp-requires-policy diff --git a/tests/topotests/bfd_bgp_cbit_topo3/r3/bfdd.conf b/tests/topotests/bfd_bgp_cbit_topo3/r3/bfdd.conf index f35e772790..ee7144d003 100644 --- a/tests/topotests/bfd_bgp_cbit_topo3/r3/bfdd.conf +++ b/tests/topotests/bfd_bgp_cbit_topo3/r3/bfdd.conf @@ -1,5 +1,5 @@ ! -debug bfd network -debug bfd peer -debug bfd zebra +! debug bfd network +! debug bfd peer +! debug bfd zebra ! diff --git a/tests/topotests/bfd_bgp_cbit_topo3/r3/bgpd.conf b/tests/topotests/bfd_bgp_cbit_topo3/r3/bgpd.conf index 1f5aac42ed..dba2ffd372 100644 --- a/tests/topotests/bfd_bgp_cbit_topo3/r3/bgpd.conf +++ b/tests/topotests/bfd_bgp_cbit_topo3/r3/bgpd.conf @@ -1,4 +1,4 @@ -debug bgp neighbor-events +! debug bgp neighbor-events router bgp 102 bgp router-id 10.254.254.3 no bgp ebgp-requires-policy diff --git a/tests/topotests/bfd_isis_topo1/rt1/bfdd.conf b/tests/topotests/bfd_isis_topo1/rt1/bfdd.conf index 57f9cd9e3d..dbcf23f306 100644 --- a/tests/topotests/bfd_isis_topo1/rt1/bfdd.conf +++ b/tests/topotests/bfd_isis_topo1/rt1/bfdd.conf @@ -1,7 +1,7 @@ ! -debug bfd network -debug bfd peer -debug bfd zebra +! debug bfd network +! debug bfd peer +! debug bfd zebra ! bfd peer 10.0.1.2 interface eth-rt2 diff --git a/tests/topotests/bfd_isis_topo1/rt1/isisd.conf b/tests/topotests/bfd_isis_topo1/rt1/isisd.conf index 8026aad49d..a5cbdd932e 100644 --- a/tests/topotests/bfd_isis_topo1/rt1/isisd.conf +++ b/tests/topotests/bfd_isis_topo1/rt1/isisd.conf @@ -5,11 +5,11 @@ hostname rt1 ! password 1 ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis adj-packets -debug isis lsp-sched +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis adj-packets +! debug isis lsp-sched ! interface lo ip router isis 1 diff --git a/tests/topotests/bfd_isis_topo1/rt1/zebra.conf b/tests/topotests/bfd_isis_topo1/rt1/zebra.conf index 6003125b6b..7e6f7881b4 100644 --- a/tests/topotests/bfd_isis_topo1/rt1/zebra.conf +++ b/tests/topotests/bfd_isis_topo1/rt1/zebra.conf @@ -3,10 +3,10 @@ log timestamp precision 3 ! hostname rt1 ! -debug zebra kernel -debug zebra packet -debug zebra events -debug zebra rib +! debug zebra kernel +! debug zebra packet +! debug zebra events +! debug zebra rib ! interface lo ip address 1.1.1.1/32 diff --git a/tests/topotests/bfd_isis_topo1/rt2/bfdd.conf b/tests/topotests/bfd_isis_topo1/rt2/bfdd.conf index 6b34e337d3..d5054aac09 100644 --- a/tests/topotests/bfd_isis_topo1/rt2/bfdd.conf +++ b/tests/topotests/bfd_isis_topo1/rt2/bfdd.conf @@ -1,7 +1,7 @@ ! -debug bfd network -debug bfd peer -debug bfd zebra +! debug bfd network +! debug bfd peer +! debug bfd zebra ! bfd peer 10.0.1.1 interface eth-rt1 diff --git a/tests/topotests/bfd_isis_topo1/rt2/isisd.conf b/tests/topotests/bfd_isis_topo1/rt2/isisd.conf index b0fde64a5e..b32170d208 100644 --- a/tests/topotests/bfd_isis_topo1/rt2/isisd.conf +++ b/tests/topotests/bfd_isis_topo1/rt2/isisd.conf @@ -4,9 +4,9 @@ hostname rt2 ! password 1 ! -debug isis events -debug isis route-events -debug isis spf-events +! debug isis events +! debug isis route-events +! debug isis spf-events ! interface lo ip router isis 1 diff --git a/tests/topotests/bfd_isis_topo1/rt2/zebra.conf b/tests/topotests/bfd_isis_topo1/rt2/zebra.conf index 5fc7fc5b28..5788e31f12 100644 --- a/tests/topotests/bfd_isis_topo1/rt2/zebra.conf +++ b/tests/topotests/bfd_isis_topo1/rt2/zebra.conf @@ -2,8 +2,8 @@ log file zebra.log ! hostname rt2 ! -debug zebra kernel -debug zebra packet +! debug zebra kernel +! debug zebra packet ! interface lo ip address 2.2.2.2/32 diff --git a/tests/topotests/bfd_isis_topo1/rt3/bfdd.conf b/tests/topotests/bfd_isis_topo1/rt3/bfdd.conf index 22937fe46f..fd9a5e1b9d 100644 --- a/tests/topotests/bfd_isis_topo1/rt3/bfdd.conf +++ b/tests/topotests/bfd_isis_topo1/rt3/bfdd.conf @@ -1,7 +1,7 @@ ! -debug bfd network -debug bfd peer -debug bfd zebra +! debug bfd network +! debug bfd peer +! debug bfd zebra ! bfd peer 10.0.2.1 interface eth-rt1 diff --git a/tests/topotests/bfd_isis_topo1/rt3/isisd.conf b/tests/topotests/bfd_isis_topo1/rt3/isisd.conf index 5c36e96c0f..b98f249395 100644 --- a/tests/topotests/bfd_isis_topo1/rt3/isisd.conf +++ b/tests/topotests/bfd_isis_topo1/rt3/isisd.conf @@ -4,9 +4,9 @@ hostname rt3 ! password 1 ! -debug isis events -debug isis route-events -debug isis spf-events +! debug isis events +! debug isis route-events +! debug isis spf-events ! interface lo ip router isis 1 diff --git a/tests/topotests/bfd_isis_topo1/rt3/zebra.conf b/tests/topotests/bfd_isis_topo1/rt3/zebra.conf index d368de9bbe..78eac2e15a 100644 --- a/tests/topotests/bfd_isis_topo1/rt3/zebra.conf +++ b/tests/topotests/bfd_isis_topo1/rt3/zebra.conf @@ -2,8 +2,8 @@ log file zebra.log ! hostname rt3 ! -debug zebra kernel -debug zebra packet +! debug zebra kernel +! debug zebra packet ! interface lo ip address 3.3.3.3/32 diff --git a/tests/topotests/bfd_isis_topo1/rt4/bfdd.conf b/tests/topotests/bfd_isis_topo1/rt4/bfdd.conf index f35e772790..ee7144d003 100644 --- a/tests/topotests/bfd_isis_topo1/rt4/bfdd.conf +++ b/tests/topotests/bfd_isis_topo1/rt4/bfdd.conf @@ -1,5 +1,5 @@ ! -debug bfd network -debug bfd peer -debug bfd zebra +! debug bfd network +! debug bfd peer +! debug bfd zebra ! diff --git a/tests/topotests/bfd_isis_topo1/rt4/isisd.conf b/tests/topotests/bfd_isis_topo1/rt4/isisd.conf index 3eac407776..6a4b05f204 100644 --- a/tests/topotests/bfd_isis_topo1/rt4/isisd.conf +++ b/tests/topotests/bfd_isis_topo1/rt4/isisd.conf @@ -4,9 +4,9 @@ hostname rt4 ! password 1 ! -debug isis events -debug isis route-events -debug isis spf-events +! debug isis events +! debug isis route-events +! debug isis spf-events ! interface lo ip router isis 1 diff --git a/tests/topotests/bfd_isis_topo1/rt4/zebra.conf b/tests/topotests/bfd_isis_topo1/rt4/zebra.conf index 7b053bac35..a6cb573ed8 100644 --- a/tests/topotests/bfd_isis_topo1/rt4/zebra.conf +++ b/tests/topotests/bfd_isis_topo1/rt4/zebra.conf @@ -2,8 +2,8 @@ log file zebra.log ! hostname rt4 ! -debug zebra kernel -debug zebra packet +! debug zebra kernel +! debug zebra packet ! interface lo ip address 4.4.4.4/32 diff --git a/tests/topotests/bfd_isis_topo1/rt5/bfdd.conf b/tests/topotests/bfd_isis_topo1/rt5/bfdd.conf index f35e772790..ee7144d003 100644 --- a/tests/topotests/bfd_isis_topo1/rt5/bfdd.conf +++ b/tests/topotests/bfd_isis_topo1/rt5/bfdd.conf @@ -1,5 +1,5 @@ ! -debug bfd network -debug bfd peer -debug bfd zebra +! debug bfd network +! debug bfd peer +! debug bfd zebra ! diff --git a/tests/topotests/bfd_isis_topo1/rt5/isisd.conf b/tests/topotests/bfd_isis_topo1/rt5/isisd.conf index 5d449f6f93..ed32b15ea1 100644 --- a/tests/topotests/bfd_isis_topo1/rt5/isisd.conf +++ b/tests/topotests/bfd_isis_topo1/rt5/isisd.conf @@ -4,9 +4,9 @@ hostname rt5 ! password 1 ! -debug isis events -debug isis route-events -debug isis spf-events +! debug isis events +! debug isis route-events +! debug isis spf-events ! interface lo ip router isis 1 diff --git a/tests/topotests/bfd_isis_topo1/rt5/zebra.conf b/tests/topotests/bfd_isis_topo1/rt5/zebra.conf index 0b7c9e02f3..33473c91a3 100644 --- a/tests/topotests/bfd_isis_topo1/rt5/zebra.conf +++ b/tests/topotests/bfd_isis_topo1/rt5/zebra.conf @@ -2,8 +2,8 @@ log file zebra.log ! hostname rt5 ! -debug zebra kernel -debug zebra packet +! debug zebra kernel +! debug zebra packet ! interface lo ip address 5.5.5.5/32 diff --git a/tests/topotests/bfd_ospf_topo1/rt1/bfdd.conf b/tests/topotests/bfd_ospf_topo1/rt1/bfdd.conf index 610a20f88a..f34f4ca61d 100644 --- a/tests/topotests/bfd_ospf_topo1/rt1/bfdd.conf +++ b/tests/topotests/bfd_ospf_topo1/rt1/bfdd.conf @@ -1,9 +1,9 @@ log file bfdd.log log timestamp precision 3 ! -debug bfd network -debug bfd peer -debug bfd zebra +! debug bfd network +! debug bfd peer +! debug bfd zebra ! bfd ! diff --git a/tests/topotests/bfd_ospf_topo1/rt1/ospfd.conf b/tests/topotests/bfd_ospf_topo1/rt1/ospfd.conf index 9da8765005..ce36494604 100644 --- a/tests/topotests/bfd_ospf_topo1/rt1/ospfd.conf +++ b/tests/topotests/bfd_ospf_topo1/rt1/ospfd.conf @@ -5,8 +5,8 @@ hostname rt1 ! password 1 ! -debug ospf event -debug ospf zebra +! debug ospf event +! debug ospf zebra ! interface lo ip ospf area 0.0.0.0 diff --git a/tests/topotests/bfd_ospf_topo1/rt1/zebra.conf b/tests/topotests/bfd_ospf_topo1/rt1/zebra.conf index 6003125b6b..7e6f7881b4 100644 --- a/tests/topotests/bfd_ospf_topo1/rt1/zebra.conf +++ b/tests/topotests/bfd_ospf_topo1/rt1/zebra.conf @@ -3,10 +3,10 @@ log timestamp precision 3 ! hostname rt1 ! -debug zebra kernel -debug zebra packet -debug zebra events -debug zebra rib +! debug zebra kernel +! debug zebra packet +! debug zebra events +! debug zebra rib ! interface lo ip address 1.1.1.1/32 diff --git a/tests/topotests/bfd_ospf_topo1/rt2/bfdd.conf b/tests/topotests/bfd_ospf_topo1/rt2/bfdd.conf index 437f063d8f..5baea3c842 100644 --- a/tests/topotests/bfd_ospf_topo1/rt2/bfdd.conf +++ b/tests/topotests/bfd_ospf_topo1/rt2/bfdd.conf @@ -1,7 +1,7 @@ ! -debug bfd network -debug bfd peer -debug bfd zebra +! debug bfd network +! debug bfd peer +! debug bfd zebra ! bfd ! diff --git a/tests/topotests/bfd_ospf_topo1/rt2/ospfd.conf b/tests/topotests/bfd_ospf_topo1/rt2/ospfd.conf index 11be6a14b2..a8ca564e4e 100644 --- a/tests/topotests/bfd_ospf_topo1/rt2/ospfd.conf +++ b/tests/topotests/bfd_ospf_topo1/rt2/ospfd.conf @@ -4,8 +4,8 @@ hostname rt2 ! password 1 ! -debug ospf event -debug ospf zebra +! debug ospf event +! debug ospf zebra ! interface lo ip ospf area 0.0.0.0 diff --git a/tests/topotests/bfd_ospf_topo1/rt2/zebra.conf b/tests/topotests/bfd_ospf_topo1/rt2/zebra.conf index 5fc7fc5b28..5788e31f12 100644 --- a/tests/topotests/bfd_ospf_topo1/rt2/zebra.conf +++ b/tests/topotests/bfd_ospf_topo1/rt2/zebra.conf @@ -2,8 +2,8 @@ log file zebra.log ! hostname rt2 ! -debug zebra kernel -debug zebra packet +! debug zebra kernel +! debug zebra packet ! interface lo ip address 2.2.2.2/32 diff --git a/tests/topotests/bfd_ospf_topo1/rt3/bfdd.conf b/tests/topotests/bfd_ospf_topo1/rt3/bfdd.conf index 437f063d8f..5baea3c842 100644 --- a/tests/topotests/bfd_ospf_topo1/rt3/bfdd.conf +++ b/tests/topotests/bfd_ospf_topo1/rt3/bfdd.conf @@ -1,7 +1,7 @@ ! -debug bfd network -debug bfd peer -debug bfd zebra +! debug bfd network +! debug bfd peer +! debug bfd zebra ! bfd ! diff --git a/tests/topotests/bfd_ospf_topo1/rt3/ospfd.conf b/tests/topotests/bfd_ospf_topo1/rt3/ospfd.conf index acc54b3866..0404994c09 100644 --- a/tests/topotests/bfd_ospf_topo1/rt3/ospfd.conf +++ b/tests/topotests/bfd_ospf_topo1/rt3/ospfd.conf @@ -4,8 +4,8 @@ hostname rt3 ! password 1 ! -debug ospf event -debug ospf zebra +! debug ospf event +! debug ospf zebra ! interface lo ip ospf area 0.0.0.0 diff --git a/tests/topotests/bfd_ospf_topo1/rt3/zebra.conf b/tests/topotests/bfd_ospf_topo1/rt3/zebra.conf index d368de9bbe..78eac2e15a 100644 --- a/tests/topotests/bfd_ospf_topo1/rt3/zebra.conf +++ b/tests/topotests/bfd_ospf_topo1/rt3/zebra.conf @@ -2,8 +2,8 @@ log file zebra.log ! hostname rt3 ! -debug zebra kernel -debug zebra packet +! debug zebra kernel +! debug zebra packet ! interface lo ip address 3.3.3.3/32 diff --git a/tests/topotests/bfd_ospf_topo1/rt4/bfdd.conf b/tests/topotests/bfd_ospf_topo1/rt4/bfdd.conf index f35e772790..ee7144d003 100644 --- a/tests/topotests/bfd_ospf_topo1/rt4/bfdd.conf +++ b/tests/topotests/bfd_ospf_topo1/rt4/bfdd.conf @@ -1,5 +1,5 @@ ! -debug bfd network -debug bfd peer -debug bfd zebra +! debug bfd network +! debug bfd peer +! debug bfd zebra ! diff --git a/tests/topotests/bfd_ospf_topo1/rt4/ospfd.conf b/tests/topotests/bfd_ospf_topo1/rt4/ospfd.conf index 670e56ccc8..6b8ab3704f 100644 --- a/tests/topotests/bfd_ospf_topo1/rt4/ospfd.conf +++ b/tests/topotests/bfd_ospf_topo1/rt4/ospfd.conf @@ -4,8 +4,8 @@ hostname rt4 ! password 1 ! -debug ospf event -debug ospf zebra +! debug ospf event +! debug ospf zebra ! interface lo ip ospf area 0.0.0.0 diff --git a/tests/topotests/bfd_ospf_topo1/rt4/zebra.conf b/tests/topotests/bfd_ospf_topo1/rt4/zebra.conf index 7b053bac35..a6cb573ed8 100644 --- a/tests/topotests/bfd_ospf_topo1/rt4/zebra.conf +++ b/tests/topotests/bfd_ospf_topo1/rt4/zebra.conf @@ -2,8 +2,8 @@ log file zebra.log ! hostname rt4 ! -debug zebra kernel -debug zebra packet +! debug zebra kernel +! debug zebra packet ! interface lo ip address 4.4.4.4/32 diff --git a/tests/topotests/bfd_ospf_topo1/rt5/bfdd.conf b/tests/topotests/bfd_ospf_topo1/rt5/bfdd.conf index f35e772790..ee7144d003 100644 --- a/tests/topotests/bfd_ospf_topo1/rt5/bfdd.conf +++ b/tests/topotests/bfd_ospf_topo1/rt5/bfdd.conf @@ -1,5 +1,5 @@ ! -debug bfd network -debug bfd peer -debug bfd zebra +! debug bfd network +! debug bfd peer +! debug bfd zebra ! diff --git a/tests/topotests/bfd_ospf_topo1/rt5/ospfd.conf b/tests/topotests/bfd_ospf_topo1/rt5/ospfd.conf index 286de51288..043432ec3d 100644 --- a/tests/topotests/bfd_ospf_topo1/rt5/ospfd.conf +++ b/tests/topotests/bfd_ospf_topo1/rt5/ospfd.conf @@ -4,8 +4,8 @@ hostname rt5 ! password 1 ! -debug ospf event -debug ospf zebra +! debug ospf event +! debug ospf zebra ! interface lo ip ospf area 0.0.0.0 diff --git a/tests/topotests/bfd_ospf_topo1/rt5/zebra.conf b/tests/topotests/bfd_ospf_topo1/rt5/zebra.conf index 0b7c9e02f3..33473c91a3 100644 --- a/tests/topotests/bfd_ospf_topo1/rt5/zebra.conf +++ b/tests/topotests/bfd_ospf_topo1/rt5/zebra.conf @@ -2,8 +2,8 @@ log file zebra.log ! hostname rt5 ! -debug zebra kernel -debug zebra packet +! debug zebra kernel +! debug zebra packet ! interface lo ip address 5.5.5.5/32 diff --git a/tests/topotests/bfd_profiles_topo1/r1/bfdd.conf b/tests/topotests/bfd_profiles_topo1/r1/bfdd.conf index 688f2e839c..c2ac9c1b7c 100644 --- a/tests/topotests/bfd_profiles_topo1/r1/bfdd.conf +++ b/tests/topotests/bfd_profiles_topo1/r1/bfdd.conf @@ -1,6 +1,6 @@ -debug bfd peer -debug bfd network -debug bfd zebra +! debug bfd peer +! debug bfd network +! debug bfd zebra ! bfd profile slowtx diff --git a/tests/topotests/bfd_profiles_topo1/r2/bfdd.conf b/tests/topotests/bfd_profiles_topo1/r2/bfdd.conf index 700c46ba1e..b68eecb34c 100644 --- a/tests/topotests/bfd_profiles_topo1/r2/bfdd.conf +++ b/tests/topotests/bfd_profiles_topo1/r2/bfdd.conf @@ -1,6 +1,6 @@ -debug bfd peer -debug bfd network -debug bfd zebra +! debug bfd peer +! debug bfd network +! debug bfd zebra ! bfd profile slowtx diff --git a/tests/topotests/bfd_profiles_topo1/r2/bgpd.conf b/tests/topotests/bfd_profiles_topo1/r2/bgpd.conf index 0c3db97bc1..1aab1d1372 100644 --- a/tests/topotests/bfd_profiles_topo1/r2/bgpd.conf +++ b/tests/topotests/bfd_profiles_topo1/r2/bgpd.conf @@ -1,4 +1,4 @@ -debug bgp neighbor-events +! debug bgp neighbor-events ! router bgp 100 bgp router-id 10.254.254.2 diff --git a/tests/topotests/bfd_profiles_topo1/r3/bfdd.conf b/tests/topotests/bfd_profiles_topo1/r3/bfdd.conf index 08eb0468d6..f3a86edce8 100644 --- a/tests/topotests/bfd_profiles_topo1/r3/bfdd.conf +++ b/tests/topotests/bfd_profiles_topo1/r3/bfdd.conf @@ -1,6 +1,6 @@ -debug bfd peer -debug bfd network -debug bfd zebra +! debug bfd peer +! debug bfd network +! debug bfd zebra ! bfd profile fasttx diff --git a/tests/topotests/bfd_profiles_topo1/r3/isisd.conf b/tests/topotests/bfd_profiles_topo1/r3/isisd.conf index ca965e3956..3bba2b03cf 100644 --- a/tests/topotests/bfd_profiles_topo1/r3/isisd.conf +++ b/tests/topotests/bfd_profiles_topo1/r3/isisd.conf @@ -1,8 +1,8 @@ hostname r3 ! -debug isis adj-packets -debug isis events -debug isis update-packets +! debug isis adj-packets +! debug isis events +! debug isis update-packets ! interface r3-eth1 ipv6 router isis lan diff --git a/tests/topotests/bfd_profiles_topo1/r4/bfdd.conf b/tests/topotests/bfd_profiles_topo1/r4/bfdd.conf index 4f5e022077..a5d1e25949 100644 --- a/tests/topotests/bfd_profiles_topo1/r4/bfdd.conf +++ b/tests/topotests/bfd_profiles_topo1/r4/bfdd.conf @@ -1,6 +1,6 @@ -debug bfd peer -debug bfd network -debug bfd zebra +! debug bfd peer +! debug bfd network +! debug bfd zebra ! bfd profile fast-tx diff --git a/tests/topotests/bfd_profiles_topo1/r4/bgpd.conf b/tests/topotests/bfd_profiles_topo1/r4/bgpd.conf index 200937a9a5..12d68270f8 100644 --- a/tests/topotests/bfd_profiles_topo1/r4/bgpd.conf +++ b/tests/topotests/bfd_profiles_topo1/r4/bgpd.conf @@ -1,4 +1,4 @@ -debug bgp neighbor-events +! debug bgp neighbor-events ! router bgp 200 bgp router-id 10.254.254.4 diff --git a/tests/topotests/bfd_profiles_topo1/r4/isisd.conf b/tests/topotests/bfd_profiles_topo1/r4/isisd.conf index d8ffc9bc2c..18009ce6dc 100644 --- a/tests/topotests/bfd_profiles_topo1/r4/isisd.conf +++ b/tests/topotests/bfd_profiles_topo1/r4/isisd.conf @@ -1,8 +1,8 @@ hostname r4 ! -debug isis adj-packets -debug isis events -debug isis update-packets +! debug isis adj-packets +! debug isis events +! debug isis update-packets ! interface r4-eth0 ipv6 router isis lan diff --git a/tests/topotests/bfd_profiles_topo1/r5/bfdd.conf b/tests/topotests/bfd_profiles_topo1/r5/bfdd.conf index 74dae5a60d..670fd44165 100644 --- a/tests/topotests/bfd_profiles_topo1/r5/bfdd.conf +++ b/tests/topotests/bfd_profiles_topo1/r5/bfdd.conf @@ -1,6 +1,6 @@ -debug bfd peer -debug bfd network -debug bfd zebra +! debug bfd peer +! debug bfd network +! debug bfd zebra ! bfd ! profile is commented out on purpose. diff --git a/tests/topotests/bfd_profiles_topo1/r6/bfdd.conf b/tests/topotests/bfd_profiles_topo1/r6/bfdd.conf index 74dae5a60d..670fd44165 100644 --- a/tests/topotests/bfd_profiles_topo1/r6/bfdd.conf +++ b/tests/topotests/bfd_profiles_topo1/r6/bfdd.conf @@ -1,6 +1,6 @@ -debug bfd peer -debug bfd network -debug bfd zebra +! debug bfd peer +! debug bfd network +! debug bfd zebra ! bfd ! profile is commented out on purpose. diff --git a/tests/topotests/bfd_topo1/r1/bfdd.conf b/tests/topotests/bfd_topo1/r1/bfdd.conf index 4102000337..b9efbafbc5 100644 --- a/tests/topotests/bfd_topo1/r1/bfdd.conf +++ b/tests/topotests/bfd_topo1/r1/bfdd.conf @@ -1,7 +1,7 @@ ! -debug bfd network -debug bfd peer -debug bfd zebra +! debug bfd network +! debug bfd peer +! debug bfd zebra ! bfd peer 192.168.0.2 diff --git a/tests/topotests/bfd_topo1/r2/bfdd.conf b/tests/topotests/bfd_topo1/r2/bfdd.conf index 412450ca1e..0d1e17e3ff 100644 --- a/tests/topotests/bfd_topo1/r2/bfdd.conf +++ b/tests/topotests/bfd_topo1/r2/bfdd.conf @@ -1,7 +1,7 @@ ! -debug bfd network -debug bfd peer -debug bfd zebra +! debug bfd network +! debug bfd peer +! debug bfd zebra ! bfd peer 192.168.0.1 diff --git a/tests/topotests/bfd_topo1/r3/bfdd.conf b/tests/topotests/bfd_topo1/r3/bfdd.conf index 4cf20bb904..e091a1c41d 100644 --- a/tests/topotests/bfd_topo1/r3/bfdd.conf +++ b/tests/topotests/bfd_topo1/r3/bfdd.conf @@ -1,7 +1,7 @@ ! -debug bfd network -debug bfd peer -debug bfd zebra +! debug bfd network +! debug bfd peer +! debug bfd zebra ! bfd peer 192.168.1.2 diff --git a/tests/topotests/bfd_topo1/r4/bfdd.conf b/tests/topotests/bfd_topo1/r4/bfdd.conf index 34b88c9a35..63dd738451 100644 --- a/tests/topotests/bfd_topo1/r4/bfdd.conf +++ b/tests/topotests/bfd_topo1/r4/bfdd.conf @@ -1,7 +1,7 @@ ! -debug bfd network -debug bfd peer -debug bfd zebra +! debug bfd network +! debug bfd peer +! debug bfd zebra ! bfd peer 192.168.2.2 diff --git a/tests/topotests/bfd_topo2/r1/bfdd.conf b/tests/topotests/bfd_topo2/r1/bfdd.conf index f03135021e..df8baeb5af 100644 --- a/tests/topotests/bfd_topo2/r1/bfdd.conf +++ b/tests/topotests/bfd_topo2/r1/bfdd.conf @@ -1,7 +1,7 @@ ! -debug bfd network -debug bfd peer -debug bfd zebra +! debug bfd network +! debug bfd peer +! debug bfd zebra ! bfd peer 2001:db8:4::1 multihop local-address 2001:db8:1::1 diff --git a/tests/topotests/bfd_topo2/r2/bfdd.conf b/tests/topotests/bfd_topo2/r2/bfdd.conf index f35e772790..ee7144d003 100644 --- a/tests/topotests/bfd_topo2/r2/bfdd.conf +++ b/tests/topotests/bfd_topo2/r2/bfdd.conf @@ -1,5 +1,5 @@ ! -debug bfd network -debug bfd peer -debug bfd zebra +! debug bfd network +! debug bfd peer +! debug bfd zebra ! diff --git a/tests/topotests/bfd_topo2/r3/bfdd.conf b/tests/topotests/bfd_topo2/r3/bfdd.conf index f35e772790..ee7144d003 100644 --- a/tests/topotests/bfd_topo2/r3/bfdd.conf +++ b/tests/topotests/bfd_topo2/r3/bfdd.conf @@ -1,5 +1,5 @@ ! -debug bfd network -debug bfd peer -debug bfd zebra +! debug bfd network +! debug bfd peer +! debug bfd zebra ! diff --git a/tests/topotests/bfd_topo2/r4/bfdd.conf b/tests/topotests/bfd_topo2/r4/bfdd.conf index 0173dc9be2..c1e8d28e96 100644 --- a/tests/topotests/bfd_topo2/r4/bfdd.conf +++ b/tests/topotests/bfd_topo2/r4/bfdd.conf @@ -1,7 +1,7 @@ ! -debug bfd network -debug bfd peer -debug bfd zebra +! debug bfd network +! debug bfd peer +! debug bfd zebra ! bfd peer 2001:db8:1::1 multihop local-address 2001:db8:4::1 diff --git a/tests/topotests/bfd_topo3/r1/bfdd.conf b/tests/topotests/bfd_topo3/r1/bfdd.conf index 8e40b76d41..60f129b48d 100644 --- a/tests/topotests/bfd_topo3/r1/bfdd.conf +++ b/tests/topotests/bfd_topo3/r1/bfdd.conf @@ -1,7 +1,7 @@ ! -debug bfd network -debug bfd peer -debug bfd zebra +! debug bfd network +! debug bfd peer +! debug bfd zebra ! bfd profile fast-tx diff --git a/tests/topotests/bfd_topo3/r2/bfdd.conf b/tests/topotests/bfd_topo3/r2/bfdd.conf index 2a92e463e0..8297043e6d 100644 --- a/tests/topotests/bfd_topo3/r2/bfdd.conf +++ b/tests/topotests/bfd_topo3/r2/bfdd.conf @@ -1,7 +1,7 @@ ! -debug bfd network -debug bfd peer -debug bfd zebra +! debug bfd network +! debug bfd peer +! debug bfd zebra ! bfd profile fast-tx diff --git a/tests/topotests/bfd_topo3/r3/bfdd.conf b/tests/topotests/bfd_topo3/r3/bfdd.conf index f7972c6ce5..51ce2ac0c8 100644 --- a/tests/topotests/bfd_topo3/r3/bfdd.conf +++ b/tests/topotests/bfd_topo3/r3/bfdd.conf @@ -1,7 +1,7 @@ ! -debug bfd network -debug bfd peer -debug bfd zebra +! debug bfd network +! debug bfd peer +! debug bfd zebra ! bfd profile slow-tx diff --git a/tests/topotests/bfd_topo3/r4/bfdd.conf b/tests/topotests/bfd_topo3/r4/bfdd.conf index f44abc0b8a..e5fc1647cf 100644 --- a/tests/topotests/bfd_topo3/r4/bfdd.conf +++ b/tests/topotests/bfd_topo3/r4/bfdd.conf @@ -1,7 +1,7 @@ ! -debug bfd network -debug bfd peer -debug bfd zebra +! debug bfd network +! debug bfd peer +! debug bfd zebra ! bfd profile slow-tx diff --git a/tests/topotests/bfd_vrf_topo1/r1/bfdd.conf b/tests/topotests/bfd_vrf_topo1/r1/bfdd.conf index fd57b2c4d5..8fca099686 100644 --- a/tests/topotests/bfd_vrf_topo1/r1/bfdd.conf +++ b/tests/topotests/bfd_vrf_topo1/r1/bfdd.conf @@ -1,7 +1,7 @@ ! -debug bfd network -debug bfd peer -debug bfd zebra +! debug bfd network +! debug bfd peer +! debug bfd zebra ! bfd peer 192.168.0.2 vrf r1-bfd-cust1 diff --git a/tests/topotests/bfd_vrf_topo1/r2/bfdd.conf b/tests/topotests/bfd_vrf_topo1/r2/bfdd.conf index e5539f14e5..4490090ec6 100644 --- a/tests/topotests/bfd_vrf_topo1/r2/bfdd.conf +++ b/tests/topotests/bfd_vrf_topo1/r2/bfdd.conf @@ -1,7 +1,7 @@ ! -debug bfd network -debug bfd peer -debug bfd zebra +! debug bfd network +! debug bfd peer +! debug bfd zebra ! bfd peer 192.168.0.1 vrf r2-bfd-cust1 diff --git a/tests/topotests/bfd_vrf_topo1/r3/bfdd.conf b/tests/topotests/bfd_vrf_topo1/r3/bfdd.conf index e1f53e1abc..0333320898 100644 --- a/tests/topotests/bfd_vrf_topo1/r3/bfdd.conf +++ b/tests/topotests/bfd_vrf_topo1/r3/bfdd.conf @@ -1,7 +1,7 @@ ! -debug bfd network -debug bfd peer -debug bfd zebra +! debug bfd network +! debug bfd peer +! debug bfd zebra ! bfd peer 192.168.1.2 vrf r3-bfd-cust1 diff --git a/tests/topotests/bfd_vrf_topo1/r4/bfdd.conf b/tests/topotests/bfd_vrf_topo1/r4/bfdd.conf index 9ef2023b21..119e5e5e40 100644 --- a/tests/topotests/bfd_vrf_topo1/r4/bfdd.conf +++ b/tests/topotests/bfd_vrf_topo1/r4/bfdd.conf @@ -1,7 +1,7 @@ ! -debug bfd network -debug bfd peer -debug bfd zebra +! debug bfd network +! debug bfd peer +! debug bfd zebra ! bfd peer 192.168.2.2 vrf r4-bfd-cust1 diff --git a/tests/topotests/bgp_aggregate_address_topo1/r1/bgpd.conf b/tests/topotests/bgp_aggregate_address_topo1/r1/bgpd.conf index fa52150085..c7cf4a527f 100644 --- a/tests/topotests/bgp_aggregate_address_topo1/r1/bgpd.conf +++ b/tests/topotests/bgp_aggregate_address_topo1/r1/bgpd.conf @@ -1,4 +1,4 @@ -debug bgp updates +! debug bgp updates ! access-list acl-sup-one seq 5 permit 192.168.2.1/32 access-list acl-sup-one seq 10 deny any diff --git a/tests/topotests/bgp_auth/R1/bgpd_multi_vrf.conf b/tests/topotests/bgp_auth/R1/bgpd_multi_vrf.conf index 071b559462..644e01c0b4 100644 --- a/tests/topotests/bgp_auth/R1/bgpd_multi_vrf.conf +++ b/tests/topotests/bgp_auth/R1/bgpd_multi_vrf.conf @@ -1,4 +1,4 @@ -debug bgp neighbor-events +! debug bgp neighbor-events router bgp 65001 vrf blue timers bgp 3 9 diff --git a/tests/topotests/bgp_auth/R1/bgpd_vrf.conf b/tests/topotests/bgp_auth/R1/bgpd_vrf.conf index fc0ae53b11..5799da165a 100644 --- a/tests/topotests/bgp_auth/R1/bgpd_vrf.conf +++ b/tests/topotests/bgp_auth/R1/bgpd_vrf.conf @@ -1,4 +1,4 @@ -debug bgp neighbor-events +! debug bgp neighbor-events router bgp 65001 vrf blue timers bgp 3 9 diff --git a/tests/topotests/bgp_evpn_mh/torm11/evpn.conf b/tests/topotests/bgp_evpn_mh/torm11/evpn.conf index 01f4b65704..2c1c695a18 100644 --- a/tests/topotests/bgp_evpn_mh/torm11/evpn.conf +++ b/tests/topotests/bgp_evpn_mh/torm11/evpn.conf @@ -1,9 +1,9 @@ ! frr defaults datacenter ! -debug bgp evpn mh es -debug bgp evpn mh route -debug bgp zebra +! debug bgp evpn mh es +! debug bgp evpn mh route +! debug bgp zebra ! ! router bgp 65002 diff --git a/tests/topotests/bgp_evpn_mh/torm11/zebra.conf b/tests/topotests/bgp_evpn_mh/torm11/zebra.conf index 33e89c06ae..a88370d06b 100644 --- a/tests/topotests/bgp_evpn_mh/torm11/zebra.conf +++ b/tests/topotests/bgp_evpn_mh/torm11/zebra.conf @@ -1,8 +1,8 @@ -debug zebra evpn mh es -debug zebra evpn mh mac -debug zebra evpn mh neigh -debug zebra evpn mh nh -debug zebra vxlan +! debug zebra evpn mh es +! debug zebra evpn mh mac +! debug zebra evpn mh neigh +! debug zebra evpn mh nh +! debug zebra vxlan ! evpn mh startup-delay 1 ! diff --git a/tests/topotests/bgp_evpn_mh/torm12/evpn.conf b/tests/topotests/bgp_evpn_mh/torm12/evpn.conf index 2c13024bbc..8b0ce1d98f 100644 --- a/tests/topotests/bgp_evpn_mh/torm12/evpn.conf +++ b/tests/topotests/bgp_evpn_mh/torm12/evpn.conf @@ -1,9 +1,9 @@ ! frr defaults datacenter ! -debug bgp evpn mh es -debug bgp evpn mh route -debug bgp zebra +! debug bgp evpn mh es +! debug bgp evpn mh route +! debug bgp zebra ! ! router bgp 65003 diff --git a/tests/topotests/bgp_evpn_mh/torm12/zebra.conf b/tests/topotests/bgp_evpn_mh/torm12/zebra.conf index 419f62b2ac..95327628f4 100644 --- a/tests/topotests/bgp_evpn_mh/torm12/zebra.conf +++ b/tests/topotests/bgp_evpn_mh/torm12/zebra.conf @@ -1,8 +1,8 @@ -debug zebra evpn mh es -debug zebra evpn mh mac -debug zebra evpn mh neigh -debug zebra evpn mh nh -debug zebra vxlan +! debug zebra evpn mh es +! debug zebra evpn mh mac +! debug zebra evpn mh neigh +! debug zebra evpn mh nh +! debug zebra vxlan ! evpn mh startup-delay 1 ! diff --git a/tests/topotests/bgp_evpn_mh/torm21/evpn.conf b/tests/topotests/bgp_evpn_mh/torm21/evpn.conf index 2a2ba061c6..5247dc1ebd 100644 --- a/tests/topotests/bgp_evpn_mh/torm21/evpn.conf +++ b/tests/topotests/bgp_evpn_mh/torm21/evpn.conf @@ -1,9 +1,9 @@ ! frr defaults datacenter ! -debug bgp evpn mh es -debug bgp evpn mh route -debug bgp zebra +! debug bgp evpn mh es +! debug bgp evpn mh route +! debug bgp zebra ! ! router bgp 65004 diff --git a/tests/topotests/bgp_evpn_mh/torm21/zebra.conf b/tests/topotests/bgp_evpn_mh/torm21/zebra.conf index 525f5eb099..6c75df73c3 100644 --- a/tests/topotests/bgp_evpn_mh/torm21/zebra.conf +++ b/tests/topotests/bgp_evpn_mh/torm21/zebra.conf @@ -1,8 +1,8 @@ -debug zebra evpn mh es -debug zebra evpn mh mac -debug zebra evpn mh neigh -debug zebra evpn mh nh -debug zebra vxlan +! debug zebra evpn mh es +! debug zebra evpn mh mac +! debug zebra evpn mh neigh +! debug zebra evpn mh nh +! debug zebra vxlan ! evpn mh startup-delay 1 ! diff --git a/tests/topotests/bgp_evpn_mh/torm22/evpn.conf b/tests/topotests/bgp_evpn_mh/torm22/evpn.conf index 432135c94a..ec56360176 100644 --- a/tests/topotests/bgp_evpn_mh/torm22/evpn.conf +++ b/tests/topotests/bgp_evpn_mh/torm22/evpn.conf @@ -1,9 +1,9 @@ ! frr defaults datacenter ! -debug bgp evpn mh es -debug bgp evpn mh route -debug bgp zebra +! debug bgp evpn mh es +! debug bgp evpn mh route +! debug bgp zebra ! router bgp 65005 bgp router-id 192.168.100.18 diff --git a/tests/topotests/bgp_evpn_mh/torm22/zebra.conf b/tests/topotests/bgp_evpn_mh/torm22/zebra.conf index 398064df6c..4c949668a2 100644 --- a/tests/topotests/bgp_evpn_mh/torm22/zebra.conf +++ b/tests/topotests/bgp_evpn_mh/torm22/zebra.conf @@ -1,8 +1,8 @@ -debug zebra evpn mh es -debug zebra evpn mh mac -debug zebra evpn mh neigh -debug zebra evpn mh nh -debug zebra vxlan +! debug zebra evpn mh es +! debug zebra evpn mh mac +! debug zebra evpn mh neigh +! debug zebra evpn mh nh +! debug zebra vxlan ! evpn mh startup-delay 1 ! diff --git a/tests/topotests/bgp_evpn_rt5/r1/bgpd.conf b/tests/topotests/bgp_evpn_rt5/r1/bgpd.conf index 9237682067..ccbeae6ed7 100644 --- a/tests/topotests/bgp_evpn_rt5/r1/bgpd.conf +++ b/tests/topotests/bgp_evpn_rt5/r1/bgpd.conf @@ -1,6 +1,6 @@ -debug bgp neighbor-events -debug bgp updates -debug bgp zebra +! debug bgp neighbor-events +! debug bgp updates +! debug bgp zebra router bgp 65000 bgp router-id 192.168.100.21 bgp log-neighbor-changes diff --git a/tests/topotests/bgp_evpn_rt5/r1/zebra.conf b/tests/topotests/bgp_evpn_rt5/r1/zebra.conf index f5eaab1953..4f1804c676 100644 --- a/tests/topotests/bgp_evpn_rt5/r1/zebra.conf +++ b/tests/topotests/bgp_evpn_rt5/r1/zebra.conf @@ -3,10 +3,10 @@ log stdout hostname r1 password zebra -debug zebra vxlan -debug zebra kernel -debug zebra dplane -debug zebra rib +! debug zebra vxlan +! debug zebra kernel +! debug zebra dplane +! debug zebra rib log stdout vrf r1-vrf-101 vni 101 diff --git a/tests/topotests/bgp_evpn_rt5/r2/bgpd.conf b/tests/topotests/bgp_evpn_rt5/r2/bgpd.conf index 6dcacd288d..744c259d9a 100644 --- a/tests/topotests/bgp_evpn_rt5/r2/bgpd.conf +++ b/tests/topotests/bgp_evpn_rt5/r2/bgpd.conf @@ -1,6 +1,6 @@ -debug bgp neighbor-events -debug bgp updates -debug bgp zebra +! debug bgp neighbor-events +! debug bgp updates +! debug bgp zebra router bgp 65000 bgp router-id 192.168.100.41 bgp log-neighbor-changes diff --git a/tests/topotests/bgp_evpn_rt5/r2/zebra.conf b/tests/topotests/bgp_evpn_rt5/r2/zebra.conf index e5f962d254..7d19a5b381 100644 --- a/tests/topotests/bgp_evpn_rt5/r2/zebra.conf +++ b/tests/topotests/bgp_evpn_rt5/r2/zebra.conf @@ -3,7 +3,7 @@ log stdout hostname r2 password zebra -debug zebra vxlan +! debug zebra vxlan vrf r2-vrf-101 vni 101 diff --git a/tests/topotests/bgp_features/r1/ospf6d.conf b/tests/topotests/bgp_features/r1/ospf6d.conf index a38e4b862a..9afc6f4919 100644 --- a/tests/topotests/bgp_features/r1/ospf6d.conf +++ b/tests/topotests/bgp_features/r1/ospf6d.conf @@ -1,6 +1,6 @@ log file ospf6d.log ! -debug ospf6 neighbor +! debug ospf6 neighbor ! interface r1-lo ! diff --git a/tests/topotests/bgp_features/r1/ospfd.conf b/tests/topotests/bgp_features/r1/ospfd.conf index 68a1bb5c75..aef017fe52 100644 --- a/tests/topotests/bgp_features/r1/ospfd.conf +++ b/tests/topotests/bgp_features/r1/ospfd.conf @@ -1,7 +1,7 @@ log file ospfd.log ! -debug ospf event -debug ospf zebra +! debug ospf event +! debug ospf zebra ! interface r1-eth1 ip ospf hello-interval 2 diff --git a/tests/topotests/bgp_features/r2/ospf6d.conf b/tests/topotests/bgp_features/r2/ospf6d.conf index 47bd5a99cc..7fe535651e 100644 --- a/tests/topotests/bgp_features/r2/ospf6d.conf +++ b/tests/topotests/bgp_features/r2/ospf6d.conf @@ -1,6 +1,6 @@ log file ospf6d.log ! -debug ospf6 neighbor +! debug ospf6 neighbor ! interface r2-lo ! diff --git a/tests/topotests/bgp_features/r2/ospfd.conf b/tests/topotests/bgp_features/r2/ospfd.conf index 6f608e454b..7f043c9d74 100644 --- a/tests/topotests/bgp_features/r2/ospfd.conf +++ b/tests/topotests/bgp_features/r2/ospfd.conf @@ -1,7 +1,7 @@ log file ospfd.log ! -debug ospf event -debug ospf zebra +! debug ospf event +! debug ospf zebra ! int r2-eth1 ip ospf hello-interval 2 diff --git a/tests/topotests/bgp_features/r3/ospf6d.conf b/tests/topotests/bgp_features/r3/ospf6d.conf index eb74901ba1..07325b69b0 100644 --- a/tests/topotests/bgp_features/r3/ospf6d.conf +++ b/tests/topotests/bgp_features/r3/ospf6d.conf @@ -1,6 +1,6 @@ log file ospf6d.log ! -debug ospf6 neighbor +! debug ospf6 neighbor ! interface r3-lo ! diff --git a/tests/topotests/bgp_features/r3/ospfd.conf b/tests/topotests/bgp_features/r3/ospfd.conf index 71e4f1e1df..c3399fd60d 100644 --- a/tests/topotests/bgp_features/r3/ospfd.conf +++ b/tests/topotests/bgp_features/r3/ospfd.conf @@ -1,7 +1,7 @@ log file ospfd.log ! -debug ospf event -debug ospf zebra +! debug ospf event +! debug ospf zebra ! int r3-eth1 ip ospf hello-interval 2 diff --git a/tests/topotests/bgp_ipv6_rtadv/r1/zebra.conf b/tests/topotests/bgp_ipv6_rtadv/r1/zebra.conf index f95c3b07a7..1397c7f5fd 100644 --- a/tests/topotests/bgp_ipv6_rtadv/r1/zebra.conf +++ b/tests/topotests/bgp_ipv6_rtadv/r1/zebra.conf @@ -1,5 +1,5 @@ -debug zebra packet recv -debug zebra packet send +! debug zebra packet recv +! debug zebra packet send log stdout interface lo ip address 10.254.254.1/32 diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/ldpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/ldpd.conf index 3c6cbddc2a..f7f2714dae 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/ldpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/ldpd.conf @@ -1,13 +1,13 @@ hostname r1 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp discovery hello recv -debug mpls ldp discovery hello sent +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp discovery hello recv +! debug mpls ldp discovery hello sent ! mpls ldp router-id 1.1.1.1 diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/ldpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/ldpd.conf index bfdef21b75..c4056e01a8 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/ldpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/ldpd.conf @@ -1,13 +1,13 @@ hostname r2 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp discovery hello recv -debug mpls ldp discovery hello sent +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp discovery hello recv +! debug mpls ldp discovery hello sent ! mpls ldp router-id 2.2.2.2 diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/ldpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/ldpd.conf index dbf1d72b5f..48956cb996 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/ldpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/ldpd.conf @@ -1,13 +1,13 @@ hostname r3 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp discovery hello recv -debug mpls ldp discovery hello sent +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp discovery hello recv +! debug mpls ldp discovery hello sent ! mpls ldp router-id 3.3.3.3 diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/ldpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/ldpd.conf index 8f3533527d..1d04aa07e7 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/ldpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/ldpd.conf @@ -1,13 +1,13 @@ hostname r4 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp discovery hello recv -debug mpls ldp discovery hello sent +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp discovery hello recv +! debug mpls ldp discovery hello sent ! mpls ldp router-id 4.4.4.4 diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/ldpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/ldpd.conf index de84f2bc3f..168b2d4802 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/ldpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/ldpd.conf @@ -2,13 +2,13 @@ hostname r1 log file ldpd.log password zebra ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp discovery hello recv -debug mpls ldp discovery hello sent +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp discovery hello recv +! debug mpls ldp discovery hello sent ! mpls ldp router-id 1.1.1.1 diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/ldpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/ldpd.conf index 411ba85ef6..847be20934 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/ldpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/ldpd.conf @@ -2,13 +2,13 @@ hostname r2 log file ldpd.log password zebra ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp discovery hello recv -debug mpls ldp discovery hello sent +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp discovery hello recv +! debug mpls ldp discovery hello sent ! mpls ldp router-id 2.2.2.2 diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/ldpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/ldpd.conf index 6002895f48..a620739ffb 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/ldpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/ldpd.conf @@ -2,13 +2,13 @@ hostname r3 password zebra log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp discovery hello recv -debug mpls ldp discovery hello sent +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp discovery hello recv +! debug mpls ldp discovery hello sent ! mpls ldp router-id 3.3.3.3 diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/ldpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/ldpd.conf index 292e9a7187..617d3a76d5 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/ldpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/ldpd.conf @@ -2,13 +2,13 @@ hostname r4 password zebra log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp discovery hello recv -debug mpls ldp discovery hello sent +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp discovery hello recv +! debug mpls ldp discovery hello sent ! mpls ldp router-id 4.4.4.4 diff --git a/tests/topotests/bgp_link_bw_ip/r4/bgpd.conf b/tests/topotests/bgp_link_bw_ip/r4/bgpd.conf index d34db982c9..88b260f7e2 100644 --- a/tests/topotests/bgp_link_bw_ip/r4/bgpd.conf +++ b/tests/topotests/bgp_link_bw_ip/r4/bgpd.conf @@ -1,9 +1,9 @@ ! log file bgpd.log ! -debug bgp updates -debug bgp zebra -debug bgp bestpath 198.10.1.1/32 +! debug bgp updates +! debug bgp zebra +! debug bgp bestpath 198.10.1.1/32 ! hostname r4 ! diff --git a/tests/topotests/bgp_lu_topo1/R1/bgpd.conf b/tests/topotests/bgp_lu_topo1/R1/bgpd.conf index 1bdb4c7a3e..a164152e0e 100644 --- a/tests/topotests/bgp_lu_topo1/R1/bgpd.conf +++ b/tests/topotests/bgp_lu_topo1/R1/bgpd.conf @@ -1,6 +1,6 @@ ! -debug bgp labelpool -debug bgp zebra +! debug bgp labelpool +! debug bgp zebra ! router bgp 1 bgp router-id 10.0.0.1 diff --git a/tests/topotests/bgp_lu_topo1/R1/zebra.conf b/tests/topotests/bgp_lu_topo1/R1/zebra.conf index 4f6fee579f..f8a9ce4e03 100644 --- a/tests/topotests/bgp_lu_topo1/R1/zebra.conf +++ b/tests/topotests/bgp_lu_topo1/R1/zebra.conf @@ -1,6 +1,6 @@ -debug zebra events -debug zebra dplane -debug zebra mpls +! debug zebra events +! debug zebra dplane +! debug zebra mpls ! interface R1-eth0 ip address 10.0.0.1/24 diff --git a/tests/topotests/bgp_lu_topo1/R2/bgpd.conf b/tests/topotests/bgp_lu_topo1/R2/bgpd.conf index bac608e1c3..d35bbb886b 100644 --- a/tests/topotests/bgp_lu_topo1/R2/bgpd.conf +++ b/tests/topotests/bgp_lu_topo1/R2/bgpd.conf @@ -1,5 +1,5 @@ -debug bgp labelpool -debug bgp zebra +! debug bgp labelpool +! debug bgp zebra ! router bgp 2 bgp router-id 10.0.0.2 diff --git a/tests/topotests/bgp_lu_topo1/R2/zebra.conf b/tests/topotests/bgp_lu_topo1/R2/zebra.conf index 33ee53efe7..083da3ef9c 100644 --- a/tests/topotests/bgp_lu_topo1/R2/zebra.conf +++ b/tests/topotests/bgp_lu_topo1/R2/zebra.conf @@ -1,7 +1,7 @@ ! -debug zebra events -debug zebra dplane -debug zebra mpls +! debug zebra events +! debug zebra dplane +! debug zebra mpls ! interface R2-eth0 ip address 10.0.0.2/24 diff --git a/tests/topotests/bgp_lu_topo1/R3/bgpd.conf b/tests/topotests/bgp_lu_topo1/R3/bgpd.conf index b42df022e0..31d26ea1ed 100644 --- a/tests/topotests/bgp_lu_topo1/R3/bgpd.conf +++ b/tests/topotests/bgp_lu_topo1/R3/bgpd.conf @@ -1,6 +1,6 @@ log file /tmp/bgpd.log ! -debug bgp updates +! debug bgp updates ! router bgp 2 bgp router-id 10.0.1.3 diff --git a/tests/topotests/bgp_lu_topo1/R3/zebra.conf b/tests/topotests/bgp_lu_topo1/R3/zebra.conf index 524978bff6..ea4a1482dd 100644 --- a/tests/topotests/bgp_lu_topo1/R3/zebra.conf +++ b/tests/topotests/bgp_lu_topo1/R3/zebra.conf @@ -1,8 +1,8 @@ log file /tmp/zebra.log ! -debug zebra events -debug zebra packet detail -debug zebra mpls +! debug zebra events +! debug zebra packet detail +! debug zebra mpls ! interface R3-eth0 ip address 10.0.1.3/24 diff --git a/tests/topotests/bgp_lu_topo2/R1/bgpd.conf b/tests/topotests/bgp_lu_topo2/R1/bgpd.conf index 13383e20b6..9fe4026977 100644 --- a/tests/topotests/bgp_lu_topo2/R1/bgpd.conf +++ b/tests/topotests/bgp_lu_topo2/R1/bgpd.conf @@ -1,8 +1,8 @@ ! no log unique-id ! -debug bgp labelpool -debug bgp zebra +! debug bgp labelpool +! debug bgp zebra ! router bgp 1 bgp router-id 10.0.0.1 diff --git a/tests/topotests/bgp_lu_topo2/R1/zebra.conf b/tests/topotests/bgp_lu_topo2/R1/zebra.conf index c782481860..64c34a3bc3 100644 --- a/tests/topotests/bgp_lu_topo2/R1/zebra.conf +++ b/tests/topotests/bgp_lu_topo2/R1/zebra.conf @@ -1,10 +1,10 @@ ! no log unique-id ! -debug zebra events -debug zebra rib det -debug zebra dplane -debug zebra mpls +! debug zebra events +! debug zebra rib det +! debug zebra dplane +! debug zebra mpls ! interface R1-eth0 ip address 10.0.0.1/24 diff --git a/tests/topotests/bgp_lu_topo2/R2/bgpd.conf b/tests/topotests/bgp_lu_topo2/R2/bgpd.conf index bab3b8dd78..917060c4df 100644 --- a/tests/topotests/bgp_lu_topo2/R2/bgpd.conf +++ b/tests/topotests/bgp_lu_topo2/R2/bgpd.conf @@ -1,8 +1,8 @@ ! no log unique-id ! -debug bgp labelpool -debug bgp zebra +! debug bgp labelpool +! debug bgp zebra ! router bgp 2 bgp router-id 10.0.0.2 diff --git a/tests/topotests/bgp_lu_topo2/R2/zebra.conf b/tests/topotests/bgp_lu_topo2/R2/zebra.conf index b8a03e4fcb..f465914f63 100644 --- a/tests/topotests/bgp_lu_topo2/R2/zebra.conf +++ b/tests/topotests/bgp_lu_topo2/R2/zebra.conf @@ -1,10 +1,10 @@ ! no log unique-id ! -debug zebra events -debug zebra dplane -debug zebra mpls -debug zebra rib det +! debug zebra events +! debug zebra dplane +! debug zebra mpls +! debug zebra rib det ! interface R2-eth0 ip address 10.0.0.2/24 diff --git a/tests/topotests/bgp_lu_topo2/R3/bgpd.conf b/tests/topotests/bgp_lu_topo2/R3/bgpd.conf index 2dfeaa3274..6443445b80 100644 --- a/tests/topotests/bgp_lu_topo2/R3/bgpd.conf +++ b/tests/topotests/bgp_lu_topo2/R3/bgpd.conf @@ -2,7 +2,7 @@ log file /tmp/bgpd.log no log unique-id ! ! -debug bgp updates +! debug bgp updates ! router bgp 2 bgp router-id 10.0.1.3 diff --git a/tests/topotests/bgp_lu_topo2/R3/zebra.conf b/tests/topotests/bgp_lu_topo2/R3/zebra.conf index e4234de48c..dd24deb214 100644 --- a/tests/topotests/bgp_lu_topo2/R3/zebra.conf +++ b/tests/topotests/bgp_lu_topo2/R3/zebra.conf @@ -2,9 +2,9 @@ log file /tmp/zebra.log no log unique-id ! ! -debug zebra events -debug zebra packet detail -debug zebra mpls +! debug zebra events +! debug zebra packet detail +! debug zebra mpls ! interface R3-eth0 ip address 10.0.1.3/24 diff --git a/tests/topotests/bgp_lu_topo2/R4/bgpd.conf b/tests/topotests/bgp_lu_topo2/R4/bgpd.conf index 3cef827b86..45c81fb93e 100644 --- a/tests/topotests/bgp_lu_topo2/R4/bgpd.conf +++ b/tests/topotests/bgp_lu_topo2/R4/bgpd.conf @@ -1,8 +1,8 @@ ! no log unique-id ! -debug bgp labelpool -debug bgp zebra +! debug bgp labelpool +! debug bgp zebra ! router bgp 4 bgp router-id 10.0.4.4 diff --git a/tests/topotests/bgp_lu_topo2/R4/zebra.conf b/tests/topotests/bgp_lu_topo2/R4/zebra.conf index ba1b2bba6e..53ffe51e06 100644 --- a/tests/topotests/bgp_lu_topo2/R4/zebra.conf +++ b/tests/topotests/bgp_lu_topo2/R4/zebra.conf @@ -1,9 +1,9 @@ no log unique-id ! -debug zebra events -debug zebra dplane -debug zebra mpls -debug zebra rib det +! debug zebra events +! debug zebra dplane +! debug zebra mpls +! debug zebra rib det ! interface R4-eth0 ip address 10.0.4.4/24 diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/ce1/zebra.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce1/zebra.conf index 8ad2ddc48c..4a8579845c 100644 --- a/tests/topotests/bgp_snmp_mplsl3vpn/ce1/zebra.conf +++ b/tests/topotests/bgp_snmp_mplsl3vpn/ce1/zebra.conf @@ -1,8 +1,8 @@ log file /tmp/zebra.log log stdout ! -debug zebra events -debug zebra dplane +! debug zebra events +! debug zebra dplane ! ! interface ce1-eth0 diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/ce2/zebra.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce2/zebra.conf index fa2e968e55..5e0aa5d3f0 100644 --- a/tests/topotests/bgp_snmp_mplsl3vpn/ce2/zebra.conf +++ b/tests/topotests/bgp_snmp_mplsl3vpn/ce2/zebra.conf @@ -1,8 +1,8 @@ log file /tmp/zebra.log log stdout ! -debug zebra events -debug zebra dplane +! debug zebra events +! debug zebra dplane ! ! interface ce2-eth0 diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/ce3/zebra.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce3/zebra.conf index ea91e21bad..fabc11e84d 100644 --- a/tests/topotests/bgp_snmp_mplsl3vpn/ce3/zebra.conf +++ b/tests/topotests/bgp_snmp_mplsl3vpn/ce3/zebra.conf @@ -1,8 +1,8 @@ log file /tmp/zebra.log log stdout ! -debug zebra events -debug zebra dplane +! debug zebra events +! debug zebra dplane ! ! interface ce3-eth0 diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/ce4/zebra.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce4/zebra.conf index 0866fa9759..e369f41b39 100644 --- a/tests/topotests/bgp_snmp_mplsl3vpn/ce4/zebra.conf +++ b/tests/topotests/bgp_snmp_mplsl3vpn/ce4/zebra.conf @@ -1,8 +1,8 @@ log file /tmp/zebra.log log stdout ! -debug zebra events -debug zebra dplane +! debug zebra events +! debug zebra dplane ! ! interface ce4-eth0 diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/r1/isisd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r1/isisd.conf index b5ca993da3..1a148f0628 100644 --- a/tests/topotests/bgp_snmp_mplsl3vpn/r1/isisd.conf +++ b/tests/topotests/bgp_snmp_mplsl3vpn/r1/isisd.conf @@ -1,7 +1,7 @@ log stdout debugging ! -debug isis route-events -debug isis events +! debug isis route-events +! debug isis events ! interface r1-eth0 ip router isis ISIS1 diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/r2/isisd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r2/isisd.conf index 3dfa43831a..396797dfb9 100644 --- a/tests/topotests/bgp_snmp_mplsl3vpn/r2/isisd.conf +++ b/tests/topotests/bgp_snmp_mplsl3vpn/r2/isisd.conf @@ -1,7 +1,7 @@ log stdout debugging ! -debug isis route-events -debug isis events +! debug isis route-events +! debug isis events ! interface r2-eth0 ip router isis ISIS1 diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/r2/zebra.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r2/zebra.conf index 9bc4331bae..4fec8af3db 100644 --- a/tests/topotests/bgp_snmp_mplsl3vpn/r2/zebra.conf +++ b/tests/topotests/bgp_snmp_mplsl3vpn/r2/zebra.conf @@ -1,8 +1,8 @@ log file /tmp/zebra.log log stdout ! -debug zebra events -debug zebra dplane +! debug zebra events +! debug zebra dplane ! ! interface r2-eth0 diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/r3/isisd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r3/isisd.conf index 578ebafad6..9e52fb6820 100644 --- a/tests/topotests/bgp_snmp_mplsl3vpn/r3/isisd.conf +++ b/tests/topotests/bgp_snmp_mplsl3vpn/r3/isisd.conf @@ -1,7 +1,7 @@ log stdout debugging ! -debug isis route-events -debug isis events +! debug isis route-events +! debug isis events ! interface r3-eth0 ip router isis ISIS1 diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/r3/zebra.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r3/zebra.conf index 4d2007e787..e433995593 100644 --- a/tests/topotests/bgp_snmp_mplsl3vpn/r3/zebra.conf +++ b/tests/topotests/bgp_snmp_mplsl3vpn/r3/zebra.conf @@ -1,8 +1,8 @@ log file /tmp/zebra.log log stdout ! -debug zebra events -debug zebra dplane +! debug zebra events +! debug zebra dplane ! ! interface r3-eth0 diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/r4/isisd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r4/isisd.conf index 3e9e9af45f..8de2cf05c5 100644 --- a/tests/topotests/bgp_snmp_mplsl3vpn/r4/isisd.conf +++ b/tests/topotests/bgp_snmp_mplsl3vpn/r4/isisd.conf @@ -1,7 +1,7 @@ log stdout debugging ! -debug isis route-events -debug isis events +! debug isis route-events +! debug isis events ! interface r4-eth0 ip router isis ISIS1 diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/r4/zebra.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r4/zebra.conf index c48407c108..14580e5b3a 100644 --- a/tests/topotests/bgp_snmp_mplsl3vpn/r4/zebra.conf +++ b/tests/topotests/bgp_snmp_mplsl3vpn/r4/zebra.conf @@ -1,8 +1,8 @@ log file /tmp/zebra.log log stdout ! -debug zebra events -debug zebra dplane +! debug zebra events +! debug zebra dplane ! ! interface r4-eth0 diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/zebra.conf b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/zebra.conf index 68b5730a63..8defa0125a 100644 --- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/zebra.conf +++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r1/zebra.conf @@ -7,9 +7,9 @@ log stdout notifications log monitor notifications log commands ! -debug zebra packet -debug zebra dplane -debug zebra kernel +! debug zebra packet +! debug zebra dplane +! debug zebra kernel ! interface eth0 ipv6 address 2001::1/64 diff --git a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/zebra.conf b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/zebra.conf index 91fd92d422..51d9c92235 100644 --- a/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/zebra.conf +++ b/tests/topotests/bgp_srv6l3vpn_to_bgp_vrf/r2/zebra.conf @@ -7,9 +7,9 @@ log stdout notifications log monitor notifications log commands ! -debug zebra packet -debug zebra dplane -debug zebra kernel +! debug zebra packet +! debug zebra dplane +! debug zebra kernel ! interface eth0 ipv6 address 2001::2/64 diff --git a/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r1/zebra.conf b/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r1/zebra.conf index f19c497208..74359a55da 100644 --- a/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r1/zebra.conf +++ b/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r1/zebra.conf @@ -1,5 +1,5 @@ -debug zebra packet recv -debug zebra packet send +! debug zebra packet recv +! debug zebra packet send log stdout interface loop1 vrf r1-cust1 ip address 10.254.254.1/32 diff --git a/tests/topotests/bgp_vrf_netns/r1/zebra.conf b/tests/topotests/bgp_vrf_netns/r1/zebra.conf index fd0e18f5fd..ed4edfa0bd 100644 --- a/tests/topotests/bgp_vrf_netns/r1/zebra.conf +++ b/tests/topotests/bgp_vrf_netns/r1/zebra.conf @@ -4,4 +4,4 @@ interface r1-eth0 vrf r1-bgp-cust1 ! line vty ! -debug vrf +! debug vrf diff --git a/tests/topotests/eigrp_topo1/r1/zebra.conf b/tests/topotests/eigrp_topo1/r1/zebra.conf index 56ae4a66f4..51579a7d11 100644 --- a/tests/topotests/eigrp_topo1/r1/zebra.conf +++ b/tests/topotests/eigrp_topo1/r1/zebra.conf @@ -1,5 +1,5 @@ log file zebra.log -debug zebra rib detail +! debug zebra rib detail ! hostname r1 ! diff --git a/tests/topotests/evpn_pim_1/leaf1/pimd.conf b/tests/topotests/evpn_pim_1/leaf1/pimd.conf index d85f33d1fc..b54aada022 100644 --- a/tests/topotests/evpn_pim_1/leaf1/pimd.conf +++ b/tests/topotests/evpn_pim_1/leaf1/pimd.conf @@ -1,6 +1,6 @@ -debug pim events -debug pim nht -debug pim zebra +! debug pim events +! debug pim nht +! debug pim zebra ip pim rp 192.168.100.1 ip pim join-prune-interval 5 ! diff --git a/tests/topotests/isis_lfa_topo1/rt1/isisd.conf b/tests/topotests/isis_lfa_topo1/rt1/isisd.conf index 2ad8c12538..833cd66ced 100644 --- a/tests/topotests/isis_lfa_topo1/rt1/isisd.conf +++ b/tests/topotests/isis_lfa_topo1/rt1/isisd.conf @@ -2,10 +2,10 @@ password 1 hostname rt1 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis lsp-gen ! interface lo ipv6 router isis 1 diff --git a/tests/topotests/isis_lfa_topo1/rt1/zebra.conf b/tests/topotests/isis_lfa_topo1/rt1/zebra.conf index 317f1031df..4ce144495c 100644 --- a/tests/topotests/isis_lfa_topo1/rt1/zebra.conf +++ b/tests/topotests/isis_lfa_topo1/rt1/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt1 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 1.1.1.1/32 diff --git a/tests/topotests/isis_lfa_topo1/rt2/isisd.conf b/tests/topotests/isis_lfa_topo1/rt2/isisd.conf index 39ff2570d4..42dee00e60 100644 --- a/tests/topotests/isis_lfa_topo1/rt2/isisd.conf +++ b/tests/topotests/isis_lfa_topo1/rt2/isisd.conf @@ -2,10 +2,10 @@ password 1 hostname rt2 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis lsp-gen ! interface lo ipv6 router isis 1 diff --git a/tests/topotests/isis_lfa_topo1/rt2/zebra.conf b/tests/topotests/isis_lfa_topo1/rt2/zebra.conf index 9feaada791..3372ec5033 100644 --- a/tests/topotests/isis_lfa_topo1/rt2/zebra.conf +++ b/tests/topotests/isis_lfa_topo1/rt2/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt2 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 2.2.2.2/32 diff --git a/tests/topotests/isis_lfa_topo1/rt3/isisd.conf b/tests/topotests/isis_lfa_topo1/rt3/isisd.conf index 8b0c7bd0dc..9dd813cff6 100644 --- a/tests/topotests/isis_lfa_topo1/rt3/isisd.conf +++ b/tests/topotests/isis_lfa_topo1/rt3/isisd.conf @@ -2,10 +2,10 @@ password 1 hostname rt3 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis lsp-gen ! interface lo ipv6 router isis 1 diff --git a/tests/topotests/isis_lfa_topo1/rt3/zebra.conf b/tests/topotests/isis_lfa_topo1/rt3/zebra.conf index 48d732e72a..231b02b9bd 100644 --- a/tests/topotests/isis_lfa_topo1/rt3/zebra.conf +++ b/tests/topotests/isis_lfa_topo1/rt3/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt3 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 3.3.3.3/32 diff --git a/tests/topotests/isis_lfa_topo1/rt4/isisd.conf b/tests/topotests/isis_lfa_topo1/rt4/isisd.conf index 86edee6ab1..7500ff8d7b 100644 --- a/tests/topotests/isis_lfa_topo1/rt4/isisd.conf +++ b/tests/topotests/isis_lfa_topo1/rt4/isisd.conf @@ -2,10 +2,10 @@ password 1 hostname rt4 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis lsp-gen ! interface lo ipv6 router isis 1 diff --git a/tests/topotests/isis_lfa_topo1/rt4/zebra.conf b/tests/topotests/isis_lfa_topo1/rt4/zebra.conf index bff10860cc..2d62924334 100644 --- a/tests/topotests/isis_lfa_topo1/rt4/zebra.conf +++ b/tests/topotests/isis_lfa_topo1/rt4/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt4 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 4.4.4.4/32 diff --git a/tests/topotests/isis_lfa_topo1/rt5/isisd.conf b/tests/topotests/isis_lfa_topo1/rt5/isisd.conf index 7a7cfe557d..5e022e9ad8 100644 --- a/tests/topotests/isis_lfa_topo1/rt5/isisd.conf +++ b/tests/topotests/isis_lfa_topo1/rt5/isisd.conf @@ -2,10 +2,10 @@ password 1 hostname rt5 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis lsp-gen ! interface lo ipv6 router isis 1 diff --git a/tests/topotests/isis_lfa_topo1/rt5/zebra.conf b/tests/topotests/isis_lfa_topo1/rt5/zebra.conf index ee1e46c966..efb7bf6d12 100644 --- a/tests/topotests/isis_lfa_topo1/rt5/zebra.conf +++ b/tests/topotests/isis_lfa_topo1/rt5/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt5 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 5.5.5.5/32 diff --git a/tests/topotests/isis_lfa_topo1/rt6/isisd.conf b/tests/topotests/isis_lfa_topo1/rt6/isisd.conf index 20cb7769a4..d262e8a564 100644 --- a/tests/topotests/isis_lfa_topo1/rt6/isisd.conf +++ b/tests/topotests/isis_lfa_topo1/rt6/isisd.conf @@ -2,10 +2,10 @@ password 1 hostname rt6 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis lsp-gen ! interface lo ipv6 router isis 1 diff --git a/tests/topotests/isis_lfa_topo1/rt6/zebra.conf b/tests/topotests/isis_lfa_topo1/rt6/zebra.conf index 4108078896..31650bd260 100644 --- a/tests/topotests/isis_lfa_topo1/rt6/zebra.conf +++ b/tests/topotests/isis_lfa_topo1/rt6/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt6 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 6.6.6.6/32 diff --git a/tests/topotests/isis_lfa_topo1/rt7/isisd.conf b/tests/topotests/isis_lfa_topo1/rt7/isisd.conf index 713e6d39f4..c2061236c3 100644 --- a/tests/topotests/isis_lfa_topo1/rt7/isisd.conf +++ b/tests/topotests/isis_lfa_topo1/rt7/isisd.conf @@ -2,10 +2,10 @@ password 1 hostname rt6 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis lsp-gen ! interface lo ipv6 router isis 1 diff --git a/tests/topotests/isis_lfa_topo1/rt7/zebra.conf b/tests/topotests/isis_lfa_topo1/rt7/zebra.conf index 353c9efa93..4271ccea11 100644 --- a/tests/topotests/isis_lfa_topo1/rt7/zebra.conf +++ b/tests/topotests/isis_lfa_topo1/rt7/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt7 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 7.7.7.7/32 diff --git a/tests/topotests/isis_lsp_bits_topo1/rt1/isisd.conf b/tests/topotests/isis_lsp_bits_topo1/rt1/isisd.conf index 90764a0d0f..fc004e429b 100644 --- a/tests/topotests/isis_lsp_bits_topo1/rt1/isisd.conf +++ b/tests/topotests/isis_lsp_bits_topo1/rt1/isisd.conf @@ -2,11 +2,11 @@ password 1 hostname rt1 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis sr-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis sr-events +! debug isis lsp-gen ! interface lo ip router isis 1 diff --git a/tests/topotests/isis_lsp_bits_topo1/rt1/zebra.conf b/tests/topotests/isis_lsp_bits_topo1/rt1/zebra.conf index 9d71d3005f..37b3f27cae 100644 --- a/tests/topotests/isis_lsp_bits_topo1/rt1/zebra.conf +++ b/tests/topotests/isis_lsp_bits_topo1/rt1/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt1 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 1.1.1.1/32 diff --git a/tests/topotests/isis_lsp_bits_topo1/rt2/isisd.conf b/tests/topotests/isis_lsp_bits_topo1/rt2/isisd.conf index 2bc4c4ad97..d01720f4f0 100644 --- a/tests/topotests/isis_lsp_bits_topo1/rt2/isisd.conf +++ b/tests/topotests/isis_lsp_bits_topo1/rt2/isisd.conf @@ -1,11 +1,11 @@ hostname rt2 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis sr-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis sr-events +! debug isis lsp-gen ! interface lo ip router isis 1 diff --git a/tests/topotests/isis_lsp_bits_topo1/rt2/zebra.conf b/tests/topotests/isis_lsp_bits_topo1/rt2/zebra.conf index 234e10efa9..03acb6f272 100644 --- a/tests/topotests/isis_lsp_bits_topo1/rt2/zebra.conf +++ b/tests/topotests/isis_lsp_bits_topo1/rt2/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt2 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 2.2.2.2/32 diff --git a/tests/topotests/isis_lsp_bits_topo1/rt3/isisd.conf b/tests/topotests/isis_lsp_bits_topo1/rt3/isisd.conf index 9ad97109b5..a8d589678a 100644 --- a/tests/topotests/isis_lsp_bits_topo1/rt3/isisd.conf +++ b/tests/topotests/isis_lsp_bits_topo1/rt3/isisd.conf @@ -1,11 +1,11 @@ hostname rt3 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis sr-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis sr-events +! debug isis lsp-gen ! interface lo ip router isis 1 diff --git a/tests/topotests/isis_lsp_bits_topo1/rt3/zebra.conf b/tests/topotests/isis_lsp_bits_topo1/rt3/zebra.conf index 9a0defd62b..5f59be19b3 100644 --- a/tests/topotests/isis_lsp_bits_topo1/rt3/zebra.conf +++ b/tests/topotests/isis_lsp_bits_topo1/rt3/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt3 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 3.3.3.3/32 diff --git a/tests/topotests/isis_lsp_bits_topo1/rt4/isisd.conf b/tests/topotests/isis_lsp_bits_topo1/rt4/isisd.conf index e85412a71d..2d30790f29 100644 --- a/tests/topotests/isis_lsp_bits_topo1/rt4/isisd.conf +++ b/tests/topotests/isis_lsp_bits_topo1/rt4/isisd.conf @@ -1,11 +1,11 @@ hostname rt4 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis sr-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis sr-events +! debug isis lsp-gen ! interface lo ip router isis 4 diff --git a/tests/topotests/isis_lsp_bits_topo1/rt4/zebra.conf b/tests/topotests/isis_lsp_bits_topo1/rt4/zebra.conf index adcf433249..a567f3b864 100644 --- a/tests/topotests/isis_lsp_bits_topo1/rt4/zebra.conf +++ b/tests/topotests/isis_lsp_bits_topo1/rt4/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt4 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 4.4.4.4/32 diff --git a/tests/topotests/isis_lsp_bits_topo1/rt5/isisd.conf b/tests/topotests/isis_lsp_bits_topo1/rt5/isisd.conf index 2cab0c88fc..263c3f9478 100644 --- a/tests/topotests/isis_lsp_bits_topo1/rt5/isisd.conf +++ b/tests/topotests/isis_lsp_bits_topo1/rt5/isisd.conf @@ -1,11 +1,11 @@ hostname rt5 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis sr-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis sr-events +! debug isis lsp-gen ! interface lo ip router isis 2 diff --git a/tests/topotests/isis_lsp_bits_topo1/rt5/zebra.conf b/tests/topotests/isis_lsp_bits_topo1/rt5/zebra.conf index 0f10ce921f..50aedb3940 100644 --- a/tests/topotests/isis_lsp_bits_topo1/rt5/zebra.conf +++ b/tests/topotests/isis_lsp_bits_topo1/rt5/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt5 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 5.5.5.5/32 diff --git a/tests/topotests/isis_lsp_bits_topo1/rt6/isisd.conf b/tests/topotests/isis_lsp_bits_topo1/rt6/isisd.conf index 249f945e0c..505604ef33 100644 --- a/tests/topotests/isis_lsp_bits_topo1/rt6/isisd.conf +++ b/tests/topotests/isis_lsp_bits_topo1/rt6/isisd.conf @@ -1,11 +1,11 @@ hostname rt6 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis sr-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis sr-events +! debug isis lsp-gen ! interface lo ip router isis 4 diff --git a/tests/topotests/isis_lsp_bits_topo1/rt6/zebra.conf b/tests/topotests/isis_lsp_bits_topo1/rt6/zebra.conf index 6084010a93..4d51d3df84 100644 --- a/tests/topotests/isis_lsp_bits_topo1/rt6/zebra.conf +++ b/tests/topotests/isis_lsp_bits_topo1/rt6/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt6 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 6.6.6.6/32 diff --git a/tests/topotests/isis_rlfa_topo1/rt1/isisd.conf b/tests/topotests/isis_rlfa_topo1/rt1/isisd.conf index a80f30dc7b..f7f0a95e1c 100644 --- a/tests/topotests/isis_rlfa_topo1/rt1/isisd.conf +++ b/tests/topotests/isis_rlfa_topo1/rt1/isisd.conf @@ -2,10 +2,10 @@ password 1 hostname rt1 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis lsp-gen ! interface lo ip router isis 1 diff --git a/tests/topotests/isis_rlfa_topo1/rt1/ldpd.conf b/tests/topotests/isis_rlfa_topo1/rt1/ldpd.conf index f60fdb9742..eb8589219e 100644 --- a/tests/topotests/isis_rlfa_topo1/rt1/ldpd.conf +++ b/tests/topotests/isis_rlfa_topo1/rt1/ldpd.conf @@ -2,9 +2,9 @@ log file ldpd.log ! hostname rt1 ! -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp zebra +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp zebra ! mpls ldp router-id 10.0.255.1 diff --git a/tests/topotests/isis_rlfa_topo1/rt1/zebra.conf b/tests/topotests/isis_rlfa_topo1/rt1/zebra.conf index 741fc2d02b..6210b29950 100644 --- a/tests/topotests/isis_rlfa_topo1/rt1/zebra.conf +++ b/tests/topotests/isis_rlfa_topo1/rt1/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt1 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 10.0.255.1/32 diff --git a/tests/topotests/isis_rlfa_topo1/rt2/isisd.conf b/tests/topotests/isis_rlfa_topo1/rt2/isisd.conf index 7b4c6c50b9..6595052fab 100644 --- a/tests/topotests/isis_rlfa_topo1/rt2/isisd.conf +++ b/tests/topotests/isis_rlfa_topo1/rt2/isisd.conf @@ -2,10 +2,10 @@ password 1 hostname rt2 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis lsp-gen ! interface lo ip router isis 1 diff --git a/tests/topotests/isis_rlfa_topo1/rt2/ldpd.conf b/tests/topotests/isis_rlfa_topo1/rt2/ldpd.conf index 0a815ef004..25882be67a 100644 --- a/tests/topotests/isis_rlfa_topo1/rt2/ldpd.conf +++ b/tests/topotests/isis_rlfa_topo1/rt2/ldpd.conf @@ -2,9 +2,9 @@ log file ldpd.log ! hostname rt2 ! -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp zebra +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp zebra ! mpls ldp router-id 10.0.255.2 diff --git a/tests/topotests/isis_rlfa_topo1/rt2/zebra.conf b/tests/topotests/isis_rlfa_topo1/rt2/zebra.conf index 657c69bf28..38c561d475 100644 --- a/tests/topotests/isis_rlfa_topo1/rt2/zebra.conf +++ b/tests/topotests/isis_rlfa_topo1/rt2/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt2 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 10.0.255.2/32 diff --git a/tests/topotests/isis_rlfa_topo1/rt3/isisd.conf b/tests/topotests/isis_rlfa_topo1/rt3/isisd.conf index 17d58a9d15..a029b7140f 100644 --- a/tests/topotests/isis_rlfa_topo1/rt3/isisd.conf +++ b/tests/topotests/isis_rlfa_topo1/rt3/isisd.conf @@ -2,10 +2,10 @@ password 1 hostname rt3 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis lsp-gen ! interface lo ip router isis 1 diff --git a/tests/topotests/isis_rlfa_topo1/rt3/ldpd.conf b/tests/topotests/isis_rlfa_topo1/rt3/ldpd.conf index 40f1f5587a..8f2234a207 100644 --- a/tests/topotests/isis_rlfa_topo1/rt3/ldpd.conf +++ b/tests/topotests/isis_rlfa_topo1/rt3/ldpd.conf @@ -2,9 +2,9 @@ log file ldpd.log ! hostname rt3 ! -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp zebra +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp zebra ! mpls ldp router-id 10.0.255.3 diff --git a/tests/topotests/isis_rlfa_topo1/rt3/zebra.conf b/tests/topotests/isis_rlfa_topo1/rt3/zebra.conf index 86f5d2871a..21557645d8 100644 --- a/tests/topotests/isis_rlfa_topo1/rt3/zebra.conf +++ b/tests/topotests/isis_rlfa_topo1/rt3/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt3 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 10.0.255.3/32 diff --git a/tests/topotests/isis_rlfa_topo1/rt4/isisd.conf b/tests/topotests/isis_rlfa_topo1/rt4/isisd.conf index 1519fd4c16..86aa6b1f46 100644 --- a/tests/topotests/isis_rlfa_topo1/rt4/isisd.conf +++ b/tests/topotests/isis_rlfa_topo1/rt4/isisd.conf @@ -2,10 +2,10 @@ password 1 hostname rt4 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis lsp-gen ! interface lo ip router isis 1 diff --git a/tests/topotests/isis_rlfa_topo1/rt4/ldpd.conf b/tests/topotests/isis_rlfa_topo1/rt4/ldpd.conf index 569ecf733e..c8d467c518 100644 --- a/tests/topotests/isis_rlfa_topo1/rt4/ldpd.conf +++ b/tests/topotests/isis_rlfa_topo1/rt4/ldpd.conf @@ -2,9 +2,9 @@ log file ldpd.log ! hostname rt4 ! -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp zebra +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp zebra ! mpls ldp router-id 10.0.255.4 diff --git a/tests/topotests/isis_rlfa_topo1/rt4/zebra.conf b/tests/topotests/isis_rlfa_topo1/rt4/zebra.conf index 1dd09bf83b..4e22813b94 100644 --- a/tests/topotests/isis_rlfa_topo1/rt4/zebra.conf +++ b/tests/topotests/isis_rlfa_topo1/rt4/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt4 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 10.0.255.4/32 diff --git a/tests/topotests/isis_rlfa_topo1/rt5/isisd.conf b/tests/topotests/isis_rlfa_topo1/rt5/isisd.conf index caf7477073..e4fc9cdd4c 100644 --- a/tests/topotests/isis_rlfa_topo1/rt5/isisd.conf +++ b/tests/topotests/isis_rlfa_topo1/rt5/isisd.conf @@ -2,10 +2,10 @@ password 1 hostname rt5 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis lsp-gen ! interface lo ip router isis 1 diff --git a/tests/topotests/isis_rlfa_topo1/rt5/ldpd.conf b/tests/topotests/isis_rlfa_topo1/rt5/ldpd.conf index 519c3d3628..c5fc36a61c 100644 --- a/tests/topotests/isis_rlfa_topo1/rt5/ldpd.conf +++ b/tests/topotests/isis_rlfa_topo1/rt5/ldpd.conf @@ -2,9 +2,9 @@ log file ldpd.log ! hostname rt5 ! -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp zebra +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp zebra ! mpls ldp router-id 10.0.255.5 diff --git a/tests/topotests/isis_rlfa_topo1/rt5/zebra.conf b/tests/topotests/isis_rlfa_topo1/rt5/zebra.conf index 7117a2a2e3..83bbb1ba4d 100644 --- a/tests/topotests/isis_rlfa_topo1/rt5/zebra.conf +++ b/tests/topotests/isis_rlfa_topo1/rt5/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt5 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 10.0.255.5/32 diff --git a/tests/topotests/isis_rlfa_topo1/rt6/isisd.conf b/tests/topotests/isis_rlfa_topo1/rt6/isisd.conf index cdf6267236..81319e4264 100644 --- a/tests/topotests/isis_rlfa_topo1/rt6/isisd.conf +++ b/tests/topotests/isis_rlfa_topo1/rt6/isisd.conf @@ -2,10 +2,10 @@ password 1 hostname rt6 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis lsp-gen ! interface lo ip router isis 1 diff --git a/tests/topotests/isis_rlfa_topo1/rt6/ldpd.conf b/tests/topotests/isis_rlfa_topo1/rt6/ldpd.conf index a5b7062bec..11bed3ce30 100644 --- a/tests/topotests/isis_rlfa_topo1/rt6/ldpd.conf +++ b/tests/topotests/isis_rlfa_topo1/rt6/ldpd.conf @@ -2,9 +2,9 @@ log file ldpd.log ! hostname rt6 ! -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp zebra +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp zebra ! mpls ldp router-id 10.0.255.6 diff --git a/tests/topotests/isis_rlfa_topo1/rt6/zebra.conf b/tests/topotests/isis_rlfa_topo1/rt6/zebra.conf index c6344870b7..1fdd0d4b61 100644 --- a/tests/topotests/isis_rlfa_topo1/rt6/zebra.conf +++ b/tests/topotests/isis_rlfa_topo1/rt6/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt6 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 10.0.255.6/32 diff --git a/tests/topotests/isis_rlfa_topo1/rt7/isisd.conf b/tests/topotests/isis_rlfa_topo1/rt7/isisd.conf index 8ab8fcb232..1f48671e74 100644 --- a/tests/topotests/isis_rlfa_topo1/rt7/isisd.conf +++ b/tests/topotests/isis_rlfa_topo1/rt7/isisd.conf @@ -2,10 +2,10 @@ password 1 hostname rt7 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis lsp-gen ! interface lo ip router isis 1 diff --git a/tests/topotests/isis_rlfa_topo1/rt7/ldpd.conf b/tests/topotests/isis_rlfa_topo1/rt7/ldpd.conf index 26d428c4c6..6c40ccb33c 100644 --- a/tests/topotests/isis_rlfa_topo1/rt7/ldpd.conf +++ b/tests/topotests/isis_rlfa_topo1/rt7/ldpd.conf @@ -2,9 +2,9 @@ log file ldpd.log ! hostname rt7 ! -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp zebra +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp zebra ! mpls ldp router-id 10.0.255.7 diff --git a/tests/topotests/isis_rlfa_topo1/rt7/zebra.conf b/tests/topotests/isis_rlfa_topo1/rt7/zebra.conf index 4c5e0f1126..114ebd93a6 100644 --- a/tests/topotests/isis_rlfa_topo1/rt7/zebra.conf +++ b/tests/topotests/isis_rlfa_topo1/rt7/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt7 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 10.0.255.7/32 diff --git a/tests/topotests/isis_rlfa_topo1/rt8/isisd.conf b/tests/topotests/isis_rlfa_topo1/rt8/isisd.conf index abdc6a53a5..7675f777a7 100644 --- a/tests/topotests/isis_rlfa_topo1/rt8/isisd.conf +++ b/tests/topotests/isis_rlfa_topo1/rt8/isisd.conf @@ -2,10 +2,10 @@ password 1 hostname rt8 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis lsp-gen ! interface lo ip router isis 1 diff --git a/tests/topotests/isis_rlfa_topo1/rt8/ldpd.conf b/tests/topotests/isis_rlfa_topo1/rt8/ldpd.conf index 1629f82de1..36e7ce12a9 100644 --- a/tests/topotests/isis_rlfa_topo1/rt8/ldpd.conf +++ b/tests/topotests/isis_rlfa_topo1/rt8/ldpd.conf @@ -2,9 +2,9 @@ log file ldpd.log ! hostname rt8 ! -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp zebra +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp zebra ! mpls ldp router-id 10.0.255.8 diff --git a/tests/topotests/isis_rlfa_topo1/rt8/zebra.conf b/tests/topotests/isis_rlfa_topo1/rt8/zebra.conf index f3f10f649a..001e62ed25 100644 --- a/tests/topotests/isis_rlfa_topo1/rt8/zebra.conf +++ b/tests/topotests/isis_rlfa_topo1/rt8/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt8 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 10.0.255.8/32 diff --git a/tests/topotests/isis_snmp/r1/isisd.conf b/tests/topotests/isis_snmp/r1/isisd.conf index dd32d3b8a5..4928341225 100644 --- a/tests/topotests/isis_snmp/r1/isisd.conf +++ b/tests/topotests/isis_snmp/r1/isisd.conf @@ -1,8 +1,8 @@ hostname r1 log file isisd.log -debug isis adj-packets -debug isis events -debug isis update-packets +! debug isis adj-packets +! debug isis events +! debug isis update-packets agentx ! router isis 1 diff --git a/tests/topotests/isis_snmp/r1/ldpd.conf b/tests/topotests/isis_snmp/r1/ldpd.conf index 4ec296ca5a..5b1cbfebc9 100644 --- a/tests/topotests/isis_snmp/r1/ldpd.conf +++ b/tests/topotests/isis_snmp/r1/ldpd.conf @@ -1,10 +1,10 @@ hostname r1 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp sync +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp sync agentx ! mpls ldp diff --git a/tests/topotests/isis_snmp/r1/zebra.conf b/tests/topotests/isis_snmp/r1/zebra.conf index 6ac341e431..4ca46da805 100644 --- a/tests/topotests/isis_snmp/r1/zebra.conf +++ b/tests/topotests/isis_snmp/r1/zebra.conf @@ -2,10 +2,10 @@ log file zebra.log ! hostname r1 ! -debug zebra kernel -debug zebra rib detailed -debug zebra dplane detailed -debug zebra nht +! debug zebra kernel +! debug zebra rib detailed +! debug zebra dplane detailed +! debug zebra nht ! interface lo ip address 1.1.1.1/32 diff --git a/tests/topotests/isis_snmp/r2/isisd.conf b/tests/topotests/isis_snmp/r2/isisd.conf index 4403d8913b..9bb8a8d5f9 100644 --- a/tests/topotests/isis_snmp/r2/isisd.conf +++ b/tests/topotests/isis_snmp/r2/isisd.conf @@ -1,8 +1,8 @@ hostname r2 log file isisd.log -debug isis adj-packets -debug isis events -debug isis update-packets +! debug isis adj-packets +! debug isis events +! debug isis update-packets agentx ! router isis 1 diff --git a/tests/topotests/isis_snmp/r2/ldpd.conf b/tests/topotests/isis_snmp/r2/ldpd.conf index eb963fe41c..533d2d9d49 100644 --- a/tests/topotests/isis_snmp/r2/ldpd.conf +++ b/tests/topotests/isis_snmp/r2/ldpd.conf @@ -1,10 +1,10 @@ hostname r2 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp sync +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp sync ! mpls ldp router-id 2.2.2.2 diff --git a/tests/topotests/isis_snmp/r2/zebra.conf b/tests/topotests/isis_snmp/r2/zebra.conf index 4aa7440c33..9f6e3d5359 100644 --- a/tests/topotests/isis_snmp/r2/zebra.conf +++ b/tests/topotests/isis_snmp/r2/zebra.conf @@ -2,10 +2,10 @@ log file zebra.log ! hostname r2 ! -debug zebra rib detailed -debug zebra dplane detailed -debug zebra kernel -debug zebra nht +! debug zebra rib detailed +! debug zebra dplane detailed +! debug zebra kernel +! debug zebra nht ! interface lo ip address 2.2.2.2/32 diff --git a/tests/topotests/isis_snmp/r3/isisd.conf b/tests/topotests/isis_snmp/r3/isisd.conf index e06fe8c1f9..4daec791b3 100644 --- a/tests/topotests/isis_snmp/r3/isisd.conf +++ b/tests/topotests/isis_snmp/r3/isisd.conf @@ -1,8 +1,8 @@ hostname r3 log file isisd.log -debug isis adj-packets -debug isis events -debug isis update-packets +! debug isis adj-packets +! debug isis events +! debug isis update-packets agentx ! router isis 1 diff --git a/tests/topotests/isis_snmp/r3/ldpd.conf b/tests/topotests/isis_snmp/r3/ldpd.conf index 2935caf13b..fae25e0710 100644 --- a/tests/topotests/isis_snmp/r3/ldpd.conf +++ b/tests/topotests/isis_snmp/r3/ldpd.conf @@ -1,10 +1,10 @@ hostname r3 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp sync +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp sync ! mpls ldp router-id 3.3.3.3 diff --git a/tests/topotests/isis_snmp/r3/zebra.conf b/tests/topotests/isis_snmp/r3/zebra.conf index 6b76114d4d..4e6bddd296 100644 --- a/tests/topotests/isis_snmp/r3/zebra.conf +++ b/tests/topotests/isis_snmp/r3/zebra.conf @@ -2,10 +2,10 @@ log file zebra.log ! hostname r3 ! -debug zebra rib detailed -debug zebra dplane detailed -debug zebra kernel -debug zebra nht +! debug zebra rib detailed +! debug zebra dplane detailed +! debug zebra kernel +! debug zebra nht ! interface lo ip address 3.3.3.3/32 diff --git a/tests/topotests/isis_snmp/r4/isisd.conf b/tests/topotests/isis_snmp/r4/isisd.conf index 1256141da9..32b07b3cb4 100644 --- a/tests/topotests/isis_snmp/r4/isisd.conf +++ b/tests/topotests/isis_snmp/r4/isisd.conf @@ -1,8 +1,8 @@ hostname r4 log file isisd.log -debug isis adj-packets -debug isis events -debug isis update-packets +! debug isis adj-packets +! debug isis events +! debug isis update-packets agentx ! router isis 1 diff --git a/tests/topotests/isis_snmp/r4/ldpd.conf b/tests/topotests/isis_snmp/r4/ldpd.conf index b27952514b..dbffdff42c 100644 --- a/tests/topotests/isis_snmp/r4/ldpd.conf +++ b/tests/topotests/isis_snmp/r4/ldpd.conf @@ -1,10 +1,10 @@ hostname r4 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp sync +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp sync ! mpls ldp router-id 4.4.4.4 diff --git a/tests/topotests/isis_snmp/r4/zebra.conf b/tests/topotests/isis_snmp/r4/zebra.conf index fa13601164..66b8ea3de8 100644 --- a/tests/topotests/isis_snmp/r4/zebra.conf +++ b/tests/topotests/isis_snmp/r4/zebra.conf @@ -2,10 +2,10 @@ log file zebra.log ! hostname r4 ! -debug zebra rib detailed -debug zebra dplane detailed -debug zebra kernel -debug zebra nht +! debug zebra rib detailed +! debug zebra dplane detailed +! debug zebra kernel +! debug zebra nht ! interface lo ip address 4.4.4.4/32 diff --git a/tests/topotests/isis_snmp/r5/isisd.conf b/tests/topotests/isis_snmp/r5/isisd.conf index 58859041a9..fe3ca0f3aa 100644 --- a/tests/topotests/isis_snmp/r5/isisd.conf +++ b/tests/topotests/isis_snmp/r5/isisd.conf @@ -1,8 +1,8 @@ hostname r5 log file isisd.log -debug isis adj-packets -debug isis events -debug isis update-packets +! debug isis adj-packets +! debug isis events +! debug isis update-packets agentx ! router isis 1 diff --git a/tests/topotests/isis_snmp/r5/ldpd.conf b/tests/topotests/isis_snmp/r5/ldpd.conf index f3ba867a9f..fd273d5dae 100644 --- a/tests/topotests/isis_snmp/r5/ldpd.conf +++ b/tests/topotests/isis_snmp/r5/ldpd.conf @@ -1,10 +1,10 @@ hostname r5 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp sync +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp sync ! mpls ldp router-id 5.5.5.5 diff --git a/tests/topotests/isis_snmp/r5/zebra.conf b/tests/topotests/isis_snmp/r5/zebra.conf index 7230129f22..5607fab9cd 100644 --- a/tests/topotests/isis_snmp/r5/zebra.conf +++ b/tests/topotests/isis_snmp/r5/zebra.conf @@ -2,10 +2,10 @@ log file zebra.log ! hostname r5 ! -debug zebra rib detailed -debug zebra dplane detailed -debug zebra kernel -debug zebra nht +! debug zebra rib detailed +! debug zebra dplane detailed +! debug zebra kernel +! debug zebra nht ! interface lo ip address 5.5.5.5/32 diff --git a/tests/topotests/isis_sr_te_topo1/dst/zebra.conf b/tests/topotests/isis_sr_te_topo1/dst/zebra.conf index e873ac8a5c..0c7937b9bb 100644 --- a/tests/topotests/isis_sr_te_topo1/dst/zebra.conf +++ b/tests/topotests/isis_sr_te_topo1/dst/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname dst ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 9.9.9.2/32 diff --git a/tests/topotests/isis_sr_te_topo1/rt1/isisd.conf b/tests/topotests/isis_sr_te_topo1/rt1/isisd.conf index 70ae1b07f5..3d5ac20451 100644 --- a/tests/topotests/isis_sr_te_topo1/rt1/isisd.conf +++ b/tests/topotests/isis_sr_te_topo1/rt1/isisd.conf @@ -2,11 +2,11 @@ password 1 hostname rt1 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis sr-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis sr-events +! debug isis lsp-gen ! interface lo ip router isis 1 diff --git a/tests/topotests/isis_sr_te_topo1/rt1/zebra.conf b/tests/topotests/isis_sr_te_topo1/rt1/zebra.conf index 9d71d3005f..37b3f27cae 100644 --- a/tests/topotests/isis_sr_te_topo1/rt1/zebra.conf +++ b/tests/topotests/isis_sr_te_topo1/rt1/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt1 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 1.1.1.1/32 diff --git a/tests/topotests/isis_sr_te_topo1/rt2/isisd.conf b/tests/topotests/isis_sr_te_topo1/rt2/isisd.conf index 733f26bc62..ba214c92c1 100644 --- a/tests/topotests/isis_sr_te_topo1/rt2/isisd.conf +++ b/tests/topotests/isis_sr_te_topo1/rt2/isisd.conf @@ -1,11 +1,11 @@ hostname rt2 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis sr-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis sr-events +! debug isis lsp-gen ! interface lo ip router isis 1 diff --git a/tests/topotests/isis_sr_te_topo1/rt2/zebra.conf b/tests/topotests/isis_sr_te_topo1/rt2/zebra.conf index dcb0686dc2..f9ac098f4f 100644 --- a/tests/topotests/isis_sr_te_topo1/rt2/zebra.conf +++ b/tests/topotests/isis_sr_te_topo1/rt2/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt2 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 2.2.2.2/32 diff --git a/tests/topotests/isis_sr_te_topo1/rt3/isisd.conf b/tests/topotests/isis_sr_te_topo1/rt3/isisd.conf index 2395906cbf..482d8152c2 100644 --- a/tests/topotests/isis_sr_te_topo1/rt3/isisd.conf +++ b/tests/topotests/isis_sr_te_topo1/rt3/isisd.conf @@ -1,11 +1,11 @@ hostname rt3 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis sr-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis sr-events +! debug isis lsp-gen ! interface lo ip router isis 1 diff --git a/tests/topotests/isis_sr_te_topo1/rt3/zebra.conf b/tests/topotests/isis_sr_te_topo1/rt3/zebra.conf index 3254529386..441c9a3aca 100644 --- a/tests/topotests/isis_sr_te_topo1/rt3/zebra.conf +++ b/tests/topotests/isis_sr_te_topo1/rt3/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt3 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 3.3.3.3/32 diff --git a/tests/topotests/isis_sr_te_topo1/rt4/isisd.conf b/tests/topotests/isis_sr_te_topo1/rt4/isisd.conf index 07a7867cbb..851c6da019 100644 --- a/tests/topotests/isis_sr_te_topo1/rt4/isisd.conf +++ b/tests/topotests/isis_sr_te_topo1/rt4/isisd.conf @@ -1,11 +1,11 @@ hostname rt4 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis sr-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis sr-events +! debug isis lsp-gen ! interface lo ip router isis 1 diff --git a/tests/topotests/isis_sr_te_topo1/rt4/zebra.conf b/tests/topotests/isis_sr_te_topo1/rt4/zebra.conf index 4945897e9d..a2569aa51f 100644 --- a/tests/topotests/isis_sr_te_topo1/rt4/zebra.conf +++ b/tests/topotests/isis_sr_te_topo1/rt4/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt4 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 4.4.4.4/32 diff --git a/tests/topotests/isis_sr_te_topo1/rt5/isisd.conf b/tests/topotests/isis_sr_te_topo1/rt5/isisd.conf index b0fcdede07..4cc54f318c 100644 --- a/tests/topotests/isis_sr_te_topo1/rt5/isisd.conf +++ b/tests/topotests/isis_sr_te_topo1/rt5/isisd.conf @@ -1,11 +1,11 @@ hostname rt5 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis sr-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis sr-events +! debug isis lsp-gen ! interface lo ip router isis 1 diff --git a/tests/topotests/isis_sr_te_topo1/rt5/zebra.conf b/tests/topotests/isis_sr_te_topo1/rt5/zebra.conf index 4cfea1a59f..f62cc8ffd3 100644 --- a/tests/topotests/isis_sr_te_topo1/rt5/zebra.conf +++ b/tests/topotests/isis_sr_te_topo1/rt5/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt5 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 5.5.5.5/32 diff --git a/tests/topotests/isis_sr_te_topo1/rt6/isisd.conf b/tests/topotests/isis_sr_te_topo1/rt6/isisd.conf index 3be24ad24c..8fec87b929 100644 --- a/tests/topotests/isis_sr_te_topo1/rt6/isisd.conf +++ b/tests/topotests/isis_sr_te_topo1/rt6/isisd.conf @@ -1,11 +1,11 @@ hostname rt6 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis sr-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis sr-events +! debug isis lsp-gen ! interface lo ip router isis 1 diff --git a/tests/topotests/isis_sr_te_topo1/rt6/zebra.conf b/tests/topotests/isis_sr_te_topo1/rt6/zebra.conf index 32c6e6c4e0..f2f1a3eefe 100644 --- a/tests/topotests/isis_sr_te_topo1/rt6/zebra.conf +++ b/tests/topotests/isis_sr_te_topo1/rt6/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt6 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 6.6.6.6/32 diff --git a/tests/topotests/isis_sr_topo1/rt1/isisd.conf b/tests/topotests/isis_sr_topo1/rt1/isisd.conf index f441527597..ed09753d20 100644 --- a/tests/topotests/isis_sr_topo1/rt1/isisd.conf +++ b/tests/topotests/isis_sr_topo1/rt1/isisd.conf @@ -2,11 +2,11 @@ password 1 hostname rt1 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis sr-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis sr-events +! debug isis lsp-gen ! interface lo ip router isis 1 diff --git a/tests/topotests/isis_sr_topo1/rt1/zebra.conf b/tests/topotests/isis_sr_topo1/rt1/zebra.conf index 9d71d3005f..37b3f27cae 100644 --- a/tests/topotests/isis_sr_topo1/rt1/zebra.conf +++ b/tests/topotests/isis_sr_topo1/rt1/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt1 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 1.1.1.1/32 diff --git a/tests/topotests/isis_sr_topo1/rt2/isisd.conf b/tests/topotests/isis_sr_topo1/rt2/isisd.conf index 796b6ed32c..9b8efe40e9 100644 --- a/tests/topotests/isis_sr_topo1/rt2/isisd.conf +++ b/tests/topotests/isis_sr_topo1/rt2/isisd.conf @@ -1,11 +1,11 @@ hostname rt2 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis sr-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis sr-events +! debug isis lsp-gen ! interface lo ip router isis 1 diff --git a/tests/topotests/isis_sr_topo1/rt2/zebra.conf b/tests/topotests/isis_sr_topo1/rt2/zebra.conf index dcb0686dc2..f9ac098f4f 100644 --- a/tests/topotests/isis_sr_topo1/rt2/zebra.conf +++ b/tests/topotests/isis_sr_topo1/rt2/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt2 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 2.2.2.2/32 diff --git a/tests/topotests/isis_sr_topo1/rt3/isisd.conf b/tests/topotests/isis_sr_topo1/rt3/isisd.conf index cc2aa1782b..ded8bd1576 100644 --- a/tests/topotests/isis_sr_topo1/rt3/isisd.conf +++ b/tests/topotests/isis_sr_topo1/rt3/isisd.conf @@ -1,11 +1,11 @@ hostname rt3 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis sr-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis sr-events +! debug isis lsp-gen ! interface lo ip router isis 1 diff --git a/tests/topotests/isis_sr_topo1/rt3/zebra.conf b/tests/topotests/isis_sr_topo1/rt3/zebra.conf index 3254529386..441c9a3aca 100644 --- a/tests/topotests/isis_sr_topo1/rt3/zebra.conf +++ b/tests/topotests/isis_sr_topo1/rt3/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt3 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 3.3.3.3/32 diff --git a/tests/topotests/isis_sr_topo1/rt4/isisd.conf b/tests/topotests/isis_sr_topo1/rt4/isisd.conf index 3852b1962b..ba9704531c 100644 --- a/tests/topotests/isis_sr_topo1/rt4/isisd.conf +++ b/tests/topotests/isis_sr_topo1/rt4/isisd.conf @@ -1,11 +1,11 @@ hostname rt4 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis sr-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis sr-events +! debug isis lsp-gen ! interface lo ip router isis 1 diff --git a/tests/topotests/isis_sr_topo1/rt4/zebra.conf b/tests/topotests/isis_sr_topo1/rt4/zebra.conf index 5889901c56..b66a9afcb5 100644 --- a/tests/topotests/isis_sr_topo1/rt4/zebra.conf +++ b/tests/topotests/isis_sr_topo1/rt4/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt4 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 4.4.4.4/32 diff --git a/tests/topotests/isis_sr_topo1/rt5/isisd.conf b/tests/topotests/isis_sr_topo1/rt5/isisd.conf index f7beea796c..3fe7bdf1b2 100644 --- a/tests/topotests/isis_sr_topo1/rt5/isisd.conf +++ b/tests/topotests/isis_sr_topo1/rt5/isisd.conf @@ -1,11 +1,11 @@ hostname rt5 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis sr-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis sr-events +! debug isis lsp-gen ! interface lo ip router isis 1 diff --git a/tests/topotests/isis_sr_topo1/rt5/zebra.conf b/tests/topotests/isis_sr_topo1/rt5/zebra.conf index a0c8f2cd7e..90ceb817fa 100644 --- a/tests/topotests/isis_sr_topo1/rt5/zebra.conf +++ b/tests/topotests/isis_sr_topo1/rt5/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt5 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 5.5.5.5/32 diff --git a/tests/topotests/isis_sr_topo1/rt6/isisd.conf b/tests/topotests/isis_sr_topo1/rt6/isisd.conf index a29b78f0a4..e7a7e2dfd4 100644 --- a/tests/topotests/isis_sr_topo1/rt6/isisd.conf +++ b/tests/topotests/isis_sr_topo1/rt6/isisd.conf @@ -1,11 +1,11 @@ hostname rt6 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis sr-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis sr-events +! debug isis lsp-gen ! interface lo ip router isis 1 diff --git a/tests/topotests/isis_sr_topo1/rt6/zebra.conf b/tests/topotests/isis_sr_topo1/rt6/zebra.conf index 6084010a93..4d51d3df84 100644 --- a/tests/topotests/isis_sr_topo1/rt6/zebra.conf +++ b/tests/topotests/isis_sr_topo1/rt6/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt6 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 6.6.6.6/32 diff --git a/tests/topotests/isis_tilfa_topo1/rt1/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt1/isisd.conf index a447a2aa5a..955bd5caa0 100644 --- a/tests/topotests/isis_tilfa_topo1/rt1/isisd.conf +++ b/tests/topotests/isis_tilfa_topo1/rt1/isisd.conf @@ -2,11 +2,11 @@ password 1 hostname rt1 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis sr-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis sr-events +! debug isis lsp-gen ! interface lo ip router isis 1 diff --git a/tests/topotests/isis_tilfa_topo1/rt1/zebra.conf b/tests/topotests/isis_tilfa_topo1/rt1/zebra.conf index 9d71d3005f..37b3f27cae 100644 --- a/tests/topotests/isis_tilfa_topo1/rt1/zebra.conf +++ b/tests/topotests/isis_tilfa_topo1/rt1/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt1 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 1.1.1.1/32 diff --git a/tests/topotests/isis_tilfa_topo1/rt2/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt2/isisd.conf index 1a756e2c72..f971c658d4 100644 --- a/tests/topotests/isis_tilfa_topo1/rt2/isisd.conf +++ b/tests/topotests/isis_tilfa_topo1/rt2/isisd.conf @@ -1,11 +1,11 @@ hostname rt2 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis sr-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis sr-events +! debug isis lsp-gen ! interface lo ip router isis 1 diff --git a/tests/topotests/isis_tilfa_topo1/rt2/zebra.conf b/tests/topotests/isis_tilfa_topo1/rt2/zebra.conf index dcb0686dc2..f9ac098f4f 100644 --- a/tests/topotests/isis_tilfa_topo1/rt2/zebra.conf +++ b/tests/topotests/isis_tilfa_topo1/rt2/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt2 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 2.2.2.2/32 diff --git a/tests/topotests/isis_tilfa_topo1/rt3/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt3/isisd.conf index 986bf2804a..64f091cfed 100644 --- a/tests/topotests/isis_tilfa_topo1/rt3/isisd.conf +++ b/tests/topotests/isis_tilfa_topo1/rt3/isisd.conf @@ -1,11 +1,11 @@ hostname rt3 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis sr-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis sr-events +! debug isis lsp-gen ! interface lo ip router isis 1 diff --git a/tests/topotests/isis_tilfa_topo1/rt3/zebra.conf b/tests/topotests/isis_tilfa_topo1/rt3/zebra.conf index 3254529386..441c9a3aca 100644 --- a/tests/topotests/isis_tilfa_topo1/rt3/zebra.conf +++ b/tests/topotests/isis_tilfa_topo1/rt3/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt3 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 3.3.3.3/32 diff --git a/tests/topotests/isis_tilfa_topo1/rt4/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt4/isisd.conf index 7d411069d1..9223852f79 100644 --- a/tests/topotests/isis_tilfa_topo1/rt4/isisd.conf +++ b/tests/topotests/isis_tilfa_topo1/rt4/isisd.conf @@ -1,11 +1,11 @@ hostname rt4 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis sr-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis sr-events +! debug isis lsp-gen ! interface lo ip router isis 1 diff --git a/tests/topotests/isis_tilfa_topo1/rt4/zebra.conf b/tests/topotests/isis_tilfa_topo1/rt4/zebra.conf index 4945897e9d..a2569aa51f 100644 --- a/tests/topotests/isis_tilfa_topo1/rt4/zebra.conf +++ b/tests/topotests/isis_tilfa_topo1/rt4/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt4 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 4.4.4.4/32 diff --git a/tests/topotests/isis_tilfa_topo1/rt5/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt5/isisd.conf index be52eb0322..a08534cf30 100644 --- a/tests/topotests/isis_tilfa_topo1/rt5/isisd.conf +++ b/tests/topotests/isis_tilfa_topo1/rt5/isisd.conf @@ -1,11 +1,11 @@ hostname rt5 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis sr-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis sr-events +! debug isis lsp-gen ! interface lo ip router isis 1 diff --git a/tests/topotests/isis_tilfa_topo1/rt5/zebra.conf b/tests/topotests/isis_tilfa_topo1/rt5/zebra.conf index 4cfea1a59f..f62cc8ffd3 100644 --- a/tests/topotests/isis_tilfa_topo1/rt5/zebra.conf +++ b/tests/topotests/isis_tilfa_topo1/rt5/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt5 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 5.5.5.5/32 diff --git a/tests/topotests/isis_tilfa_topo1/rt6/isisd.conf b/tests/topotests/isis_tilfa_topo1/rt6/isisd.conf index db47622a10..d92f822b8d 100644 --- a/tests/topotests/isis_tilfa_topo1/rt6/isisd.conf +++ b/tests/topotests/isis_tilfa_topo1/rt6/isisd.conf @@ -1,11 +1,11 @@ hostname rt6 log file isisd.log ! -debug isis events -debug isis route-events -debug isis spf-events -debug isis sr-events -debug isis lsp-gen +! debug isis events +! debug isis route-events +! debug isis spf-events +! debug isis sr-events +! debug isis lsp-gen ! interface lo ip router isis 1 diff --git a/tests/topotests/isis_tilfa_topo1/rt6/zebra.conf b/tests/topotests/isis_tilfa_topo1/rt6/zebra.conf index 6084010a93..4d51d3df84 100644 --- a/tests/topotests/isis_tilfa_topo1/rt6/zebra.conf +++ b/tests/topotests/isis_tilfa_topo1/rt6/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt6 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 6.6.6.6/32 diff --git a/tests/topotests/isis_topo1/r1/isisd.conf b/tests/topotests/isis_topo1/r1/isisd.conf index 4e3761e5a1..9c1bfffdfb 100644 --- a/tests/topotests/isis_topo1/r1/isisd.conf +++ b/tests/topotests/isis_topo1/r1/isisd.conf @@ -1,7 +1,7 @@ hostname r1 -debug isis adj-packets -debug isis events -debug isis update-packets +! debug isis adj-packets +! debug isis events +! debug isis update-packets interface r1-eth0 ip router isis 1 isis hello-interval 2 diff --git a/tests/topotests/isis_topo1/r2/isisd.conf b/tests/topotests/isis_topo1/r2/isisd.conf index 14db0940ec..e8b578939b 100644 --- a/tests/topotests/isis_topo1/r2/isisd.conf +++ b/tests/topotests/isis_topo1/r2/isisd.conf @@ -1,7 +1,7 @@ hostname r2 -debug isis adj-packets -debug isis events -debug isis update-packets +! debug isis adj-packets +! debug isis events +! debug isis update-packets interface r2-eth0 ip router isis 1 isis hello-interval 2 diff --git a/tests/topotests/isis_topo1/r3/isisd.conf b/tests/topotests/isis_topo1/r3/isisd.conf index 6f36c0fa36..47bfc5359c 100644 --- a/tests/topotests/isis_topo1/r3/isisd.conf +++ b/tests/topotests/isis_topo1/r3/isisd.conf @@ -1,7 +1,7 @@ hostname r3 -debug isis adj-packets -debug isis events -debug isis update-packets +! debug isis adj-packets +! debug isis events +! debug isis update-packets interface r3-eth0 ip router isis 1 isis hello-interval 2 diff --git a/tests/topotests/isis_topo1/r4/isisd.conf b/tests/topotests/isis_topo1/r4/isisd.conf index 502e035f50..50c876db92 100644 --- a/tests/topotests/isis_topo1/r4/isisd.conf +++ b/tests/topotests/isis_topo1/r4/isisd.conf @@ -1,7 +1,7 @@ hostname r4 -debug isis adj-packets -debug isis events -debug isis update-packets +! debug isis adj-packets +! debug isis events +! debug isis update-packets interface r4-eth0 ip router isis 1 isis hello-interval 2 diff --git a/tests/topotests/isis_topo1/r5/isisd.conf b/tests/topotests/isis_topo1/r5/isisd.conf index 42493a4991..e0e9200d62 100644 --- a/tests/topotests/isis_topo1/r5/isisd.conf +++ b/tests/topotests/isis_topo1/r5/isisd.conf @@ -1,7 +1,7 @@ hostname r5 -debug isis adj-packets -debug isis events -debug isis update-packets +! debug isis adj-packets +! debug isis events +! debug isis update-packets interface r5-eth0 ip router isis 1 isis hello-interval 2 diff --git a/tests/topotests/isis_topo1_vrf/r1/isisd.conf b/tests/topotests/isis_topo1_vrf/r1/isisd.conf index 5fb4c14d0b..0e8e490c94 100755 --- a/tests/topotests/isis_topo1_vrf/r1/isisd.conf +++ b/tests/topotests/isis_topo1_vrf/r1/isisd.conf @@ -1,7 +1,7 @@ hostname r1 -debug isis adj-packets -debug isis events -debug isis update-packets +! debug isis adj-packets +! debug isis events +! debug isis update-packets interface r1-eth0 ip router isis 1 vrf r1-cust1 ipv6 router isis 1 vrf r1-cust1 diff --git a/tests/topotests/isis_topo1_vrf/r2/isisd.conf b/tests/topotests/isis_topo1_vrf/r2/isisd.conf index 0d2bc7ab72..1e9bb9fb7f 100755 --- a/tests/topotests/isis_topo1_vrf/r2/isisd.conf +++ b/tests/topotests/isis_topo1_vrf/r2/isisd.conf @@ -1,7 +1,7 @@ hostname r2 -debug isis adj-packets -debug isis events -debug isis update-packets +! debug isis adj-packets +! debug isis events +! debug isis update-packets interface r2-eth0 ip router isis 1 vrf r2-cust1 ipv6 router isis 1 vrf r2-cust1 diff --git a/tests/topotests/isis_topo1_vrf/r3/isisd.conf b/tests/topotests/isis_topo1_vrf/r3/isisd.conf index 66092407ab..93a33f6db2 100755 --- a/tests/topotests/isis_topo1_vrf/r3/isisd.conf +++ b/tests/topotests/isis_topo1_vrf/r3/isisd.conf @@ -1,7 +1,7 @@ hostname r3 -debug isis adj-packets -debug isis events -debug isis update-packets +! debug isis adj-packets +! debug isis events +! debug isis update-packets interface r3-eth0 ip router isis 1 vrf r3-cust1 ipv6 router isis 1 vrf r3-cust1 diff --git a/tests/topotests/isis_topo1_vrf/r4/isisd.conf b/tests/topotests/isis_topo1_vrf/r4/isisd.conf index 05815e8418..b8c0b77f44 100755 --- a/tests/topotests/isis_topo1_vrf/r4/isisd.conf +++ b/tests/topotests/isis_topo1_vrf/r4/isisd.conf @@ -1,9 +1,9 @@ hostname r4 -debug isis adj-packets -debug isis events -debug isis update-packets -debug isis lsp-gen -debug isis lsp-sched +! debug isis adj-packets +! debug isis events +! debug isis update-packets +! debug isis lsp-gen +! debug isis lsp-sched interface r4-eth0 ip router isis 1 vrf r4-cust1 diff --git a/tests/topotests/isis_topo1_vrf/r5/isisd.conf b/tests/topotests/isis_topo1_vrf/r5/isisd.conf index f663c33fe9..e6febd5dea 100755 --- a/tests/topotests/isis_topo1_vrf/r5/isisd.conf +++ b/tests/topotests/isis_topo1_vrf/r5/isisd.conf @@ -1,7 +1,7 @@ hostname r5 -debug isis adj-packets -debug isis events -debug isis update-packets +! debug isis adj-packets +! debug isis events +! debug isis update-packets interface r5-eth0 ip router isis 1 vrf r5-cust1 ipv6 router isis 1 vrf r5-cust1 diff --git a/tests/topotests/ldp_oc_acl_topo1/r1/ldpd.conf b/tests/topotests/ldp_oc_acl_topo1/r1/ldpd.conf index 85bb970fdf..4d5fe38cf1 100644 --- a/tests/topotests/ldp_oc_acl_topo1/r1/ldpd.conf +++ b/tests/topotests/ldp_oc_acl_topo1/r1/ldpd.conf @@ -1,13 +1,13 @@ hostname r1 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp discovery hello recv -debug mpls ldp discovery hello sent +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp discovery hello recv +! debug mpls ldp discovery hello sent ! mpls ldp router-id 1.1.1.1 diff --git a/tests/topotests/ldp_oc_acl_topo1/r2/ldpd.conf b/tests/topotests/ldp_oc_acl_topo1/r2/ldpd.conf index e1a552c701..175d3d0cee 100644 --- a/tests/topotests/ldp_oc_acl_topo1/r2/ldpd.conf +++ b/tests/topotests/ldp_oc_acl_topo1/r2/ldpd.conf @@ -1,13 +1,13 @@ hostname r2 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp discovery hello recv -debug mpls ldp discovery hello sent +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp discovery hello recv +! debug mpls ldp discovery hello sent ! mpls ldp router-id 2.2.2.2 diff --git a/tests/topotests/ldp_oc_acl_topo1/r3/ldpd.conf b/tests/topotests/ldp_oc_acl_topo1/r3/ldpd.conf index 4e66b140ac..81bd25ac6b 100644 --- a/tests/topotests/ldp_oc_acl_topo1/r3/ldpd.conf +++ b/tests/topotests/ldp_oc_acl_topo1/r3/ldpd.conf @@ -1,13 +1,13 @@ hostname r3 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp discovery hello recv -debug mpls ldp discovery hello sent +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp discovery hello recv +! debug mpls ldp discovery hello sent ! mpls ldp router-id 3.3.3.3 diff --git a/tests/topotests/ldp_oc_acl_topo1/r4/ldpd.conf b/tests/topotests/ldp_oc_acl_topo1/r4/ldpd.conf index 6b7d28f983..9f66d7ba45 100644 --- a/tests/topotests/ldp_oc_acl_topo1/r4/ldpd.conf +++ b/tests/topotests/ldp_oc_acl_topo1/r4/ldpd.conf @@ -1,13 +1,13 @@ hostname r4 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp discovery hello recv -debug mpls ldp discovery hello sent +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp discovery hello recv +! debug mpls ldp discovery hello sent ! mpls ldp router-id 4.4.4.4 diff --git a/tests/topotests/ldp_oc_topo1/r1/ldpd.conf b/tests/topotests/ldp_oc_topo1/r1/ldpd.conf index 2a8e023832..fdb9e628b3 100644 --- a/tests/topotests/ldp_oc_topo1/r1/ldpd.conf +++ b/tests/topotests/ldp_oc_topo1/r1/ldpd.conf @@ -1,13 +1,13 @@ hostname r1 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp discovery hello recv -debug mpls ldp discovery hello sent +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp discovery hello recv +! debug mpls ldp discovery hello sent ! mpls ldp router-id 1.1.1.1 diff --git a/tests/topotests/ldp_oc_topo1/r2/ldpd.conf b/tests/topotests/ldp_oc_topo1/r2/ldpd.conf index e1a552c701..175d3d0cee 100644 --- a/tests/topotests/ldp_oc_topo1/r2/ldpd.conf +++ b/tests/topotests/ldp_oc_topo1/r2/ldpd.conf @@ -1,13 +1,13 @@ hostname r2 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp discovery hello recv -debug mpls ldp discovery hello sent +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp discovery hello recv +! debug mpls ldp discovery hello sent ! mpls ldp router-id 2.2.2.2 diff --git a/tests/topotests/ldp_oc_topo1/r3/ldpd.conf b/tests/topotests/ldp_oc_topo1/r3/ldpd.conf index 4e66b140ac..81bd25ac6b 100644 --- a/tests/topotests/ldp_oc_topo1/r3/ldpd.conf +++ b/tests/topotests/ldp_oc_topo1/r3/ldpd.conf @@ -1,13 +1,13 @@ hostname r3 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp discovery hello recv -debug mpls ldp discovery hello sent +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp discovery hello recv +! debug mpls ldp discovery hello sent ! mpls ldp router-id 3.3.3.3 diff --git a/tests/topotests/ldp_oc_topo1/r4/ldpd.conf b/tests/topotests/ldp_oc_topo1/r4/ldpd.conf index 6b7d28f983..9f66d7ba45 100644 --- a/tests/topotests/ldp_oc_topo1/r4/ldpd.conf +++ b/tests/topotests/ldp_oc_topo1/r4/ldpd.conf @@ -1,13 +1,13 @@ hostname r4 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp discovery hello recv -debug mpls ldp discovery hello sent +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp discovery hello recv +! debug mpls ldp discovery hello sent ! mpls ldp router-id 4.4.4.4 diff --git a/tests/topotests/ldp_snmp/r1/isisd.conf b/tests/topotests/ldp_snmp/r1/isisd.conf index da2970d94e..d1abb497a6 100644 --- a/tests/topotests/ldp_snmp/r1/isisd.conf +++ b/tests/topotests/ldp_snmp/r1/isisd.conf @@ -1,9 +1,9 @@ hostname r1 log file isisd.log -debug isis adj-packets -debug isis events -debug isis update-packets -debug isis ldp-sync +! debug isis adj-packets +! debug isis events +! debug isis update-packets +! debug isis ldp-sync ! router isis 1 lsp-gen-interval 2 diff --git a/tests/topotests/ldp_snmp/r1/ldpd.conf b/tests/topotests/ldp_snmp/r1/ldpd.conf index 01fc039b09..c13135ff90 100644 --- a/tests/topotests/ldp_snmp/r1/ldpd.conf +++ b/tests/topotests/ldp_snmp/r1/ldpd.conf @@ -1,10 +1,10 @@ hostname r1 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp sync +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp sync ! mpls ldp router-id 1.1.1.1 diff --git a/tests/topotests/ldp_snmp/r1/zebra.conf b/tests/topotests/ldp_snmp/r1/zebra.conf index ea047355ad..bbb98d22fa 100644 --- a/tests/topotests/ldp_snmp/r1/zebra.conf +++ b/tests/topotests/ldp_snmp/r1/zebra.conf @@ -2,12 +2,12 @@ log file zebra.log ! hostname r1 ! -debug zebra kernel -debug zebra rib detailed -debug zebra dplane detailed -debug zebra nht -debug zebra pseudowires -debug zebra mpls +! debug zebra kernel +! debug zebra rib detailed +! debug zebra dplane detailed +! debug zebra nht +! debug zebra pseudowires +! debug zebra mpls ! interface lo ip address 1.1.1.1/32 diff --git a/tests/topotests/ldp_snmp/r2/isisd.conf b/tests/topotests/ldp_snmp/r2/isisd.conf index b29a2b93ee..213b65ee4c 100644 --- a/tests/topotests/ldp_snmp/r2/isisd.conf +++ b/tests/topotests/ldp_snmp/r2/isisd.conf @@ -1,9 +1,9 @@ hostname r2 log file isisd.log -debug isis adj-packets -debug isis events -debug isis update-packets -debug isis ldp-sync +! debug isis adj-packets +! debug isis events +! debug isis update-packets +! debug isis ldp-sync ! router isis 1 lsp-gen-interval 2 diff --git a/tests/topotests/ldp_snmp/r2/ldpd.conf b/tests/topotests/ldp_snmp/r2/ldpd.conf index c93e1a6ac5..fdb76ed3c0 100644 --- a/tests/topotests/ldp_snmp/r2/ldpd.conf +++ b/tests/topotests/ldp_snmp/r2/ldpd.conf @@ -1,10 +1,10 @@ hostname r2 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp sync +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp sync ! mpls ldp router-id 2.2.2.2 diff --git a/tests/topotests/ldp_snmp/r2/ospfd.conf b/tests/topotests/ldp_snmp/r2/ospfd.conf index f93f6aed56..50c593cb58 100644 --- a/tests/topotests/ldp_snmp/r2/ospfd.conf +++ b/tests/topotests/ldp_snmp/r2/ospfd.conf @@ -1,7 +1,7 @@ hostname r2 log file ospfd.log -debug ospf zebra interface -debug ospf ldp-sync +! debug ospf zebra interface +! debug ospf ldp-sync ! router ospf router-id 2.2.2.2 diff --git a/tests/topotests/ldp_snmp/r2/zebra.conf b/tests/topotests/ldp_snmp/r2/zebra.conf index c244442876..c79b210f11 100644 --- a/tests/topotests/ldp_snmp/r2/zebra.conf +++ b/tests/topotests/ldp_snmp/r2/zebra.conf @@ -2,11 +2,11 @@ log file zebra.log ! hostname r2 ! -debug zebra rib detailed -debug zebra dplane detailed -debug zebra kernel -debug zebra nht -debug zebra pseudowires +! debug zebra rib detailed +! debug zebra dplane detailed +! debug zebra kernel +! debug zebra nht +! debug zebra pseudowires ! interface lo ip address 2.2.2.2/32 diff --git a/tests/topotests/ldp_snmp/r3/isisd.conf b/tests/topotests/ldp_snmp/r3/isisd.conf index 4c8499f23d..956d58239b 100644 --- a/tests/topotests/ldp_snmp/r3/isisd.conf +++ b/tests/topotests/ldp_snmp/r3/isisd.conf @@ -1,9 +1,9 @@ hostname r3 log file isisd.log -debug isis adj-packets -debug isis events -debug isis update-packets -debug isis ldp-sync +! debug isis adj-packets +! debug isis events +! debug isis update-packets +! debug isis ldp-sync ! router isis 1 lsp-gen-interval 2 diff --git a/tests/topotests/ldp_snmp/r3/ldpd.conf b/tests/topotests/ldp_snmp/r3/ldpd.conf index b7eeb258f1..d1a928bf45 100644 --- a/tests/topotests/ldp_snmp/r3/ldpd.conf +++ b/tests/topotests/ldp_snmp/r3/ldpd.conf @@ -1,10 +1,10 @@ hostname r3 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp sync +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp sync ! mpls ldp router-id 3.3.3.3 diff --git a/tests/topotests/ldp_snmp/r3/zebra.conf b/tests/topotests/ldp_snmp/r3/zebra.conf index b1919bd296..45929acb21 100644 --- a/tests/topotests/ldp_snmp/r3/zebra.conf +++ b/tests/topotests/ldp_snmp/r3/zebra.conf @@ -2,11 +2,11 @@ log file zebra.log ! hostname r3 ! -debug zebra rib detailed -debug zebra dplane detailed -debug zebra kernel -debug zebra nht -debug zebra pseudowires +! debug zebra rib detailed +! debug zebra dplane detailed +! debug zebra kernel +! debug zebra nht +! debug zebra pseudowires ! interface lo ip address 3.3.3.3/32 diff --git a/tests/topotests/ldp_sync_isis_topo1/r1/isisd.conf b/tests/topotests/ldp_sync_isis_topo1/r1/isisd.conf index da2970d94e..d1abb497a6 100644 --- a/tests/topotests/ldp_sync_isis_topo1/r1/isisd.conf +++ b/tests/topotests/ldp_sync_isis_topo1/r1/isisd.conf @@ -1,9 +1,9 @@ hostname r1 log file isisd.log -debug isis adj-packets -debug isis events -debug isis update-packets -debug isis ldp-sync +! debug isis adj-packets +! debug isis events +! debug isis update-packets +! debug isis ldp-sync ! router isis 1 lsp-gen-interval 2 diff --git a/tests/topotests/ldp_sync_isis_topo1/r1/ldpd.conf b/tests/topotests/ldp_sync_isis_topo1/r1/ldpd.conf index b9c32d3000..973acf4356 100644 --- a/tests/topotests/ldp_sync_isis_topo1/r1/ldpd.conf +++ b/tests/topotests/ldp_sync_isis_topo1/r1/ldpd.conf @@ -1,10 +1,10 @@ hostname r1 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp sync +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp sync ! mpls ldp router-id 1.1.1.1 diff --git a/tests/topotests/ldp_sync_isis_topo1/r1/zebra.conf b/tests/topotests/ldp_sync_isis_topo1/r1/zebra.conf index ea047355ad..bbb98d22fa 100644 --- a/tests/topotests/ldp_sync_isis_topo1/r1/zebra.conf +++ b/tests/topotests/ldp_sync_isis_topo1/r1/zebra.conf @@ -2,12 +2,12 @@ log file zebra.log ! hostname r1 ! -debug zebra kernel -debug zebra rib detailed -debug zebra dplane detailed -debug zebra nht -debug zebra pseudowires -debug zebra mpls +! debug zebra kernel +! debug zebra rib detailed +! debug zebra dplane detailed +! debug zebra nht +! debug zebra pseudowires +! debug zebra mpls ! interface lo ip address 1.1.1.1/32 diff --git a/tests/topotests/ldp_sync_isis_topo1/r2/isisd.conf b/tests/topotests/ldp_sync_isis_topo1/r2/isisd.conf index b29a2b93ee..213b65ee4c 100644 --- a/tests/topotests/ldp_sync_isis_topo1/r2/isisd.conf +++ b/tests/topotests/ldp_sync_isis_topo1/r2/isisd.conf @@ -1,9 +1,9 @@ hostname r2 log file isisd.log -debug isis adj-packets -debug isis events -debug isis update-packets -debug isis ldp-sync +! debug isis adj-packets +! debug isis events +! debug isis update-packets +! debug isis ldp-sync ! router isis 1 lsp-gen-interval 2 diff --git a/tests/topotests/ldp_sync_isis_topo1/r2/ldpd.conf b/tests/topotests/ldp_sync_isis_topo1/r2/ldpd.conf index 52398b1b72..e738ff9917 100644 --- a/tests/topotests/ldp_sync_isis_topo1/r2/ldpd.conf +++ b/tests/topotests/ldp_sync_isis_topo1/r2/ldpd.conf @@ -1,10 +1,10 @@ hostname r2 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp sync +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp sync ! mpls ldp router-id 2.2.2.2 diff --git a/tests/topotests/ldp_sync_isis_topo1/r2/zebra.conf b/tests/topotests/ldp_sync_isis_topo1/r2/zebra.conf index c244442876..c79b210f11 100644 --- a/tests/topotests/ldp_sync_isis_topo1/r2/zebra.conf +++ b/tests/topotests/ldp_sync_isis_topo1/r2/zebra.conf @@ -2,11 +2,11 @@ log file zebra.log ! hostname r2 ! -debug zebra rib detailed -debug zebra dplane detailed -debug zebra kernel -debug zebra nht -debug zebra pseudowires +! debug zebra rib detailed +! debug zebra dplane detailed +! debug zebra kernel +! debug zebra nht +! debug zebra pseudowires ! interface lo ip address 2.2.2.2/32 diff --git a/tests/topotests/ldp_sync_isis_topo1/r3/isisd.conf b/tests/topotests/ldp_sync_isis_topo1/r3/isisd.conf index 4c8499f23d..956d58239b 100644 --- a/tests/topotests/ldp_sync_isis_topo1/r3/isisd.conf +++ b/tests/topotests/ldp_sync_isis_topo1/r3/isisd.conf @@ -1,9 +1,9 @@ hostname r3 log file isisd.log -debug isis adj-packets -debug isis events -debug isis update-packets -debug isis ldp-sync +! debug isis adj-packets +! debug isis events +! debug isis update-packets +! debug isis ldp-sync ! router isis 1 lsp-gen-interval 2 diff --git a/tests/topotests/ldp_sync_isis_topo1/r3/ldpd.conf b/tests/topotests/ldp_sync_isis_topo1/r3/ldpd.conf index 2935caf13b..fae25e0710 100644 --- a/tests/topotests/ldp_sync_isis_topo1/r3/ldpd.conf +++ b/tests/topotests/ldp_sync_isis_topo1/r3/ldpd.conf @@ -1,10 +1,10 @@ hostname r3 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp sync +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp sync ! mpls ldp router-id 3.3.3.3 diff --git a/tests/topotests/ldp_sync_isis_topo1/r3/zebra.conf b/tests/topotests/ldp_sync_isis_topo1/r3/zebra.conf index b1919bd296..45929acb21 100644 --- a/tests/topotests/ldp_sync_isis_topo1/r3/zebra.conf +++ b/tests/topotests/ldp_sync_isis_topo1/r3/zebra.conf @@ -2,11 +2,11 @@ log file zebra.log ! hostname r3 ! -debug zebra rib detailed -debug zebra dplane detailed -debug zebra kernel -debug zebra nht -debug zebra pseudowires +! debug zebra rib detailed +! debug zebra dplane detailed +! debug zebra kernel +! debug zebra nht +! debug zebra pseudowires ! interface lo ip address 3.3.3.3/32 diff --git a/tests/topotests/ldp_sync_ospf_topo1/r1/ldpd.conf b/tests/topotests/ldp_sync_ospf_topo1/r1/ldpd.conf index b9c32d3000..973acf4356 100644 --- a/tests/topotests/ldp_sync_ospf_topo1/r1/ldpd.conf +++ b/tests/topotests/ldp_sync_ospf_topo1/r1/ldpd.conf @@ -1,10 +1,10 @@ hostname r1 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp sync +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp sync ! mpls ldp router-id 1.1.1.1 diff --git a/tests/topotests/ldp_sync_ospf_topo1/r1/ospfd.conf b/tests/topotests/ldp_sync_ospf_topo1/r1/ospfd.conf index eefcd1e71c..dc201695f4 100644 --- a/tests/topotests/ldp_sync_ospf_topo1/r1/ospfd.conf +++ b/tests/topotests/ldp_sync_ospf_topo1/r1/ospfd.conf @@ -1,7 +1,7 @@ hostname r1 log file ospfd.log -debug ospf zebra interface -debug ospf ldp-sync +! debug ospf zebra interface +! debug ospf ldp-sync ! router ospf router-id 1.1.1.1 diff --git a/tests/topotests/ldp_sync_ospf_topo1/r1/zebra.conf b/tests/topotests/ldp_sync_ospf_topo1/r1/zebra.conf index ea047355ad..bbb98d22fa 100644 --- a/tests/topotests/ldp_sync_ospf_topo1/r1/zebra.conf +++ b/tests/topotests/ldp_sync_ospf_topo1/r1/zebra.conf @@ -2,12 +2,12 @@ log file zebra.log ! hostname r1 ! -debug zebra kernel -debug zebra rib detailed -debug zebra dplane detailed -debug zebra nht -debug zebra pseudowires -debug zebra mpls +! debug zebra kernel +! debug zebra rib detailed +! debug zebra dplane detailed +! debug zebra nht +! debug zebra pseudowires +! debug zebra mpls ! interface lo ip address 1.1.1.1/32 diff --git a/tests/topotests/ldp_sync_ospf_topo1/r2/ldpd.conf b/tests/topotests/ldp_sync_ospf_topo1/r2/ldpd.conf index 52398b1b72..e738ff9917 100644 --- a/tests/topotests/ldp_sync_ospf_topo1/r2/ldpd.conf +++ b/tests/topotests/ldp_sync_ospf_topo1/r2/ldpd.conf @@ -1,10 +1,10 @@ hostname r2 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp sync +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp sync ! mpls ldp router-id 2.2.2.2 diff --git a/tests/topotests/ldp_sync_ospf_topo1/r2/ospfd.conf b/tests/topotests/ldp_sync_ospf_topo1/r2/ospfd.conf index f93f6aed56..50c593cb58 100644 --- a/tests/topotests/ldp_sync_ospf_topo1/r2/ospfd.conf +++ b/tests/topotests/ldp_sync_ospf_topo1/r2/ospfd.conf @@ -1,7 +1,7 @@ hostname r2 log file ospfd.log -debug ospf zebra interface -debug ospf ldp-sync +! debug ospf zebra interface +! debug ospf ldp-sync ! router ospf router-id 2.2.2.2 diff --git a/tests/topotests/ldp_sync_ospf_topo1/r2/zebra.conf b/tests/topotests/ldp_sync_ospf_topo1/r2/zebra.conf index c244442876..c79b210f11 100644 --- a/tests/topotests/ldp_sync_ospf_topo1/r2/zebra.conf +++ b/tests/topotests/ldp_sync_ospf_topo1/r2/zebra.conf @@ -2,11 +2,11 @@ log file zebra.log ! hostname r2 ! -debug zebra rib detailed -debug zebra dplane detailed -debug zebra kernel -debug zebra nht -debug zebra pseudowires +! debug zebra rib detailed +! debug zebra dplane detailed +! debug zebra kernel +! debug zebra nht +! debug zebra pseudowires ! interface lo ip address 2.2.2.2/32 diff --git a/tests/topotests/ldp_sync_ospf_topo1/r3/ldpd.conf b/tests/topotests/ldp_sync_ospf_topo1/r3/ldpd.conf index 2935caf13b..fae25e0710 100644 --- a/tests/topotests/ldp_sync_ospf_topo1/r3/ldpd.conf +++ b/tests/topotests/ldp_sync_ospf_topo1/r3/ldpd.conf @@ -1,10 +1,10 @@ hostname r3 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp sync +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp sync ! mpls ldp router-id 3.3.3.3 diff --git a/tests/topotests/ldp_sync_ospf_topo1/r3/ospfd.conf b/tests/topotests/ldp_sync_ospf_topo1/r3/ospfd.conf index 09eea759ad..b641fd8713 100644 --- a/tests/topotests/ldp_sync_ospf_topo1/r3/ospfd.conf +++ b/tests/topotests/ldp_sync_ospf_topo1/r3/ospfd.conf @@ -1,7 +1,7 @@ hostname r3 log file ospfd.log -debug ospf zebra interface -debug ospf ldp-sync +! debug ospf zebra interface +! debug ospf ldp-sync ! router ospf router-id 3.3.3.3 diff --git a/tests/topotests/ldp_sync_ospf_topo1/r3/zebra.conf b/tests/topotests/ldp_sync_ospf_topo1/r3/zebra.conf index b1919bd296..45929acb21 100644 --- a/tests/topotests/ldp_sync_ospf_topo1/r3/zebra.conf +++ b/tests/topotests/ldp_sync_ospf_topo1/r3/zebra.conf @@ -2,11 +2,11 @@ log file zebra.log ! hostname r3 ! -debug zebra rib detailed -debug zebra dplane detailed -debug zebra kernel -debug zebra nht -debug zebra pseudowires +! debug zebra rib detailed +! debug zebra dplane detailed +! debug zebra kernel +! debug zebra nht +! debug zebra pseudowires ! interface lo ip address 3.3.3.3/32 diff --git a/tests/topotests/ldp_topo1/r1/ldpd.conf b/tests/topotests/ldp_topo1/r1/ldpd.conf index 3c6cbddc2a..f7f2714dae 100644 --- a/tests/topotests/ldp_topo1/r1/ldpd.conf +++ b/tests/topotests/ldp_topo1/r1/ldpd.conf @@ -1,13 +1,13 @@ hostname r1 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp discovery hello recv -debug mpls ldp discovery hello sent +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp discovery hello recv +! debug mpls ldp discovery hello sent ! mpls ldp router-id 1.1.1.1 diff --git a/tests/topotests/ldp_topo1/r2/ldpd.conf b/tests/topotests/ldp_topo1/r2/ldpd.conf index bfdef21b75..c4056e01a8 100644 --- a/tests/topotests/ldp_topo1/r2/ldpd.conf +++ b/tests/topotests/ldp_topo1/r2/ldpd.conf @@ -1,13 +1,13 @@ hostname r2 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp discovery hello recv -debug mpls ldp discovery hello sent +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp discovery hello recv +! debug mpls ldp discovery hello sent ! mpls ldp router-id 2.2.2.2 diff --git a/tests/topotests/ldp_topo1/r3/ldpd.conf b/tests/topotests/ldp_topo1/r3/ldpd.conf index dbf1d72b5f..48956cb996 100644 --- a/tests/topotests/ldp_topo1/r3/ldpd.conf +++ b/tests/topotests/ldp_topo1/r3/ldpd.conf @@ -1,13 +1,13 @@ hostname r3 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp discovery hello recv -debug mpls ldp discovery hello sent +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp discovery hello recv +! debug mpls ldp discovery hello sent ! mpls ldp router-id 3.3.3.3 diff --git a/tests/topotests/ldp_topo1/r4/ldpd.conf b/tests/topotests/ldp_topo1/r4/ldpd.conf index 8f3533527d..1d04aa07e7 100644 --- a/tests/topotests/ldp_topo1/r4/ldpd.conf +++ b/tests/topotests/ldp_topo1/r4/ldpd.conf @@ -1,13 +1,13 @@ hostname r4 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp discovery hello recv -debug mpls ldp discovery hello sent +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp discovery hello recv +! debug mpls ldp discovery hello sent ! mpls ldp router-id 4.4.4.4 diff --git a/tests/topotests/ldp_vpls_topo1/r1/ldpd.conf b/tests/topotests/ldp_vpls_topo1/r1/ldpd.conf index a1c0c822d6..594ec5a58f 100644 --- a/tests/topotests/ldp_vpls_topo1/r1/ldpd.conf +++ b/tests/topotests/ldp_vpls_topo1/r1/ldpd.conf @@ -1,13 +1,13 @@ hostname r1 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp discovery hello recv -debug mpls ldp discovery hello sent +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp discovery hello recv +! debug mpls ldp discovery hello sent ! mpls ldp router-id 1.1.1.1 diff --git a/tests/topotests/ldp_vpls_topo1/r1/show_ip_route_after_link_down.ref b/tests/topotests/ldp_vpls_topo1/r1/show_ip_route_after_link_down.ref new file mode 100644 index 0000000000..84113a0383 --- /dev/null +++ b/tests/topotests/ldp_vpls_topo1/r1/show_ip_route_after_link_down.ref @@ -0,0 +1,20 @@ +{ + "2.2.2.2/32":[ + { + "prefix":"2.2.2.2/32", + "protocol":"ospf", + "selected":true, + "distance":110, + "metric":20, + "nexthops":[ + { + "fib":true, + "ip":"10.0.2.3", + "afi":"ipv4", + "interfaceName":"r1-eth2", + "active":true + } + ] + } + ] +} diff --git a/tests/topotests/ldp_vpls_topo1/r1/zebra.conf b/tests/topotests/ldp_vpls_topo1/r1/zebra.conf index ea047355ad..bbb98d22fa 100644 --- a/tests/topotests/ldp_vpls_topo1/r1/zebra.conf +++ b/tests/topotests/ldp_vpls_topo1/r1/zebra.conf @@ -2,12 +2,12 @@ log file zebra.log ! hostname r1 ! -debug zebra kernel -debug zebra rib detailed -debug zebra dplane detailed -debug zebra nht -debug zebra pseudowires -debug zebra mpls +! debug zebra kernel +! debug zebra rib detailed +! debug zebra dplane detailed +! debug zebra nht +! debug zebra pseudowires +! debug zebra mpls ! interface lo ip address 1.1.1.1/32 diff --git a/tests/topotests/ldp_vpls_topo1/r2/ldpd.conf b/tests/topotests/ldp_vpls_topo1/r2/ldpd.conf index 06e5973040..ffb4f0974a 100644 --- a/tests/topotests/ldp_vpls_topo1/r2/ldpd.conf +++ b/tests/topotests/ldp_vpls_topo1/r2/ldpd.conf @@ -1,13 +1,13 @@ hostname r2 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp discovery hello recv -debug mpls ldp discovery hello sent +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp discovery hello recv +! debug mpls ldp discovery hello sent ! mpls ldp router-id 2.2.2.2 diff --git a/tests/topotests/ldp_vpls_topo1/r2/zebra.conf b/tests/topotests/ldp_vpls_topo1/r2/zebra.conf index c244442876..c79b210f11 100644 --- a/tests/topotests/ldp_vpls_topo1/r2/zebra.conf +++ b/tests/topotests/ldp_vpls_topo1/r2/zebra.conf @@ -2,11 +2,11 @@ log file zebra.log ! hostname r2 ! -debug zebra rib detailed -debug zebra dplane detailed -debug zebra kernel -debug zebra nht -debug zebra pseudowires +! debug zebra rib detailed +! debug zebra dplane detailed +! debug zebra kernel +! debug zebra nht +! debug zebra pseudowires ! interface lo ip address 2.2.2.2/32 diff --git a/tests/topotests/ldp_vpls_topo1/r3/ldpd.conf b/tests/topotests/ldp_vpls_topo1/r3/ldpd.conf index 57a203bce3..c95471ffd8 100644 --- a/tests/topotests/ldp_vpls_topo1/r3/ldpd.conf +++ b/tests/topotests/ldp_vpls_topo1/r3/ldpd.conf @@ -1,13 +1,13 @@ hostname r3 log file ldpd.log ! -debug mpls ldp zebra -debug mpls ldp event -debug mpls ldp errors -debug mpls ldp messages recv -debug mpls ldp messages sent -debug mpls ldp discovery hello recv -debug mpls ldp discovery hello sent +! debug mpls ldp zebra +! debug mpls ldp event +! debug mpls ldp errors +! debug mpls ldp messages recv +! debug mpls ldp messages sent +! debug mpls ldp discovery hello recv +! debug mpls ldp discovery hello sent ! mpls ldp router-id 3.3.3.3 diff --git a/tests/topotests/ldp_vpls_topo1/r3/zebra.conf b/tests/topotests/ldp_vpls_topo1/r3/zebra.conf index 6b1eaa2ca0..bcc0d8d2be 100644 --- a/tests/topotests/ldp_vpls_topo1/r3/zebra.conf +++ b/tests/topotests/ldp_vpls_topo1/r3/zebra.conf @@ -2,11 +2,11 @@ log file zebra.log ! hostname r3 ! -debug zebra rib detailed -debug zebra dplane detailed -debug zebra kernel -debug zebra nht -debug zebra pseudowires +! debug zebra rib detailed +! debug zebra dplane detailed +! debug zebra kernel +! debug zebra nht +! debug zebra pseudowires ! interface lo ip address 3.3.3.3/32 diff --git a/tests/topotests/ldp_vpls_topo1/test_ldp_vpls_topo1.py b/tests/topotests/ldp_vpls_topo1/test_ldp_vpls_topo1.py index 86128a629d..8a41ea510e 100644 --- a/tests/topotests/ldp_vpls_topo1/test_ldp_vpls_topo1.py +++ b/tests/topotests/ldp_vpls_topo1/test_ldp_vpls_topo1.py @@ -272,9 +272,15 @@ def test_ldp_pseudowires_after_link_down(): # Shut down r1-r2 link */ tgen = get_topogen() - tgen.gears["r1"].peer_link_enable("r1-eth1", False) - topotest.sleep(5, "Waiting for the network to reconverge") - + rname = "r1" + tgen.gears[rname].peer_link_enable("r1-eth1", False) + router_compare_json_output( + rname, + "show ip route json", + "show_ip_route_after_link_down.ref", + count=160, + wait=1, + ) # check if the pseudowire is still up (using an alternate path # for nexthop resolution). Give some extra wait time. for rname in ["r1", "r2", "r3"]: diff --git a/tests/topotests/msdp_topo1/r1/pimd.conf b/tests/topotests/msdp_topo1/r1/pimd.conf index 4274315271..5bb268ebef 100644 --- a/tests/topotests/msdp_topo1/r1/pimd.conf +++ b/tests/topotests/msdp_topo1/r1/pimd.conf @@ -1,5 +1,5 @@ -debug pim -debug pim zebra +! debug pim +! debug pim zebra ! interface lo ip pim diff --git a/tests/topotests/msdp_topo1/r2/pimd.conf b/tests/topotests/msdp_topo1/r2/pimd.conf index a4a69bf05c..733bd6f2f1 100644 --- a/tests/topotests/msdp_topo1/r2/pimd.conf +++ b/tests/topotests/msdp_topo1/r2/pimd.conf @@ -1,5 +1,5 @@ -debug pim -debug pim zebra +! debug pim +! debug pim zebra ! interface lo ip pim diff --git a/tests/topotests/msdp_topo1/r3/pimd.conf b/tests/topotests/msdp_topo1/r3/pimd.conf index db94447c76..47987c0aa8 100644 --- a/tests/topotests/msdp_topo1/r3/pimd.conf +++ b/tests/topotests/msdp_topo1/r3/pimd.conf @@ -1,5 +1,5 @@ -debug pim -debug pim zebra +! debug pim +! debug pim zebra ! interface lo ip pim diff --git a/tests/topotests/msdp_topo1/r4/pimd.conf b/tests/topotests/msdp_topo1/r4/pimd.conf index e9bb59054c..28085913fb 100644 --- a/tests/topotests/msdp_topo1/r4/pimd.conf +++ b/tests/topotests/msdp_topo1/r4/pimd.conf @@ -1,5 +1,5 @@ -debug pim -debug pim zebra +! debug pim +! debug pim zebra ! interface lo ip pim diff --git a/tests/topotests/nhrp_topo/r1/nhrpd.conf b/tests/topotests/nhrp_topo/r1/nhrpd.conf index 04114bdbe6..e5224e4aab 100644 --- a/tests/topotests/nhrp_topo/r1/nhrpd.conf +++ b/tests/topotests/nhrp_topo/r1/nhrpd.conf @@ -1,5 +1,5 @@ log stdout debugging -debug nhrp all +! debug nhrp all interface r1-gre0 ip nhrp holdtime 500 ip nhrp shortcut diff --git a/tests/topotests/nhrp_topo/r2/nhrpd.conf b/tests/topotests/nhrp_topo/r2/nhrpd.conf index e4f6fb7445..f9185f9a63 100644 --- a/tests/topotests/nhrp_topo/r2/nhrpd.conf +++ b/tests/topotests/nhrp_topo/r2/nhrpd.conf @@ -1,4 +1,4 @@ -debug nhrp all +! debug nhrp all log stdout debugging nhrp nflog-group 1 interface r2-gre0 diff --git a/tests/topotests/nhrp_topo/r3/zebra.conf b/tests/topotests/nhrp_topo/r3/zebra.conf index 6d3d267978..e77f955225 100644 --- a/tests/topotests/nhrp_topo/r3/zebra.conf +++ b/tests/topotests/nhrp_topo/r3/zebra.conf @@ -1,7 +1,7 @@ -debug zebra kernel -debug zebra rib -debug zebra events -debug zebra packet +! debug zebra kernel +! debug zebra rib +! debug zebra events +! debug zebra packet ip forwarding interface r3-eth0 ip address 10.1.1.3/24 diff --git a/tests/topotests/ospf6_gr_topo1/rt1/ospf6d.conf b/tests/topotests/ospf6_gr_topo1/rt1/ospf6d.conf index 9e2ad298a3..8a9b4eb124 100644 --- a/tests/topotests/ospf6_gr_topo1/rt1/ospf6d.conf +++ b/tests/topotests/ospf6_gr_topo1/rt1/ospf6d.conf @@ -3,14 +3,14 @@ hostname rt1 log file ospf6d.log log commands ! -debug ospf6 lsa router originate -debug ospf6 lsa router flooding -debug ospf6 zebra -debug ospf6 interface -debug ospf6 neighbor -debug ospf6 flooding -debug ospf6 graceful-restart -debug ospf6 spf process +! debug ospf6 lsa router originate +! debug ospf6 lsa router flooding +! debug ospf6 zebra +! debug ospf6 interface +! debug ospf6 neighbor +! debug ospf6 flooding +! debug ospf6 graceful-restart +! debug ospf6 spf process ! interface lo ipv6 ospf area 1 diff --git a/tests/topotests/ospf6_gr_topo1/rt1/zebra.conf b/tests/topotests/ospf6_gr_topo1/rt1/zebra.conf index f29f5b73fb..01ecd647b5 100644 --- a/tests/topotests/ospf6_gr_topo1/rt1/zebra.conf +++ b/tests/topotests/ospf6_gr_topo1/rt1/zebra.conf @@ -3,10 +3,10 @@ hostname rt1 log file zebra.log log commands ! -debug zebra event -debug zebra packet -debug zebra rib -debug zebra kernel +! debug zebra event +! debug zebra packet +! debug zebra rib +! debug zebra kernel ! interface lo ip address 1.1.1.1/32 diff --git a/tests/topotests/ospf6_gr_topo1/rt2/ospf6d.conf b/tests/topotests/ospf6_gr_topo1/rt2/ospf6d.conf index cfa8758344..bcce341f51 100644 --- a/tests/topotests/ospf6_gr_topo1/rt2/ospf6d.conf +++ b/tests/topotests/ospf6_gr_topo1/rt2/ospf6d.conf @@ -3,14 +3,14 @@ hostname rt2 log file ospf6d.log log commands ! -debug ospf6 lsa router originate -debug ospf6 lsa router flooding -debug ospf6 zebra -debug ospf6 interface -debug ospf6 neighbor -debug ospf6 flooding -debug ospf6 graceful-restart -debug ospf6 spf process +! debug ospf6 lsa router originate +! debug ospf6 lsa router flooding +! debug ospf6 zebra +! debug ospf6 interface +! debug ospf6 neighbor +! debug ospf6 flooding +! debug ospf6 graceful-restart +! debug ospf6 spf process ! interface lo ipv6 ospf area 0 diff --git a/tests/topotests/ospf6_gr_topo1/rt2/zebra.conf b/tests/topotests/ospf6_gr_topo1/rt2/zebra.conf index e4fe7620da..5e5731b7ab 100644 --- a/tests/topotests/ospf6_gr_topo1/rt2/zebra.conf +++ b/tests/topotests/ospf6_gr_topo1/rt2/zebra.conf @@ -3,10 +3,10 @@ hostname rt2 log file zebra.log log commands ! -debug zebra event -debug zebra packet -debug zebra rib -debug zebra kernel +! debug zebra event +! debug zebra packet +! debug zebra rib +! debug zebra kernel ! interface lo ip address 2.2.2.2/32 diff --git a/tests/topotests/ospf6_gr_topo1/rt3/ospf6d.conf b/tests/topotests/ospf6_gr_topo1/rt3/ospf6d.conf index f33f14f34f..8dba58e07c 100644 --- a/tests/topotests/ospf6_gr_topo1/rt3/ospf6d.conf +++ b/tests/topotests/ospf6_gr_topo1/rt3/ospf6d.conf @@ -3,14 +3,14 @@ hostname rt3 log file ospf6d.log log commands ! -debug ospf6 lsa router originate -debug ospf6 lsa router flooding -debug ospf6 zebra -debug ospf6 interface -debug ospf6 neighbor -debug ospf6 flooding -debug ospf6 graceful-restart -debug ospf6 spf process +! debug ospf6 lsa router originate +! debug ospf6 lsa router flooding +! debug ospf6 zebra +! debug ospf6 interface +! debug ospf6 neighbor +! debug ospf6 flooding +! debug ospf6 graceful-restart +! debug ospf6 spf process ! interface lo ipv6 ospf area 0 diff --git a/tests/topotests/ospf6_gr_topo1/rt3/zebra.conf b/tests/topotests/ospf6_gr_topo1/rt3/zebra.conf index 3a9de21d30..ca3eea410d 100644 --- a/tests/topotests/ospf6_gr_topo1/rt3/zebra.conf +++ b/tests/topotests/ospf6_gr_topo1/rt3/zebra.conf @@ -3,10 +3,10 @@ hostname rt3 log file zebra.log log commands ! -debug zebra event -debug zebra packet -debug zebra rib -debug zebra kernel +! debug zebra event +! debug zebra packet +! debug zebra rib +! debug zebra kernel ! interface lo ip address 3.3.3.3/32 diff --git a/tests/topotests/ospf6_gr_topo1/rt4/ospf6d.conf b/tests/topotests/ospf6_gr_topo1/rt4/ospf6d.conf index 301eb57e7d..9be5321e68 100644 --- a/tests/topotests/ospf6_gr_topo1/rt4/ospf6d.conf +++ b/tests/topotests/ospf6_gr_topo1/rt4/ospf6d.conf @@ -3,14 +3,14 @@ hostname rt4 log file ospf6d.log log commands ! -debug ospf6 lsa router originate -debug ospf6 lsa router flooding -debug ospf6 zebra -debug ospf6 interface -debug ospf6 neighbor -debug ospf6 flooding -debug ospf6 graceful-restart -debug ospf6 spf process +! debug ospf6 lsa router originate +! debug ospf6 lsa router flooding +! debug ospf6 zebra +! debug ospf6 interface +! debug ospf6 neighbor +! debug ospf6 flooding +! debug ospf6 graceful-restart +! debug ospf6 spf process ! interface lo ipv6 ospf area 0 diff --git a/tests/topotests/ospf6_gr_topo1/rt4/zebra.conf b/tests/topotests/ospf6_gr_topo1/rt4/zebra.conf index eeea417b70..c488b2a387 100644 --- a/tests/topotests/ospf6_gr_topo1/rt4/zebra.conf +++ b/tests/topotests/ospf6_gr_topo1/rt4/zebra.conf @@ -3,10 +3,10 @@ hostname rt4 log file zebra.log log commands ! -debug zebra event -debug zebra packet -debug zebra rib -debug zebra kernel +! debug zebra event +! debug zebra packet +! debug zebra rib +! debug zebra kernel ! interface lo ip address 4.4.4.4/32 diff --git a/tests/topotests/ospf6_gr_topo1/rt5/ospf6d.conf b/tests/topotests/ospf6_gr_topo1/rt5/ospf6d.conf index 254fea75fc..98ba8bc447 100644 --- a/tests/topotests/ospf6_gr_topo1/rt5/ospf6d.conf +++ b/tests/topotests/ospf6_gr_topo1/rt5/ospf6d.conf @@ -3,14 +3,14 @@ hostname rt5 log file ospf6d.log log commands ! -debug ospf6 lsa router originate -debug ospf6 lsa router flooding -debug ospf6 zebra -debug ospf6 interface -debug ospf6 neighbor -debug ospf6 flooding -debug ospf6 graceful-restart -debug ospf6 spf process +! debug ospf6 lsa router originate +! debug ospf6 lsa router flooding +! debug ospf6 zebra +! debug ospf6 interface +! debug ospf6 neighbor +! debug ospf6 flooding +! debug ospf6 graceful-restart +! debug ospf6 spf process ! interface lo ipv6 ospf area 2 diff --git a/tests/topotests/ospf6_gr_topo1/rt5/zebra.conf b/tests/topotests/ospf6_gr_topo1/rt5/zebra.conf index 0cdb90b129..43ed901266 100644 --- a/tests/topotests/ospf6_gr_topo1/rt5/zebra.conf +++ b/tests/topotests/ospf6_gr_topo1/rt5/zebra.conf @@ -3,10 +3,10 @@ hostname rt5 log file zebra.log log commands ! -debug zebra event -debug zebra packet -debug zebra rib -debug zebra kernel +! debug zebra event +! debug zebra packet +! debug zebra rib +! debug zebra kernel ! interface lo ip address 5.5.5.5/32 diff --git a/tests/topotests/ospf6_gr_topo1/rt6/ospf6d.conf b/tests/topotests/ospf6_gr_topo1/rt6/ospf6d.conf index b1feb1ac57..d6d6f0cf92 100644 --- a/tests/topotests/ospf6_gr_topo1/rt6/ospf6d.conf +++ b/tests/topotests/ospf6_gr_topo1/rt6/ospf6d.conf @@ -3,14 +3,14 @@ hostname rt6 log file ospf6d.log log commands ! -debug ospf6 lsa router originate -debug ospf6 lsa router flooding -debug ospf6 zebra -debug ospf6 interface -debug ospf6 neighbor -debug ospf6 flooding -debug ospf6 graceful-restart -debug ospf6 spf process +! debug ospf6 lsa router originate +! debug ospf6 lsa router flooding +! debug ospf6 zebra +! debug ospf6 interface +! debug ospf6 neighbor +! debug ospf6 flooding +! debug ospf6 graceful-restart +! debug ospf6 spf process ! interface lo ipv6 ospf area 0 diff --git a/tests/topotests/ospf6_gr_topo1/rt6/zebra.conf b/tests/topotests/ospf6_gr_topo1/rt6/zebra.conf index 3c2312da8a..5ec27de17a 100644 --- a/tests/topotests/ospf6_gr_topo1/rt6/zebra.conf +++ b/tests/topotests/ospf6_gr_topo1/rt6/zebra.conf @@ -3,10 +3,10 @@ hostname rt6 log file zebra.log log commands ! -debug zebra event -debug zebra packet -debug zebra rib -debug zebra kernel +! debug zebra event +! debug zebra packet +! debug zebra rib +! debug zebra kernel ! interface lo ip address 6.6.6.6/32 diff --git a/tests/topotests/ospf6_gr_topo1/rt7/ospf6d.conf b/tests/topotests/ospf6_gr_topo1/rt7/ospf6d.conf index d032741d1a..cee6ee577e 100644 --- a/tests/topotests/ospf6_gr_topo1/rt7/ospf6d.conf +++ b/tests/topotests/ospf6_gr_topo1/rt7/ospf6d.conf @@ -3,14 +3,14 @@ hostname rt7 log file ospf6d.log log commands ! -debug ospf6 lsa router originate -debug ospf6 lsa router flooding -debug ospf6 zebra -debug ospf6 interface -debug ospf6 neighbor -debug ospf6 flooding -debug ospf6 graceful-restart -debug ospf6 spf process +! debug ospf6 lsa router originate +! debug ospf6 lsa router flooding +! debug ospf6 zebra +! debug ospf6 interface +! debug ospf6 neighbor +! debug ospf6 flooding +! debug ospf6 graceful-restart +! debug ospf6 spf process ! interface lo ipv6 ospf area 3 diff --git a/tests/topotests/ospf6_gr_topo1/rt7/zebra.conf b/tests/topotests/ospf6_gr_topo1/rt7/zebra.conf index 9cc8c29c1e..3939472b5e 100644 --- a/tests/topotests/ospf6_gr_topo1/rt7/zebra.conf +++ b/tests/topotests/ospf6_gr_topo1/rt7/zebra.conf @@ -3,10 +3,10 @@ hostname rt7 log file zebra.log log commands ! -debug zebra event -debug zebra packet -debug zebra rib -debug zebra kernel +! debug zebra event +! debug zebra packet +! debug zebra rib +! debug zebra kernel ! interface lo ip address 7.7.7.7/32 diff --git a/tests/topotests/ospf6_topo1/r1/ospf6d.conf b/tests/topotests/ospf6_topo1/r1/ospf6d.conf index 9f7e058931..5f1ceee964 100644 --- a/tests/topotests/ospf6_topo1/r1/ospf6d.conf +++ b/tests/topotests/ospf6_topo1/r1/ospf6d.conf @@ -1,13 +1,13 @@ hostname r1 log file ospf6d.log ! -debug ospf6 message all -debug ospf6 lsa unknown -debug ospf6 zebra -debug ospf6 interface -debug ospf6 neighbor -debug ospf6 route table -debug ospf6 flooding +! debug ospf6 message all +! debug ospf6 lsa unknown +! debug ospf6 zebra +! debug ospf6 interface +! debug ospf6 neighbor +! debug ospf6 route table +! debug ospf6 flooding ! interface r1-stubnet ipv6 ospf6 network broadcast diff --git a/tests/topotests/ospf6_topo1/r1/zebra.conf b/tests/topotests/ospf6_topo1/r1/zebra.conf index dfbcea8d21..3a7db9f25e 100644 --- a/tests/topotests/ospf6_topo1/r1/zebra.conf +++ b/tests/topotests/ospf6_topo1/r1/zebra.conf @@ -2,8 +2,8 @@ hostname r1 log file zebra.log ! -debug zebra events -debug zebra rib +! debug zebra events +! debug zebra rib ! interface r1-stubnet ipv6 address fc00:1:1:1::1/64 diff --git a/tests/topotests/ospf6_topo1/r2/ospf6d.conf b/tests/topotests/ospf6_topo1/r2/ospf6d.conf index 26ebc2c0ea..d51b41e1e5 100644 --- a/tests/topotests/ospf6_topo1/r2/ospf6d.conf +++ b/tests/topotests/ospf6_topo1/r2/ospf6d.conf @@ -1,13 +1,13 @@ hostname r2 log file ospf6d.log ! -debug ospf6 message all -debug ospf6 lsa unknown -debug ospf6 zebra -debug ospf6 interface -debug ospf6 neighbor -debug ospf6 route table -debug ospf6 flooding +! debug ospf6 message all +! debug ospf6 lsa unknown +! debug ospf6 zebra +! debug ospf6 interface +! debug ospf6 neighbor +! debug ospf6 route table +! debug ospf6 flooding ! interface r2-stubnet ipv6 ospf6 network broadcast diff --git a/tests/topotests/ospf6_topo1/r2/zebra.conf b/tests/topotests/ospf6_topo1/r2/zebra.conf index f05d1a60ff..5571dc979c 100644 --- a/tests/topotests/ospf6_topo1/r2/zebra.conf +++ b/tests/topotests/ospf6_topo1/r2/zebra.conf @@ -2,8 +2,8 @@ hostname r2 log file zebra.log ! -debug zebra events -debug zebra rib +! debug zebra events +! debug zebra rib ! interface r2-stubnet ipv6 address fc00:2:2:2::2/64 diff --git a/tests/topotests/ospf6_topo1/r3/ospf6d.conf b/tests/topotests/ospf6_topo1/r3/ospf6d.conf index e902496530..cad71ac067 100644 --- a/tests/topotests/ospf6_topo1/r3/ospf6d.conf +++ b/tests/topotests/ospf6_topo1/r3/ospf6d.conf @@ -1,13 +1,13 @@ hostname r3 log file ospf6d.log ! -debug ospf6 message all -debug ospf6 lsa unknown -debug ospf6 zebra -debug ospf6 interface -debug ospf6 neighbor -debug ospf6 route table -debug ospf6 flooding +! debug ospf6 message all +! debug ospf6 lsa unknown +! debug ospf6 zebra +! debug ospf6 interface +! debug ospf6 neighbor +! debug ospf6 route table +! debug ospf6 flooding ! interface r3-stubnet ipv6 ospf6 network broadcast diff --git a/tests/topotests/ospf6_topo1/r3/zebra.conf b/tests/topotests/ospf6_topo1/r3/zebra.conf index d8051c350d..3cc5626bd7 100644 --- a/tests/topotests/ospf6_topo1/r3/zebra.conf +++ b/tests/topotests/ospf6_topo1/r3/zebra.conf @@ -2,8 +2,8 @@ hostname r3 log file zebra.log ! -debug zebra events -debug zebra rib +! debug zebra events +! debug zebra rib ! interface r3-stubnet ipv6 address fc00:3:3:3::3/64 diff --git a/tests/topotests/ospf6_topo1/r4/ospf6d.conf b/tests/topotests/ospf6_topo1/r4/ospf6d.conf index 5607a789de..f0b166bc4b 100644 --- a/tests/topotests/ospf6_topo1/r4/ospf6d.conf +++ b/tests/topotests/ospf6_topo1/r4/ospf6d.conf @@ -1,13 +1,13 @@ hostname r4 log file ospf6d.log ! -debug ospf6 message all -debug ospf6 lsa unknown -debug ospf6 zebra -debug ospf6 interface -debug ospf6 neighbor -debug ospf6 route table -debug ospf6 flooding +! debug ospf6 message all +! debug ospf6 lsa unknown +! debug ospf6 zebra +! debug ospf6 interface +! debug ospf6 neighbor +! debug ospf6 route table +! debug ospf6 flooding ! interface r4-stubnet ipv6 ospf6 network broadcast diff --git a/tests/topotests/ospf6_topo1/r4/zebra.conf b/tests/topotests/ospf6_topo1/r4/zebra.conf index cada58bd01..20e27cea46 100644 --- a/tests/topotests/ospf6_topo1/r4/zebra.conf +++ b/tests/topotests/ospf6_topo1/r4/zebra.conf @@ -2,8 +2,8 @@ hostname r4 log file zebra.log ! -debug zebra events -debug zebra rib +! debug zebra events +! debug zebra rib ! interface r4-stubnet ipv6 address fc00:4:4:4::4/64 diff --git a/tests/topotests/ospf6_topo1_vrf/r1/ospf6d.conf b/tests/topotests/ospf6_topo1_vrf/r1/ospf6d.conf index 83bdfb7c81..e60c5991a4 100644 --- a/tests/topotests/ospf6_topo1_vrf/r1/ospf6d.conf +++ b/tests/topotests/ospf6_topo1_vrf/r1/ospf6d.conf @@ -1,13 +1,13 @@ hostname r1 log file ospf6d.log ! -debug ospf6 message all -debug ospf6 lsa unknown -debug ospf6 zebra -debug ospf6 interface -debug ospf6 neighbor -debug ospf6 route table -debug ospf6 flooding +! debug ospf6 message all +! debug ospf6 lsa unknown +! debug ospf6 zebra +! debug ospf6 interface +! debug ospf6 neighbor +! debug ospf6 route table +! debug ospf6 flooding ! interface r1-stubnet ipv6 ospf6 area 0.0.0.0 diff --git a/tests/topotests/ospf6_topo1_vrf/r1/zebra.conf b/tests/topotests/ospf6_topo1_vrf/r1/zebra.conf index abe8a9bc45..704912b52d 100644 --- a/tests/topotests/ospf6_topo1_vrf/r1/zebra.conf +++ b/tests/topotests/ospf6_topo1_vrf/r1/zebra.conf @@ -2,8 +2,8 @@ hostname r1 log file zebra.log ! -debug zebra events -debug zebra rib +! debug zebra events +! debug zebra rib ! interface r1-stubnet vrf r1-cust1 ipv6 address fc00:1:1:1::1/64 diff --git a/tests/topotests/ospf6_topo1_vrf/r2/ospf6d.conf b/tests/topotests/ospf6_topo1_vrf/r2/ospf6d.conf index 7fd01aa0cc..778c7781d8 100644 --- a/tests/topotests/ospf6_topo1_vrf/r2/ospf6d.conf +++ b/tests/topotests/ospf6_topo1_vrf/r2/ospf6d.conf @@ -1,13 +1,13 @@ hostname r2 log file ospf6d.log ! -debug ospf6 message all -debug ospf6 lsa unknown -debug ospf6 zebra -debug ospf6 interface -debug ospf6 neighbor -debug ospf6 route table -debug ospf6 flooding +! debug ospf6 message all +! debug ospf6 lsa unknown +! debug ospf6 zebra +! debug ospf6 interface +! debug ospf6 neighbor +! debug ospf6 route table +! debug ospf6 flooding ! interface r2-stubnet ipv6 ospf6 area 0.0.0.0 diff --git a/tests/topotests/ospf6_topo1_vrf/r2/zebra.conf b/tests/topotests/ospf6_topo1_vrf/r2/zebra.conf index e1011bd3b6..123d8c4a35 100644 --- a/tests/topotests/ospf6_topo1_vrf/r2/zebra.conf +++ b/tests/topotests/ospf6_topo1_vrf/r2/zebra.conf @@ -2,8 +2,8 @@ hostname r2 log file zebra.log ! -debug zebra events -debug zebra rib +! debug zebra events +! debug zebra rib ! interface r2-stubnet vrf r2-cust1 ipv6 address fc00:2:2:2::2/64 diff --git a/tests/topotests/ospf6_topo1_vrf/r3/ospf6d.conf b/tests/topotests/ospf6_topo1_vrf/r3/ospf6d.conf index df5aed3a6a..61d183f1d8 100644 --- a/tests/topotests/ospf6_topo1_vrf/r3/ospf6d.conf +++ b/tests/topotests/ospf6_topo1_vrf/r3/ospf6d.conf @@ -1,13 +1,13 @@ hostname r3 log file ospf6d.log ! -debug ospf6 message all -debug ospf6 lsa unknown -debug ospf6 zebra -debug ospf6 interface -debug ospf6 neighbor -debug ospf6 route table -debug ospf6 flooding +! debug ospf6 message all +! debug ospf6 lsa unknown +! debug ospf6 zebra +! debug ospf6 interface +! debug ospf6 neighbor +! debug ospf6 route table +! debug ospf6 flooding ! interface r3-stubnet ipv6 ospf6 area 0.0.0.0 diff --git a/tests/topotests/ospf6_topo1_vrf/r3/zebra.conf b/tests/topotests/ospf6_topo1_vrf/r3/zebra.conf index f489f3ac73..bd6873d2a8 100644 --- a/tests/topotests/ospf6_topo1_vrf/r3/zebra.conf +++ b/tests/topotests/ospf6_topo1_vrf/r3/zebra.conf @@ -2,8 +2,8 @@ hostname r3 log file zebra.log ! -debug zebra events -debug zebra rib +! debug zebra events +! debug zebra rib ! interface r3-stubnet vrf r3-cust1 ipv6 address fc00:3:3:3::3/64 diff --git a/tests/topotests/ospf6_topo1_vrf/r4/ospf6d.conf b/tests/topotests/ospf6_topo1_vrf/r4/ospf6d.conf index 465defb40f..12f6f52166 100644 --- a/tests/topotests/ospf6_topo1_vrf/r4/ospf6d.conf +++ b/tests/topotests/ospf6_topo1_vrf/r4/ospf6d.conf @@ -1,13 +1,13 @@ hostname r4 log file ospf6d.log ! -debug ospf6 message all -debug ospf6 lsa unknown -debug ospf6 zebra -debug ospf6 interface -debug ospf6 neighbor -debug ospf6 route table -debug ospf6 flooding +! debug ospf6 message all +! debug ospf6 lsa unknown +! debug ospf6 zebra +! debug ospf6 interface +! debug ospf6 neighbor +! debug ospf6 route table +! debug ospf6 flooding ! interface r4-stubnet ipv6 ospf6 area 0.0.0.1 diff --git a/tests/topotests/ospf6_topo1_vrf/r4/zebra.conf b/tests/topotests/ospf6_topo1_vrf/r4/zebra.conf index c59116df8c..0d9d011f6d 100644 --- a/tests/topotests/ospf6_topo1_vrf/r4/zebra.conf +++ b/tests/topotests/ospf6_topo1_vrf/r4/zebra.conf @@ -2,8 +2,8 @@ hostname r4 log file zebra.log ! -debug zebra events -debug zebra rib +! debug zebra events +! debug zebra rib ! interface r4-stubnet vrf r4-cust1 ipv6 address fc00:4:4:4::4/64 diff --git a/tests/topotests/ospf6_topo2/r1/ospf6d.conf b/tests/topotests/ospf6_topo2/r1/ospf6d.conf index 1bf6550d9f..a9d46be41a 100644 --- a/tests/topotests/ospf6_topo2/r1/ospf6d.conf +++ b/tests/topotests/ospf6_topo2/r1/ospf6d.conf @@ -1,30 +1,30 @@ -debug ospf6 lsa router -debug ospf6 lsa router originate -debug ospf6 lsa router examine -debug ospf6 lsa router flooding -debug ospf6 lsa nssa -debug ospf6 lsa nssa originate -debug ospf6 lsa nssa examine -debug ospf6 lsa nssa flooding -debug ospf6 lsa as-external -debug ospf6 lsa as-external originate -debug ospf6 lsa as-external examine -debug ospf6 lsa as-external flooding -debug ospf6 lsa intra-prefix -debug ospf6 lsa intra-prefix originate -debug ospf6 lsa intra-prefix examine -debug ospf6 lsa intra-prefix flooding -debug ospf6 border-routers -debug ospf6 zebra -debug ospf6 interface -debug ospf6 neighbor -debug ospf6 flooding -debug ospf6 spf process -debug ospf6 route intra-area -debug ospf6 route inter-area -debug ospf6 abr -debug ospf6 asbr -debug ospf6 nssa +! debug ospf6 lsa router +! debug ospf6 lsa router originate +! debug ospf6 lsa router examine +! debug ospf6 lsa router flooding +! debug ospf6 lsa nssa +! debug ospf6 lsa nssa originate +! debug ospf6 lsa nssa examine +! debug ospf6 lsa nssa flooding +! debug ospf6 lsa as-external +! debug ospf6 lsa as-external originate +! debug ospf6 lsa as-external examine +! debug ospf6 lsa as-external flooding +! debug ospf6 lsa intra-prefix +! debug ospf6 lsa intra-prefix originate +! debug ospf6 lsa intra-prefix examine +! debug ospf6 lsa intra-prefix flooding +! debug ospf6 border-routers +! debug ospf6 zebra +! debug ospf6 interface +! debug ospf6 neighbor +! debug ospf6 flooding +! debug ospf6 spf process +! debug ospf6 route intra-area +! debug ospf6 route inter-area +! debug ospf6 abr +! debug ospf6 asbr +! debug ospf6 nssa ! interface r1-eth0 ipv6 ospf6 area 0.0.0.1 diff --git a/tests/topotests/ospf6_topo2/r2/ospf6d.conf b/tests/topotests/ospf6_topo2/r2/ospf6d.conf index 7567c9cd64..8819a588f1 100644 --- a/tests/topotests/ospf6_topo2/r2/ospf6d.conf +++ b/tests/topotests/ospf6_topo2/r2/ospf6d.conf @@ -1,30 +1,30 @@ -debug ospf6 lsa router -debug ospf6 lsa router originate -debug ospf6 lsa router examine -debug ospf6 lsa router flooding -debug ospf6 lsa nssa -debug ospf6 lsa nssa originate -debug ospf6 lsa nssa examine -debug ospf6 lsa nssa flooding -debug ospf6 lsa as-external -debug ospf6 lsa as-external originate -debug ospf6 lsa as-external examine -debug ospf6 lsa as-external flooding -debug ospf6 lsa intra-prefix -debug ospf6 lsa intra-prefix originate -debug ospf6 lsa intra-prefix examine -debug ospf6 lsa intra-prefix flooding -debug ospf6 border-routers -debug ospf6 zebra -debug ospf6 interface -debug ospf6 neighbor -debug ospf6 flooding -debug ospf6 spf process -debug ospf6 route intra-area -debug ospf6 route inter-area -debug ospf6 abr -debug ospf6 asbr -debug ospf6 nssa +! debug ospf6 lsa router +! debug ospf6 lsa router originate +! debug ospf6 lsa router examine +! debug ospf6 lsa router flooding +! debug ospf6 lsa nssa +! debug ospf6 lsa nssa originate +! debug ospf6 lsa nssa examine +! debug ospf6 lsa nssa flooding +! debug ospf6 lsa as-external +! debug ospf6 lsa as-external originate +! debug ospf6 lsa as-external examine +! debug ospf6 lsa as-external flooding +! debug ospf6 lsa intra-prefix +! debug ospf6 lsa intra-prefix originate +! debug ospf6 lsa intra-prefix examine +! debug ospf6 lsa intra-prefix flooding +! debug ospf6 border-routers +! debug ospf6 zebra +! debug ospf6 interface +! debug ospf6 neighbor +! debug ospf6 flooding +! debug ospf6 spf process +! debug ospf6 route intra-area +! debug ospf6 route inter-area +! debug ospf6 abr +! debug ospf6 asbr +! debug ospf6 nssa ! interface r2-eth0 ipv6 ospf6 area 0.0.0.1 diff --git a/tests/topotests/ospf6_topo2/r3/ospf6d.conf b/tests/topotests/ospf6_topo2/r3/ospf6d.conf index 0fb4e7e365..6e4f56ba7a 100644 --- a/tests/topotests/ospf6_topo2/r3/ospf6d.conf +++ b/tests/topotests/ospf6_topo2/r3/ospf6d.conf @@ -1,30 +1,30 @@ -debug ospf6 lsa router -debug ospf6 lsa router originate -debug ospf6 lsa router examine -debug ospf6 lsa router flooding -debug ospf6 lsa nssa -debug ospf6 lsa nssa originate -debug ospf6 lsa nssa examine -debug ospf6 lsa nssa flooding -debug ospf6 lsa as-external -debug ospf6 lsa as-external originate -debug ospf6 lsa as-external examine -debug ospf6 lsa as-external flooding -debug ospf6 lsa intra-prefix -debug ospf6 lsa intra-prefix originate -debug ospf6 lsa intra-prefix examine -debug ospf6 lsa intra-prefix flooding -debug ospf6 border-routers -debug ospf6 zebra -debug ospf6 interface -debug ospf6 neighbor -debug ospf6 flooding -debug ospf6 spf process -debug ospf6 route intra-area -debug ospf6 route inter-area -debug ospf6 abr -debug ospf6 asbr -debug ospf6 nssa +! debug ospf6 lsa router +! debug ospf6 lsa router originate +! debug ospf6 lsa router examine +! debug ospf6 lsa router flooding +! debug ospf6 lsa nssa +! debug ospf6 lsa nssa originate +! debug ospf6 lsa nssa examine +! debug ospf6 lsa nssa flooding +! debug ospf6 lsa as-external +! debug ospf6 lsa as-external originate +! debug ospf6 lsa as-external examine +! debug ospf6 lsa as-external flooding +! debug ospf6 lsa intra-prefix +! debug ospf6 lsa intra-prefix originate +! debug ospf6 lsa intra-prefix examine +! debug ospf6 lsa intra-prefix flooding +! debug ospf6 border-routers +! debug ospf6 zebra +! debug ospf6 interface +! debug ospf6 neighbor +! debug ospf6 flooding +! debug ospf6 spf process +! debug ospf6 route intra-area +! debug ospf6 route inter-area +! debug ospf6 abr +! debug ospf6 asbr +! debug ospf6 nssa ! interface r3-eth0 ipv6 ospf6 area 0.0.0.0 diff --git a/tests/topotests/ospf6_topo2/r4/ospf6d.conf b/tests/topotests/ospf6_topo2/r4/ospf6d.conf index 91f8df440c..59a2fd5cc9 100644 --- a/tests/topotests/ospf6_topo2/r4/ospf6d.conf +++ b/tests/topotests/ospf6_topo2/r4/ospf6d.conf @@ -1,30 +1,30 @@ -debug ospf6 lsa router -debug ospf6 lsa router originate -debug ospf6 lsa router examine -debug ospf6 lsa router flooding -debug ospf6 lsa nssa -debug ospf6 lsa nssa originate -debug ospf6 lsa nssa examine -debug ospf6 lsa nssa flooding -debug ospf6 lsa as-external -debug ospf6 lsa as-external originate -debug ospf6 lsa as-external examine -debug ospf6 lsa as-external flooding -debug ospf6 lsa intra-prefix -debug ospf6 lsa intra-prefix originate -debug ospf6 lsa intra-prefix examine -debug ospf6 lsa intra-prefix flooding -debug ospf6 border-routers -debug ospf6 zebra -debug ospf6 interface -debug ospf6 neighbor -debug ospf6 flooding -debug ospf6 spf process -debug ospf6 route intra-area -debug ospf6 route inter-area -debug ospf6 abr -debug ospf6 asbr -debug ospf6 nssa +! debug ospf6 lsa router +! debug ospf6 lsa router originate +! debug ospf6 lsa router examine +! debug ospf6 lsa router flooding +! debug ospf6 lsa nssa +! debug ospf6 lsa nssa originate +! debug ospf6 lsa nssa examine +! debug ospf6 lsa nssa flooding +! debug ospf6 lsa as-external +! debug ospf6 lsa as-external originate +! debug ospf6 lsa as-external examine +! debug ospf6 lsa as-external flooding +! debug ospf6 lsa intra-prefix +! debug ospf6 lsa intra-prefix originate +! debug ospf6 lsa intra-prefix examine +! debug ospf6 lsa intra-prefix flooding +! debug ospf6 border-routers +! debug ospf6 zebra +! debug ospf6 interface +! debug ospf6 neighbor +! debug ospf6 flooding +! debug ospf6 spf process +! debug ospf6 route intra-area +! debug ospf6 route inter-area +! debug ospf6 abr +! debug ospf6 asbr +! debug ospf6 nssa ! interface r4-eth0 ipv6 ospf6 area 0.0.0.2 diff --git a/tests/topotests/ospf_gr_topo1/rt1/ospfd.conf b/tests/topotests/ospf_gr_topo1/rt1/ospfd.conf index 9590a7cadf..27042e1a85 100644 --- a/tests/topotests/ospf_gr_topo1/rt1/ospfd.conf +++ b/tests/topotests/ospf_gr_topo1/rt1/ospfd.conf @@ -3,16 +3,16 @@ hostname rt1 log file ospfd.log log commands ! -debug ospf zebra -debug ospf event -debug ospf lsa -debug ospf te -debug ospf packet all -debug ospf packet ls-update detail -debug ospf ism -debug ospf nsm -debug ospf nssa -debug ospf graceful-restart +! debug ospf zebra +! debug ospf event +! debug ospf lsa +! debug ospf te +! debug ospf packet all +! debug ospf packet ls-update detail +! debug ospf ism +! debug ospf nsm +! debug ospf nssa +! debug ospf graceful-restart ! interface lo ip ospf area 1 diff --git a/tests/topotests/ospf_gr_topo1/rt1/zebra.conf b/tests/topotests/ospf_gr_topo1/rt1/zebra.conf index 183cd3df48..7b99b58548 100644 --- a/tests/topotests/ospf_gr_topo1/rt1/zebra.conf +++ b/tests/topotests/ospf_gr_topo1/rt1/zebra.conf @@ -3,10 +3,10 @@ hostname rt1 log file zebra.log log commands ! -debug zebra event -debug zebra packet -debug zebra rib -debug zebra kernel +! debug zebra event +! debug zebra packet +! debug zebra rib +! debug zebra kernel ! interface lo ip address 1.1.1.1/32 diff --git a/tests/topotests/ospf_gr_topo1/rt2/ospfd.conf b/tests/topotests/ospf_gr_topo1/rt2/ospfd.conf index 4f60d37b18..591b242da7 100644 --- a/tests/topotests/ospf_gr_topo1/rt2/ospfd.conf +++ b/tests/topotests/ospf_gr_topo1/rt2/ospfd.conf @@ -3,16 +3,16 @@ hostname rt2 log file ospfd.log log commands ! -debug ospf zebra -debug ospf event -debug ospf lsa -debug ospf te -debug ospf packet all -debug ospf packet ls-update detail -debug ospf ism -debug ospf nsm -debug ospf nssa -debug ospf graceful-restart +! debug ospf zebra +! debug ospf event +! debug ospf lsa +! debug ospf te +! debug ospf packet all +! debug ospf packet ls-update detail +! debug ospf ism +! debug ospf nsm +! debug ospf nssa +! debug ospf graceful-restart ! interface lo ip ospf area 0 diff --git a/tests/topotests/ospf_gr_topo1/rt2/zebra.conf b/tests/topotests/ospf_gr_topo1/rt2/zebra.conf index 8bde98ad44..73571aadbf 100644 --- a/tests/topotests/ospf_gr_topo1/rt2/zebra.conf +++ b/tests/topotests/ospf_gr_topo1/rt2/zebra.conf @@ -3,10 +3,10 @@ hostname rt2 log file zebra.log log commands ! -debug zebra event -debug zebra packet -debug zebra rib -debug zebra kernel +! debug zebra event +! debug zebra packet +! debug zebra rib +! debug zebra kernel ! interface lo ip address 2.2.2.2/32 diff --git a/tests/topotests/ospf_gr_topo1/rt3/ospfd.conf b/tests/topotests/ospf_gr_topo1/rt3/ospfd.conf index 870878287d..5e7477120a 100644 --- a/tests/topotests/ospf_gr_topo1/rt3/ospfd.conf +++ b/tests/topotests/ospf_gr_topo1/rt3/ospfd.conf @@ -3,16 +3,16 @@ hostname rt3 log file ospfd.log log commands ! -debug ospf zebra -debug ospf event -debug ospf lsa -debug ospf te -debug ospf packet all -debug ospf packet ls-update detail -debug ospf ism -debug ospf nsm -debug ospf nssa -debug ospf graceful-restart +! debug ospf zebra +! debug ospf event +! debug ospf lsa +! debug ospf te +! debug ospf packet all +! debug ospf packet ls-update detail +! debug ospf ism +! debug ospf nsm +! debug ospf nssa +! debug ospf graceful-restart ! interface lo ip ospf area 0 diff --git a/tests/topotests/ospf_gr_topo1/rt3/zebra.conf b/tests/topotests/ospf_gr_topo1/rt3/zebra.conf index dfd89cbe5b..c09bafef2e 100644 --- a/tests/topotests/ospf_gr_topo1/rt3/zebra.conf +++ b/tests/topotests/ospf_gr_topo1/rt3/zebra.conf @@ -3,10 +3,10 @@ hostname rt3 log file zebra.log log commands ! -debug zebra event -debug zebra packet -debug zebra rib -debug zebra kernel +! debug zebra event +! debug zebra packet +! debug zebra rib +! debug zebra kernel ! interface lo ip address 3.3.3.3/32 diff --git a/tests/topotests/ospf_gr_topo1/rt4/ospfd.conf b/tests/topotests/ospf_gr_topo1/rt4/ospfd.conf index 0aff1faf2c..7aa722cb8a 100644 --- a/tests/topotests/ospf_gr_topo1/rt4/ospfd.conf +++ b/tests/topotests/ospf_gr_topo1/rt4/ospfd.conf @@ -3,16 +3,16 @@ hostname rt4 log file ospfd.log log commands ! -debug ospf zebra -debug ospf event -debug ospf lsa -debug ospf te -debug ospf packet all -debug ospf packet ls-update detail -debug ospf ism -debug ospf nsm -debug ospf nssa -debug ospf graceful-restart +! debug ospf zebra +! debug ospf event +! debug ospf lsa +! debug ospf te +! debug ospf packet all +! debug ospf packet ls-update detail +! debug ospf ism +! debug ospf nsm +! debug ospf nssa +! debug ospf graceful-restart ! interface lo ip ospf area 0 diff --git a/tests/topotests/ospf_gr_topo1/rt4/zebra.conf b/tests/topotests/ospf_gr_topo1/rt4/zebra.conf index f399b29f3f..e21b23e4d3 100644 --- a/tests/topotests/ospf_gr_topo1/rt4/zebra.conf +++ b/tests/topotests/ospf_gr_topo1/rt4/zebra.conf @@ -3,10 +3,10 @@ hostname rt4 log file zebra.log log commands ! -debug zebra event -debug zebra packet -debug zebra rib -debug zebra kernel +! debug zebra event +! debug zebra packet +! debug zebra rib +! debug zebra kernel ! interface lo ip address 4.4.4.4/32 diff --git a/tests/topotests/ospf_gr_topo1/rt5/ospfd.conf b/tests/topotests/ospf_gr_topo1/rt5/ospfd.conf index 4af89389a5..0e25f1a138 100644 --- a/tests/topotests/ospf_gr_topo1/rt5/ospfd.conf +++ b/tests/topotests/ospf_gr_topo1/rt5/ospfd.conf @@ -3,16 +3,16 @@ hostname rt5 log file ospfd.log log commands ! -debug ospf zebra -debug ospf event -debug ospf lsa -debug ospf te -debug ospf packet all -debug ospf packet ls-update detail -debug ospf ism -debug ospf nsm -debug ospf nssa -debug ospf graceful-restart +! debug ospf zebra +! debug ospf event +! debug ospf lsa +! debug ospf te +! debug ospf packet all +! debug ospf packet ls-update detail +! debug ospf ism +! debug ospf nsm +! debug ospf nssa +! debug ospf graceful-restart ! interface lo ip ospf area 2 diff --git a/tests/topotests/ospf_gr_topo1/rt5/zebra.conf b/tests/topotests/ospf_gr_topo1/rt5/zebra.conf index 49a1c05a6d..83f12c6635 100644 --- a/tests/topotests/ospf_gr_topo1/rt5/zebra.conf +++ b/tests/topotests/ospf_gr_topo1/rt5/zebra.conf @@ -3,10 +3,10 @@ hostname rt5 log file zebra.log log commands ! -debug zebra event -debug zebra packet -debug zebra rib -debug zebra kernel +! debug zebra event +! debug zebra packet +! debug zebra rib +! debug zebra kernel ! interface lo ip address 5.5.5.5/32 diff --git a/tests/topotests/ospf_gr_topo1/rt6/ospfd.conf b/tests/topotests/ospf_gr_topo1/rt6/ospfd.conf index 2295a75fe7..3960e6b40c 100644 --- a/tests/topotests/ospf_gr_topo1/rt6/ospfd.conf +++ b/tests/topotests/ospf_gr_topo1/rt6/ospfd.conf @@ -3,16 +3,16 @@ hostname rt6 log file ospfd.log log commands ! -debug ospf zebra -debug ospf event -debug ospf lsa -debug ospf te -debug ospf packet all -debug ospf packet ls-update detail -debug ospf ism -debug ospf nsm -debug ospf nssa -debug ospf graceful-restart +! debug ospf zebra +! debug ospf event +! debug ospf lsa +! debug ospf te +! debug ospf packet all +! debug ospf packet ls-update detail +! debug ospf ism +! debug ospf nsm +! debug ospf nssa +! debug ospf graceful-restart ! interface lo ip ospf area 0 diff --git a/tests/topotests/ospf_gr_topo1/rt6/zebra.conf b/tests/topotests/ospf_gr_topo1/rt6/zebra.conf index d6a8f52b3a..67ebf14575 100644 --- a/tests/topotests/ospf_gr_topo1/rt6/zebra.conf +++ b/tests/topotests/ospf_gr_topo1/rt6/zebra.conf @@ -3,10 +3,10 @@ hostname rt6 log file zebra.log log commands ! -debug zebra event -debug zebra packet -debug zebra rib -debug zebra kernel +! debug zebra event +! debug zebra packet +! debug zebra rib +! debug zebra kernel ! interface lo ip address 6.6.6.6/32 diff --git a/tests/topotests/ospf_gr_topo1/rt7/ospfd.conf b/tests/topotests/ospf_gr_topo1/rt7/ospfd.conf index 8534eda5a7..e52424e1db 100644 --- a/tests/topotests/ospf_gr_topo1/rt7/ospfd.conf +++ b/tests/topotests/ospf_gr_topo1/rt7/ospfd.conf @@ -3,16 +3,16 @@ hostname rt7 log file ospfd.log log commands ! -debug ospf zebra -debug ospf event -debug ospf lsa -debug ospf te -debug ospf packet all -debug ospf packet ls-update detail -debug ospf ism -debug ospf nsm -debug ospf nssa -debug ospf graceful-restart +! debug ospf zebra +! debug ospf event +! debug ospf lsa +! debug ospf te +! debug ospf packet all +! debug ospf packet ls-update detail +! debug ospf ism +! debug ospf nsm +! debug ospf nssa +! debug ospf graceful-restart ! interface lo ip ospf area 3 diff --git a/tests/topotests/ospf_gr_topo1/rt7/zebra.conf b/tests/topotests/ospf_gr_topo1/rt7/zebra.conf index c481e4532b..7037e6fc5f 100644 --- a/tests/topotests/ospf_gr_topo1/rt7/zebra.conf +++ b/tests/topotests/ospf_gr_topo1/rt7/zebra.conf @@ -3,10 +3,10 @@ hostname rt7 log file zebra.log log commands ! -debug zebra event -debug zebra packet -debug zebra rib -debug zebra kernel +! debug zebra event +! debug zebra packet +! debug zebra rib +! debug zebra kernel ! interface lo ip address 7.7.7.7/32 diff --git a/tests/topotests/ospf_sr_te_topo1/dst/zebra.conf b/tests/topotests/ospf_sr_te_topo1/dst/zebra.conf index 4cb50fdb27..fbe55e53a4 100644 --- a/tests/topotests/ospf_sr_te_topo1/dst/zebra.conf +++ b/tests/topotests/ospf_sr_te_topo1/dst/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname dst ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 9.9.9.2/32 diff --git a/tests/topotests/ospf_sr_te_topo1/rt1/ospfd.conf b/tests/topotests/ospf_sr_te_topo1/rt1/ospfd.conf index 225ac93528..a440fa6fdf 100644 --- a/tests/topotests/ospf_sr_te_topo1/rt1/ospfd.conf +++ b/tests/topotests/ospf_sr_te_topo1/rt1/ospfd.conf @@ -2,11 +2,11 @@ password 1 hostname rt1 log file ospfd.log ! -debug ospf sr -debug ospf te -debug ospf event -debug ospf lsa -debug ospf zebra +! debug ospf sr +! debug ospf te +! debug ospf event +! debug ospf lsa +! debug ospf zebra ! interface lo ip ospf area 0.0.0.0 diff --git a/tests/topotests/ospf_sr_te_topo1/rt1/zebra.conf b/tests/topotests/ospf_sr_te_topo1/rt1/zebra.conf index dd686ea3da..6b282b110b 100644 --- a/tests/topotests/ospf_sr_te_topo1/rt1/zebra.conf +++ b/tests/topotests/ospf_sr_te_topo1/rt1/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt1 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 1.1.1.1/32 diff --git a/tests/topotests/ospf_sr_te_topo1/rt2/ospfd.conf b/tests/topotests/ospf_sr_te_topo1/rt2/ospfd.conf index f6a7bbb621..7bec98cd76 100644 --- a/tests/topotests/ospf_sr_te_topo1/rt2/ospfd.conf +++ b/tests/topotests/ospf_sr_te_topo1/rt2/ospfd.conf @@ -1,11 +1,11 @@ hostname rt2 log file ospfd.log ! -debug ospf sr -debug ospf te -debug ospf event -debug ospf lsa -debug ospf zebra +! debug ospf sr +! debug ospf te +! debug ospf event +! debug ospf lsa +! debug ospf zebra ! interface lo ip ospf area 0.0.0.0 diff --git a/tests/topotests/ospf_sr_te_topo1/rt2/zebra.conf b/tests/topotests/ospf_sr_te_topo1/rt2/zebra.conf index ddd50ba520..24795c2618 100644 --- a/tests/topotests/ospf_sr_te_topo1/rt2/zebra.conf +++ b/tests/topotests/ospf_sr_te_topo1/rt2/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt2 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 2.2.2.2/32 diff --git a/tests/topotests/ospf_sr_te_topo1/rt3/ospfd.conf b/tests/topotests/ospf_sr_te_topo1/rt3/ospfd.conf index 5f71cd8484..40b85c4601 100644 --- a/tests/topotests/ospf_sr_te_topo1/rt3/ospfd.conf +++ b/tests/topotests/ospf_sr_te_topo1/rt3/ospfd.conf @@ -1,11 +1,11 @@ hostname rt3 log file ospfd.log ! -debug ospf sr -debug ospf te -debug ospf event -debug ospf lsa -debug ospf zebra +! debug ospf sr +! debug ospf te +! debug ospf event +! debug ospf lsa +! debug ospf zebra ! interface lo ip ospf area 0.0.0.0 diff --git a/tests/topotests/ospf_sr_te_topo1/rt3/zebra.conf b/tests/topotests/ospf_sr_te_topo1/rt3/zebra.conf index 0825b5c8bf..353c710bdb 100644 --- a/tests/topotests/ospf_sr_te_topo1/rt3/zebra.conf +++ b/tests/topotests/ospf_sr_te_topo1/rt3/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt3 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 3.3.3.3/32 diff --git a/tests/topotests/ospf_sr_te_topo1/rt4/ospfd.conf b/tests/topotests/ospf_sr_te_topo1/rt4/ospfd.conf index d4862cd233..4d3380d107 100644 --- a/tests/topotests/ospf_sr_te_topo1/rt4/ospfd.conf +++ b/tests/topotests/ospf_sr_te_topo1/rt4/ospfd.conf @@ -1,11 +1,11 @@ hostname rt4 log file ospfd.log ! -debug ospf sr -debug ospf te -debug ospf event -debug ospf lsa -debug ospf zebra +! debug ospf sr +! debug ospf te +! debug ospf event +! debug ospf lsa +! debug ospf zebra ! interface lo ip ospf area 0.0.0.0 diff --git a/tests/topotests/ospf_sr_te_topo1/rt4/zebra.conf b/tests/topotests/ospf_sr_te_topo1/rt4/zebra.conf index c6d1f4f40e..966eb725a1 100644 --- a/tests/topotests/ospf_sr_te_topo1/rt4/zebra.conf +++ b/tests/topotests/ospf_sr_te_topo1/rt4/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt4 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 4.4.4.4/32 diff --git a/tests/topotests/ospf_sr_te_topo1/rt5/ospfd.conf b/tests/topotests/ospf_sr_te_topo1/rt5/ospfd.conf index fdc0dcfdb7..b111ce588a 100644 --- a/tests/topotests/ospf_sr_te_topo1/rt5/ospfd.conf +++ b/tests/topotests/ospf_sr_te_topo1/rt5/ospfd.conf @@ -1,11 +1,11 @@ hostname rt5 log file ospfd.log ! -debug ospf sr -debug ospf te -debug ospf event -debug ospf lsa -debug ospf zebra +! debug ospf sr +! debug ospf te +! debug ospf event +! debug ospf lsa +! debug ospf zebra ! interface lo ip ospf area 0.0.0.0 diff --git a/tests/topotests/ospf_sr_te_topo1/rt5/zebra.conf b/tests/topotests/ospf_sr_te_topo1/rt5/zebra.conf index 96b732d398..3184f1d778 100644 --- a/tests/topotests/ospf_sr_te_topo1/rt5/zebra.conf +++ b/tests/topotests/ospf_sr_te_topo1/rt5/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt5 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 5.5.5.5/32 diff --git a/tests/topotests/ospf_sr_te_topo1/rt6/ospfd.conf b/tests/topotests/ospf_sr_te_topo1/rt6/ospfd.conf index c06565be0b..f0c5a9c0ba 100644 --- a/tests/topotests/ospf_sr_te_topo1/rt6/ospfd.conf +++ b/tests/topotests/ospf_sr_te_topo1/rt6/ospfd.conf @@ -1,11 +1,11 @@ hostname rt6 log file ospfd.log ! -debug ospf sr -debug ospf te -debug ospf event -debug ospf lsa -debug ospf zebra +! debug ospf sr +! debug ospf te +! debug ospf event +! debug ospf lsa +! debug ospf zebra ! interface lo ip ospf area 0.0.0.0 diff --git a/tests/topotests/ospf_sr_te_topo1/rt6/zebra.conf b/tests/topotests/ospf_sr_te_topo1/rt6/zebra.conf index 360837c4ca..c556aa3681 100644 --- a/tests/topotests/ospf_sr_te_topo1/rt6/zebra.conf +++ b/tests/topotests/ospf_sr_te_topo1/rt6/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt6 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 6.6.6.6/32 diff --git a/tests/topotests/ospf_sr_topo1/rt1/ospfd.conf b/tests/topotests/ospf_sr_topo1/rt1/ospfd.conf index 6a12ae5011..be9abf6238 100644 --- a/tests/topotests/ospf_sr_topo1/rt1/ospfd.conf +++ b/tests/topotests/ospf_sr_topo1/rt1/ospfd.conf @@ -2,11 +2,11 @@ password 1 hostname rt1 log file ospfd.log ! -debug ospf sr -debug ospf te -debug ospf event -debug ospf lsa -debug ospf zebra +! debug ospf sr +! debug ospf te +! debug ospf event +! debug ospf lsa +! debug ospf zebra ! interface lo ! diff --git a/tests/topotests/ospf_sr_topo1/rt1/zebra.conf b/tests/topotests/ospf_sr_topo1/rt1/zebra.conf index 7d3139a80e..520f2e4994 100644 --- a/tests/topotests/ospf_sr_topo1/rt1/zebra.conf +++ b/tests/topotests/ospf_sr_topo1/rt1/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt1 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 1.1.1.1/32 diff --git a/tests/topotests/ospf_sr_topo1/rt2/ospfd.conf b/tests/topotests/ospf_sr_topo1/rt2/ospfd.conf index adf4d09235..30ef12a79e 100644 --- a/tests/topotests/ospf_sr_topo1/rt2/ospfd.conf +++ b/tests/topotests/ospf_sr_topo1/rt2/ospfd.conf @@ -2,11 +2,11 @@ password 1 hostname rt2 log file ospfd.log ! -debug ospf sr -debug ospf te -debug ospf event -debug ospf lsa -debug ospf zebra +! debug ospf sr +! debug ospf te +! debug ospf event +! debug ospf lsa +! debug ospf zebra ! interface lo ! diff --git a/tests/topotests/ospf_sr_topo1/rt2/zebra.conf b/tests/topotests/ospf_sr_topo1/rt2/zebra.conf index c4ed4276d9..fbf805cdac 100644 --- a/tests/topotests/ospf_sr_topo1/rt2/zebra.conf +++ b/tests/topotests/ospf_sr_topo1/rt2/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt2 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 2.2.2.2/32 diff --git a/tests/topotests/ospf_sr_topo1/rt3/ospfd.conf b/tests/topotests/ospf_sr_topo1/rt3/ospfd.conf index c45c1069fb..e315679765 100644 --- a/tests/topotests/ospf_sr_topo1/rt3/ospfd.conf +++ b/tests/topotests/ospf_sr_topo1/rt3/ospfd.conf @@ -2,11 +2,11 @@ password 1 hostname rt3 log file ospfd.log ! -debug ospf sr -debug ospf te -debug ospf event -debug ospf lsa -debug ospf zebra +! debug ospf sr +! debug ospf te +! debug ospf event +! debug ospf lsa +! debug ospf zebra ! interface lo ! diff --git a/tests/topotests/ospf_sr_topo1/rt3/zebra.conf b/tests/topotests/ospf_sr_topo1/rt3/zebra.conf index 89a781fe3c..fc9db060e9 100644 --- a/tests/topotests/ospf_sr_topo1/rt3/zebra.conf +++ b/tests/topotests/ospf_sr_topo1/rt3/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt3 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 3.3.3.3/32 diff --git a/tests/topotests/ospf_sr_topo1/rt4/ospfd.conf b/tests/topotests/ospf_sr_topo1/rt4/ospfd.conf index 9853ce64cf..681aaa3a8c 100644 --- a/tests/topotests/ospf_sr_topo1/rt4/ospfd.conf +++ b/tests/topotests/ospf_sr_topo1/rt4/ospfd.conf @@ -2,11 +2,11 @@ password 1 hostname rt4 log file ospfd.log ! -debug ospf sr -debug ospf te -debug ospf event -debug ospf lsa -debug ospf zebra +! debug ospf sr +! debug ospf te +! debug ospf event +! debug ospf lsa +! debug ospf zebra ! interface lo ! diff --git a/tests/topotests/ospf_sr_topo1/rt4/zebra.conf b/tests/topotests/ospf_sr_topo1/rt4/zebra.conf index 13c621eb31..d794837eb7 100644 --- a/tests/topotests/ospf_sr_topo1/rt4/zebra.conf +++ b/tests/topotests/ospf_sr_topo1/rt4/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt4 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 4.4.4.4/32 diff --git a/tests/topotests/ospf_sr_topo1/rt5/ospfd.conf b/tests/topotests/ospf_sr_topo1/rt5/ospfd.conf index e6a755c430..0b441c70de 100644 --- a/tests/topotests/ospf_sr_topo1/rt5/ospfd.conf +++ b/tests/topotests/ospf_sr_topo1/rt5/ospfd.conf @@ -2,11 +2,11 @@ password 1 hostname rt5 log file ospfd.log ! -debug ospf sr -debug ospf te -debug ospf event -debug ospf lsa -debug ospf zebra +! debug ospf sr +! debug ospf te +! debug ospf event +! debug ospf lsa +! debug ospf zebra ! interface lo ! diff --git a/tests/topotests/ospf_sr_topo1/rt5/zebra.conf b/tests/topotests/ospf_sr_topo1/rt5/zebra.conf index ca2d6df665..09923f28e9 100644 --- a/tests/topotests/ospf_sr_topo1/rt5/zebra.conf +++ b/tests/topotests/ospf_sr_topo1/rt5/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt5 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 5.5.5.5/32 diff --git a/tests/topotests/ospf_sr_topo1/rt6/ospfd.conf b/tests/topotests/ospf_sr_topo1/rt6/ospfd.conf index 1ec71e4454..7bb5de9440 100644 --- a/tests/topotests/ospf_sr_topo1/rt6/ospfd.conf +++ b/tests/topotests/ospf_sr_topo1/rt6/ospfd.conf @@ -2,11 +2,11 @@ password 1 hostname rt6 log file ospfd.log ! -debug ospf sr -debug ospf te -debug ospf event -debug ospf lsa -debug ospf zebra +! debug ospf sr +! debug ospf te +! debug ospf event +! debug ospf lsa +! debug ospf zebra ! interface lo ! diff --git a/tests/topotests/ospf_sr_topo1/rt6/zebra.conf b/tests/topotests/ospf_sr_topo1/rt6/zebra.conf index 4b739d0bca..1452560065 100644 --- a/tests/topotests/ospf_sr_topo1/rt6/zebra.conf +++ b/tests/topotests/ospf_sr_topo1/rt6/zebra.conf @@ -2,9 +2,9 @@ log file zebra.log ! hostname rt6 ! -debug zebra kernel -debug zebra packet -debug zebra mpls +! debug zebra kernel +! debug zebra packet +! debug zebra mpls ! interface lo ip address 6.6.6.6/32 diff --git a/tests/topotests/ospf_tilfa_topo1/rt1/ospfd.conf b/tests/topotests/ospf_tilfa_topo1/rt1/ospfd.conf index eaef49225f..04b2c381e2 100644 --- a/tests/topotests/ospf_tilfa_topo1/rt1/ospfd.conf +++ b/tests/topotests/ospf_tilfa_topo1/rt1/ospfd.conf @@ -1,5 +1,5 @@ -debug ospf sr -debug ospf ti-lfa +! debug ospf sr +! debug ospf ti-lfa ! interface lo ! diff --git a/tests/topotests/ospf_tilfa_topo1/rt2/ospfd.conf b/tests/topotests/ospf_tilfa_topo1/rt2/ospfd.conf index 7548aad7f8..e6e4847ba7 100644 --- a/tests/topotests/ospf_tilfa_topo1/rt2/ospfd.conf +++ b/tests/topotests/ospf_tilfa_topo1/rt2/ospfd.conf @@ -1,5 +1,5 @@ -debug ospf sr -debug ospf ti-lfa +! debug ospf sr +! debug ospf ti-lfa ! interface lo ! diff --git a/tests/topotests/ospf_tilfa_topo1/rt3/ospfd.conf b/tests/topotests/ospf_tilfa_topo1/rt3/ospfd.conf index 6258295b6f..472cdc6bcb 100644 --- a/tests/topotests/ospf_tilfa_topo1/rt3/ospfd.conf +++ b/tests/topotests/ospf_tilfa_topo1/rt3/ospfd.conf @@ -1,5 +1,5 @@ -debug ospf sr -debug ospf ti-lfa +! debug ospf sr +! debug ospf ti-lfa ! interface lo ! diff --git a/tests/topotests/ospf_tilfa_topo1/rt4/ospfd.conf b/tests/topotests/ospf_tilfa_topo1/rt4/ospfd.conf index ad02214017..75770dc5dd 100644 --- a/tests/topotests/ospf_tilfa_topo1/rt4/ospfd.conf +++ b/tests/topotests/ospf_tilfa_topo1/rt4/ospfd.conf @@ -1,5 +1,5 @@ -debug ospf sr -debug ospf ti-lfa +! debug ospf sr +! debug ospf ti-lfa ! interface lo ! diff --git a/tests/topotests/ospf_tilfa_topo1/rt5/ospfd.conf b/tests/topotests/ospf_tilfa_topo1/rt5/ospfd.conf index 1b95858f53..ef9d583ae9 100644 --- a/tests/topotests/ospf_tilfa_topo1/rt5/ospfd.conf +++ b/tests/topotests/ospf_tilfa_topo1/rt5/ospfd.conf @@ -1,5 +1,5 @@ -debug ospf sr -debug ospf ti-lfa +! debug ospf sr +! debug ospf ti-lfa ! interface lo ! diff --git a/tests/topotests/ospf_topo1/test_ospf_topo1.py b/tests/topotests/ospf_topo1/test_ospf_topo1.py index 710895cc6b..e2a6ff64a4 100644 --- a/tests/topotests/ospf_topo1/test_ospf_topo1.py +++ b/tests/topotests/ospf_topo1/test_ospf_topo1.py @@ -30,6 +30,7 @@ import os import re import sys from functools import partial +from time import sleep import pytest # Save the Current Working Directory to find configuration files. @@ -475,7 +476,18 @@ def test_ospf_link_down_kernel_route(): assertmsg = 'OSPF IPv4 route mismatch in router "{}" after link down'.format( router.name ) - assert topotest.json_cmp(routes, expected) is None, assertmsg + count = 0 + not_found = True + while not_found and count < 10: + not_found = topotest.json_cmp(routes, expected) + if not_found: + sleep(1) + routes = topotest.ip4_route(router) + count += 1 + else: + not_found = False + break + assert not_found is False, assertmsg def test_ospf6_link_down(): @@ -547,7 +559,19 @@ def test_ospf6_link_down_kernel_route(): assertmsg = 'OSPF IPv6 route mismatch in router "{}" after link down'.format( router.name ) - assert topotest.json_cmp(routes, expected) is None, assertmsg + count = 0 + not_found = True + while not_found and count < 10: + not_found = topotest.json_cmp(routes, expected) + if not_found: + sleep(1) + routes = topotest.ip6_route(router) + count += 1 + else: + not_found = False + break + + assert not_found is False, assertmsg def test_memory_leak(): diff --git a/tests/topotests/ospf_topo1_vrf/r1/zebra.conf b/tests/topotests/ospf_topo1_vrf/r1/zebra.conf index e100d3b121..56d7a9764e 100644 --- a/tests/topotests/ospf_topo1_vrf/r1/zebra.conf +++ b/tests/topotests/ospf_topo1_vrf/r1/zebra.conf @@ -1,7 +1,7 @@ -debug zebra kernel -debug zebra dplane detail -debug zebra rib -debug zebra event +! debug zebra kernel +! debug zebra dplane detail +! debug zebra rib +! debug zebra event ! hostname r1 password zebra diff --git a/tests/topotests/pbr_topo1/r1/pbrd.conf b/tests/topotests/pbr_topo1/r1/pbrd.conf index 45cb7656ab..2a5f464780 100644 --- a/tests/topotests/pbr_topo1/r1/pbrd.conf +++ b/tests/topotests/pbr_topo1/r1/pbrd.conf @@ -1,7 +1,7 @@ -debug pbr -debug pbr events -debug pbr nht -debug pbr zebra +! debug pbr +! debug pbr events +! debug pbr nht +! debug pbr zebra # Valid table range pbr table range 10000 50000 # Try to set invalid bounds diff --git a/tests/topotests/pim_acl/r1/ospfd.conf b/tests/topotests/pim_acl/r1/ospfd.conf index e1f47fb3b1..c453dec96c 100644 --- a/tests/topotests/pim_acl/r1/ospfd.conf +++ b/tests/topotests/pim_acl/r1/ospfd.conf @@ -1,6 +1,6 @@ hostname r1 ! -debug ospf event +! debug ospf event ! interface r1-eth1 ip ospf hello-interval 2 diff --git a/tests/topotests/pim_acl/r1/pimd.conf b/tests/topotests/pim_acl/r1/pimd.conf index a148c73146..5bdfbea72a 100644 --- a/tests/topotests/pim_acl/r1/pimd.conf +++ b/tests/topotests/pim_acl/r1/pimd.conf @@ -1,12 +1,12 @@ hostname r1 ! -debug igmp events -debug igmp packets -debug pim events -debug pim packets -debug pim trace -debug pim zebra -debug pim bsm +! debug igmp events +! debug igmp packets +! debug pim events +! debug pim packets +! debug pim trace +! debug pim zebra +! debug pim bsm ! ip pim rp 192.168.0.11 prefix-list rp-pl-1 ip pim rp 192.168.0.12 prefix-list rp-pl-2 diff --git a/tests/topotests/pim_acl/r11/ospfd.conf b/tests/topotests/pim_acl/r11/ospfd.conf index e107220a4e..86fb66db61 100644 --- a/tests/topotests/pim_acl/r11/ospfd.conf +++ b/tests/topotests/pim_acl/r11/ospfd.conf @@ -1,6 +1,6 @@ hostname r11 ! -debug ospf event +! debug ospf event ! interface r11-eth0 ip ospf hello-interval 2 diff --git a/tests/topotests/pim_acl/r11/pimd.conf b/tests/topotests/pim_acl/r11/pimd.conf index b1d45205da..3e409ddd31 100644 --- a/tests/topotests/pim_acl/r11/pimd.conf +++ b/tests/topotests/pim_acl/r11/pimd.conf @@ -1,10 +1,10 @@ hostname r11 ! -debug pim events -debug pim packets -debug pim trace -debug pim zebra -debug pim bsm +! debug pim events +! debug pim packets +! debug pim trace +! debug pim zebra +! debug pim bsm ! ip pim rp 192.168.0.11 239.100.0.0/28 ip pim join-prune-interval 5 diff --git a/tests/topotests/pim_acl/r12/ospfd.conf b/tests/topotests/pim_acl/r12/ospfd.conf index f9203c78e4..1110df18b4 100644 --- a/tests/topotests/pim_acl/r12/ospfd.conf +++ b/tests/topotests/pim_acl/r12/ospfd.conf @@ -1,6 +1,6 @@ hostname r12 ! -debug ospf event +! debug ospf event ! interface r12-eth0 ip ospf hello-interval 2 diff --git a/tests/topotests/pim_acl/r12/pimd.conf b/tests/topotests/pim_acl/r12/pimd.conf index ba9e7d902f..2fc853bc04 100644 --- a/tests/topotests/pim_acl/r12/pimd.conf +++ b/tests/topotests/pim_acl/r12/pimd.conf @@ -1,10 +1,10 @@ hostname r12 ! -debug pim events -debug pim packets -debug pim trace -debug pim zebra -debug pim bsm +! debug pim events +! debug pim packets +! debug pim trace +! debug pim zebra +! debug pim bsm ! ip pim rp 192.168.0.12 239.100.0.17/32 ip pim join-prune-interval 5 diff --git a/tests/topotests/pim_acl/r13/ospfd.conf b/tests/topotests/pim_acl/r13/ospfd.conf index 830c5a14b6..aff24c7038 100644 --- a/tests/topotests/pim_acl/r13/ospfd.conf +++ b/tests/topotests/pim_acl/r13/ospfd.conf @@ -1,6 +1,6 @@ hostname r13 ! -debug ospf event +! debug ospf event ! interface r13-eth0 ip ospf hello-interval 2 diff --git a/tests/topotests/pim_acl/r13/pimd.conf b/tests/topotests/pim_acl/r13/pimd.conf index 2ff1743574..5e44879306 100644 --- a/tests/topotests/pim_acl/r13/pimd.conf +++ b/tests/topotests/pim_acl/r13/pimd.conf @@ -1,10 +1,10 @@ hostname r13 ! -debug pim events -debug pim packets -debug pim trace -debug pim zebra -debug pim bsm +! debug pim events +! debug pim packets +! debug pim trace +! debug pim zebra +! debug pim bsm ! ip pim rp 192.168.0.13 239.100.0.32/27 ip pim join-prune-interval 5 diff --git a/tests/topotests/pim_acl/r14/ospfd.conf b/tests/topotests/pim_acl/r14/ospfd.conf index 422e4c08b0..e5cf8e2567 100644 --- a/tests/topotests/pim_acl/r14/ospfd.conf +++ b/tests/topotests/pim_acl/r14/ospfd.conf @@ -1,6 +1,6 @@ hostname r14 ! -debug ospf event +! debug ospf event ! interface r14-eth0 ip ospf hello-interval 2 diff --git a/tests/topotests/pim_acl/r14/pimd.conf b/tests/topotests/pim_acl/r14/pimd.conf index 1324a9e40b..42beb2ab08 100644 --- a/tests/topotests/pim_acl/r14/pimd.conf +++ b/tests/topotests/pim_acl/r14/pimd.conf @@ -1,10 +1,10 @@ hostname r14 ! -debug pim events -debug pim packets -debug pim trace -debug pim zebra -debug pim bsm +! debug pim events +! debug pim packets +! debug pim trace +! debug pim zebra +! debug pim bsm ! ip pim rp 192.168.0.14 239.100.0.96/28 ip pim rp 192.168.0.14 239.100.0.128/25 diff --git a/tests/topotests/pim_acl/r15/ospfd.conf b/tests/topotests/pim_acl/r15/ospfd.conf index cd4d7b3875..cc58325e2b 100644 --- a/tests/topotests/pim_acl/r15/ospfd.conf +++ b/tests/topotests/pim_acl/r15/ospfd.conf @@ -1,6 +1,6 @@ hostname r15 ! -debug ospf event +! debug ospf event ! interface r15-eth0 ip ospf hello-interval 2 diff --git a/tests/topotests/pim_acl/r15/pimd.conf b/tests/topotests/pim_acl/r15/pimd.conf index f47e78c221..d5a0450067 100644 --- a/tests/topotests/pim_acl/r15/pimd.conf +++ b/tests/topotests/pim_acl/r15/pimd.conf @@ -1,10 +1,10 @@ hostname r15 ! -debug pim events -debug pim packets -debug pim trace -debug pim zebra -debug pim bsm +! debug pim events +! debug pim packets +! debug pim trace +! debug pim zebra +! debug pim bsm ! ip pim rp 192.168.0.15 239.100.0.64/28 ip pim join-prune-interval 5 diff --git a/tests/topotests/pim_basic/test_pim.py b/tests/topotests/pim_basic/test_pim.py index 03b4368e42..6cea521aa9 100644 --- a/tests/topotests/pim_basic/test_pim.py +++ b/tests/topotests/pim_basic/test_pim.py @@ -172,7 +172,11 @@ def test_pim_send_mcast_stream(): } } - assert topotest.json_cmp(out, expected) is None, "failed to converge pim" + test_func = partial( + topotest.router_json_cmp, r1, "show ip pim upstream json", expected + ) + _, result = topotest.run_and_expect(test_func, None, count=20, wait=1) + assert result is None, "failed to converge pim" # tgen.mininet_cli() diff --git a/tests/topotests/pim_igmp_vrf/r1/ospfd.conf b/tests/topotests/pim_igmp_vrf/r1/ospfd.conf index 263b5867cc..88eb5a8a05 100644 --- a/tests/topotests/pim_igmp_vrf/r1/ospfd.conf +++ b/tests/topotests/pim_igmp_vrf/r1/ospfd.conf @@ -1,6 +1,6 @@ hostname r1 ! -debug ospf event +! debug ospf event ! ! interface r1-eth1 diff --git a/tests/topotests/pim_igmp_vrf/r1/pimd.conf b/tests/topotests/pim_igmp_vrf/r1/pimd.conf index f04c255de9..040c3d01b1 100644 --- a/tests/topotests/pim_igmp_vrf/r1/pimd.conf +++ b/tests/topotests/pim_igmp_vrf/r1/pimd.conf @@ -1,12 +1,12 @@ hostname r1 ! -debug igmp events -debug igmp packets -debug pim events -debug pim packets -debug pim trace -debug pim zebra -debug pim bsm +! debug igmp events +! debug igmp packets +! debug pim events +! debug pim packets +! debug pim trace +! debug pim zebra +! debug pim bsm ! interface r1-eth0 ip igmp diff --git a/tests/topotests/pim_igmp_vrf/r11/ospfd.conf b/tests/topotests/pim_igmp_vrf/r11/ospfd.conf index e107220a4e..86fb66db61 100644 --- a/tests/topotests/pim_igmp_vrf/r11/ospfd.conf +++ b/tests/topotests/pim_igmp_vrf/r11/ospfd.conf @@ -1,6 +1,6 @@ hostname r11 ! -debug ospf event +! debug ospf event ! interface r11-eth0 ip ospf hello-interval 2 diff --git a/tests/topotests/pim_igmp_vrf/r11/pimd.conf b/tests/topotests/pim_igmp_vrf/r11/pimd.conf index b1d45205da..3e409ddd31 100644 --- a/tests/topotests/pim_igmp_vrf/r11/pimd.conf +++ b/tests/topotests/pim_igmp_vrf/r11/pimd.conf @@ -1,10 +1,10 @@ hostname r11 ! -debug pim events -debug pim packets -debug pim trace -debug pim zebra -debug pim bsm +! debug pim events +! debug pim packets +! debug pim trace +! debug pim zebra +! debug pim bsm ! ip pim rp 192.168.0.11 239.100.0.0/28 ip pim join-prune-interval 5 diff --git a/tests/topotests/pim_igmp_vrf/r12/ospfd.conf b/tests/topotests/pim_igmp_vrf/r12/ospfd.conf index 03acc82c1d..f0dcabece2 100644 --- a/tests/topotests/pim_igmp_vrf/r12/ospfd.conf +++ b/tests/topotests/pim_igmp_vrf/r12/ospfd.conf @@ -1,6 +1,6 @@ hostname r12 ! -debug ospf event +! debug ospf event ! interface r12-eth0 ip ospf hello-interval 2 diff --git a/tests/topotests/pim_igmp_vrf/r12/pimd.conf b/tests/topotests/pim_igmp_vrf/r12/pimd.conf index 5cb76efa22..2c308f7818 100644 --- a/tests/topotests/pim_igmp_vrf/r12/pimd.conf +++ b/tests/topotests/pim_igmp_vrf/r12/pimd.conf @@ -1,10 +1,10 @@ hostname r12 ! -debug pim events -debug pim packets -debug pim trace -debug pim zebra -debug pim bsm +! debug pim events +! debug pim packets +! debug pim trace +! debug pim zebra +! debug pim bsm ! ip pim rp 192.168.0.12 239.100.0.0/28 ip pim join-prune-interval 5 diff --git a/tests/topotests/ripng_topo1/r1/ripngd.conf b/tests/topotests/ripng_topo1/r1/ripngd.conf index 07ed7296d9..1312dc0b63 100644 --- a/tests/topotests/ripng_topo1/r1/ripngd.conf +++ b/tests/topotests/ripng_topo1/r1/ripngd.conf @@ -1,8 +1,8 @@ log file ripngd.log ! -debug ripng events -debug ripng packet -debug ripng zebra +! debug ripng events +! debug ripng packet +! debug ripng zebra ! router ripng timers basic 5 180 5 diff --git a/tests/topotests/ripng_topo1/r2/ripngd.conf b/tests/topotests/ripng_topo1/r2/ripngd.conf index ef2c42195d..8511bdb457 100644 --- a/tests/topotests/ripng_topo1/r2/ripngd.conf +++ b/tests/topotests/ripng_topo1/r2/ripngd.conf @@ -1,8 +1,8 @@ log file ripngd.log ! -debug ripng events -debug ripng packet -debug ripng zebra +! debug ripng events +! debug ripng packet +! debug ripng zebra ! router ripng timers basic 5 180 5 diff --git a/tests/topotests/ripng_topo1/r3/ripngd.conf b/tests/topotests/ripng_topo1/r3/ripngd.conf index 506eaac442..c3cada44af 100644 --- a/tests/topotests/ripng_topo1/r3/ripngd.conf +++ b/tests/topotests/ripng_topo1/r3/ripngd.conf @@ -1,8 +1,8 @@ log file ripngd.log ! -debug ripng events -debug ripng packet -debug ripng zebra +! debug ripng events +! debug ripng packet +! debug ripng zebra ! router ripng timers basic 5 180 5 diff --git a/tests/topotests/simple_snmp_test/r1/isisd.conf b/tests/topotests/simple_snmp_test/r1/isisd.conf index b5ca993da3..1a148f0628 100644 --- a/tests/topotests/simple_snmp_test/r1/isisd.conf +++ b/tests/topotests/simple_snmp_test/r1/isisd.conf @@ -1,7 +1,7 @@ log stdout debugging ! -debug isis route-events -debug isis events +! debug isis route-events +! debug isis events ! interface r1-eth0 ip router isis ISIS1 diff --git a/tests/topotests/srv6_locator/r1/zebra.conf b/tests/topotests/srv6_locator/r1/zebra.conf index d0c0232073..85001d710e 100644 --- a/tests/topotests/srv6_locator/r1/zebra.conf +++ b/tests/topotests/srv6_locator/r1/zebra.conf @@ -1,7 +1,7 @@ hostname r1 ! -debug zebra events -debug zebra rib detailed +! debug zebra events +! debug zebra rib detailed ! log stdout notifications log monitor notifications diff --git a/tests/topotests/zebra_seg6_route/r1/zebra.conf b/tests/topotests/zebra_seg6_route/r1/zebra.conf index ad661e116b..e5e360ffa5 100644 --- a/tests/topotests/zebra_seg6_route/r1/zebra.conf +++ b/tests/topotests/zebra_seg6_route/r1/zebra.conf @@ -4,9 +4,9 @@ log stdout notifications log monitor notifications log commands ! -debug zebra packet -debug zebra dplane -debug zebra kernel msgdump +! debug zebra packet +! debug zebra dplane +! debug zebra kernel msgdump ! interface dum0 ipv6 address 2001::1/64 diff --git a/tests/topotests/zebra_seg6local_route/r1/zebra.conf b/tests/topotests/zebra_seg6local_route/r1/zebra.conf index 22eb88098b..dee7a9171a 100644 --- a/tests/topotests/zebra_seg6local_route/r1/zebra.conf +++ b/tests/topotests/zebra_seg6local_route/r1/zebra.conf @@ -4,6 +4,6 @@ log stdout notifications log monitor notifications log commands ! -debug zebra packet -debug zebra dplane -debug zebra kernel msgdump +! debug zebra packet +! debug zebra dplane +! debug zebra kernel msgdump diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c index 61bd1417d1..85721d7d70 100644 --- a/zebra/zapi_msg.c +++ b/zebra/zapi_msg.c @@ -604,8 +604,6 @@ int zsend_redistribute_route(int cmd, struct zserv *client, api_nh->bh_type = nexthop->bh_type; break; case NEXTHOP_TYPE_IPV4: - api_nh->gate.ipv4 = nexthop->gate.ipv4; - break; case NEXTHOP_TYPE_IPV4_IFINDEX: api_nh->gate.ipv4 = nexthop->gate.ipv4; api_nh->ifindex = nexthop->ifindex; @@ -614,8 +612,6 @@ int zsend_redistribute_route(int cmd, struct zserv *client, api_nh->ifindex = nexthop->ifindex; break; case NEXTHOP_TYPE_IPV6: - api_nh->gate.ipv6 = nexthop->gate.ipv6; - break; case NEXTHOP_TYPE_IPV6_IFINDEX: api_nh->gate.ipv6 = nexthop->gate.ipv6; api_nh->ifindex = nexthop->ifindex; @@ -893,7 +889,7 @@ void zsend_iptable_notify_owner(const struct zebra_dplane_ctx *ctx, s = stream_new(ZEBRA_MAX_PACKET_SIZ); zclient_create_header(s, cmd, VRF_DEFAULT); - stream_put(s, ¬e, sizeof(note)); + stream_putw(s, note); stream_putl(s, ipt.unique); stream_put(s, ipt.ipset_name, ZEBRA_IPSET_NAME_SIZE); stream_putw_at(s, 0, stream_get_endp(s)); @@ -928,7 +924,7 @@ void zsend_ipset_notify_owner(const struct zebra_dplane_ctx *ctx, s = stream_new(ZEBRA_MAX_PACKET_SIZ); zclient_create_header(s, cmd, VRF_DEFAULT); - stream_put(s, ¬e, sizeof(note)); + stream_putw(s, note); stream_putl(s, ipset.unique); stream_put(s, ipset.ipset_name, ZEBRA_IPSET_NAME_SIZE); stream_putw_at(s, 0, stream_get_endp(s)); @@ -966,7 +962,7 @@ void zsend_ipset_entry_notify_owner(const struct zebra_dplane_ctx *ctx, s = stream_new(ZEBRA_MAX_PACKET_SIZ); zclient_create_header(s, cmd, VRF_DEFAULT); - stream_put(s, ¬e, sizeof(note)); + stream_putw(s, note); stream_putl(s, ipent.unique); stream_put(s, ipset.ipset_name, ZEBRA_IPSET_NAME_SIZE); stream_putw_at(s, 0, stream_get_endp(s)); diff --git a/zebra/zebra_dplane.c b/zebra/zebra_dplane.c index 9e9844390d..3d258e0829 100644 --- a/zebra/zebra_dplane.c +++ b/zebra/zebra_dplane.c @@ -341,7 +341,7 @@ struct zebra_dplane_ctx { struct dplane_rule_info rule; struct zebra_pbr_iptable iptable; struct zebra_pbr_ipset ipset; - union { + struct { struct zebra_pbr_ipset_entry entry; struct zebra_pbr_ipset_info info; } ipset_entry; @@ -2166,6 +2166,7 @@ bool dplane_ctx_get_pbr_ipset(const struct zebra_dplane_ctx *ctx, ctx->zd_op == DPLANE_OP_IPSET_ENTRY_DELETE) { memset(ipset, 0, sizeof(struct zebra_pbr_ipset)); ipset->type = ctx->u.ipset_entry.info.type; + ipset->family = ctx->u.ipset_entry.info.family; memcpy(&ipset->ipset_name, &ctx->u.ipset_entry.info.ipset_name, ZEBRA_IPSET_NAME_SIZE); } else @@ -2943,6 +2944,7 @@ dplane_ctx_ipset_entry_init(struct zebra_dplane_ctx *ctx, enum dplane_op_e op, sizeof(struct zebra_pbr_ipset_entry)); ctx->u.ipset_entry.entry.backpointer = NULL; ctx->u.ipset_entry.info.type = ipset->type; + ctx->u.ipset_entry.info.family = ipset->family; memcpy(&ctx->u.ipset_entry.info.ipset_name, &ipset->ipset_name, ZEBRA_IPSET_NAME_SIZE); diff --git a/zebra/zebra_evpn_mac.c b/zebra/zebra_evpn_mac.c index c1bb19d4e5..6fc01925eb 100644 --- a/zebra/zebra_evpn_mac.c +++ b/zebra/zebra_evpn_mac.c @@ -106,19 +106,6 @@ static void zebra_evpn_mac_ifp_new(struct zebra_if *zif) listset_app_node_mem(zif->mac_list); } -/* Free up the mac_list if any as a part of the interface del/cleanup */ -void zebra_evpn_mac_ifp_del(struct interface *ifp) -{ - struct zebra_if *zif = ifp->info; - - if (zif->mac_list) { - if (IS_ZEBRA_DEBUG_EVPN_MH_MAC) - zlog_debug("MAC list deleted for ifp %s (%u)", - zif->ifp->name, zif->ifp->ifindex); - list_delete(&zif->mac_list); - } -} - /* Unlink local mac from a destination access port */ static void zebra_evpn_mac_ifp_unlink(struct zebra_mac *zmac) { @@ -139,6 +126,25 @@ static void zebra_evpn_mac_ifp_unlink(struct zebra_mac *zmac) zmac->ifp = NULL; } +/* Free up the mac_list if any as a part of the interface del/cleanup */ +void zebra_evpn_mac_ifp_del(struct interface *ifp) +{ + struct zebra_if *zif = ifp->info; + struct listnode *node; + struct zebra_mac *zmac; + + if (zif->mac_list) { + if (IS_ZEBRA_DEBUG_EVPN_MH_MAC) + zlog_debug("MAC list deleted for ifp %s (%u)", + zif->ifp->name, zif->ifp->ifindex); + + for (ALL_LIST_ELEMENTS_RO(zif->mac_list, node, zmac)) { + zebra_evpn_mac_ifp_unlink(zmac); + } + list_delete(&zif->mac_list); + } +} + /* Link local mac to destination access port. This is done only if the * local mac is associated with a zero ESI i.e. single attach or lacp-bypass * bridge port member diff --git a/zebra/zebra_l2.c b/zebra/zebra_l2.c index 30e74902aa..420bed7064 100644 --- a/zebra/zebra_l2.c +++ b/zebra/zebra_l2.c @@ -162,7 +162,7 @@ void zebra_l2_map_slave_to_bond(struct zebra_if *zif, vrf_id_t vrf_id) struct zebra_if *bond_zif; struct zebra_l2info_bondslave *bond_slave = &zif->bondslave_info; - bond_if = if_lookup_by_index_all_vrf(bond_slave->bond_ifindex); + bond_if = if_lookup_by_index(bond_slave->bond_ifindex, vrf_id); if (bond_if == bond_slave->bond_if) return; diff --git a/zebra/zebra_netns_notify.c b/zebra/zebra_netns_notify.c index 0d260ad639..5b9539904f 100644 --- a/zebra/zebra_netns_notify.c +++ b/zebra/zebra_netns_notify.c @@ -165,6 +165,7 @@ static int zebra_ns_delete(char *name) /* the deletion order is the same * as the one used when siging signal is received */ + vrf->ns_ctxt = NULL; vrf_delete(vrf); if (ns) ns_delete(ns); diff --git a/zebra/zebra_pbr.h b/zebra/zebra_pbr.h index 2e9658e7e5..c5102df4fa 100644 --- a/zebra/zebra_pbr.h +++ b/zebra/zebra_pbr.h @@ -70,6 +70,8 @@ struct zebra_pbr_ipset_info { */ uint32_t type; + uint8_t family; + char ipset_name[ZEBRA_IPSET_NAME_SIZE]; }; diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c index c13c867d2a..bb46a1e62e 100644 --- a/zebra/zebra_vxlan.c +++ b/zebra/zebra_vxlan.c @@ -4736,13 +4736,11 @@ void zebra_vxlan_macvlan_down(struct interface *ifp) assert(zif); link_ifp = zif->link; if (!link_ifp) { - if (IS_ZEBRA_DEBUG_VXLAN) { - struct interface *ifp; - - ifp = if_lookup_by_index_all_vrf(zif->link_ifindex); - zlog_debug("macvlan parent link is not found. Parent index %d ifp %s", - zif->link_ifindex, ifp ? ifp->name : " "); - } + if (IS_ZEBRA_DEBUG_VXLAN) + zlog_debug( + "macvlan parent link is not found. Parent index %d ifp %s", + zif->link_ifindex, + ifindex2ifname(zif->link_ifindex, ifp->vrf_id)); return; } link_zif = link_ifp->info; |