Merge "Use method is_valid_cidr from oslo.utils"

neutronclient/common/utils.py

@@ -21,7 +21,6 @@ import argparse
 import functools
 import hashlib
 import logging
-import netaddr
 import os
 
 from oslo_utils import encodeutils
@@ -226,11 +225,3 @@ def add_boolean_argument(parser, name, **kwargs):
         choices=['True', 'true', 'False', 'false'],
         default=default,
         **kwargs)
-
-
-def is_valid_cidr(cidr):
-    try:
-        netaddr.IPNetwork(cidr)
-        return True
-    except Exception:
-        return False

neutronclient/shell.py

@@ -30,6 +30,7 @@ import sys
 from keystoneauth1 import session
 import os_client_config
 from oslo_utils import encodeutils
+from oslo_utils import netutils
 
 from cliff import app
 from cliff import command
@@ -39,7 +40,6 @@ from neutronclient._i18n import _
 from neutronclient.common import clientmanager
 from neutronclient.common import exceptions as exc
 from neutronclient.common import extension as client_extension
-from neutronclient.common import utils
 from neutronclient.neutron.v2_0 import address_scope
 from neutronclient.neutron.v2_0 import agent
 from neutronclient.neutron.v2_0 import agentscheduler
@@ -120,7 +120,7 @@ def get_first_valid_cidr(value_specs):
     # When cidr was separated from network, the value will not be able
     # to be parsed into known_args, but saved to _values_specs instead.
     for value in value_specs:
-        if utils.is_valid_cidr(value):
+        if netutils.is_valid_cidr(value):
             return value
 
 

neutronclient/tests/unit/test_utils.py

@@ -15,6 +15,8 @@
 
 import argparse
 
+from oslo_utils import netutils
+
 import testtools
 
 from neutronclient.common import exceptions
@@ -140,9 +142,9 @@ class TestUtils(testtools.TestCase):
         self.assertEqual(('test_name', 'test_id', 'test', 'pass'), act)
 
     def test_is_cidr(self):
-        self.assertTrue(utils.is_valid_cidr('10.10.10.0/24'))
-        self.assertFalse(utils.is_valid_cidr('10.10.10..0/24'))
-        self.assertFalse(utils.is_valid_cidr('wrong_cidr_format'))
+        self.assertTrue(netutils.is_valid_cidr('10.10.10.0/24'))
+        self.assertFalse(netutils.is_valid_cidr('10.10.10..0/24'))
+        self.assertFalse(netutils.is_valid_cidr('wrong_cidr_format'))
 
 
 class ImportClassTestCase(testtools.TestCase):