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 <sharpd@cumulusnetworks.com>

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 c1bb7e3d15cef7d6b7ed986229d87a53b3e302ca..2712e54f128e6d86c6975485578ae2950aa3270e 100644 (file)
--- 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 c889a4c5967bdc4501c7143ac3c45ee71cd80145..69305512cb6f085b2622b56855803cb2cce119be 100644 (file)
--- 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 36dd97190e1629b0b3f19243040285b5b7bd2d07..3ad95c3612a60f3b3225775787598b2c4c1340d1 100644 (file)
--- 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 33041262f6a030cf66175dbda4a767870e8d9fde..502c4c8b2f4ce09210613c5bdccf11bb3aca0e48 100644 (file)
--- 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 524051426b68af3b780ce885dd8ab6ff942a2df4..95890f25b9280ba154b884eb854cfc19589c75b1 100644 (file)
--- 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 29b9f0da6ca21c1dbbdeb1443a5ac3fe7870f812..2f7de073c330db380ac5589d80b11389f5971345 100644 (file)
--- 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 e09b505ee45169d8c1f00d679d786d94aafdd7bc..720d06dbf1e3b812b77f7de5c22fb977c764debd 100644 (file)
--- 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 c3309d8c75567d1efde2696ff29c5f969a6aa802..b81cd33c4f0ca2f716fbf9a7270c0ec6baa42137 100644 (file)
--- 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 54401bfb2f00cae64910b0c39f25ec5347239edc..f18e5b852e07c415c2010f9ff728f93bb0471288 100644 (file)
--- 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 f742fede1a4b9db3bf5a2c14c2d7f3d6582dbf71..54a09335889953342f3531356a0dfac2ed8591d8 100644 (file)
--- 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 91311f32c5b2adcd4c3037e281ebdea163cdfc6c..5289628480d2168264395d1f8d2293e3bf1627c7 100644 (file)
--- 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 a9549e8fee1c25c64e582b19939ca02b943b4559..5da53ae1e7c3506c08ab5ea83091cdb241403930 100644 (file)
--- 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 cda6d9429a13c85eb0ed492abda57fa42fc5e238..e4a6b8e32c8f55f769f9613998df7e0bf088cc6d 100644 (file)
--- 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 e2a8de7db747ba0bf815a730a27d17638d550092..a861469c7abe183e4819d5e1241b19cf9dbddd0b 100644 (file)
--- 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 7b267a6ee16123267428952ebba7ec1076c118f7..480f95954e792771665dd5cee04745a148e75f26 100644 (file)
--- 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 2f8759f960d9a77baf125026e5c648712a46b243..06bdc31f8c9d602c7d6bfdf16066b63407b7a782 100644 (file)
--- 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 b3fe5ff23d0c7f6c80c144d52533fd9068fe5fe8..ada354bd625caf809a0e1d1f852f1d09b39a6ed7 100644 (file)
--- 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 524051426b68af3b780ce885dd8ab6ff942a2df4..95890f25b9280ba154b884eb854cfc19589c75b1 100644 (file)
--- 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 fbb6a65d6166af400a4bec8d5bf86cd39d5d212d..4932d63d4f61de8beea21e3e5e002f69f5440730 100644 (file)
--- 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 d61f776f3d6dac505724611e6f8af491b66d6afb..1a5e41aae6efbbc76ad1b64bd5ef179fb076e9d8 100644 (file)
--- 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 626d8227e726f2bbd0950bc8d8bf7050db5d589c..a38afd632f3d09542863970edc81b951558bcf90 100644 (file)
--- 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 524051426b68af3b780ce885dd8ab6ff942a2df4..95890f25b9280ba154b884eb854cfc19589c75b1 100644 (file)
--- 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 8c75a39efa09ce12b7ecbcf9470ef8ca9aff5e31..dbeb2c4665ddf2b1a05ae5255127b76532e06faa 100644 (file)
--- 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 38f8758cbc95b897a29e694634b2b978b946a761..ae1787718c901f81b9433a31012a0139f1e687ee 100644 (file)
--- 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