From d2e7bb04317f62643ab2005b601da2265c502c93 Mon Sep 17 00:00:00 2001 From: Zhongyue Luo Date: Wed, 31 Oct 2012 13:19:10 +0800 Subject: Use uuidutils.is_uuid_like for uuid validation Change-Id: I8fc760062ecaee45d263db663a52971be96f264a --- nova/api/ec2/ec2utils.py | 8 ++++---- nova/api/openstack/compute/contrib/floating_ips.py | 4 ++-- nova/api/openstack/compute/servers.py | 9 +++++---- 3 files changed, 11 insertions(+), 10 deletions(-) (limited to 'nova/api') diff --git a/nova/api/ec2/ec2utils.py b/nova/api/ec2/ec2utils.py index 4d0a926df..580cfdac7 100644 --- a/nova/api/ec2/ec2utils.py +++ b/nova/api/ec2/ec2utils.py @@ -25,7 +25,7 @@ from nova import flags from nova.network import model as network_model from nova.openstack.common import log as logging from nova.openstack.common import timeutils -from nova import utils +from nova.openstack.common import uuidutils FLAGS = flags.FLAGS @@ -130,7 +130,7 @@ def id_to_ec2_id(instance_id, template='i-%08x'): def id_to_ec2_inst_id(instance_id): """Get or create an ec2 instance ID (i-[base 16 number]) from uuid.""" - if utils.is_uuid_like(instance_id): + if uuidutils.is_uuid_like(instance_id): ctxt = context.get_admin_context() int_id = get_int_id_from_instance_uuid(ctxt, instance_id) return id_to_ec2_id(int_id) @@ -150,7 +150,7 @@ def get_instance_uuid_from_int_id(context, int_id): def id_to_ec2_snap_id(snapshot_id): """Get or create an ec2 volume ID (vol-[base 16 number]) from uuid.""" - if utils.is_uuid_like(snapshot_id): + if uuidutils.is_uuid_like(snapshot_id): ctxt = context.get_admin_context() int_id = get_int_id_from_snapshot_uuid(ctxt, snapshot_id) return id_to_ec2_id(int_id, 'snap-%08x') @@ -160,7 +160,7 @@ def id_to_ec2_snap_id(snapshot_id): def id_to_ec2_vol_id(volume_id): """Get or create an ec2 volume ID (vol-[base 16 number]) from uuid.""" - if utils.is_uuid_like(volume_id): + if uuidutils.is_uuid_like(volume_id): ctxt = context.get_admin_context() int_id = get_int_id_from_volume_uuid(ctxt, volume_id) return id_to_ec2_id(int_id, 'vol-%08x') diff --git a/nova/api/openstack/compute/contrib/floating_ips.py b/nova/api/openstack/compute/contrib/floating_ips.py index 56a6a8fad..4f6dbffdb 100644 --- a/nova/api/openstack/compute/contrib/floating_ips.py +++ b/nova/api/openstack/compute/contrib/floating_ips.py @@ -27,7 +27,7 @@ from nova.compute import utils as compute_utils from nova import exception from nova import network from nova.openstack.common import log as logging -from nova import utils +from nova.openstack.common import uuidutils LOG = logging.getLogger(__name__) @@ -307,7 +307,7 @@ class FloatingIPActionController(wsgi.Controller): # disassociate if associated if (instance and floating_ip.get('fixed_ip_id') and - (utils.is_uuid_like(id) and + (uuidutils.is_uuid_like(id) and [instance['uuid'] == id] or [instance['id'] == id])[0]): disassociate_floating_ip(self, context, instance, address) diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index ba88d72e7..c4293255d 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -36,6 +36,7 @@ from nova.openstack.common import importutils from nova.openstack.common import log as logging from nova.openstack.common.rpc import common as rpc_common from nova.openstack.common import timeutils +from nova.openstack.common import uuidutils from nova import utils @@ -621,7 +622,7 @@ class Controller(wsgi.Controller): # port parameter is only for qunatum v2.0 msg = _("Unknown argment : port") raise exc.HTTPBadRequest(explanation=msg) - if not utils.is_uuid_like(port_id): + if not uuidutils.is_uuid_like(port_id): msg = _("Bad port format: port uuid is " "not in proper format " "(%s)") % port_id @@ -629,9 +630,9 @@ class Controller(wsgi.Controller): else: network_uuid = network['uuid'] - if not port_id and not utils.is_uuid_like(network_uuid): + if not port_id and not uuidutils.is_uuid_like(network_uuid): br_uuid = network_uuid.split('-', 1)[-1] - if not utils.is_uuid_like(br_uuid): + if not uuidutils.is_uuid_like(br_uuid): msg = _("Bad networks format: network uuid is " "not in proper format " "(%s)") % network_uuid @@ -1099,7 +1100,7 @@ class Controller(wsgi.Controller): # down to an id and use the default glance connection params image_uuid = image_href.split('/').pop() - if not utils.is_uuid_like(image_uuid): + if not uuidutils.is_uuid_like(image_uuid): msg = _("Invalid imageRef provided.") raise exc.HTTPBadRequest(explanation=msg) -- cgit