diff options
| author | Daniel Walton <dwalton@cumulusnetworks.com> | 2016-06-21 14:52:43 +0000 |
|---|---|---|
| committer | Daniel Walton <dwalton@cumulusnetworks.com> | 2016-06-21 14:53:20 +0000 |
| commit | bb132d19d7a0f5687911ab2979beb260014c0a8c (patch) | |
| tree | cd0dff508413dc6d890fc7b9d5cc0f178b3d2a26 | |
| parent | c9deb8fd4512802f4e1ad86b5ed32217358d7ea8 (diff) | |
quagga-reload.py thinks the BGP ASN changed when it did not
Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
Ticket: CM-11463
(cherry picked from commit ab5f8310801f1870a7c5c22e1595e4452c558ddb)
| -rwxr-xr-x | tools/quagga-reload.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/quagga-reload.py b/tools/quagga-reload.py index 27fc3830c6..9c0cbb48d6 100755 --- a/tools/quagga-reload.py +++ b/tools/quagga-reload.py @@ -567,7 +567,11 @@ def compare_context_objects(newconf, running): if running_ctx_keys not in newconf.contexts: # Check if bgp's local ASN has changed. If yes, just restart it - if "router bgp" in running_ctx_keys[0]: + # We check that the len is 1 here so that we only look at ('router bgp 10') + # and not ('router bgp 10', 'address-family ipv4 unicast'). The + # latter could cause a false restart_bgpd positive if ipv4 unicast is in + # running but not in newconf. + if "router bgp" in running_ctx_keys[0] and len(running_ctx_keys) == 1: restart_bgpd = True continue |