tests: Turn on nhrpd and babeld as part of all-protocol-startup

Turn on a few more daemons to run during this test.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/tests/topotests/all-protocol-startup/r1/babeld.conf b/tests/topotests/all-protocol-startup/r1/babeld.conf
new file mode 100644 (file)
index 0000000..3e119bf
--- /dev/null
+++ b/tests/topotests/all-protocol-startup/r1/babeld.conf
@@ -0,0 +1,4 @@
+router babel
+  network 192.168.1.1
+  network 192.168.2.1
+!
\ No newline at end of file

diff --git a/tests/topotests/all-protocol-startup/r1/nhrpd.conf b/tests/topotests/all-protocol-startup/r1/nhrpd.conf
new file mode 100644 (file)
index 0000000..74e0f12
--- /dev/null
+++ b/tests/topotests/all-protocol-startup/r1/nhrpd.conf
@@ -0,0 +1 @@
+!
\ No newline at end of file

diff --git a/tests/topotests/all-protocol-startup/test_all_protocol_startup.py b/tests/topotests/all-protocol-startup/test_all_protocol_startup.py
index f78c2b4bc055b34c498660bc333c05ec494cc9b1..fb211957a731ba96d495baf6c89b0c8ed222daa7 100755 (executable)
--- a/tests/topotests/all-protocol-startup/test_all_protocol_startup.py
+++ b/tests/topotests/all-protocol-startup/test_all_protocol_startup.py
@@ -121,6 +121,8 @@ def setup_module(module):
             # Only test LDPd if it's installed and Kernel >= 4.5
             net['r%s' % i].loadConf('ldpd', '%s/r%s/ldpd.conf' % (thisDir, i))
         net['r%s' % i].loadConf('sharpd')
+        net['r%s' % i].loadConf('nhrpd', '%s/r%s/nhrpd.conf' % (thisDir, i))
+        net['r%s' % i].loadConf('babeld', '%s/r%s/babeld.conf' % (thisDir, i))
         net['r%s' % i].startRouter()
 
     # For debugging after starting Quagga/FRR daemons, uncomment the next line

diff --git a/tests/topotests/lib/topogen.py b/tests/topotests/lib/topogen.py
index 7629d8a5043443a527404669a90a710fc7c53573..673d65376fa7c40505c51bb9f66898be873d0171 100644 (file)
--- a/tests/topotests/lib/topogen.py
+++ b/tests/topotests/lib/topogen.py
@@ -555,6 +555,7 @@ class TopoRouter(TopoGear):
     RD_STATIC = 12
     RD_BFD = 13
     RD_SHARP = 14
+    RD_BABEL = 15
     RD = {
         RD_ZEBRA: "zebra",
         RD_RIP: "ripd",
@@ -570,6 +571,7 @@ class TopoRouter(TopoGear):
         RD_STATIC: "staticd",
         RD_BFD: "bfdd",
         RD_SHARP: "sharpd",
+        RD_BABEL: "babeld",
     }
 
     def __init__(self, tgen, cls, name, **params):

diff --git a/tests/topotests/lib/topotest.py b/tests/topotests/lib/topotest.py
index cefb61d198132d377cb5504c930a7c4b6aacc973..b35606df8f96fbfb32c08222c0c4349223a31696 100644 (file)
--- a/tests/topotests/lib/topotest.py
+++ b/tests/topotests/lib/topotest.py
@@ -870,6 +870,7 @@ class Router(Node):
             "staticd": 0,
             "bfdd": 0,
             "sharpd": 0,
+            "babeld": 0,
         }
         self.daemons_options = {"zebra": ""}
         self.reportCores = True