From: Daniel Walton <dwalton@cumulusnetworks.com>
Date: Thu, 1 Oct 2015 18:23:00 +0000 (-0700)
Subject: 'service quagga reload' breaks with four top level keywords
X-Git-Tag: frr-2.0-rc1~1241^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=2fed5dcd9208a5b8bdbc49febd908f9e72603ede;p=matthieu%2Ffrr.git

'service quagga reload' breaks with four top level keywords

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by:   Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by:   Vivek Venkataraman <vivek@cumulusnetworks.com>

Ticket: CM-7757
Reviewed By: Donald and Vivek
---

diff --git a/tools/quagga-reload.py b/tools/quagga-reload.py
index cc3910760d..343d61ae78 100755
--- a/tools/quagga-reload.py
+++ b/tools/quagga-reload.py
@@ -219,7 +219,23 @@ end
 
         # the keywords that we know are single line contexts. bgp in this case
         # is not the main router bgp block, but enabling multi-instance
-        oneline_ctx_keywords = ("ip ", "ipv6 ", "log ", "hostname ", "zebra ", "ptm-enable", "debug ", "service ", "enable ", "password ", "access-list ", "bgp ")
+        oneline_ctx_keywords = ("access-list ",
+                                "bgp ",
+                                "debug ",
+                                "dump ",
+                                "enable ",
+                                "hostname ",
+                                "ip ",
+                                "ipv6 ",
+                                "log ",
+                                "password ",
+                                "ptm-enable",
+                                "router-id ",
+                                "service ",
+                                "table ",
+                                "username ",
+                                "zebra ")
+
 
         for line in self.lines: