summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/topotests/Dockerfile1
-rw-r--r--tests/topotests/bfd-bgp-cbit-topo3/r1/peers.json5
-rw-r--r--tests/topotests/bfd-bgp-cbit-topo3/r1/peers_down.json5
-rw-r--r--tests/topotests/bfd-bgp-cbit-topo3/r3/peers.json5
-rw-r--r--tests/topotests/bfd-bgp-cbit-topo3/r3/peers_down.json5
-rw-r--r--tests/topotests/bfd-profiles-topo1/r1/bfdd.conf1
-rw-r--r--tests/topotests/bfd-profiles-topo1/r2/bfd-peers-initial.json3
-rw-r--r--tests/topotests/bfd-profiles-topo1/r2/bfdd.conf1
-rw-r--r--tests/topotests/bfd-profiles-topo1/r3/bfd-peers-initial.json1
-rw-r--r--tests/topotests/bfd-profiles-topo1/r4/bfd-peers-initial.json2
-rw-r--r--tests/topotests/bfd-topo1/r2/peers.json2
-rw-r--r--tests/topotests/bfd-topo2/r1/peers.json10
-rw-r--r--tests/topotests/bfd-topo2/r2/peers.json15
-rw-r--r--tests/topotests/bfd-topo2/r3/peers.json5
-rw-r--r--tests/topotests/bfd-topo2/r4/peers.json10
-rw-r--r--tests/topotests/bfd-topo3/r1/bfd-peers.json15
-rw-r--r--tests/topotests/bfd-topo3/r2/bfd-peers.json10
-rw-r--r--tests/topotests/bfd-topo3/r3/bfd-peers.json15
-rw-r--r--tests/topotests/bfd-topo3/r4/bfd-peers.json10
-rw-r--r--tests/topotests/bfd-vrf-topo1/r2/peers.json2
-rwxr-xr-xtests/topotests/bgp-snmp-mplsl3vpn/test_bgp_snmp_mplsvpn.py25
-rwxr-xr-xtests/topotests/docker/frr-topotests.sh1
-rwxr-xr-xtests/topotests/docker/inner/compile_frr.sh12
-rwxr-xr-xtests/topotests/docker/inner/funcs.sh1
-rw-r--r--tests/topotests/ldp-snmp/test_ldp_snmp_topo1.py48
25 files changed, 147 insertions, 63 deletions
diff --git a/tests/topotests/Dockerfile b/tests/topotests/Dockerfile
index b7042d84c6..c9110d2db9 100644
--- a/tests/topotests/Dockerfile
+++ b/tests/topotests/Dockerfile
@@ -23,6 +23,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
libreadline-dev \
libc-ares-dev \
libcap-dev \
+ libelf-dev \
man \
mininet \
pkg-config \
diff --git a/tests/topotests/bfd-bgp-cbit-topo3/r1/peers.json b/tests/topotests/bfd-bgp-cbit-topo3/r1/peers.json
index d1927ae49a..b436d5562e 100644
--- a/tests/topotests/bfd-bgp-cbit-topo3/r1/peers.json
+++ b/tests/topotests/bfd-bgp-cbit-topo3/r1/peers.json
@@ -8,9 +8,10 @@
"remote-diagnostic":"ok",
"receive-interval":300,
"transmit-interval":300,
- "echo-interval":0,
+ "echo-receive-interval":50,
+ "echo-transmit-interval":0,
"remote-receive-interval":300,
"remote-transmit-interval":300,
- "remote-echo-interval":50
+ "remote-echo-receive-interval":50
}
]
diff --git a/tests/topotests/bfd-bgp-cbit-topo3/r1/peers_down.json b/tests/topotests/bfd-bgp-cbit-topo3/r1/peers_down.json
index 25b47f18ec..c7c7b96ee7 100644
--- a/tests/topotests/bfd-bgp-cbit-topo3/r1/peers_down.json
+++ b/tests/topotests/bfd-bgp-cbit-topo3/r1/peers_down.json
@@ -6,9 +6,10 @@
"status":"up",
"receive-interval":300,
"transmit-interval":300,
- "echo-interval":0,
+ "echo-receive-interval":50,
+ "echo-transmit-interval":0,
"remote-receive-interval":300,
"remote-transmit-interval":300,
- "remote-echo-interval":50
+ "remote-echo-receive-interval":50
}
]
diff --git a/tests/topotests/bfd-bgp-cbit-topo3/r3/peers.json b/tests/topotests/bfd-bgp-cbit-topo3/r3/peers.json
index 5193f2a6e2..fc9e145340 100644
--- a/tests/topotests/bfd-bgp-cbit-topo3/r3/peers.json
+++ b/tests/topotests/bfd-bgp-cbit-topo3/r3/peers.json
@@ -8,9 +8,10 @@
"remote-diagnostic":"ok",
"receive-interval":300,
"transmit-interval":300,
- "echo-interval":0,
+ "echo-receive-interval":50,
+ "echo-transmit-interval":0,
"remote-receive-interval":300,
"remote-transmit-interval":300,
- "remote-echo-interval":50
+ "remote-echo-receive-interval":50
}
]
diff --git a/tests/topotests/bfd-bgp-cbit-topo3/r3/peers_down.json b/tests/topotests/bfd-bgp-cbit-topo3/r3/peers_down.json
index 9e4bd2633f..620c6ddcd4 100644
--- a/tests/topotests/bfd-bgp-cbit-topo3/r3/peers_down.json
+++ b/tests/topotests/bfd-bgp-cbit-topo3/r3/peers_down.json
@@ -6,9 +6,10 @@
"status":"down",
"receive-interval":300,
"transmit-interval":300,
- "echo-interval":0,
+ "echo-receive-interval":50,
+ "echo-transmit-interval":0,
"remote-receive-interval":300,
"remote-transmit-interval":300,
- "remote-echo-interval":50
+ "remote-echo-receive-interval":50
}
]
diff --git a/tests/topotests/bfd-profiles-topo1/r1/bfdd.conf b/tests/topotests/bfd-profiles-topo1/r1/bfdd.conf
index 4d636ab052..688f2e839c 100644
--- a/tests/topotests/bfd-profiles-topo1/r1/bfdd.conf
+++ b/tests/topotests/bfd-profiles-topo1/r1/bfdd.conf
@@ -6,6 +6,7 @@ bfd
profile slowtx
receive-interval 800
transmit-interval 800
+ echo receive-interval 400
!
peer 172.16.0.1 interface r1-eth0
profile slowtx
diff --git a/tests/topotests/bfd-profiles-topo1/r2/bfd-peers-initial.json b/tests/topotests/bfd-profiles-topo1/r2/bfd-peers-initial.json
index 3df9ec9c9d..503f776aec 100644
--- a/tests/topotests/bfd-profiles-topo1/r2/bfd-peers-initial.json
+++ b/tests/topotests/bfd-profiles-topo1/r2/bfd-peers-initial.json
@@ -12,6 +12,7 @@
"remote-id": "*",
"remote-receive-interval": 800,
"remote-transmit-interval": 800,
+ "remote-echo-receive-interval": 400,
"status": "up",
"transmit-interval": 800,
"uptime": "*",
@@ -27,7 +28,7 @@
"receive-interval": 250,
"remote-detect-multiplier": 3,
"remote-diagnostic": "ok",
- "remote-echo-interval": 50,
+ "remote-echo-receive-interval": 50,
"remote-id": "*",
"remote-receive-interval": 300,
"remote-transmit-interval": 300,
diff --git a/tests/topotests/bfd-profiles-topo1/r2/bfdd.conf b/tests/topotests/bfd-profiles-topo1/r2/bfdd.conf
index 23a39a6ee0..700c46ba1e 100644
--- a/tests/topotests/bfd-profiles-topo1/r2/bfdd.conf
+++ b/tests/topotests/bfd-profiles-topo1/r2/bfdd.conf
@@ -10,6 +10,7 @@ bfd
profile fasttx
receive-interval 250
transmit-interval 250
+ echo receive-interval disabled
!
peer 172.16.0.2 interface r2-eth0
profile slowtx
diff --git a/tests/topotests/bfd-profiles-topo1/r3/bfd-peers-initial.json b/tests/topotests/bfd-profiles-topo1/r3/bfd-peers-initial.json
index d2d0c601c3..d987a0ae7d 100644
--- a/tests/topotests/bfd-profiles-topo1/r3/bfd-peers-initial.json
+++ b/tests/topotests/bfd-profiles-topo1/r3/bfd-peers-initial.json
@@ -12,6 +12,7 @@
"remote-id": "*",
"remote-receive-interval": 250,
"remote-transmit-interval": 250,
+ "remote-echo-receive-interval": 0,
"status": "up",
"transmit-interval": 300,
"uptime": "*",
diff --git a/tests/topotests/bfd-profiles-topo1/r4/bfd-peers-initial.json b/tests/topotests/bfd-profiles-topo1/r4/bfd-peers-initial.json
index 2c2e136abf..c73296ac97 100644
--- a/tests/topotests/bfd-profiles-topo1/r4/bfd-peers-initial.json
+++ b/tests/topotests/bfd-profiles-topo1/r4/bfd-peers-initial.json
@@ -29,7 +29,7 @@
"receive-interval": 300,
"remote-detect-multiplier": 3,
"remote-diagnostic": "ok",
- "remote-echo-interval": 50,
+ "remote-echo-receive-interval": 50,
"remote-id": "*",
"remote-receive-interval": 300,
"remote-transmit-interval": 300,
diff --git a/tests/topotests/bfd-topo1/r2/peers.json b/tests/topotests/bfd-topo1/r2/peers.json
index 5035d643c5..267459c7a8 100644
--- a/tests/topotests/bfd-topo1/r2/peers.json
+++ b/tests/topotests/bfd-topo1/r2/peers.json
@@ -4,7 +4,7 @@
"status": "up"
},
{
- "remote-echo-interval": 100,
+ "remote-echo-receive-interval": 100,
"peer": "192.168.1.1",
"status": "up"
},
diff --git a/tests/topotests/bfd-topo2/r1/peers.json b/tests/topotests/bfd-topo2/r1/peers.json
index b14351cd81..9bce991d0d 100644
--- a/tests/topotests/bfd-topo2/r1/peers.json
+++ b/tests/topotests/bfd-topo2/r1/peers.json
@@ -8,10 +8,11 @@
"remote-diagnostic":"ok",
"receive-interval":300,
"transmit-interval":300,
- "echo-interval":0,
+ "echo-receive-interval":50,
+ "echo-transmit-interval":0,
"remote-receive-interval":300,
"remote-transmit-interval":300,
- "remote-echo-interval":50
+ "remote-echo-receive-interval":50
},
{
"multihop":false,
@@ -21,9 +22,10 @@
"remote-diagnostic":"ok",
"receive-interval":300,
"transmit-interval":300,
- "echo-interval":0,
+ "echo-receive-interval":50,
+ "echo-transmit-interval":0,
"remote-receive-interval":300,
"remote-transmit-interval":300,
- "remote-echo-interval":50
+ "remote-echo-receive-interval":50
}
]
diff --git a/tests/topotests/bfd-topo2/r2/peers.json b/tests/topotests/bfd-topo2/r2/peers.json
index 29075fcc80..ec2135ce37 100644
--- a/tests/topotests/bfd-topo2/r2/peers.json
+++ b/tests/topotests/bfd-topo2/r2/peers.json
@@ -3,39 +3,42 @@
"status": "up",
"transmit-interval": 300,
"remote-receive-interval": 300,
- "echo-interval": 0,
+ "echo-receive-interval": 50,
+ "echo-transmit-interval": 0,
"diagnostic": "ok",
"multihop": false,
"interface": "r2-eth0",
"remote-transmit-interval": 300,
"receive-interval": 300,
- "remote-echo-interval": 50,
+ "remote-echo-receive-interval": 50,
"remote-diagnostic": "ok"
},
{
"status": "up",
"transmit-interval": 300,
"remote-receive-interval": 300,
- "echo-interval": 0,
+ "echo-receive-interval": 50,
+ "echo-transmit-interval": 0,
"diagnostic": "ok",
"multihop": false,
"interface": "r2-eth2",
"remote-transmit-interval": 300,
"receive-interval": 300,
- "remote-echo-interval": 50,
+ "remote-echo-receive-interval": 50,
"remote-diagnostic": "ok"
},
{
"status": "up",
"transmit-interval": 300,
"remote-receive-interval": 300,
- "echo-interval": 0,
+ "echo-receive-interval": 50,
+ "echo-transmit-interval": 0,
"diagnostic": "ok",
"multihop": false,
"interface": "r2-eth1",
"remote-transmit-interval": 300,
"receive-interval": 300,
- "remote-echo-interval": 50,
+ "remote-echo-receive-interval": 50,
"remote-diagnostic": "ok",
"peer": "10.0.3.1"
}
diff --git a/tests/topotests/bfd-topo2/r3/peers.json b/tests/topotests/bfd-topo2/r3/peers.json
index 6698bff201..c19c980338 100644
--- a/tests/topotests/bfd-topo2/r3/peers.json
+++ b/tests/topotests/bfd-topo2/r3/peers.json
@@ -3,13 +3,14 @@
"status": "up",
"transmit-interval": 300,
"remote-receive-interval": 300,
- "echo-interval": 0,
+ "echo-receive-interval": 50,
+ "echo-transmit-interval": 0,
"diagnostic": "ok",
"multihop": false,
"interface": "r3-eth0",
"remote-transmit-interval": 300,
"receive-interval": 300,
- "remote-echo-interval": 50,
+ "remote-echo-receive-interval": 50,
"remote-diagnostic": "ok",
"peer": "10.0.3.2"
}
diff --git a/tests/topotests/bfd-topo2/r4/peers.json b/tests/topotests/bfd-topo2/r4/peers.json
index 83101eb47f..dd26b9b580 100644
--- a/tests/topotests/bfd-topo2/r4/peers.json
+++ b/tests/topotests/bfd-topo2/r4/peers.json
@@ -8,10 +8,11 @@
"remote-diagnostic":"ok",
"receive-interval":300,
"transmit-interval":300,
- "echo-interval":0,
+ "echo-receive-interval": 50,
+ "echo-transmit-interval":0,
"remote-receive-interval":300,
"remote-transmit-interval":300,
- "remote-echo-interval":50
+ "remote-echo-receive-interval":50
},
{
"multihop":false,
@@ -21,9 +22,10 @@
"remote-diagnostic":"ok",
"receive-interval":300,
"transmit-interval":300,
- "echo-interval":0,
+ "echo-receive-interval": 50,
+ "echo-transmit-interval":0,
"remote-receive-interval":300,
"remote-transmit-interval":300,
- "remote-echo-interval":50
+ "remote-echo-receive-interval":50
}
]
diff --git a/tests/topotests/bfd-topo3/r1/bfd-peers.json b/tests/topotests/bfd-topo3/r1/bfd-peers.json
index 56205d538b..f8a354fc20 100644
--- a/tests/topotests/bfd-topo3/r1/bfd-peers.json
+++ b/tests/topotests/bfd-topo3/r1/bfd-peers.json
@@ -2,7 +2,8 @@
{
"detect-multiplier": 3,
"diagnostic": "ok",
- "echo-interval": 0,
+ "echo-receive-interval": 50,
+ "echo-transmit-interval": 0,
"id": "*",
"local": "2001:db8:1::1",
"minimum-ttl": 253,
@@ -12,7 +13,7 @@
"receive-interval": 2000,
"remote-detect-multiplier": 3,
"remote-diagnostic": "ok",
- "remote-echo-interval": 50,
+ "remote-echo-receive-interval": 50,
"remote-id": "*",
"remote-receive-interval": 2000,
"remote-transmit-interval": 2000,
@@ -24,7 +25,8 @@
{
"detect-multiplier": 3,
"diagnostic": "ok",
- "echo-interval": 0,
+ "echo-receive-interval": 50,
+ "echo-transmit-interval": 0,
"id": "*",
"interface": "r1-eth0",
"local": "2001:db8:1::1",
@@ -34,7 +36,7 @@
"receive-interval": 600,
"remote-detect-multiplier": 3,
"remote-diagnostic": "ok",
- "remote-echo-interval": 50,
+ "remote-echo-receive-interval": 50,
"remote-id": "*",
"remote-receive-interval": 600,
"remote-transmit-interval": 600,
@@ -46,7 +48,8 @@
{
"detect-multiplier": 3,
"diagnostic": "ok",
- "echo-interval": 0,
+ "echo-receive-interval": 50,
+ "echo-transmit-interval": 0,
"id": "*",
"local": "192.168.1.1",
"minimum-ttl": 254,
@@ -56,7 +59,7 @@
"receive-interval": 2000,
"remote-detect-multiplier": 3,
"remote-diagnostic": "ok",
- "remote-echo-interval": 50,
+ "remote-echo-receive-interval": 50,
"remote-id": "*",
"remote-receive-interval": 2000,
"remote-transmit-interval": 2000,
diff --git a/tests/topotests/bfd-topo3/r2/bfd-peers.json b/tests/topotests/bfd-topo3/r2/bfd-peers.json
index cb8985b13e..786d66dbe3 100644
--- a/tests/topotests/bfd-topo3/r2/bfd-peers.json
+++ b/tests/topotests/bfd-topo3/r2/bfd-peers.json
@@ -2,7 +2,8 @@
{
"detect-multiplier": 3,
"diagnostic": "ok",
- "echo-interval": 0,
+ "echo-receive-interval": 50,
+ "echo-transmit-interval": 0,
"id": "*",
"interface": "r2-eth0",
"local": "2001:db8:1::2",
@@ -12,7 +13,7 @@
"receive-interval": 600,
"remote-detect-multiplier": 3,
"remote-diagnostic": "ok",
- "remote-echo-interval": 50,
+ "remote-echo-receive-interval": 50,
"remote-id": "*",
"remote-receive-interval": 600,
"remote-transmit-interval": 600,
@@ -24,7 +25,8 @@
{
"detect-multiplier": 3,
"diagnostic": "ok",
- "echo-interval": 0,
+ "echo-receive-interval": 50,
+ "echo-transmit-interval": 0,
"id": "*",
"interface": "r2-eth1",
"local": "2001:db8:2::2",
@@ -34,7 +36,7 @@
"receive-interval": 2000,
"remote-detect-multiplier": 3,
"remote-diagnostic": "ok",
- "remote-echo-interval": 50,
+ "remote-echo-receive-interval": 50,
"remote-id": "*",
"remote-receive-interval": 2000,
"remote-transmit-interval": 2000,
diff --git a/tests/topotests/bfd-topo3/r3/bfd-peers.json b/tests/topotests/bfd-topo3/r3/bfd-peers.json
index 8be35fd084..1f58663a4e 100644
--- a/tests/topotests/bfd-topo3/r3/bfd-peers.json
+++ b/tests/topotests/bfd-topo3/r3/bfd-peers.json
@@ -2,7 +2,8 @@
{
"detect-multiplier": 3,
"diagnostic": "ok",
- "echo-interval": 0,
+ "echo-receive-interval": 50,
+ "echo-transmit-interval": 0,
"id": "*",
"interface": "r3-eth1",
"local": "2001:db8:3::2",
@@ -12,7 +13,7 @@
"receive-interval": 2000,
"remote-detect-multiplier": 3,
"remote-diagnostic": "ok",
- "remote-echo-interval": 50,
+ "remote-echo-receive-interval": 50,
"remote-id": "*",
"remote-receive-interval": 2000,
"remote-transmit-interval": 2000,
@@ -24,7 +25,8 @@
{
"detect-multiplier": 3,
"diagnostic": "ok",
- "echo-interval": 0,
+ "echo-receive-interval": 50,
+ "echo-transmit-interval": 0,
"id": "*",
"interface": "r3-eth0",
"local": "2001:db8:2::1",
@@ -34,7 +36,7 @@
"receive-interval": 2000,
"remote-detect-multiplier": 3,
"remote-diagnostic": "ok",
- "remote-echo-interval": 50,
+ "remote-echo-receive-interval": 50,
"remote-id": "*",
"remote-receive-interval": 2000,
"remote-transmit-interval": 2000,
@@ -46,7 +48,8 @@
{
"detect-multiplier": 3,
"diagnostic": "ok",
- "echo-interval": 0,
+ "echo-receive-interval": 50,
+ "echo-transmit-interval": 0,
"id": "*",
"local": "192.168.2.1",
"minimum-ttl": 254,
@@ -56,7 +59,7 @@
"receive-interval": 2000,
"remote-detect-multiplier": 3,
"remote-diagnostic": "ok",
- "remote-echo-interval": 50,
+ "remote-echo-receive-interval": 50,
"remote-id": "*",
"remote-receive-interval": 2000,
"remote-transmit-interval": 2000,
diff --git a/tests/topotests/bfd-topo3/r4/bfd-peers.json b/tests/topotests/bfd-topo3/r4/bfd-peers.json
index e2e6722ef4..5477f39120 100644
--- a/tests/topotests/bfd-topo3/r4/bfd-peers.json
+++ b/tests/topotests/bfd-topo3/r4/bfd-peers.json
@@ -2,7 +2,8 @@
{
"detect-multiplier": 3,
"diagnostic": "ok",
- "echo-interval": 0,
+ "echo-receive-interval": 50,
+ "echo-transmit-interval": 0,
"id": "*",
"local": "2001:db8:3::1",
"minimum-ttl": 253,
@@ -12,7 +13,7 @@
"receive-interval": 2000,
"remote-detect-multiplier": 3,
"remote-diagnostic": "ok",
- "remote-echo-interval": 50,
+ "remote-echo-receive-interval": 50,
"remote-id": "*",
"remote-receive-interval": 2000,
"remote-transmit-interval": 2000,
@@ -24,7 +25,8 @@
{
"detect-multiplier": 3,
"diagnostic": "ok",
- "echo-interval": 0,
+ "echo-receive-interval": 50,
+ "echo-transmit-interval": 0,
"id": "*",
"interface": "r4-eth0",
"local": "2001:db8:3::1",
@@ -34,7 +36,7 @@
"receive-interval": 2000,
"remote-detect-multiplier": 3,
"remote-diagnostic": "ok",
- "remote-echo-interval": 50,
+ "remote-echo-receive-interval": 50,
"remote-id": "*",
"remote-receive-interval": 2000,
"remote-transmit-interval": 2000,
diff --git a/tests/topotests/bfd-vrf-topo1/r2/peers.json b/tests/topotests/bfd-vrf-topo1/r2/peers.json
index 5035d643c5..267459c7a8 100644
--- a/tests/topotests/bfd-vrf-topo1/r2/peers.json
+++ b/tests/topotests/bfd-vrf-topo1/r2/peers.json
@@ -4,7 +4,7 @@
"status": "up"
},
{
- "remote-echo-interval": 100,
+ "remote-echo-receive-interval": 100,
"peer": "192.168.1.1",
"status": "up"
},
diff --git a/tests/topotests/bgp-snmp-mplsl3vpn/test_bgp_snmp_mplsvpn.py b/tests/topotests/bgp-snmp-mplsl3vpn/test_bgp_snmp_mplsvpn.py
index 89f5554d41..db4eab9d3d 100755
--- a/tests/topotests/bgp-snmp-mplsl3vpn/test_bgp_snmp_mplsvpn.py
+++ b/tests/topotests/bgp-snmp-mplsl3vpn/test_bgp_snmp_mplsvpn.py
@@ -505,10 +505,8 @@ def test_r1_mplsvpn_VrfTable():
associated_int = r1_snmp.get(
"mplsL3VpnVrfAssociatedInterfaces.{}".format(snmp_str_to_oid("VRF-a"))
)
- assertmsg = (
- "mplsL3VpnVrfAssociatedInterfaces incorrect should be 3 value {}".format(
- associated_int
- )
+ assertmsg = "mplsL3VpnVrfAssociatedInterfaces incorrect should be 3 value {}".format(
+ associated_int
)
assert associated_int == "3", assertmsg
@@ -634,7 +632,6 @@ rte_table_test = {
"C0 A8 C8 0A",
'""',
],
- "mplsL3VpnVrfRteInetCidrIfIndex": ["5", "6", "4", "5", "0", "6", "0"],
"mplsL3VpnVrfRteInetCidrType": [
"local(3)",
"local(3)",
@@ -732,8 +729,24 @@ def test_r1_mplsvpn_rte_table():
)
if passed:
break
+ # generate ifindex row grabbing ifindices from vtysh
+ if passed:
+ ifindex_row = [
+ router_interface_get_ifindex(r1r, "eth3"),
+ router_interface_get_ifindex(r1r, "eth4"),
+ router_interface_get_ifindex(r1r, "eth2"),
+ router_interface_get_ifindex(r1r, "eth3"),
+ "0",
+ router_interface_get_ifindex(r1r, "eth4"),
+ "0",
+ ]
+ if not r1_snmp.test_oid_walk(
+ "mplsL3VpnVrfRteInetCidrIfIndex", ifindex_row, oid_list
+ ):
+ passed = False
+
print("passed {}".format(passed))
- # assert passed, assertmsg
+ assert passed, assertmsg
def test_memory_leak():
diff --git a/tests/topotests/docker/frr-topotests.sh b/tests/topotests/docker/frr-topotests.sh
index d25856ea62..9ef59b3bbc 100755
--- a/tests/topotests/docker/frr-topotests.sh
+++ b/tests/topotests/docker/frr-topotests.sh
@@ -132,6 +132,7 @@ if [ -z "$TOPOTEST_FRR" ]; then
echo "frr-topotests only works if you have your tree in git." >&2
exit 1
fi
+ git -C "$TOPOTEST_FRR" ls-files -z > "${TOPOTEST_LOGS}/git-ls-files"
fi
if [ -z "$TOPOTEST_BUILDCACHE" ]; then
diff --git a/tests/topotests/docker/inner/compile_frr.sh b/tests/topotests/docker/inner/compile_frr.sh
index dee0ec8118..495beaf3cc 100755
--- a/tests/topotests/docker/inner/compile_frr.sh
+++ b/tests/topotests/docker/inner/compile_frr.sh
@@ -34,19 +34,15 @@ CDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
if [ "${TOPOTEST_CLEAN}" != "0" ]; then
log_info "Cleaning FRR builddir..."
- rm -rf $FRR_SYNC_DIR $FRR_BUILD_DIR &> /dev/null
+ rm -rf $FRR_BUILD_DIR &> /dev/null
fi
log_info "Syncing FRR source with host..."
-mkdir -p $FRR_SYNC_DIR
+mkdir -p $FRR_BUILD_DIR
rsync -a --info=progress2 \
- --exclude '*.o' \
- --exclude '*.lo'\
+ --from0 --files-from=/tmp/git-ls-files \
--chown root:root \
- $FRR_HOST_DIR/. $FRR_SYNC_DIR/
-(cd $FRR_SYNC_DIR && git clean -xdf > /dev/null)
-mkdir -p $FRR_BUILD_DIR
-rsync -a --info=progress2 --chown root:root $FRR_SYNC_DIR/. $FRR_BUILD_DIR/
+ $FRR_HOST_DIR/. $FRR_BUILD_DIR/
cd "$FRR_BUILD_DIR" || \
log_fatal "failed to find frr directory"
diff --git a/tests/topotests/docker/inner/funcs.sh b/tests/topotests/docker/inner/funcs.sh
index acb8b55e97..d78d5006bc 100755
--- a/tests/topotests/docker/inner/funcs.sh
+++ b/tests/topotests/docker/inner/funcs.sh
@@ -23,7 +23,6 @@
# SOFTWARE.
FRR_HOST_DIR=/root/host-frr
-FRR_SYNC_DIR=/root/persist/frr-sync
FRR_BUILD_DIR=/root/persist/frr-build
if [ ! -L "/root/frr" ]; then
diff --git a/tests/topotests/ldp-snmp/test_ldp_snmp_topo1.py b/tests/topotests/ldp-snmp/test_ldp_snmp_topo1.py
index c8760f457a..4144f9b261 100644
--- a/tests/topotests/ldp-snmp/test_ldp_snmp_topo1.py
+++ b/tests/topotests/ldp-snmp/test_ldp_snmp_topo1.py
@@ -301,6 +301,41 @@ def test_r1_ldp_entity_table():
'mplsLdpEntityRowStatus', ['createAndGo(4)'])
+def test_r1_ldp_entity_stats_table():
+ "Test mplsLdpEntityStatsTable"
+ tgen = get_topogen()
+
+ r1 = tgen.net.get("r1")
+ r1_snmp = SnmpTester(r1, "1.1.1.1", "public", "2c")
+
+ assert r1_snmp.test_oid_walk(
+ 'mplsLdpEntityStatsSessionAttempts', ['0'])
+ assert r1_snmp.test_oid_walk(
+ 'mplsLdpEntityStatsSessionRejectedNoHelloErrors', ['0'])
+ assert r1_snmp.test_oid_walk(
+ 'mplsLdpEntityStatsSessionRejectedAdErrors', ['0'])
+ assert r1_snmp.test_oid_walk(
+ 'mplsLdpEntityStatsSessionRejectedMaxPduErrors', ['0'])
+ assert r1_snmp.test_oid_walk(
+ 'mplsLdpEntityStatsSessionRejectedLRErrors', ['0'])
+ assert r1_snmp.test_oid_walk(
+ 'mplsLdpEntityStatsBadLdpIdentifierErrors', ['0'])
+ assert r1_snmp.test_oid_walk(
+ 'mplsLdpEntityStatsBadPduLengthErrors', ['0'])
+ assert r1_snmp.test_oid_walk(
+ 'mplsLdpEntityStatsBadMessageLengthErrors', ['0'])
+ assert r1_snmp.test_oid_walk(
+ 'mplsLdpEntityStatsBadTlvLengthErrors', ['0'])
+ assert r1_snmp.test_oid_walk(
+ 'mplsLdpEntityStatsMalformedTlvValueErrors', ['0'])
+ assert r1_snmp.test_oid_walk(
+ 'mplsLdpEntityStatsKeepAliveTimerExpErrors', ['0'])
+ assert r1_snmp.test_oid_walk(
+ 'mplsLdpEntityStatsShutdownReceivedNotifications', ['0'])
+ assert r1_snmp.test_oid_walk(
+ 'mplsLdpEntityStatsShutdownSentNotifications', ['0'])
+
+
def test_r1_ldp_peer_table():
"Test mplsLdpPeerTable"
tgen = get_topogen()
@@ -342,6 +377,19 @@ def test_r1_ldp_session_table():
['(0) 0:00:00.00', '(0) 0:00:00.00'])
+def test_r1_ldp_session_stats_table():
+ "Test mplsLdpSessionStatsTable"
+ tgen = get_topogen()
+
+ r1 = tgen.net.get("r1")
+ r1_snmp = SnmpTester(r1, "1.1.1.1", "public", "2c")
+
+ assert r1_snmp.test_oid_walk(
+ 'mplsLdpSessionStatsUnknownMesTypeErrors', ['0', '0'])
+ assert r1_snmp.test_oid_walk(
+ 'mplsLdpSessionStatsUnknownTlvErrors', ['0', '0'])
+
+
def test_r1_ldp_hello_adjacency_table():
"Test mplsLdpHelloAdjacencyTable"
tgen = get_topogen()