From c19e12b74fdccc1b7befed776ac20487f81d67ce Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Mon, 27 Jul 2020 11:09:16 -0400 Subject: [PATCH] tests: Remove 'log monitor' from tests The `log monitor' command is a no-op and actually outputs a `this doesn't do anything` warning. Let's remove this cli line from our tests as that don't do anything and people will look at these configs for guidance. Signed-off-by: Donald Sharp --- tests/topotests/bgp_l3vpn_to_bgp_direct/ce1/bgpd.conf | 1 - tests/topotests/bgp_l3vpn_to_bgp_direct/ce2/bgpd.conf | 1 - tests/topotests/bgp_l3vpn_to_bgp_direct/ce3/bgpd.conf | 1 - tests/topotests/bgp_l3vpn_to_bgp_direct/r1/bgpd.conf | 1 - tests/topotests/bgp_l3vpn_to_bgp_direct/r2/bgpd.conf | 1 - tests/topotests/bgp_l3vpn_to_bgp_direct/r3/bgpd.conf | 1 - tests/topotests/bgp_l3vpn_to_bgp_direct/r4/bgpd.conf | 1 - tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/bgpd.conf | 1 - tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/bgpd.conf | 1 - tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/bgpd.conf | 1 - tests/topotests/bgp_l3vpn_to_bgp_vrf/ce4/bgpd.conf | 1 - tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/bgpd.conf | 1 - tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/bgpd.conf | 1 - tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/bgpd.conf | 1 - tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/bgpd.conf | 1 - tests/topotests/bgp_prefix_sid/r1/bgpd.conf | 1 - tests/topotests/bgp_rfapi_basic_sanity/r1/bgpd.conf | 1 - tests/topotests/bgp_rfapi_basic_sanity/r2/bgpd.conf | 1 - tests/topotests/bgp_rfapi_basic_sanity/r3/bgpd.conf | 1 - tests/topotests/bgp_rfapi_basic_sanity/r4/bgpd.conf | 1 - tests/topotests/bgp_rfapi_basic_sanity_config2/r1/bgpd.conf | 1 - tests/topotests/bgp_rfapi_basic_sanity_config2/r2/bgpd.conf | 1 - tests/topotests/bgp_rfapi_basic_sanity_config2/r3/bgpd.conf | 1 - tests/topotests/bgp_rfapi_basic_sanity_config2/r4/bgpd.conf | 1 - 24 files changed, 24 deletions(-) diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/ce1/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce1/bgpd.conf index c1bb7e3d15..2712e54f12 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_direct/ce1/bgpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce1/bgpd.conf @@ -3,7 +3,6 @@ frr defaults traditional hostname ce1 password zebra log stdout notifications -log monitor notifications log commands router bgp 5226 no bgp network import-check diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/ce2/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce2/bgpd.conf index c889a4c596..69305512cb 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_direct/ce2/bgpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce2/bgpd.conf @@ -3,7 +3,6 @@ frr defaults traditional hostname ce2 password zebra log stdout notifications -log monitor notifications log commands router bgp 5226 no bgp network import-check diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/ce3/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce3/bgpd.conf index 36dd97190e..3ad95c3612 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_direct/ce3/bgpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/ce3/bgpd.conf @@ -3,7 +3,6 @@ frr defaults traditional hostname ce3 password zebra log stdout notifications -log monitor notifications log commands router bgp 5226 no bgp network import-check diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/bgpd.conf index 33041262f6..502c4c8b2f 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/bgpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r1/bgpd.conf @@ -3,7 +3,6 @@ frr defaults traditional hostname r1 password zebra log stdout notifications -log monitor notifications log commands router bgp 5226 bgp router-id 1.1.1.1 diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/bgpd.conf index 524051426b..95890f25b9 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/bgpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r2/bgpd.conf @@ -3,7 +3,6 @@ frr defaults traditional hostname r2 password zebra log stdout notifications -log monitor notifications log commands router bgp 5226 bgp router-id 2.2.2.2 diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/bgpd.conf index 29b9f0da6c..2f7de073c3 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/bgpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r3/bgpd.conf @@ -3,7 +3,6 @@ frr defaults traditional hostname r3 password zebra log stdout notifications -log monitor notifications log commands router bgp 5226 bgp router-id 3.3.3.3 diff --git a/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/bgpd.conf index e09b505ee4..720d06dbf1 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/bgpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_direct/r4/bgpd.conf @@ -3,7 +3,6 @@ frr defaults traditional hostname r4 password zebra log stdout notifications -log monitor notifications log commands router bgp 5226 bgp router-id 4.4.4.4 diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/bgpd.conf index c3309d8c75..b81cd33c4f 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/bgpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce1/bgpd.conf @@ -3,7 +3,6 @@ frr defaults traditional hostname ce1 password zebra log stdout notifications -log monitor notifications log commands log file bgpd.log diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/bgpd.conf index 54401bfb2f..f18e5b852e 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/bgpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce2/bgpd.conf @@ -3,7 +3,6 @@ frr defaults traditional hostname ce2 password zebra log stdout notifications -log monitor notifications log commands log file bgpd.log diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/bgpd.conf index f742fede1a..54a0933588 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/bgpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce3/bgpd.conf @@ -3,7 +3,6 @@ frr defaults traditional hostname ce3 password zebra log stdout notifications -log monitor notifications log commands log file bgpd.log diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce4/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce4/bgpd.conf index 91311f32c5..5289628480 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce4/bgpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/ce4/bgpd.conf @@ -3,7 +3,6 @@ frr defaults traditional hostname ce4 password zebra log stdout notifications -log monitor notifications log commands log file bgpd.log diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/bgpd.conf index a9549e8fee..5da53ae1e7 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/bgpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r1/bgpd.conf @@ -3,7 +3,6 @@ frr defaults traditional hostname r1 password zebra log stdout notifications -log monitor notifications log commands log file bgpd.log debugging diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/bgpd.conf index cda6d9429a..e4a6b8e32c 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/bgpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r2/bgpd.conf @@ -3,7 +3,6 @@ frr defaults traditional hostname r2 password zebra log stdout notifications -log monitor notifications log commands log file bgpd.log debugging diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/bgpd.conf index e2a8de7db7..a861469c7a 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/bgpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r3/bgpd.conf @@ -3,7 +3,6 @@ frr defaults traditional hostname r3 password zebra log stdout notifications -log monitor notifications log commands log file bgpd.log diff --git a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/bgpd.conf b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/bgpd.conf index 7b267a6ee1..480f95954e 100644 --- a/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/bgpd.conf +++ b/tests/topotests/bgp_l3vpn_to_bgp_vrf/r4/bgpd.conf @@ -3,7 +3,6 @@ frr defaults traditional hostname r4 password zebra log stdout notifications -log monitor notifications log commands log file bgpd.log debug diff --git a/tests/topotests/bgp_prefix_sid/r1/bgpd.conf b/tests/topotests/bgp_prefix_sid/r1/bgpd.conf index 2f8759f960..06bdc31f8c 100644 --- a/tests/topotests/bgp_prefix_sid/r1/bgpd.conf +++ b/tests/topotests/bgp_prefix_sid/r1/bgpd.conf @@ -1,5 +1,4 @@ log stdout notifications -log monitor notifications log commands ! router bgp 1 diff --git a/tests/topotests/bgp_rfapi_basic_sanity/r1/bgpd.conf b/tests/topotests/bgp_rfapi_basic_sanity/r1/bgpd.conf index b3fe5ff23d..ada354bd62 100644 --- a/tests/topotests/bgp_rfapi_basic_sanity/r1/bgpd.conf +++ b/tests/topotests/bgp_rfapi_basic_sanity/r1/bgpd.conf @@ -3,7 +3,6 @@ frr defaults traditional hostname r1 password zebra log stdout notifications -log monitor notifications log commands router bgp 5226 bgp router-id 1.1.1.1 diff --git a/tests/topotests/bgp_rfapi_basic_sanity/r2/bgpd.conf b/tests/topotests/bgp_rfapi_basic_sanity/r2/bgpd.conf index 524051426b..95890f25b9 100644 --- a/tests/topotests/bgp_rfapi_basic_sanity/r2/bgpd.conf +++ b/tests/topotests/bgp_rfapi_basic_sanity/r2/bgpd.conf @@ -3,7 +3,6 @@ frr defaults traditional hostname r2 password zebra log stdout notifications -log monitor notifications log commands router bgp 5226 bgp router-id 2.2.2.2 diff --git a/tests/topotests/bgp_rfapi_basic_sanity/r3/bgpd.conf b/tests/topotests/bgp_rfapi_basic_sanity/r3/bgpd.conf index fbb6a65d61..4932d63d4f 100644 --- a/tests/topotests/bgp_rfapi_basic_sanity/r3/bgpd.conf +++ b/tests/topotests/bgp_rfapi_basic_sanity/r3/bgpd.conf @@ -3,7 +3,6 @@ frr defaults traditional hostname r3 password zebra log stdout notifications -log monitor notifications log commands router bgp 5226 bgp router-id 3.3.3.3 diff --git a/tests/topotests/bgp_rfapi_basic_sanity/r4/bgpd.conf b/tests/topotests/bgp_rfapi_basic_sanity/r4/bgpd.conf index d61f776f3d..1a5e41aae6 100644 --- a/tests/topotests/bgp_rfapi_basic_sanity/r4/bgpd.conf +++ b/tests/topotests/bgp_rfapi_basic_sanity/r4/bgpd.conf @@ -3,7 +3,6 @@ frr defaults traditional hostname r4 password zebra log stdout notifications -log monitor notifications log commands router bgp 5226 bgp router-id 4.4.4.4 diff --git a/tests/topotests/bgp_rfapi_basic_sanity_config2/r1/bgpd.conf b/tests/topotests/bgp_rfapi_basic_sanity_config2/r1/bgpd.conf index 626d8227e7..a38afd632f 100644 --- a/tests/topotests/bgp_rfapi_basic_sanity_config2/r1/bgpd.conf +++ b/tests/topotests/bgp_rfapi_basic_sanity_config2/r1/bgpd.conf @@ -3,7 +3,6 @@ frr defaults traditional hostname r1 password zebra log stdout notifications -log monitor notifications log commands router bgp 5226 bgp router-id 1.1.1.1 diff --git a/tests/topotests/bgp_rfapi_basic_sanity_config2/r2/bgpd.conf b/tests/topotests/bgp_rfapi_basic_sanity_config2/r2/bgpd.conf index 524051426b..95890f25b9 100644 --- a/tests/topotests/bgp_rfapi_basic_sanity_config2/r2/bgpd.conf +++ b/tests/topotests/bgp_rfapi_basic_sanity_config2/r2/bgpd.conf @@ -3,7 +3,6 @@ frr defaults traditional hostname r2 password zebra log stdout notifications -log monitor notifications log commands router bgp 5226 bgp router-id 2.2.2.2 diff --git a/tests/topotests/bgp_rfapi_basic_sanity_config2/r3/bgpd.conf b/tests/topotests/bgp_rfapi_basic_sanity_config2/r3/bgpd.conf index 8c75a39efa..dbeb2c4665 100644 --- a/tests/topotests/bgp_rfapi_basic_sanity_config2/r3/bgpd.conf +++ b/tests/topotests/bgp_rfapi_basic_sanity_config2/r3/bgpd.conf @@ -3,7 +3,6 @@ frr defaults traditional hostname r3 password zebra log stdout notifications -log monitor notifications log commands router bgp 5226 bgp router-id 3.3.3.3 diff --git a/tests/topotests/bgp_rfapi_basic_sanity_config2/r4/bgpd.conf b/tests/topotests/bgp_rfapi_basic_sanity_config2/r4/bgpd.conf index 38f8758cbc..ae1787718c 100644 --- a/tests/topotests/bgp_rfapi_basic_sanity_config2/r4/bgpd.conf +++ b/tests/topotests/bgp_rfapi_basic_sanity_config2/r4/bgpd.conf @@ -3,7 +3,6 @@ frr defaults traditional hostname r4 password zebra log stdout notifications -log monitor notifications log commands router bgp 5226 bgp router-id 4.4.4.4 -- 2.39.5