From 2db3e7dcd978efb7894ea03cdcf9665f1e6c819f Mon Sep 17 00:00:00 2001 From: "ChangBo Guo(gcb)" Date: Mon, 26 Sep 2016 14:42:17 +0800 Subject: [PATCH] Remove unused method is_valid_ipv6_cidr We don't use method is_valid_ipv6_cidr anywhere, so just remove it. Change-Id: I855969e278533607508591421f175ec4662d0f45 --- ironic/common/utils.py | 8 -------- ironic/tests/unit/common/test_utils.py | 11 ----------- 2 files changed, 19 deletions(-) diff --git a/ironic/common/utils.py b/ironic/common/utils.py index 5b87863181..51c56c1c02 100644 --- a/ironic/common/utils.py +++ b/ironic/common/utils.py @@ -300,14 +300,6 @@ def validate_and_normalize_datapath_id(datapath_id): return datapath_id.lower() -def is_valid_ipv6_cidr(address): - try: - str(netaddr.IPNetwork(address, version=6).cidr) - return True - except Exception: - return False - - def get_shortened_ipv6(address): addr = netaddr.IPAddress(address, version=6) return str(addr.ipv6()) diff --git a/ironic/tests/unit/common/test_utils.py b/ironic/tests/unit/common/test_utils.py index ada2cf648a..d8b19ed9b2 100644 --- a/ironic/tests/unit/common/test_utils.py +++ b/ironic/tests/unit/common/test_utils.py @@ -337,17 +337,6 @@ class GenericUtilsTestCase(base.TestCase): self.assertFalse(utils.is_valid_boolstr('maybe')) self.assertFalse(utils.is_valid_boolstr('only on tuesdays')) - def test_is_valid_ipv6_cidr(self): - self.assertTrue(utils.is_valid_ipv6_cidr("2600::/64")) - self.assertTrue(utils.is_valid_ipv6_cidr( - "abcd:ef01:2345:6789:abcd:ef01:192.168.254.254/48")) - self.assertTrue(utils.is_valid_ipv6_cidr( - "0000:0000:0000:0000:0000:0000:0000:0001/32")) - self.assertTrue(utils.is_valid_ipv6_cidr( - "0000:0000:0000:0000:0000:0000:0000:0001")) - self.assertFalse(utils.is_valid_ipv6_cidr("foo")) - self.assertFalse(utils.is_valid_ipv6_cidr("127.0.0.1")) - def test_get_shortened_ipv6(self): self.assertEqual("abcd:ef01:2345:6789:abcd:ef01:c0a8:fefe", utils.get_shortened_ipv6(