From afe11d5edf9d157a696cfea080045917691d00c1 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 12 Sep 2023 13:05:05 -0400 Subject: [PATCH] tests: snmp tests sometimes fail with `Unable to bind` the snmp tests are using zebra.conf to setup the address that they are binding to and immediately after that they are starting snmpd. If snmpd starts up *before* zebra has installed the address the bind on the address will fail. Causing the entire test to fail. Modify the snmpd.conf for all our snmp tests to bind to all addresses. Things still work and we no longer have an issue. Signed-off-by: Donald Sharp --- tests/topotests/bgp_snmp_mplsl3vpn/ce1/snmpd.conf | 4 ++-- tests/topotests/bgp_snmp_mplsl3vpn/ce2/snmpd.conf | 4 ++-- tests/topotests/bgp_snmp_mplsl3vpn/ce3/snmpd.conf | 4 ++-- tests/topotests/bgp_snmp_mplsl3vpn/ce4/snmpd.conf | 4 ++-- tests/topotests/bgp_snmp_mplsl3vpn/r1/snmpd.conf | 4 ++-- tests/topotests/bgp_snmp_mplsl3vpn/r2/snmpd.conf | 4 ++-- tests/topotests/bgp_snmp_mplsl3vpn/r3/snmpd.conf | 4 ++-- tests/topotests/bgp_snmp_mplsl3vpn/r4/snmpd.conf | 4 ++-- tests/topotests/isis_snmp/r1/snmpd.conf | 4 ++-- tests/topotests/isis_snmp/r2/snmpd.conf | 4 ++-- tests/topotests/isis_snmp/r3/snmpd.conf | 4 ++-- tests/topotests/isis_snmp/r4/snmpd.conf | 4 ++-- tests/topotests/isis_snmp/r5/snmpd.conf | 4 ++-- tests/topotests/ldp_snmp/r1/snmpd.conf | 4 ++-- tests/topotests/ldp_snmp/r2/snmpd.conf | 4 ++-- tests/topotests/simple_snmp_test/r1/snmpd.conf | 2 +- 16 files changed, 31 insertions(+), 31 deletions(-) diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/ce1/snmpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce1/snmpd.conf index 4aff57acaf..c8d0bab048 100644 --- a/tests/topotests/bgp_snmp_mplsl3vpn/ce1/snmpd.conf +++ b/tests/topotests/bgp_snmp_mplsl3vpn/ce1/snmpd.conf @@ -1,4 +1,4 @@ -agentAddress udp:10.5.5.5:161 +agentAddress udp:161 com2sec public localhost public @@ -15,4 +15,4 @@ rouser frr master agentx agentXSocket /etc/frr/agentx -agentXPerms 777 755 root frr \ No newline at end of file +agentXPerms 777 755 root frr diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/ce2/snmpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce2/snmpd.conf index 29c2041d12..c8d0bab048 100644 --- a/tests/topotests/bgp_snmp_mplsl3vpn/ce2/snmpd.conf +++ b/tests/topotests/bgp_snmp_mplsl3vpn/ce2/snmpd.conf @@ -1,4 +1,4 @@ -agentAddress udp:10.6.6.6:161 +agentAddress udp:161 com2sec public localhost public @@ -15,4 +15,4 @@ rouser frr master agentx agentXSocket /etc/frr/agentx -agentXPerms 777 755 root frr \ No newline at end of file +agentXPerms 777 755 root frr diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/ce3/snmpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce3/snmpd.conf index 4aff57acaf..c8d0bab048 100644 --- a/tests/topotests/bgp_snmp_mplsl3vpn/ce3/snmpd.conf +++ b/tests/topotests/bgp_snmp_mplsl3vpn/ce3/snmpd.conf @@ -1,4 +1,4 @@ -agentAddress udp:10.5.5.5:161 +agentAddress udp:161 com2sec public localhost public @@ -15,4 +15,4 @@ rouser frr master agentx agentXSocket /etc/frr/agentx -agentXPerms 777 755 root frr \ No newline at end of file +agentXPerms 777 755 root frr diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/ce4/snmpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce4/snmpd.conf index 4aff57acaf..c8d0bab048 100644 --- a/tests/topotests/bgp_snmp_mplsl3vpn/ce4/snmpd.conf +++ b/tests/topotests/bgp_snmp_mplsl3vpn/ce4/snmpd.conf @@ -1,4 +1,4 @@ -agentAddress udp:10.5.5.5:161 +agentAddress udp:161 com2sec public localhost public @@ -15,4 +15,4 @@ rouser frr master agentx agentXSocket /etc/frr/agentx -agentXPerms 777 755 root frr \ No newline at end of file +agentXPerms 777 755 root frr diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/r1/snmpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r1/snmpd.conf index 2ada53ced9..d7886e5132 100644 --- a/tests/topotests/bgp_snmp_mplsl3vpn/r1/snmpd.conf +++ b/tests/topotests/bgp_snmp_mplsl3vpn/r1/snmpd.conf @@ -1,4 +1,4 @@ -agentAddress udp:10.1.1.1:161 +agentAddress udp:161 com2sec public 10.1.1.1 public @@ -17,4 +17,4 @@ master agentx noRangeCheck yes agentXSocket /etc/frr/agentx -agentXPerms 777 755 root frr \ No newline at end of file +agentXPerms 777 755 root frr diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/r2/snmpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r2/snmpd.conf index 3db1ab7ace..c8d0bab048 100644 --- a/tests/topotests/bgp_snmp_mplsl3vpn/r2/snmpd.conf +++ b/tests/topotests/bgp_snmp_mplsl3vpn/r2/snmpd.conf @@ -1,4 +1,4 @@ -agentAddress udp:10.2.2.2:161 +agentAddress udp:161 com2sec public localhost public @@ -15,4 +15,4 @@ rouser frr master agentx agentXSocket /etc/frr/agentx -agentXPerms 777 755 root frr \ No newline at end of file +agentXPerms 777 755 root frr diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/r3/snmpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r3/snmpd.conf index 494df81ffb..c8d0bab048 100644 --- a/tests/topotests/bgp_snmp_mplsl3vpn/r3/snmpd.conf +++ b/tests/topotests/bgp_snmp_mplsl3vpn/r3/snmpd.conf @@ -1,4 +1,4 @@ -agentAddress udp:10.3.3.3:161 +agentAddress udp:161 com2sec public localhost public @@ -15,4 +15,4 @@ rouser frr master agentx agentXSocket /etc/frr/agentx -agentXPerms 777 755 root frr \ No newline at end of file +agentXPerms 777 755 root frr diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/r4/snmpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/r4/snmpd.conf index f3809607e3..c8d0bab048 100644 --- a/tests/topotests/bgp_snmp_mplsl3vpn/r4/snmpd.conf +++ b/tests/topotests/bgp_snmp_mplsl3vpn/r4/snmpd.conf @@ -1,4 +1,4 @@ -agentAddress udp:10.4.4.4:161 +agentAddress udp:161 com2sec public localhost public @@ -15,4 +15,4 @@ rouser frr master agentx agentXSocket /etc/frr/agentx -agentXPerms 777 755 root frr \ No newline at end of file +agentXPerms 777 755 root frr diff --git a/tests/topotests/isis_snmp/r1/snmpd.conf b/tests/topotests/isis_snmp/r1/snmpd.conf index 3fd5e982e8..cdcd9a2b37 100644 --- a/tests/topotests/isis_snmp/r1/snmpd.conf +++ b/tests/topotests/isis_snmp/r1/snmpd.conf @@ -1,4 +1,4 @@ -agentAddress udp:1.1.1.1:161 +agentAddress udp:161 com2sec public 1.1.1.1 public @@ -15,4 +15,4 @@ rouser frr master agentx agentXSocket /etc/frr/agentx -agentXPerms 777 755 root frr \ No newline at end of file +agentXPerms 777 755 root frr diff --git a/tests/topotests/isis_snmp/r2/snmpd.conf b/tests/topotests/isis_snmp/r2/snmpd.conf index fc648057a5..e511929f67 100644 --- a/tests/topotests/isis_snmp/r2/snmpd.conf +++ b/tests/topotests/isis_snmp/r2/snmpd.conf @@ -1,4 +1,4 @@ -agentAddress udp:2.2.2.2:161 +agentAddress udp::161 com2sec public 2.2.2.2 public @@ -15,4 +15,4 @@ rouser frr master agentx agentXSocket /etc/frr/agentx -agentXPerms 777 755 root frr \ No newline at end of file +agentXPerms 777 755 root frr diff --git a/tests/topotests/isis_snmp/r3/snmpd.conf b/tests/topotests/isis_snmp/r3/snmpd.conf index 20af65e431..19fb256b9a 100644 --- a/tests/topotests/isis_snmp/r3/snmpd.conf +++ b/tests/topotests/isis_snmp/r3/snmpd.conf @@ -1,4 +1,4 @@ -agentAddress udp:3.3.3.3:161 +agentAddress udp:161 com2sec public 3.3.3.3 public @@ -15,4 +15,4 @@ rouser frr master agentx agentXSocket /etc/frr/agentx -agentXPerms 777 755 root frr \ No newline at end of file +agentXPerms 777 755 root frr diff --git a/tests/topotests/isis_snmp/r4/snmpd.conf b/tests/topotests/isis_snmp/r4/snmpd.conf index 76e4b79069..2178a3e1d8 100644 --- a/tests/topotests/isis_snmp/r4/snmpd.conf +++ b/tests/topotests/isis_snmp/r4/snmpd.conf @@ -1,4 +1,4 @@ -agentAddress udp:4.4.4.4:161 +agentAddress udp:161 com2sec public 4.4.4.4 public @@ -15,4 +15,4 @@ rouser frr master agentx agentXSocket /etc/frr/agentx -agentXPerms 777 755 root frr \ No newline at end of file +agentXPerms 777 755 root frr diff --git a/tests/topotests/isis_snmp/r5/snmpd.conf b/tests/topotests/isis_snmp/r5/snmpd.conf index af59194bc9..5b11cfc5e0 100644 --- a/tests/topotests/isis_snmp/r5/snmpd.conf +++ b/tests/topotests/isis_snmp/r5/snmpd.conf @@ -1,4 +1,4 @@ -agentAddress udp:5.5.5.5:161 +agentAddress udp::161 com2sec public 5.5.5.5 public @@ -15,4 +15,4 @@ rouser frr master agentx agentXSocket /etc/frr/agentx -agentXPerms 777 755 root frr \ No newline at end of file +agentXPerms 777 755 root frr diff --git a/tests/topotests/ldp_snmp/r1/snmpd.conf b/tests/topotests/ldp_snmp/r1/snmpd.conf index 3fd5e982e8..cdcd9a2b37 100644 --- a/tests/topotests/ldp_snmp/r1/snmpd.conf +++ b/tests/topotests/ldp_snmp/r1/snmpd.conf @@ -1,4 +1,4 @@ -agentAddress udp:1.1.1.1:161 +agentAddress udp:161 com2sec public 1.1.1.1 public @@ -15,4 +15,4 @@ rouser frr master agentx agentXSocket /etc/frr/agentx -agentXPerms 777 755 root frr \ No newline at end of file +agentXPerms 777 755 root frr diff --git a/tests/topotests/ldp_snmp/r2/snmpd.conf b/tests/topotests/ldp_snmp/r2/snmpd.conf index fc648057a5..17ddc2a1f9 100644 --- a/tests/topotests/ldp_snmp/r2/snmpd.conf +++ b/tests/topotests/ldp_snmp/r2/snmpd.conf @@ -1,4 +1,4 @@ -agentAddress udp:2.2.2.2:161 +agentAddress udp:161 com2sec public 2.2.2.2 public @@ -15,4 +15,4 @@ rouser frr master agentx agentXSocket /etc/frr/agentx -agentXPerms 777 755 root frr \ No newline at end of file +agentXPerms 777 755 root frr diff --git a/tests/topotests/simple_snmp_test/r1/snmpd.conf b/tests/topotests/simple_snmp_test/r1/snmpd.conf index 740574cb8e..cdcd9a2b37 100644 --- a/tests/topotests/simple_snmp_test/r1/snmpd.conf +++ b/tests/topotests/simple_snmp_test/r1/snmpd.conf @@ -1,4 +1,4 @@ -agentAddress udp:1.1.1.1:161 +agentAddress udp:161 com2sec public 1.1.1.1 public