Ignore wrong ip address, don't crash bgpcfgd

Author: Pavel Shirshov

src/sonic-bgpcfgd/app/template.py

@@ -4,6 +4,7 @@
 import jinja2
 import netaddr
 
+from .log import log_err
 
 class TemplateFabric(object):
     """ Fabric for rendering jinja2 templates """
@@ -97,12 +98,11 @@ def pfx_filter(value):
             intf, ip_address = key
             if '/' not in ip_address:
                 if TemplateFabric.is_ipv4(ip_address):
-                    new_ip_address = "%s/32" % ip_address
+                    table[(intf, "%s/32" % ip_address)] = val
                 elif TemplateFabric.is_ipv6(ip_address):
-                    new_ip_address = "%s/128" % ip_address
+                    table[(intf, "%s/128" % ip_address)] = val
                 else:
-                    raise ValueError("'%s' is invalid ip address" % ip_address)
-                table[(intf, new_ip_address)] = val
+                    log_err("'%s' is invalid ip address" % ip_address)
             else:
                 table[key] = val
         return table

src/sonic-bgpcfgd/tests/test_pfx_filter.py

@@ -1,5 +1,7 @@
 from app.template import TemplateFabric
 from collections import OrderedDict
+import pytest
+
 
 def test_pfx_filter_none():
     res = TemplateFabric.pfx_filter(None)
@@ -126,12 +128,12 @@ def test_pfx_filter_pfx_comprehensive():
     res = TemplateFabric.pfx_filter(src)
     assert res == expected
 
-def test_pfx_filter_pfx_exception():
+@pytest.fixture
+def test_pfx_filter_wrong_ip(caplog):
     src = {
-        ('Loopback0', '23asef45'): {},
+        ('Loopback0', 'wrong_ip'): {},
     }
-    try:
-        res = TemplateFabric.pfx_filter(src)
-        assert False, "Exception wasn't raised"
-    except ValueError as e:
-        assert str(e) == "'23asef45' is invalid ip address"
+    res = TemplateFabric.pfx_filter(src)
+    assert "'wrong_ip' is invalid ip address" in caplog.text
+    assert isinstance(res, OrderedDict) and len(res) == 0
+