Adding upstream version 9.1.upstream/9.1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

21 files changed, 1363 insertions, 0 deletions

diff --git a/tests/topotests/bgp_rfapi_basic_sanity/__init__.py b/tests/topotests/bgp_rfapi_basic_sanity/__init__.py
new file mode 100755
index 0000000..e69de29
--- /dev/null
+++ b/tests/topotests/bgp_rfapi_basic_sanity/__init__.py
diff --git a/tests/topotests/bgp_rfapi_basic_sanity/customize.py b/tests/topotests/bgp_rfapi_basic_sanity/customize.py
new file mode 100644
index 0000000..c789fa8
--- /dev/null
+++ b/tests/topotests/bgp_rfapi_basic_sanity/customize.py
@@ -0,0 +1,102 @@
+#!/usr/bin/env python
+# SPDX-License-Identifier: ISC
+
+#
+# Part of NetDEF Topology Tests
+#
+# Copyright (c) 2017-2018 by
+# Network Device Education Foundation, Inc. ("NetDEF")
+# Modified by LabN Consulting, L.L.C.
+#
+
+r"""
+customize.py: Simple FRR MPLS L3VPN test topology
+
+             +---------+
+             |    r1   |
+             | 1.1.1.1 |                              PE Router
+             +----+----+
+                  | .1  r1-eth0
+                  |
+            ~~~~~~~~~~~~~
+          ~~     sw0     ~~
+          ~~ 10.0.1.0/24 ~~
+            ~~~~~~~~~~~~~
+                  |10.0.1.0/24
+                  |
+                  | .2  r2-eth0
+             +----+----+
+             |    r2   |
+             | 2.2.2.2 |                              P router
+             +--+---+--+
+    r2-eth2  .2 |   | .2  r2-eth1
+         ______/     \______
+        /                   \
+  ~~~~~~~~~~~~~        ~~~~~~~~~~~~~
+~~     sw2     ~~    ~~     sw1     ~~
+~~ 10.0.3.0/24 ~~    ~~ 10.0.2.0/24 ~~
+  ~~~~~~~~~~~~~        ~~~~~~~~~~~~~
+        |                 /    |
+         \      _________/     |
+          \    /                \
+r3-eth1 .3 |  | .3  r3-eth0      | .4 r4-eth0
+      +----+--+---+         +----+----+
+      |     r3    |         |    r4   |
+      |  3.3.3.3  |         | 4.4.4.4 |               PE Routers
+      +-----------+         +---------+
+ 
+"""
+
+import os
+
+# pylint: disable=C0413
+# Import topogen and topotest helpers
+from lib.topogen import get_topogen
+from lib.topolog import logger
+from lib.ltemplate import ltemplateRtrCmd
+
+# Required to instantiate the topology builder class.
+
+
+CWD = os.path.dirname(os.path.realpath(__file__))
+# test name based on directory
+TEST = os.path.basename(CWD)
+
+
+def build_topo(tgen):
+    "Build function"
+
+    # This function only purpose is to define allocation and relationship
+    # between routers, switches and hosts.
+    #
+    # Create P/PE routers
+    tgen.add_router("r1")
+    for routern in range(2, 5):
+        tgen.add_router("r{}".format(routern))
+    # Create a switch with just one router connected to it to simulate a
+    # empty network.
+    switch = {}
+    switch[0] = tgen.add_switch("sw0")
+    switch[0].add_link(tgen.gears["r1"], nodeif="r1-eth0")
+    switch[0].add_link(tgen.gears["r2"], nodeif="r2-eth0")
+
+    switch[1] = tgen.add_switch("sw1")
+    switch[1].add_link(tgen.gears["r2"], nodeif="r2-eth1")
+    switch[1].add_link(tgen.gears["r3"], nodeif="r3-eth0")
+    switch[1].add_link(tgen.gears["r4"], nodeif="r4-eth0")
+
+    switch[2] = tgen.add_switch("sw2")
+    switch[2].add_link(tgen.gears["r2"], nodeif="r2-eth2")
+    switch[2].add_link(tgen.gears["r3"], nodeif="r3-eth1")
+
+
+def ltemplatePreRouterStartHook():
+    cc = ltemplateRtrCmd()
+    tgen = get_topogen()
+    logger.info("pre router-start hook")
+    return True
+
+
+def ltemplatePostRouterStartHook():
+    logger.info("post router-start hook")
+    return True
diff --git a/tests/topotests/bgp_rfapi_basic_sanity/r1/bgpd.conf b/tests/topotests/bgp_rfapi_basic_sanity/r1/bgpd.conf
new file mode 100644
index 0000000..f6e0baa
--- /dev/null
+++ b/tests/topotests/bgp_rfapi_basic_sanity/r1/bgpd.conf
@@ -0,0 +1,50 @@
+frr defaults traditional
+!
+hostname r1
+password zebra
+log stdout notifications
+log commands
+router bgp 5226
+   bgp router-id 1.1.1.1
+   bgp cluster-id 1.1.1.1
+   no bgp ebgp-requires-policy
+   neighbor 2.2.2.2 remote-as 5226
+   neighbor 2.2.2.2 timers 3 10
+   neighbor 2.2.2.2 update-source 1.1.1.1
+!
+   address-family ipv4 unicast
+     redistribute vnc-direct
+     no neighbor 2.2.2.2 activate
+   exit-address-family
+!
+   address-family ipv4 vpn
+     neighbor 2.2.2.2 activate
+   exit-address-family
+!
+ rfp holddown-factor 0
+!
+ vnc defaults
+  rd auto:vn:123
+  response-lifetime 45
+  rt both 1000:1 1000:2
+  exit-vnc
+!
+ vnc nve-group red
+  prefix vn 10.0.0.0/8
+  rd auto:vn:10
+  rt both 1000:10
+  exit-vnc
+!
+ vnc nve-group blue
+  prefix vn 20.0.0.0/8
+  rd auto:vn:20
+  rt both 1000:20
+  exit-vnc
+!
+ vnc nve-group green
+  prefix vn 30.0.0.0/8
+  rd auto:vn:20
+  rt both 1000:30
+  exit-vnc
+!
+end
diff --git a/tests/topotests/bgp_rfapi_basic_sanity/r1/ospfd.conf b/tests/topotests/bgp_rfapi_basic_sanity/r1/ospfd.conf
new file mode 100644
index 0000000..460a8fb
--- /dev/null
+++ b/tests/topotests/bgp_rfapi_basic_sanity/r1/ospfd.conf
@@ -0,0 +1,12 @@
+hostname r1
+log file ospfd.log
+!
+router ospf
+ router-id 1.1.1.1
+ network 0.0.0.0/4 area 0
+ redistribute static
+!
+int r1-eth0
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
+!
diff --git a/tests/topotests/bgp_rfapi_basic_sanity/r1/zebra.conf b/tests/topotests/bgp_rfapi_basic_sanity/r1/zebra.conf
new file mode 100644
index 0000000..18f61e0
--- /dev/null
+++ b/tests/topotests/bgp_rfapi_basic_sanity/r1/zebra.conf
@@ -0,0 +1,24 @@
+log file zebra.log
+!
+hostname r1
+!
+interface lo
+ ip address 1.1.1.1/32
+!
+interface r1-eth0
+ description to sw0
+ ip address 10.0.1.1/24
+ no link-detect
+!
+interface r1-eth4
+ description to ce1
+ ip address 192.168.1.1/24
+ no link-detect
+!
+ip route 99.0.0.1/32 192.168.1.2
+!
+ip forwarding
+!
+!
+line vty
+!
diff --git a/tests/topotests/bgp_rfapi_basic_sanity/r2/bgpd.conf b/tests/topotests/bgp_rfapi_basic_sanity/r2/bgpd.conf
new file mode 100644
index 0000000..19050e6
--- /dev/null
+++ b/tests/topotests/bgp_rfapi_basic_sanity/r2/bgpd.conf
@@ -0,0 +1,33 @@
+frr defaults traditional
+!
+hostname r2
+password zebra
+log stdout notifications
+log commands
+router bgp 5226
+   bgp router-id 2.2.2.2
+   bgp cluster-id 2.2.2.2
+   no bgp ebgp-requires-policy
+   neighbor 1.1.1.1 remote-as 5226
+   neighbor 1.1.1.1 timers 3 10
+   neighbor 1.1.1.1 update-source 2.2.2.2
+   neighbor 3.3.3.3 remote-as 5226
+   neighbor 3.3.3.3 timers 3 10
+   neighbor 3.3.3.3 update-source 2.2.2.2
+   neighbor 4.4.4.4 remote-as 5226
+   neighbor 4.4.4.4 timers 3 10
+   neighbor 4.4.4.4 update-source 2.2.2.2
+   address-family ipv4 unicast
+     no neighbor 1.1.1.1 activate
+     no neighbor 3.3.3.3 activate
+     no neighbor 4.4.4.4 activate
+   exit-address-family
+   address-family ipv4 vpn
+     neighbor 1.1.1.1 activate
+     neighbor 1.1.1.1 route-reflector-client
+     neighbor 3.3.3.3 activate
+     neighbor 3.3.3.3 route-reflector-client
+     neighbor 4.4.4.4 activate
+     neighbor 4.4.4.4 route-reflector-client
+   exit-address-family
+end
diff --git a/tests/topotests/bgp_rfapi_basic_sanity/r2/ospfd.conf b/tests/topotests/bgp_rfapi_basic_sanity/r2/ospfd.conf
new file mode 100644
index 0000000..dbed618
--- /dev/null
+++ b/tests/topotests/bgp_rfapi_basic_sanity/r2/ospfd.conf
@@ -0,0 +1,19 @@
+hostname r2
+log file ospfd.log
+!
+router ospf
+ router-id 2.2.2.2
+ network 0.0.0.0/0 area 0
+!
+int r2-eth0
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
+!
+int r2-eth1
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
+!
+int r2-eth2
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
+!
diff --git a/tests/topotests/bgp_rfapi_basic_sanity/r2/zebra.conf b/tests/topotests/bgp_rfapi_basic_sanity/r2/zebra.conf
new file mode 100644
index 0000000..dd1dbac
--- /dev/null
+++ b/tests/topotests/bgp_rfapi_basic_sanity/r2/zebra.conf
@@ -0,0 +1,27 @@
+log file zebra.log
+!
+hostname r2
+!
+interface lo
+ ip address 2.2.2.2/32
+!
+interface r2-eth0
+ description to sw0
+ ip address 10.0.1.2/24
+ no link-detect
+!
+interface r2-eth1
+ description to sw1
+ ip address 10.0.2.2/24
+ no link-detect
+!
+interface r2-eth2
+ description to sw2
+ ip address 10.0.3.2/24
+ no link-detect
+!
+ip forwarding
+!
+!
+line vty
+!
diff --git a/tests/topotests/bgp_rfapi_basic_sanity/r3/bgpd.conf b/tests/topotests/bgp_rfapi_basic_sanity/r3/bgpd.conf
new file mode 100644
index 0000000..2210f24
--- /dev/null
+++ b/tests/topotests/bgp_rfapi_basic_sanity/r3/bgpd.conf
@@ -0,0 +1,48 @@
+frr defaults traditional
+!
+hostname r3
+password zebra
+log stdout notifications
+log commands
+router bgp 5226
+   bgp router-id 3.3.3.3
+   bgp cluster-id 3.3.3.3
+   no bgp ebgp-requires-policy
+   neighbor 2.2.2.2 remote-as 5226
+   neighbor 2.2.2.2 timers 3 10
+   neighbor 2.2.2.2 update-source 3.3.3.3
+!
+   address-family ipv4 unicast
+     no neighbor 2.2.2.2 activate
+   exit-address-family
+   address-family ipv4 vpn
+     neighbor 2.2.2.2 activate
+   exit-address-family
+!
+ rfp holddown-factor 0
+!
+ vnc defaults
+  rd auto:vn:123
+  response-lifetime 45
+  rt both 1000:1 1000:2
+  exit-vnc
+!
+ vnc nve-group red
+  prefix vn 10.0.0.0/8
+  rd auto:vn:10
+  rt both 1000:10
+  exit-vnc
+!
+ vnc nve-group blue
+  prefix vn 20.0.0.0/8
+  rd auto:vn:20
+  rt both 1000:20
+  exit-vnc
+!
+ vnc nve-group green
+  prefix vn 30.0.0.0/8
+  rd auto:vn:20
+  rt both 1000:30
+  exit-vnc
+!
+end
diff --git a/tests/topotests/bgp_rfapi_basic_sanity/r3/ospfd.conf b/tests/topotests/bgp_rfapi_basic_sanity/r3/ospfd.conf
new file mode 100644
index 0000000..0e64ed6
--- /dev/null
+++ b/tests/topotests/bgp_rfapi_basic_sanity/r3/ospfd.conf
@@ -0,0 +1,17 @@
+hostname r3
+password 1
+log file ospfd.log
+!
+router ospf
+ router-id 3.3.3.3
+ network 0.0.0.0/4 area 0
+ redistribute static
+!
+int r3-eth0
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
+!
+int r3-eth1
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
+!
diff --git a/tests/topotests/bgp_rfapi_basic_sanity/r3/zebra.conf b/tests/topotests/bgp_rfapi_basic_sanity/r3/zebra.conf
new file mode 100644
index 0000000..9dbc290
--- /dev/null
+++ b/tests/topotests/bgp_rfapi_basic_sanity/r3/zebra.conf
@@ -0,0 +1,29 @@
+log file zebra.log
+!
+hostname r3
+!
+interface lo
+ ip address 3.3.3.3/32
+!
+interface r3-eth0
+ description to sw1
+ ip address 10.0.2.3/24
+ no link-detect
+!
+interface r3-eth1
+ description to sw2
+ ip address 10.0.3.3/24
+ no link-detect
+!
+interface r3-eth4
+ description to ce2
+ ip address 192.168.1.1/24
+ no link-detect
+!
+ip route 99.0.0.2/32 192.168.1.2
+!
+ip forwarding
+!
+!
+line vty
+!
diff --git a/tests/topotests/bgp_rfapi_basic_sanity/r4/bgpd.conf b/tests/topotests/bgp_rfapi_basic_sanity/r4/bgpd.conf
new file mode 100644
index 0000000..28b5f9c
--- /dev/null
+++ b/tests/topotests/bgp_rfapi_basic_sanity/r4/bgpd.conf
@@ -0,0 +1,49 @@
+frr defaults traditional
+!
+hostname r4
+password zebra
+log stdout notifications
+log commands
+router bgp 5226
+   bgp router-id 4.4.4.4
+   bgp cluster-id 4.4.4.4
+   no bgp ebgp-requires-policy
+   neighbor 2.2.2.2 remote-as 5226
+   neighbor 2.2.2.2 timers 3 10
+   neighbor 2.2.2.2 update-source 4.4.4.4
+!
+   address-family ipv4 unicast
+     no neighbor 2.2.2.2 activate
+   exit-address-family
+!
+   address-family ipv4 vpn
+     neighbor 2.2.2.2 activate
+   exit-address-family
+!
+ rfp holddown-factor 0
+!
+ vnc defaults
+  rd auto:vn:123
+  response-lifetime 45
+  rt both 1000:1 1000:2
+  exit-vnc
+!
+ vnc nve-group red
+  prefix vn 10.0.0.0/8
+  rd auto:vn:10
+  rt both 1000:10
+  exit-vnc
+!
+ vnc nve-group blue
+  prefix vn 20.0.0.0/8
+  rd auto:vn:20
+  rt both 1000:20
+  exit-vnc
+!
+ vnc nve-group green
+  prefix vn 30.0.0.0/8
+  rd auto:vn:20
+  rt both 1000:30
+  exit-vnc
+!
+end
diff --git a/tests/topotests/bgp_rfapi_basic_sanity/r4/ospfd.conf b/tests/topotests/bgp_rfapi_basic_sanity/r4/ospfd.conf
new file mode 100644
index 0000000..89e37df
--- /dev/null
+++ b/tests/topotests/bgp_rfapi_basic_sanity/r4/ospfd.conf
@@ -0,0 +1,12 @@
+hostname r4
+log file ospfd.log
+!
+router ospf
+ router-id 4.4.4.4
+ network 0.0.0.0/4 area 0
+ redistribute static
+!
+int r4-eth0
+ ip ospf hello-interval 2
+ ip ospf dead-interval 10
+!
diff --git a/tests/topotests/bgp_rfapi_basic_sanity/r4/zebra.conf b/tests/topotests/bgp_rfapi_basic_sanity/r4/zebra.conf
new file mode 100644
index 0000000..415f03d
--- /dev/null
+++ b/tests/topotests/bgp_rfapi_basic_sanity/r4/zebra.conf
@@ -0,0 +1,23 @@
+log file zebra.log
+!
+hostname r4
+!
+interface lo
+ ip address 4.4.4.4/32
+!
+interface r4-eth0
+ description to sw1
+ ip address 10.0.2.4/24
+ no link-detect
+!
+interface r4-eth4
+ description to ce3
+ ip address 192.168.1.1/24
+ no link-detect
+!
+ip route 99.0.0.3/32 192.168.1.2
+!
+ip forwarding
+!
+line vty
+!
diff --git a/tests/topotests/bgp_rfapi_basic_sanity/scripts/add_routes.py b/tests/topotests/bgp_rfapi_basic_sanity/scripts/add_routes.py
new file mode 100644
index 0000000..bc47dfc
--- /dev/null
+++ b/tests/topotests/bgp_rfapi_basic_sanity/scripts/add_routes.py
@@ -0,0 +1,159 @@
+from lib.lutil import luCommand
+
+holddownFactorSet = luCommand(
+    "r1",
+    'vtysh -c "show running"',
+    "rfp holddown-factor",
+    "none",
+    "Holddown factor set",
+)
+if not holddownFactorSet:
+    to = "-1"
+    cost = ""
+else:
+    to = "6"
+    cost = "cost 50"
+luCommand(
+    "r1",
+    'vtysh -c "debug rfapi-dev open vn 10.0.0.1 un 1.1.1.1"',
+    "rfapi_set_response_cb: status 0",
+    "pass",
+    "Opened RFAPI",
+)
+luCommand(
+    "r1",
+    'vtysh -c "debug rfapi-dev query vn 10.0.0.1 un 1.1.1.1 target 11.11.11.11"',
+    "rc=2",
+    "pass",
+    "Clean query",
+)
+luCommand(
+    "r1",
+    'vtysh -c "debug rfapi-dev register vn 10.0.0.1 un 1.1.1.1 prefix 11.11.11.0/24 lifetime {}"'.format(
+        to
+    ),
+    "",
+    "none",
+    "Prefix registered",
+)
+luCommand(
+    "r1",
+    'vtysh -c "show vnc registrations local"',
+    "1 out of 1",
+    "wait",
+    "Local registration",
+)
+luCommand("r1", 'vtysh -c "debug rfapi-dev response-omit-self off"', ".", "none")
+luCommand(
+    "r1",
+    'vtysh -c "debug rfapi-dev query vn 10.0.0.1 un 1.1.1.1 target 11.11.11.11"',
+    "11.11.11.0/24",
+    "pass",
+    "Query self",
+)
+
+luCommand(
+    "r3",
+    'vtysh -c "debug rfapi-dev open vn 10.0.0.2 un 2.2.2.2"',
+    "rfapi_set_response_cb: status 0",
+    "pass",
+    "Opened RFAPI",
+)
+luCommand(
+    "r3",
+    'vtysh -c "debug rfapi-dev register vn 10.0.0.2 un 2.2.2.2 prefix 22.22.22.0/24 lifetime {}"'.format(
+        to
+    ),
+    "",
+    "none",
+    "Prefix registered",
+)
+luCommand(
+    "r3",
+    'vtysh -c "show vnc registrations local"',
+    "1 out of 1",
+    "wait",
+    "Local registration",
+)
+luCommand("r3", 'vtysh -c "debug rfapi-dev response-omit-self on"', ".", "none")
+luCommand(
+    "r3",
+    'vtysh -c "debug rfapi-dev query vn 10.0.0.2 un 2.2.2.2 target 22.22.22.22"',
+    "rc=2",
+    "pass",
+    "Self excluded",
+)
+luCommand(
+    "r3",
+    'vtysh -c "debug rfapi-dev open vn 10.0.1.2 un 2.1.1.2"',
+    "rfapi_set_response_cb: status 0",
+    "pass",
+    "Opened query only RFAPI",
+)
+luCommand(
+    "r3",
+    'vtysh -c "debug rfapi-dev query vn 10.0.1.2 un 2.1.1.2 target 22.22.22.22"',
+    "22.22.22.0/24",
+    "pass",
+    "See local",
+)
+
+luCommand(
+    "r4",
+    'vtysh -c "debug rfapi-dev open vn 10.0.0.3 un 3.3.3.3"',
+    "rfapi_set_response_cb: status 0",
+    "pass",
+    "Opened RFAPI",
+)
+luCommand(
+    "r4",
+    'vtysh -c "debug rfapi-dev register vn 10.0.0.3 un 3.3.3.3 prefix 33.33.33.0/24 lifetime {}"'.format(
+        to
+    ),
+    "",
+    "none",
+    "Prefix registered",
+)
+luCommand(
+    "r4",
+    'vtysh -c "show vnc registrations local"',
+    "1 out of 1",
+    "wait",
+    "Local registration",
+)
+luCommand("r4", 'vtysh -c "debug rfapi-dev response-omit-self off"', ".", "none")
+luCommand(
+    "r4",
+    'vtysh -c "debug rfapi-dev query vn 10.0.0.3 un 3.3.3.3 target 33.33.33.33"',
+    "33.33.33.0/24",
+    "pass",
+    "Query self",
+)
+
+luCommand(
+    "r4",
+    'vtysh -c "debug rfapi-dev register vn 10.0.0.3 un 3.3.3.3 prefix 11.11.11.0/24 lifetime {} {}"'.format(
+        to, cost
+    ),
+    "",
+    "none",
+    "MP Prefix registered",
+)
+luCommand(
+    "r4",
+    'vtysh -c "show vnc registrations local"',
+    "2 out of 2",
+    "wait",
+    "Local registration",
+)
+luCommand(
+    "r4",
+    'vtysh -c "debug rfapi-dev query vn 10.0.0.3 un 3.3.3.3 target 11.11.11.11"',
+    "11.11.11.0/24",
+    "pass",
+    "Query self MP",
+)
+
+luCommand("r1", 'vtysh -c "show vnc registrations"', ".", "none")
+luCommand("r3", 'vtysh -c "show vnc registrations"', ".", "none")
+luCommand("r4", 'vtysh -c "show vnc registrations"', ".", "none")
diff --git a/tests/topotests/bgp_rfapi_basic_sanity/scripts/adjacencies.py b/tests/topotests/bgp_rfapi_basic_sanity/scripts/adjacencies.py
new file mode 100644
index 0000000..9878cdc
--- /dev/null
+++ b/tests/topotests/bgp_rfapi_basic_sanity/scripts/adjacencies.py
@@ -0,0 +1,50 @@
+from lib.lutil import luCommand
+
+luCommand(
+    "r1", "ping 2.2.2.2 -c 1", " 0. packet loss", "wait", "PE->P2 (loopback) ping", 60
+)
+luCommand(
+    "r3", "ping 2.2.2.2 -c 1", " 0. packet loss", "wait", "PE->P2 (loopback) ping", 60
+)
+luCommand(
+    "r4", "ping 2.2.2.2 -c 1", " 0. packet loss", "wait", "PE->P2 (loopback) ping", 60
+)
+luCommand(
+    "r2",
+    'vtysh -c "show bgp summary"',
+    " 00:0.* 00:0.* 00:0",
+    "wait",
+    "Core adjacencies up",
+    180,
+)
+luCommand(
+    "r1",
+    'vtysh -c "show bgp vrf all summary"',
+    " 00:0",
+    "wait",
+    "All adjacencies up",
+    180,
+)
+luCommand(
+    "r3",
+    'vtysh -c "show bgp vrf all summary"',
+    " 00:0",
+    "wait",
+    "All adjacencies up",
+    180,
+)
+luCommand(
+    "r4",
+    'vtysh -c "show bgp vrf all summary"',
+    " 00:0",
+    "wait",
+    "All adjacencies up",
+    180,
+)
+luCommand(
+    "r1", "ping 3.3.3.3 -c 1", " 0. packet loss", "wait", "PE->PE3 (loopback) ping"
+)
+luCommand(
+    "r1", "ping 4.4.4.4 -c 1", " 0. packet loss", "wait", "PE->PE4 (loopback) ping"
+)
+# luCommand('r4','ping 3.3.3.3 -c 1',' 0. packet loss','wait','PE->PE3 (loopback) ping')
diff --git a/tests/topotests/bgp_rfapi_basic_sanity/scripts/check_close.py b/tests/topotests/bgp_rfapi_basic_sanity/scripts/check_close.py
new file mode 100644
index 0000000..e68fac8
--- /dev/null
+++ b/tests/topotests/bgp_rfapi_basic_sanity/scripts/check_close.py
@@ -0,0 +1,102 @@
+from lib.lutil import luCommand
+
+holddownFactorSet = luCommand(
+    "r1",
+    'vtysh -c "show running"',
+    "rfp holddown-factor",
+    "none",
+    "Holddown factor set",
+)
+if not holddownFactorSet:
+    to = "-1"
+else:
+    to = "1"
+luCommand(
+    "r1",
+    'vtysh -c "debug rfapi-dev open vn 20.0.0.1 un 1.1.1.21"',
+    "rfapi_set_response_cb: status 0",
+    "pass",
+    "Opened RFAPI",
+)
+luCommand(
+    "r1",
+    'vtysh -c "debug rfapi-dev register vn 20.0.0.1 un 1.1.1.21 prefix 111.111.111.0/24 lifetime {}"'.format(
+        to
+    ),
+    "",
+    "none",
+    "Prefix registered",
+)
+luCommand(
+    "r1",
+    'vtysh -c "show vnc registrations local"',
+    "111.111.111.0/24",
+    "wait",
+    "Local registration",
+    1,
+)
+luCommand("r1", 'vtysh -c "show vnc registrations"', ".", "none")
+luCommand(
+    "r3",
+    'vtysh -c "show vnc registrations"',
+    "111.111.111.0/24",
+    "wait",
+    "See registration",
+)
+luCommand(
+    "r4",
+    'vtysh -c "show vnc registrations"',
+    "111.111.111.0/24",
+    "wait",
+    "See registration",
+)
+luCommand(
+    "r1",
+    'vtysh -c "debug rfapi-dev close vn 20.0.0.1 un 1.1.1.21"',
+    "status 0",
+    "pass",
+    "Closed RFAPI",
+)
+luCommand(
+    "r1",
+    'vtysh -c "show vnc registrations"',
+    "Locally: *Active:  1 .* Remotely: *Active:  3",
+    "wait",
+    "See cleanup",
+)
+luCommand(
+    "r3",
+    'vtysh -c "show vnc registrations"',
+    "Locally: *Active:  1 .* Remotely: *Active:  3",
+    "wait",
+    "See cleanup",
+)
+luCommand(
+    "r4",
+    'vtysh -c "show vnc registrations"',
+    "Locally: *Active:  2 .* Remotely: *Active:  2",
+    "wait",
+    "See cleanup",
+)
+luCommand(
+    "r1",
+    'vtysh -c "show vnc registrations"',
+    "In Holddown: *Active:  0",
+    "wait",
+    "Out of holddown",
+    20,
+)
+luCommand(
+    "r3",
+    'vtysh -c "show vnc registrations"',
+    "In Holddown: *Active:  0",
+    "wait",
+    "Out of holddown",
+)
+luCommand(
+    "r4",
+    'vtysh -c "show vnc registrations"',
+    "In Holddown: *Active:  0",
+    "wait",
+    "Out of holddown",
+)
diff --git a/tests/topotests/bgp_rfapi_basic_sanity/scripts/check_routes.py b/tests/topotests/bgp_rfapi_basic_sanity/scripts/check_routes.py
new file mode 100644
index 0000000..24b3cba
--- /dev/null
+++ b/tests/topotests/bgp_rfapi_basic_sanity/scripts/check_routes.py
@@ -0,0 +1,74 @@
+from lib.lutil import luCommand
+
+luCommand("r1", 'vtysh -c "show bgp ipv4 vpn"', "", "none", "VPN SAFI")
+luCommand("r2", 'vtysh -c "show bgp ipv4 vpn"', "", "none", "VPN SAFI")
+luCommand("r3", 'vtysh -c "show bgp ipv4 vpn"', "", "none", "VPN SAFI")
+luCommand("r4", 'vtysh -c "show bgp ipv4 vpn"', "", "none", "VPN SAFI")
+luCommand(
+    "r1",
+    'vtysh -c "show vnc registrations"',
+    "Locally: *Active:  1 .* Remotely: *Active:  3",
+    "wait",
+    "See all registrations",
+)
+luCommand(
+    "r3",
+    'vtysh -c "show vnc registrations"',
+    "Locally: *Active:  1 .* Remotely: *Active:  3",
+    "wait",
+    "See all registrations",
+)
+luCommand(
+    "r4",
+    'vtysh -c "show vnc registrations"',
+    "Locally: *Active:  2 .* Remotely: *Active:  2",
+    "wait",
+    "See all registrations",
+)
+num = "4 routes and 4"
+luCommand("r1", 'vtysh -c "show bgp ipv4 vpn"', num, "pass", "VPN SAFI okay")
+luCommand("r2", 'vtysh -c "show bgp ipv4 vpn"', num, "pass", "VPN SAFI okay")
+luCommand("r3", 'vtysh -c "show bgp ipv4 vpn"', num, "pass", "VPN SAFI okay")
+luCommand("r4", 'vtysh -c "show bgp ipv4 vpn"', num, "pass", "VPN SAFI okay")
+luCommand(
+    "r1",
+    'vtysh -c "debug rfapi-dev query vn 10.0.0.1 un 1.1.1.1 target 22.22.22.22"',
+    "pfx=",
+    "pass",
+    "Query R2s info",
+)
+luCommand(
+    "r1",
+    'vtysh -c "debug rfapi-dev query vn 10.0.0.1 un 1.1.1.1 target 33.33.33.33"',
+    "pfx=",
+    "pass",
+    "Query R4s info",
+)
+luCommand(
+    "r3",
+    'vtysh -c "debug rfapi-dev query vn 10.0.0.2 un 2.2.2.2 target 11.11.11.11"',
+    "11.11.11.0/24.*11.11.11.0/24.*",
+    "pass",
+    "Query R1s+R4s info",
+)
+luCommand(
+    "r3",
+    'vtysh -c "debug rfapi-dev query vn 10.0.0.2 un 2.2.2.2 target 33.33.33.33"',
+    "pfx=",
+    "pass",
+    "Query R4s info",
+)
+luCommand(
+    "r4",
+    'vtysh -c "debug rfapi-dev query vn 10.0.0.3 un 3.3.3.3 target 11.11.11.11"',
+    "11.11.11.0/24.*11.11.11.0/24.*",
+    "pass",
+    "Query R1s+R4s info",
+)
+luCommand(
+    "r4",
+    'vtysh -c "debug rfapi-dev query vn 10.0.0.3 un 3.3.3.3 target 22.22.22.22"',
+    "pfx=",
+    "pass",
+    "Query R2s info",
+)
diff --git a/tests/topotests/bgp_rfapi_basic_sanity/scripts/check_timeout.py b/tests/topotests/bgp_rfapi_basic_sanity/scripts/check_timeout.py
new file mode 100644
index 0000000..f5c2db2
--- /dev/null
+++ b/tests/topotests/bgp_rfapi_basic_sanity/scripts/check_timeout.py
@@ -0,0 +1,325 @@
+from lib.lutil import luCommand
+
+holddownFactorSet = luCommand(
+    "r1",
+    'vtysh -c "show running"',
+    "rfp holddown-factor",
+    "none",
+    "Holddown factor set",
+)
+luCommand("r1", 'vtysh -c "show vnc registrations"', ".", "none")
+luCommand("r3", 'vtysh -c "show vnc registrations"', ".", "none")
+luCommand("r4", 'vtysh -c "show vnc registrations"', ".", "none")
+if not holddownFactorSet:
+    luCommand(
+        "r1",
+        'vtysh -c "show vnc summary"',
+        ".",
+        "pass",
+        "Holddown factor not set -- skipping test",
+    )
+else:
+    # holddown time test
+    luCommand(
+        "r1",
+        'vtysh -c "debug rfapi-dev register vn 10.0.0.1 un 1.1.1.1 prefix 1.111.0.0/16 lifetime 10"',
+        "",
+        "none",
+        "Prefix registered",
+    )
+    luCommand(
+        "r1",
+        'vtysh -c "show vnc registrations local"',
+        "1.111.0.0/16",
+        "wait",
+        "Local registration",
+    )
+
+    luCommand(
+        "r3",
+        'vtysh -c "debug rfapi-dev register vn 10.0.0.2 un 2.2.2.2 prefix 1.222.0.0/16 lifetime 10"',
+        "",
+        "none",
+        "Prefix registered",
+    )
+    luCommand(
+        "r3",
+        'vtysh -c "show vnc registrations local"',
+        "1.222.0.0/16",
+        "wait",
+        "Local registration",
+    )
+
+    luCommand(
+        "r4",
+        'vtysh -c "show vnc registrations"',
+        "Remotely: *Active:  4 ",
+        "wait",
+        "See registrations, L=10",
+    )
+
+    luCommand(
+        "r4",
+        'vtysh -c "debug rfapi-dev register vn 10.0.0.3 un 3.3.3.3 prefix 1.222.0.0/16 lifetime 5 cost 50"',
+        "",
+        "none",
+        "MP Prefix registered",
+    )
+    luCommand(
+        "r4",
+        'vtysh -c "show vnc registrations local"',
+        "1.222.0.0/16",
+        "wait",
+        "Local registration (MP prefix)",
+    )
+
+    luCommand("r1", 'vtysh -c "show vnc registrations"', ".", "none")
+    luCommand("r3", 'vtysh -c "show vnc registrations"', ".", "none")
+
+    luCommand(
+        "r4",
+        'vtysh -c "debug rfapi-dev query vn 10.0.0.3 un 3.3.3.3 target 1.111.111.111"',
+        "pfx=",
+        "pass",
+        "Query R1s info",
+    )
+    luCommand(
+        "r4",
+        'vtysh -c "debug rfapi-dev query vn 10.0.0.3 un 3.3.3.3 target 1.222.222.222"',
+        "1.222.0.0/16.*1.222.0.0/16",
+        "pass",
+        "Query R3s+R4s info",
+    )
+
+    luCommand(
+        "r4",
+        'vtysh -c "debug rfapi-dev unregister vn 10.0.0.3 un 3.3.3.3 prefix 1.222.0.0/16"',
+        "",
+        "none",
+        "MP Prefix removed",
+    )
+    luCommand(
+        "r4",
+        'vtysh -c "show vnc registrations"',
+        "In Holddown: *Active:  1 ",
+        "wait",
+        "MP prefix in holddown",
+    )
+    luCommand(
+        "r1",
+        'vtysh -c "show vnc registrations"',
+        "In Holddown: *Active:  1 ",
+        "wait",
+        "MP prefix in holddown",
+    )
+    luCommand(
+        "r3",
+        'vtysh -c "show vnc registrations"',
+        "In Holddown: *Active:  1 ",
+        "wait",
+        "MP prefix in holddown",
+    )
+    luCommand(
+        "r1",
+        'vtysh -c "debug rfapi-dev query vn 10.0.0.1 un 1.1.1.1 target 1.222.222.222"',
+        "1.222.0.0/16",
+        "pass",
+        "Query R3s info",
+    )
+    luCommand(
+        "r1",
+        'vtysh -c "debug rfapi-dev unregister vn 10.0.0.1 un 1.1.1.1 prefix 1.111.0.0/16"',
+        "",
+        "none",
+        "Prefix timeout",
+    )
+    luCommand(
+        "r1",
+        'vtysh -c "show vnc registrations holddown"',
+        "1.111.0.0/16",
+        "wait",
+        "Local holddown",
+        1,
+    )
+    luCommand(
+        "r3",
+        'vtysh -c "debug rfapi-dev unregister vn 10.0.0.2 un 2.2.2.2 prefix 1.222.0.0/16"',
+        "",
+        "none",
+        "Prefix timeout",
+    )
+    luCommand(
+        "r3",
+        'vtysh -c "show vnc registrations holddown"',
+        "1.222.0.0/16",
+        "wait",
+        "Local holddown",
+        1,
+    )
+    luCommand("r4", 'vtysh -c "show vnc registrations"', ".", "none")
+    luCommand("r4", 'vtysh -c "show vnc registrations"', ".", "none")
+
+    luCommand(
+        "r4",
+        'vtysh -c "show vnc registrations"',
+        "In Holddown: *Active:  2 ",
+        "wait",
+        "In holddown",
+    )
+    luCommand(
+        "r1",
+        'vtysh -c "show vnc registrations"',
+        "In Holddown: *Active:  2 ",
+        "wait",
+        "In holddown",
+    )
+    luCommand(
+        "r3",
+        'vtysh -c "show vnc registrations"',
+        "In Holddown: *Active:  2 ",
+        "wait",
+        "In holddown",
+    )
+
+    luCommand(
+        "r1",
+        'vtysh -c "show vnc registrations"',
+        "In Holddown: *Active:  0",
+        "wait",
+        "Out of holddown",
+        20,
+    )
+    luCommand(
+        "r3",
+        'vtysh -c "show vnc registrations"',
+        "In Holddown: *Active:  0",
+        "wait",
+        "Out of holddown",
+    )
+    luCommand(
+        "r4",
+        'vtysh -c "show vnc registrations"',
+        "In Holddown: *Active:  0",
+        "wait",
+        "Out of holddown",
+    )
+
+    # kill test
+    luCommand(
+        "r1",
+        'vtysh -c "debug rfapi-dev register vn 10.0.0.1 un 1.1.1.1 prefix 1.111.0.0/16 lifetime 10"',
+        "",
+        "none",
+        "Prefix registered",
+    )
+    luCommand(
+        "r1",
+        'vtysh -c "show vnc registrations local"',
+        "1.111.0.0/16",
+        "wait",
+        "Local registration",
+    )
+
+    luCommand(
+        "r3",
+        'vtysh -c "debug rfapi-dev register vn 10.0.0.2 un 2.2.2.2 prefix 1.222.0.0/16 lifetime 10"',
+        "",
+        "none",
+        "Prefix registered",
+    )
+    luCommand(
+        "r3",
+        'vtysh -c "show vnc registrations local"',
+        "1.222.0.0/16",
+        "wait",
+        "Local registration",
+    )
+
+    luCommand(
+        "r4",
+        'vtysh -c "show vnc registrations"',
+        "Remotely: *Active:  4 ",
+        "wait",
+        "See registrations L=10 (pre-kill)",
+        5,
+    )
+    luCommand("r1", 'vtysh -c "show vnc registrations"', ".", "none")
+    luCommand("r3", 'vtysh -c "show vnc registrations"', ".", "none")
+    luCommand(
+        "r1",
+        'vtysh -c "debug rfapi-dev unregister vn 10.0.0.1 un 1.1.1.1 prefix 1.111.0.0/16 kill"',
+        "",
+        "none",
+        "Prefix kill",
+    )
+    luCommand(
+        "r1",
+        'vtysh -c "show vnc registrations"',
+        "Locally: *Active:  1 .* Remotely: *Active:  4 .*In Holddown: *Active:  0",
+        "wait",
+        "Registration killed",
+        1,
+    )
+    luCommand(
+        "r3",
+        'vtysh -c "show vnc registrations"',
+        "Locally: *Active:  2 .* Remotely: *Active:  3 .*In Holddown: *Active:  1",
+        "wait",
+        "Remote in holddown",
+        5,
+    )
+    luCommand(
+        "r4",
+        'vtysh -c "show vnc registrations"',
+        "Locally: *Active:  2 .* Remotely: *Active:  3 .*In Holddown: *Active:  1",
+        "wait",
+        "Remote in holddown",
+        5,
+    )
+
+    luCommand(
+        "r3",
+        'vtysh -c "debug rfapi-dev unregister vn 10.0.0.2 un 2.2.2.2 prefix 1.222.0.0/16 kill"',
+        "",
+        "none",
+        "Prefix kill",
+    )
+    luCommand(
+        "r3",
+        'vtysh -c "show vnc registrations"',
+        "Locally: *Active:  1 .* Remotely: *Active:  3 .*In Holddown: *Active:  1",
+        "wait",
+        "Registration killed",
+        1,
+    )
+    luCommand(
+        "r4",
+        'vtysh -c "show vnc registrations"',
+        "Locally: *Active:  2 .* Remotely: *Active:  2 .*In Holddown: *Active:  2",
+        "wait",
+        "Remote in holddown",
+        5,
+    )
+
+    luCommand(
+        "r1",
+        'vtysh -c "show vnc registrations"',
+        "Locally: *Active:  1 .* Remotely: *Active:  3 .*In Holddown: *Active:  0",
+        "wait",
+        "Out of holddown",
+        20,
+    )
+    luCommand(
+        "r3",
+        'vtysh -c "show vnc registrations"',
+        "Locally: *Active:  1 .* Remotely: *Active:  3 .*In Holddown: *Active:  0",
+        "wait",
+        "Out of holddown",
+    )
+    luCommand(
+        "r4",
+        'vtysh -c "show vnc registrations"',
+        "Locally: *Active:  2 .* Remotely: *Active:  2 .*In Holddown: *Active:  0",
+        "wait",
+        "Out of holddown",
+    )
diff --git a/tests/topotests/bgp_rfapi_basic_sanity/scripts/cleanup_all.py b/tests/topotests/bgp_rfapi_basic_sanity/scripts/cleanup_all.py
new file mode 100644
index 0000000..7201ac8
--- /dev/null
+++ b/tests/topotests/bgp_rfapi_basic_sanity/scripts/cleanup_all.py
@@ -0,0 +1,124 @@
+from lib.lutil import luCommand
+
+luCommand(
+    "r1",
+    'vtysh -c "debug rfapi-dev unregister vn 10.0.0.1 un 1.1.1.1 prefix 11.11.11.0/24"',
+    "",
+    "none",
+    "Prefix removed",
+)
+luCommand(
+    "r1",
+    'vtysh -c "show vnc registrations"',
+    "Locally: *Active:  0 ",
+    "wait",
+    "Local registration removed",
+)
+luCommand(
+    "r1",
+    'vtysh -c "debug rfapi-dev close vn 10.0.0.1 un 1.1.1.1"',
+    "status 0",
+    "pass",
+    "Closed RFAPI",
+)
+
+luCommand(
+    "r3",
+    'vtysh -c "debug rfapi-dev unregister vn 10.0.0.2 un 2.2.2.2 prefix 22.22.22.0/24"',
+    "",
+    "none",
+    "Prefix removed",
+)
+luCommand(
+    "r3",
+    'vtysh -c "show vnc registrations"',
+    "Locally: *Active:  0 ",
+    "wait",
+    "Local registration removed",
+)
+luCommand(
+    "r3",
+    'vtysh -c "debug rfapi-dev close vn 10.0.0.2 un 2.2.2.2"',
+    "status 0",
+    "pass",
+    "Closed RFAPI",
+)
+
+luCommand(
+    "r4",
+    'vtysh -c "debug rfapi-dev unregister vn 10.0.0.3 un 3.3.3.3 prefix 33.33.33.0/24"',
+    "",
+    "none",
+    "Prefix removed",
+)
+luCommand(
+    "r4",
+    'vtysh -c "debug rfapi-dev unregister vn 10.0.0.3 un 3.3.3.3 prefix 11.11.11.0/24"',
+    "",
+    "none",
+    "MP prefix removed",
+)
+luCommand(
+    "r4",
+    'vtysh -c "show vnc registrations"',
+    "Locally: *Active:  0 ",
+    "wait",
+    "Local registration removed",
+)
+# luCommand('r4','vtysh -c "debug rfapi-dev close vn 10.0.0.3 un 3.3.3.3"','status 0', 'pass', 'Closed RFAPI')
+luCommand("r4", 'vtysh -c "clear vnc nve *"', ".", "pass", "Cleared NVEs")
+
+luCommand(
+    "r1",
+    'vtysh -c "show vnc registrations"',
+    "Locally: *Active:  0 .* Remotely: *Active:  0",
+    "wait",
+    "All registrations cleared",
+)
+luCommand(
+    "r3",
+    'vtysh -c "show vnc registrations"',
+    "Locally: *Active:  0 .* Remotely: *Active:  0",
+    "wait",
+    "All registrations cleared",
+)
+luCommand(
+    "r4",
+    'vtysh -c "show vnc registrations"',
+    "Locally: *Active:  0 .* Remotely: *Active:  0",
+    "wait",
+    "All registrations cleared",
+)
+
+num = "0 exist"
+luCommand("r1", 'vtysh -c "show bgp ipv4 vpn"', num, "pass", "VPN SAFI clear")
+luCommand("r2", 'vtysh -c "show bgp ipv4 vpn"', num, "pass", "VPN SAFI clear")
+luCommand("r3", 'vtysh -c "show bgp ipv4 vpn"', num, "pass", "VPN SAFI clear")
+luCommand("r4", 'vtysh -c "show bgp ipv4 vpn"', num, "pass", "VPN SAFI clear")
+
+luCommand(
+    "r1",
+    'vtysh -c "show vnc registrations"',
+    "Locally: *Active:  0 .* Remotely: *Active:  0 .*In Holddown: *Active:  0",
+    "wait",
+    "No holddowns",
+    20,
+)
+luCommand(
+    "r3",
+    'vtysh -c "show vnc registrations"',
+    "Locally: *Active:  0 .* Remotely: *Active:  0 .*In Holddown: *Active:  0",
+    "wait",
+    "No holddowns",
+)
+luCommand(
+    "r4",
+    'vtysh -c "show vnc registrations"',
+    "Locally: *Active:  0 .* Remotely: *Active:  0 .*In Holddown: *Active:  0",
+    "wait",
+    "No holddowns",
+)
+
+luCommand("r1", 'vtysh -c "show vnc summary"', ".", "none")
+luCommand("r3", 'vtysh -c "show vnc summary"', ".", "none")
+luCommand("r4", 'vtysh -c "show vnc summary"', ".", "none")
diff --git a/tests/topotests/bgp_rfapi_basic_sanity/test_bgp_rfapi_basic_sanity.py b/tests/topotests/bgp_rfapi_basic_sanity/test_bgp_rfapi_basic_sanity.py
new file mode 100755
index 0000000..7534dce
--- /dev/null
+++ b/tests/topotests/bgp_rfapi_basic_sanity/test_bgp_rfapi_basic_sanity.py
@@ -0,0 +1,84 @@
+#!/usr/bin/env python
+# SPDX-License-Identifier: ISC
+
+#
+# Part of NetDEF Topology Tests
+#
+# Copyright (c) 2018, LabN Consulting, L.L.C.
+# Authored by Lou Berger <lberger@labn.net>
+#
+
+import os
+import sys
+import pytest
+
+sys.path.append(os.path.join(os.path.dirname(os.path.realpath(__file__)), ".."))
+
+from lib.ltemplate import *
+
+pytestmark = [pytest.mark.bgpd, pytest.mark.ospfd]
+
+
+def test_add_routes():
+    CliOnFail = None
+    # For debugging, uncomment the next line
+    # CliOnFail = 'tgen.mininet_cli'
+    CheckFunc = "ltemplateVersionCheck('3.1')"
+    # uncomment next line to start cli *before* script is run
+    # CheckFunc = 'ltemplateVersionCheck(\'3.1\', cli=True)'
+    ltemplateTest("scripts/add_routes.py", False, CliOnFail, CheckFunc)
+
+
+def test_adjacencies():
+    CliOnFail = None
+    # For debugging, uncomment the next line
+    # CliOnFail = 'tgen.mininet_cli'
+    CheckFunc = "ltemplateVersionCheck('3.1')"
+    # uncomment next line to start cli *before* script is run
+    # CheckFunc = 'ltemplateVersionCheck(\'3.1\', cli=True)'
+    ltemplateTest("scripts/adjacencies.py", False, CliOnFail, CheckFunc)
+
+
+def test_check_routes():
+    CliOnFail = None
+    # For debugging, uncomment the next line
+    # CliOnFail = 'tgen.mininet_cli'
+    CheckFunc = "ltemplateVersionCheck('3.1')"
+    # uncomment next line to start cli *before* script is run
+    # CheckFunc = 'ltemplateVersionCheck(\'3.1\', cli=True)'
+    ltemplateTest("scripts/check_routes.py", False, CliOnFail, CheckFunc)
+
+
+def test_check_close():
+    CliOnFail = None
+    # For debugging, uncomment the next line
+    # CliOnFail = 'tgen.mininet_cli'
+    CheckFunc = "ltemplateVersionCheck('3.1')"
+    # uncomment next line to start cli *before* script is run
+    # CheckFunc = 'ltemplateVersionCheck(\'3.1\', cli=True)'
+    ltemplateTest("scripts/check_close.py", False, CliOnFail, CheckFunc)
+
+
+def test_check_timeout():
+    CliOnFail = None
+    # For debugging, uncomment the next line
+    # CliOnFail = 'tgen.mininet_cli'
+    CheckFunc = "ltemplateVersionCheck('3.1')"
+    # uncomment next line to start cli *before* script is run
+    # CheckFunc = 'ltemplateVersionCheck(\'3.1\', cli=True)'
+    ltemplateTest("scripts/check_timeout.py", False, CliOnFail, CheckFunc)
+
+
+def test_cleanup_all():
+    CliOnFail = None
+    # For debugging, uncomment the next line
+    # CliOnFail = 'tgen.mininet_cli'
+    CheckFunc = "ltemplateVersionCheck('3.1')"
+    # uncomment next line to start cli *before* script is run
+    # CheckFunc = 'ltemplateVersionCheck(\'3.1\', cli=True)'
+    ltemplateTest("scripts/cleanup_all.py", False, CliOnFail, CheckFunc)
+
+
+if __name__ == "__main__":
+    retval = pytest.main(["-s"])
+    sys.exit(retval)