openstack
/
python-novaclient
Code Issues Proposed changes

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
parent 0d454089c9 852e2e5f31
commit 0c0f093744
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
novaclient/utils.py
View File

@ -353,3 +353,12 @@ def _load_entry_point(ep_name, name=None):
return ep.load() return ep.load()
except (ImportError, pkg_resources.UnknownExtra, AttributeError): except (ImportError, pkg_resources.UnknownExtra, AttributeError):
continue 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

3
novaclient/v1_1/shell.py
View File

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