openstack
/
nova
Code Issues Proposed changes

Merge "Reuse is_int_like from oslo_utils"

This commit is contained in:
Jenkins 2015-02-25 08:19:36 +00:00 committed by Gerrit Code Review
parent 932e7aa8f8 8b92d5341b
commit 03f0942c6c
4 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/compute/api.py
View File

@ -1941,7 +1941,7 @@ class API(base.Base):
if uuidutils.is_uuid_like(instance_id):
instance = objects.Instance.get_by_uuid(
context, instance_id, expected_attrs=expected_attrs)
elif utils.is_int_like(instance_id):
elif strutils.is_int_like(instance_id):
instance = objects.Instance.get_by_id(
context, instance_id, expected_attrs=expected_attrs)
else:

3
nova/network/api.py
View File

@ -20,6 +20,7 @@ import functools
from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import strutils
from nova import exception
from nova.i18n import _LI
@ -124,7 +125,7 @@ class API(base_api.NetworkAPI):
@wrap_check_policy
def get_floating_ip(self, context, id):
if not utils.is_int_like(id):
if not strutils.is_int_like(id):
raise exception.InvalidID(id=id)
return objects.FloatingIP.get_by_id(context, id)

21
nova/tests/unit/test_utils.py
View File

@ -561,27 +561,6 @@ class LastBytesTestCase(test.NoDBTestCase):
self.assertEqual((content, 0), utils.last_bytes(flo, 1000))
class IntLikeTestCase(test.NoDBTestCase):
def test_is_int_like(self):
self.assertTrue(utils.is_int_like(1))
self.assertTrue(utils.is_int_like("1"))
self.assertTrue(utils.is_int_like("514"))
self.assertTrue(utils.is_int_like("0"))
self.assertFalse(utils.is_int_like(1.1))
self.assertFalse(utils.is_int_like("1.1"))
self.assertFalse(utils.is_int_like("1.1.1"))
self.assertFalse(utils.is_int_like(None))
self.assertFalse(utils.is_int_like("0."))
self.assertFalse(utils.is_int_like("aaaaaa"))
self.assertFalse(utils.is_int_like("...."))
self.assertFalse(utils.is_int_like("1g"))
self.assertFalse(
utils.is_int_like("0cc3346e-9fef-4445-abe6-5d2b2690ec64"))
self.assertFalse(utils.is_int_like("a1"))
class MetadataToDictTestCase(test.NoDBTestCase):
def test_metadata_to_dict(self):
self.assertEqual(utils.metadata_to_dict(

8
nova/utils.py
View File

@ -430,14 +430,6 @@ def parse_server_string(server_str):
return ('', '')
def is_int_like(val):
"""Check if a value looks like an int."""
try:
return str(int(val)) == str(val)
except Exception:
return False
def is_valid_ipv6_cidr(address):
try:
netaddr.IPNetwork(address, version=6).cidr