Merge pull request #17547 from donaldsharp/some_cleanups

Some cleanups
FRRouting · Dec 3, 2024 · 426dc2b · 426dc2b
2 parents 6e1eeed + 0d7d795
commit 426dc2b
Show file tree

Hide file tree

Showing 66 changed files with 16 additions and 154 deletions.
diff --git a/bgpd/bgp_clist.c b/bgpd/bgp_clist.c
@@ -11,7 +11,6 @@
 #include "queue.h"
 #include "filter.h"
 #include "stream.h"
-#include "jhash.h"
 #include "frrstr.h"
 
 #include "bgpd/bgpd.h"

diff --git a/tests/topotests/bgp_lu_topo1/R3/bgpd.conf b/tests/topotests/bgp_lu_topo1/R3/bgpd.conf
@@ -1,4 +1,3 @@
-log file /tmp/bgpd.log
 !
 ! debug bgp updates
 !

diff --git a/tests/topotests/bgp_lu_topo1/R3/zebra.conf b/tests/topotests/bgp_lu_topo1/R3/zebra.conf
@@ -1,4 +1,3 @@
-log file /tmp/zebra.log
 !
 ! debug zebra events
 ! debug zebra packet detail

diff --git a/tests/topotests/bgp_lu_topo2/R3/bgpd.conf b/tests/topotests/bgp_lu_topo2/R3/bgpd.conf
@@ -1,4 +1,3 @@
-log file /tmp/bgpd.log
 no log unique-id
 !
 !

diff --git a/tests/topotests/bgp_lu_topo2/R3/staticd.conf b/tests/topotests/bgp_lu_topo2/R3/staticd.conf
@@ -1,4 +1,3 @@
-log file /tmp/staticd.log
 no log unique-id
 !
 !

diff --git a/tests/topotests/bgp_lu_topo2/R3/zebra.conf b/tests/topotests/bgp_lu_topo2/R3/zebra.conf
@@ -1,4 +1,3 @@
-log file /tmp/zebra.log
 no log unique-id
 !
 !

diff --git a/tests/topotests/bgp_nexthop_ipv6/test_bgp_nexthop_ipv6_topo1.py b/tests/topotests/bgp_nexthop_ipv6/test_bgp_nexthop_ipv6_topo1.py
@@ -222,7 +222,6 @@ def test_bgp_ipv6_table_step1():
     link_local_cache = {}
     router_list = tgen.routers().values()
     for router in router_list:
-        # router.cmd("vtysh -c 'sh bgp ipv6 json' >/tmp/show_bgp_ipv6_%s.json" % router.name)
         ref_file = "{}/{}/show_bgp_ipv6_step1.json".format(CWD, router.name)
         expected = json.loads(open(ref_file).read())
         replace_link_local(expected, link_local_cache)
@@ -275,7 +274,6 @@ def test_bgp_ipv6_table_step2():
 
     router_list = tgen.routers().values()
     for router in router_list:
-        # router.cmd("vtysh -c 'sh bgp ipv6 json' >/tmp/show_bgp_ipv6_%s.json" % router.name)
         ref_file = "{}/{}/show_bgp_ipv6_step2.json".format(CWD, router.name)
         expected = json.loads(open(ref_file).read())
         replace_link_local(expected, link_local_cache)
@@ -327,7 +325,6 @@ def test_bgp_ipv6_table_step3():
 
     router_list = tgen.routers().values()
     for router in router_list:
-        # router.cmd("vtysh -c 'sh bgp ipv6 json' >/tmp/show_bgp_ipv6_%s.json" % router.name)
         ref_file = "{}/{}/show_bgp_ipv6_step1.json".format(CWD, router.name)
         expected = json.loads(open(ref_file).read())
         replace_link_local(expected, link_local_cache)

diff --git a/tests/topotests/bgp_route_server_client/test_bgp_route_server_client.py b/tests/topotests/bgp_route_server_client/test_bgp_route_server_client.py
@@ -180,7 +180,6 @@ def test_bgp_route_server_client_step1():
         else:
             cmd = "show bgp ipv6 unicast json"
 
-        # router.cmd("vtysh -c 'sh bgp ipv6 json' >/tmp/show_bgp_ipv6_%s.json" % router.name)
         ref_file = "{}/{}/show_bgp_ipv6_step1.json".format(CWD, router.name)
         expected = json.loads(open(ref_file).read())
         replace_link_local(expected, link_local_cache)
@@ -230,7 +229,6 @@ def test_bgp_route_server_client_step2():
         else:
             cmd = "show bgp ipv6 unicast json"
 
-        # router.cmd("vtysh -c 'sh bgp ipv6 json' >/tmp/show_bgp_ipv6_%s.json" % router.name)
         ref_file = "{}/{}/show_bgp_ipv6_step2.json".format(CWD, router.name)
         expected = json.loads(open(ref_file).read())
         replace_link_local(expected, link_local_cache)
@@ -286,7 +284,6 @@ def test_bgp_route_server_client_step3():
         else:
             cmd = "show bgp ipv6 unicast json"
 
-        # router.cmd("vtysh -c 'sh bgp ipv6 json' >/tmp/show_bgp_ipv6_%s.json" % router.name)
         ref_file = "{}/{}/show_bgp_ipv6_step1.json".format(CWD, router.name)
         expected = json.loads(open(ref_file).read())
         replace_link_local(expected, link_local_cache)

diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/ce1/bgpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce1/bgpd.conf
@@ -1,4 +1,3 @@
-log file /tmp/bgpd.log debugging
 !
 router bgp 65001
  timers bgp 3 9

diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/ce1/zebra.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce1/zebra.conf
@@ -1,5 +1,3 @@
-log file /tmp/zebra.log
-log stdout
 !
 ! debug zebra events
 ! debug zebra dplane

diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/ce2/bgpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce2/bgpd.conf
@@ -1,4 +1,3 @@
-log file /tmp/bgpd.log debugging
 !
 router bgp 65001
  bgp router-id 192.168.200.10

diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/ce2/zebra.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce2/zebra.conf
@@ -1,5 +1,3 @@
-log file /tmp/zebra.log
-log stdout
 !
 ! debug zebra events
 ! debug zebra dplane

diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/ce3/bgpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce3/bgpd.conf
@@ -1,4 +1,3 @@
-log file /tmp/bgpd.log debugging
 !
 router bgp 65001
  bgp router-id 192.168.200.10

diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/ce3/zebra.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce3/zebra.conf
@@ -1,5 +1,3 @@
-log file /tmp/zebra.log
-log stdout
 !
 ! debug zebra events
 ! debug zebra dplane

diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/ce4/bgpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce4/bgpd.conf
@@ -1,4 +1,3 @@
-log file /tmp/bgpd.log debugging
 !
 router bgp 65001
  bgp router-id 192.168.200.10

diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/ce4/zebra.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce4/zebra.conf
@@ -1,5 +1,3 @@
-log file /tmp/zebra.log
-log stdout
 !
 ! debug zebra events
 ! debug zebra dplane

diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/r1/bgpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r1/bgpd.conf
@@ -1,4 +1,3 @@
-log file /tmp/bgpd.log debugging
 !
 router bgp 65000
  bgp router-id 10.1.1.1

diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/r2/zebra.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r2/zebra.conf
@@ -1,5 +1,3 @@
-log file /tmp/zebra.log
-log stdout
 !
 ! debug zebra events
 ! debug zebra dplane

diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/r3/zebra.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r3/zebra.conf
@@ -1,5 +1,3 @@
-log file /tmp/zebra.log
-log stdout
 !
 ! debug zebra events
 ! debug zebra dplane

diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/r4/bgpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r4/bgpd.conf
@@ -1,4 +1,3 @@
-log file /tmp/bgpd.log debugging
 !
 router bgp 65000
  bgp router-id 10.4.4.4

diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/r4/zebra.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r4/zebra.conf
@@ -1,5 +1,3 @@
-log file /tmp/zebra.log
-log stdout
 !
 ! debug zebra events
 ! debug zebra dplane

diff --git a/tests/topotests/ospf_metric_propagation/h1/frr.conf b/tests/topotests/ospf_metric_propagation/h1/frr.conf
@@ -1,10 +1,8 @@
 !
 hostname h1
-password zebra
-log file /tmp/h1-frr.log
 !
 ip route 0.0.0.0/0 10.0.91.1
 !
 interface h1-eth0
  ip address 10.0.91.2/24
-!
+!
diff --git a/tests/topotests/ospf_metric_propagation/h2/frr.conf b/tests/topotests/ospf_metric_propagation/h2/frr.conf
@@ -1,10 +1,8 @@
 !
 hostname h2
-password zebra
-log file /tmp/h2-frr.log
 !
 ip route 0.0.0.0/0 10.0.94.4
 !
 interface h2-eth0
  ip address 10.0.94.2/24
-!
+!
diff --git a/tests/topotests/ospf_metric_propagation/r1/frr.conf b/tests/topotests/ospf_metric_propagation/r1/frr.conf
@@ -1,8 +1,5 @@
 !
 hostname r1
-password zebra
-log file /tmp/r1-frr.log
-ip forwarding
 !
 interface r1-eth0
  ip address 10.0.1.1/24
@@ -93,4 +90,4 @@ route-map costplus permit 30
 route-map costplus permit 40
   set metric-type type-1
   set metric +1
-  exit
+  exit
diff --git a/tests/topotests/ospf_metric_propagation/r2/frr.conf b/tests/topotests/ospf_metric_propagation/r2/frr.conf
@@ -1,8 +1,5 @@
 !
 hostname r2
-password zebra
-log file /tmp/r2-frr.log
-ip forwarding
 !
 interface r2-eth0
  ip address 10.0.1.2/24

diff --git a/tests/topotests/ospf_metric_propagation/r3/frr.conf b/tests/topotests/ospf_metric_propagation/r3/frr.conf
@@ -1,8 +1,5 @@
 !
 hostname r3
-password zebra
-log file /tmp/r3-frr.log
-ip forwarding
 !
 interface r3-eth0
  ip address 10.0.3.3/24

diff --git a/tests/topotests/ospf_metric_propagation/r4/frr.conf b/tests/topotests/ospf_metric_propagation/r4/frr.conf
@@ -1,8 +1,5 @@
 !
 hostname r4
-password zebra
-log file /tmp/r4-frr.log
-ip forwarding
 !
 interface r4-eth0
  ip address 10.0.3.4/24

diff --git a/tests/topotests/ospf_metric_propagation/ra/frr.conf b/tests/topotests/ospf_metric_propagation/ra/frr.conf
@@ -1,8 +1,5 @@
 !
 hostname ra
-password zebra
-log file /tmp/ra-frr.log
-ip forwarding
 !
 interface ra-eth0
  ip address 10.0.50.5/24

diff --git a/tests/topotests/ospf_metric_propagation/rb/frr.conf b/tests/topotests/ospf_metric_propagation/rb/frr.conf
@@ -1,8 +1,5 @@
 !
 hostname rb
-password zebra
-log file /tmp/rb-frr.log
-ip forwarding
 !
 interface rb-eth0
  ip address 10.0.50.6/24

diff --git a/tests/topotests/ospf_metric_propagation/rc/frr.conf b/tests/topotests/ospf_metric_propagation/rc/frr.conf
@@ -1,8 +1,5 @@
 !
 hostname rc
-password zebra
-log file /tmp/rc-frr.log
-ip forwarding
 !
 interface rc-eth0
  ip address 10.0.70.7/24

diff --git a/tests/topotests/ospf_multi_instance/r1/frr.conf b/tests/topotests/ospf_multi_instance/r1/frr.conf
@@ -1,8 +1,5 @@
 !
 hostname r1
-password zebra
-log file /tmp/r1-frr.log
-ip forwarding
 !
 interface lo
  ip address 1.1.1.1/32

diff --git a/tests/topotests/ospf_multi_instance/r3/frr.conf b/tests/topotests/ospf_multi_instance/r3/frr.conf
@@ -1,8 +1,5 @@
 !
 hostname r3
-password zebra
-log file /tmp/r3-frr.log
-ip forwarding
 !
 interface lo
  ip address 3.3.3.1/32

diff --git a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r1/frr.conf b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r1/frr.conf
@@ -1,7 +1,5 @@
 !
 hostname r1
-password zebra
-log file /tmp/r1-frr.log
 !
 interface r1-eth0
  ip address 10.0.1.1/24

diff --git a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r2/frr.conf b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r2/frr.conf
@@ -1,7 +1,5 @@
 !
 hostname r2
-password zebra
-log file /tmp/r2-frr.log
 !
 interface r2-eth0
  ip address 10.0.2.2/24

diff --git a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r3/frr.conf b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r3/frr.conf
@@ -1,7 +1,5 @@
 !
 hostname r3
-password zebra
-log file /tmp/r3-frr.log
 !
 interface r3-eth0
  ip address 10.0.3.3/24

diff --git a/tests/topotests/ospf_multi_vrf_bgp_route_leak/r4/frr.conf b/tests/topotests/ospf_multi_vrf_bgp_route_leak/r4/frr.conf
@@ -1,7 +1,5 @@
 !
 hostname r4
-password zebra
-log file /tmp/r4-frr.log
 !
 interface r4-eth0
  ip address 10.0.4.4/24

diff --git a/tests/topotests/ospf_netns_vrf/r1/ospfd.conf b/tests/topotests/ospf_netns_vrf/r1/ospfd.conf
@@ -1,7 +1,5 @@
 !
 hostname r1
-password zebra
-log file /tmp/r1-ospfd.log
 !
 interface r1-eth0 vrf r1-ospf-cust1
   ip ospf hello-interval 1

diff --git a/tests/topotests/ospf_netns_vrf/r1/zebra.conf b/tests/topotests/ospf_netns_vrf/r1/zebra.conf
@@ -4,8 +4,6 @@
 ! debug zebra event
 !
 hostname r1
-password zebra
-log file /tmp/r1-zebra.log
 !
 interface r1-eth0 vrf r1-ospf-cust1
  ip address 10.0.1.1/24

diff --git a/tests/topotests/ospf_netns_vrf/r2/ospfd.conf b/tests/topotests/ospf_netns_vrf/r2/ospfd.conf
@@ -1,7 +1,5 @@
 !
 hostname r2
-password zebra
-log file /tmp/r2-ospfd.log
 !
 interface r2-eth0 vrf r2-ospf-cust1
   ip ospf hello-interval 1

diff --git a/tests/topotests/ospf_netns_vrf/r2/zebra.conf b/tests/topotests/ospf_netns_vrf/r2/zebra.conf
@@ -1,7 +1,5 @@
 !
 hostname r2
-password zebra
-log file /tmp/r2-zebra.log
 !
 interface r2-eth0 vrf r2-ospf-cust1
  ip address 10.0.2.1/24

diff --git a/tests/topotests/ospf_netns_vrf/r3/ospfd.conf b/tests/topotests/ospf_netns_vrf/r3/ospfd.conf
@@ -1,7 +1,5 @@
 !
 hostname r3
-password zebra
-log file /tmp/r3-ospfd.log
 !
 !
 interface r3-eth0 vrf r3-ospf-cust1

diff --git a/tests/topotests/ospf_netns_vrf/r3/zebra.conf b/tests/topotests/ospf_netns_vrf/r3/zebra.conf
@@ -1,7 +1,5 @@
 !
 hostname r3
-password zebra
-log file /tmp/r3-zebra.log
 !
 interface r3-eth0 vrf r3-ospf-cust1
  ip address 10.0.3.1/24

diff --git a/tests/topotests/ospf_p2mp/r1/frr-p2mp-non-broadcast.conf b/tests/topotests/ospf_p2mp/r1/frr-p2mp-non-broadcast.conf
@@ -1,8 +1,5 @@
 !
 hostname r1
-password zebra
-log file /tmp/r1-frr.log
-ip forwarding
 !
 interface r1-eth0
  ip address 10.1.0.1/24

diff --git a/tests/topotests/ospf_p2mp/r1/frr-p2mp.conf b/tests/topotests/ospf_p2mp/r1/frr-p2mp.conf
@@ -1,13 +1,10 @@
 !
-!log file ospfd.log debug
 ! debug ospf event
 ! debug ospf client
 ! debug ospf lsa
 ! debug ospf packet all
 
 hostname r1
-password zebra
-log file /tmp/r1-frr.log
 ip forwarding
 !
 interface r1-eth0

diff --git a/tests/topotests/ospf_p2mp/r2/frr-p2mp-non-broadcast.conf b/tests/topotests/ospf_p2mp/r2/frr-p2mp-non-broadcast.conf
@@ -1,8 +1,5 @@
 !
 hostname r2
-password zebra
-log file /tmp/r1-frr.log
-ip forwarding
 !
 interface r2-eth0
  ip address 10.1.0.2/24

diff --git a/tests/topotests/ospf_p2mp/r2/frr-p2mp.conf b/tests/topotests/ospf_p2mp/r2/frr-p2mp.conf
@@ -1,14 +1,10 @@
 !
-!log file ospfd.log debug
 ! debug ospf event
 ! debug ospf client
 ! debug ospf lsa
 ! debug ospf packet all
 !
 hostname r2
-password zebra
-log file /tmp/r1-frr.log
-ip forwarding
 !
 interface r2-eth0
  ip address 10.1.0.2/24