diff --git a/oslo_utils/netutils.py b/oslo_utils/netutils.py index ebef117..0ad02fd 100644 --- a/oslo_utils/netutils.py +++ b/oslo_utils/netutils.py @@ -123,7 +123,7 @@ def is_valid_cidr(address): try: # Validate the correct CIDR Address netaddr.IPNetwork(address) - except netaddr.AddrFormatError: + except (TypeError, netaddr.AddrFormatError): return False # Prior validation partially verify /xx part diff --git a/oslo_utils/tests/test_netutils.py b/oslo_utils/tests/test_netutils.py index d80f6b7..9b15d61 100644 --- a/oslo_utils/tests/test_netutils.py +++ b/oslo_utils/tests/test_netutils.py @@ -190,6 +190,7 @@ class NetworkUtilsTest(test_base.BaseTestCase): self.assertFalse(netutils.is_valid_cidr('10.0.0.1')) self.assertFalse(netutils.is_valid_cidr('10.0.0.1/33')) + self.assertFalse(netutils.is_valid_cidr(10)) def test_valid_port(self): valid_inputs = [1, '1', 2, '3', '5', 8, 13, 21,