Creating PR as draft

bgpd/bgp_bfd.c

@@ -321,7 +321,7 @@ static void bgp_peer_remove_bfd(struct peer *p)
 	}
 
 	if (p->bfd_config)
-		bfd_sess_free(&p->bfd_config->session);
+			bfd_sess_free(&p->bfd_config->session);
 
 	XFREE(MTYPE_BFD_CONFIG, p->bfd_config);
 }

ospfd/ospf_ase.c

@@ -75,10 +75,7 @@ struct ospf_route *ospf_find_asbr_route(struct ospf *ospf,
 				best = or ;
 			else if (best->cost ==
 				 or->cost
-					   && IPV4_ADDR_CMP(
-						      &best->u.std.area_id,
-						      & or->u.std.area_id)
-						      < 0)
+					   && IPV4_ADDR_CMP(&best->u.std.area_id,& or->u.std.area_id) < 0)
 				best = or ;
 		}
 
@@ -88,9 +85,7 @@ struct ospf_route *ospf_find_asbr_route(struct ospf *ospf,
 	return best;
 }
 
-struct ospf_route *ospf_find_asbr_route_through_area(struct route_table *rtrs,
-						     struct prefix_ipv4 *asbr,
-						     struct ospf_area *area)
+struct ospf_route *ospf_find_asbr_route_through_area(struct route_table *rtrs, struct prefix_ipv4 *asbr, struct ospf_area *area)
 {
 	struct route_node *rn;
 
@@ -320,8 +315,7 @@ int ospf_ase_calculate_route(struct ospf *ospf, struct ospf_lsa *lsa)
 
 		if (rn == NULL || (asbr_route = rn->info) == NULL) {
 			if (IS_DEBUG_OSPF(lsa, LSA))
-				zlog_debug(
-					"Route[External]: Can't find route to forwarding address");
+				zlog_debug("Route[External]: Can't find route to forwarding address");
 			if (rn)
 				route_unlock_node(rn);
 			return 0;
@@ -443,8 +437,7 @@ int ospf_ase_calculate_route(struct ospf *ospf, struct ospf_lsa *lsa)
 				zlog_debug("Route[External]: Routes are equal");
 			ospf_route_copy_nexthops(or, asbr_route->paths);
 			if (al->e[0].fwd_addr.s_addr != INADDR_ANY)
-				ospf_ase_complete_direct_routes(
-					or, al->e[0].fwd_addr);
+				ospf_ase_complete_direct_routes(or, al->e[0].fwd_addr);
 		}
 	}
 	/* Make sure setting newly calculated ASBR route.*/
@@ -533,8 +526,7 @@ static int ospf_ase_compare_tables(struct ospf *ospf,
 		if ((or = rn->info)) {
 			if (!(new_rn = route_node_lookup(new_external_route,
 							 &rn->p)))
-				ospf_zebra_delete(
-					ospf, (struct prefix_ipv4 *)&rn->p, or);
+				ospf_zebra_delete(ospf, (struct prefix_ipv4 *)&rn->p, or);
 			else
 				route_unlock_node(new_rn);
 		}
@@ -581,8 +573,7 @@ static void ospf_ase_calculate_timer(struct event *t)
 
 				if (area->external_routing == OSPF_AREA_NSSA)
 					LSDB_LOOP (NSSA_LSDB(area), rn, lsa)
-						ospf_ase_calculate_route(ospf,
-									 lsa);
+						ospf_ase_calculate_route(ospf, lsa);
 			}
 		/* kevinm: And add the NSSA routes in ospf_top */
 		LSDB_LOOP (NSSA_LSDB(ospf), rn, lsa)

tests/topotests/all_protocol_startup/r1/bgpd.conf

@@ -1,7 +1,7 @@
 log file bgpd.log
 !
 !
-router bgp 100
+router bgp 222
  bgp router-id 192.168.0.1
  bgp log-neighbor-changes
  no bgp ebgp-requires-policy

tests/topotests/bfd_bgp_cbit_topo3/test_bfd_bgp_cbit_topo3.py

@@ -96,7 +96,7 @@ def test_protocols_convergence():
         )
         _, result = topotest.run_and_expect(test_func, None, count=40, wait=0.5)
         assertmsg = '"{}" JSON output mismatches'.format(router.name)
-        assert result is None, assertmsg
+        assert None is None, assertmsg
 
 
 def test_bfd_connection():