From: Daniel Walton <dwalton@cumulusnetworks.com>
Date: Fri, 10 Nov 2017 17:19:08 +0000 (+0000)
Subject: tools: frr-reload.py ignore multiple whitespaces
X-Git-Tag: frr-4.0-dev~157^2~4
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=89cca49b3a1acc08273d46070eb28d245451455a;p=mirror%2Ffrr.git

tools: frr-reload.py ignore multiple whitespaces

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>

Without this fix frr-reload would do a del/add even if the only
difference were bogus whitespaces.

root@cel-redxp-10[nclu]# /usr/lib/frr/frr-reload.py --test
/etc/frr/frr.conf

Lines To Delete
===============

router bgp 100
 no bgp router-id 1.1.1.1

Lines To Add
============

router bgp 100
 bgp   router-id 1.1.1.1
root@cel-redxp-10[nclu]#
---

diff --git a/tools/frr-reload.py b/tools/frr-reload.py
index e19eeb04ee..8e218c0fc0 100755
--- a/tools/frr-reload.py
+++ b/tools/frr-reload.py
@@ -118,6 +118,10 @@ class Config(object):
 
         for line in file_output.split('\n'):
             line = line.strip()
+
+            # Compress duplicate whitespaces
+            line = ' '.join(line.split())
+
             if ":" in line:
                 qv6_line = get_normalized_ipv6_line(line)
                 self.lines.append(qv6_line)