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

diff --git a/tests/topotests/bgp_snmp_mplsl3vpn/ce1/snmpd.conf b/tests/topotests/bgp_snmp_mplsl3vpn/ce1/snmpd.conf
index 4aff57acaf17ecf5f4906cf1901f72caee10ae78..c8d0bab0486918e9723785e7a486ea498426e1d3 100644 (file)
--- 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 29c2041d12fa5cd30a09f458ebc299f2dbe6d5bc..c8d0bab0486918e9723785e7a486ea498426e1d3 100644 (file)
--- 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 4aff57acaf17ecf5f4906cf1901f72caee10ae78..c8d0bab0486918e9723785e7a486ea498426e1d3 100644 (file)
--- 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 4aff57acaf17ecf5f4906cf1901f72caee10ae78..c8d0bab0486918e9723785e7a486ea498426e1d3 100644 (file)
--- 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 2ada53ced999556c1ac42d34331040fc2bb9db5c..d7886e51329c878fe56c62650efa35c2d5f4faa3 100644 (file)
--- 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 3db1ab7acedb9416edd51ec41d8c2314ffb9fdd7..c8d0bab0486918e9723785e7a486ea498426e1d3 100644 (file)
--- 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 494df81ffb4abf588b483d3d146f007061d8496d..c8d0bab0486918e9723785e7a486ea498426e1d3 100644 (file)
--- 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 f3809607e35e6bf4dab31ee9b4193f1bafd8d333..c8d0bab0486918e9723785e7a486ea498426e1d3 100644 (file)
--- 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 3fd5e982e8fbbdaa4adce98ed82577445e0e1d03..cdcd9a2b372dd0076a22d8088cd0372a3ce996f6 100644 (file)
--- 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 fc648057a5e10fe578074f446b5c8142aa1a9c21..e511929f67ac4f12abd07d451a3cf163ced2bc4d 100644 (file)
--- 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 20af65e431bd6a9d4ce52c137fb7312a26549c8d..19fb256b9ab0d74bcafe328ba0aa1d5689184939 100644 (file)
--- 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 76e4b79069610a3e45a7754825c4828d3d2652b2..2178a3e1d8eb95d482da6b542d5fd2c0c7ed6936 100644 (file)
--- 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 af59194bc9e2e566b828063be2b43460acc5e5c5..5b11cfc5e0e838356626f4e85b2e27e238d359d8 100644 (file)
--- 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 3fd5e982e8fbbdaa4adce98ed82577445e0e1d03..cdcd9a2b372dd0076a22d8088cd0372a3ce996f6 100644 (file)
--- 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 fc648057a5e10fe578074f446b5c8142aa1a9c21..17ddc2a1f9a887e06ad6c269fc2d01db5f8e8375 100644 (file)
--- 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 740574cb8e9af33f1dfd853e549b0bb3a5b79831..cdcd9a2b372dd0076a22d8088cd0372a3ce996f6 100644 (file)
--- 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