Merge "Check whether the security group id is integer"

This commit is contained in:
Jenkins 2013-08-04 13:31:50 +00:00 committed by Gerrit Code Review
commit 0c0f093744
2 changed files with 10 additions and 2 deletions

View File

@ -353,3 +353,12 @@ def _load_entry_point(ep_name, name=None):
return ep.load()
except (ImportError, pkg_resources.UnknownExtra, AttributeError):
continue
def is_integer_like(val):
"""Returns validation of a value as an integer."""
try:
value = int(val)
return True
except (TypeError, ValueError, AttributeError):
return False

View File

@ -30,7 +30,6 @@ import time
from novaclient import exceptions
from novaclient.openstack.common import strutils
from novaclient.openstack.common import timeutils
from novaclient.openstack.common import uuidutils
from novaclient import utils
from novaclient.v1_1 import availability_zones
from novaclient.v1_1 import quotas
@ -1918,7 +1917,7 @@ def _print_secgroups(secgroups):
def _get_secgroup(cs, secgroup):
# Check secgroup is an ID
if uuidutils.is_uuid_like(strutils.safe_encode(secgroup)):
if utils.is_integer_like(strutils.safe_encode(secgroup)):
try:
return cs.security_groups.get(secgroup)
except exceptions.NotFound: