From 66f7abbee759b0305f32de0a43ff8cfaa4b699b7 Mon Sep 17 00:00:00 2001 From: Zhongyue Luo Date: Wed, 31 Oct 2012 11:01:33 +0800 Subject: [PATCH] Use uuidutils for uuid validation Removed api.v2.attributes import Removed re import Fixed if-else statement to enhance readability Change-Id: Id4c107f3bc8c6eb94ae155814538b8f6081cb93b --- quantum/db/securitygroups_db.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/quantum/db/securitygroups_db.py b/quantum/db/securitygroups_db.py index b204eec59..2093b334b 100644 --- a/quantum/db/securitygroups_db.py +++ b/quantum/db/securitygroups_db.py @@ -17,19 +17,17 @@ # @author: Aaron Rosen, Nicira, Inc # -import re - import sqlalchemy as sa from sqlalchemy import orm from sqlalchemy.orm import exc from sqlalchemy.orm import scoped_session -from quantum.api.v2 import attributes from quantum.common import utils from quantum.db import model_base from quantum.db import models_v2 from quantum.extensions import securitygroup as ext_sg from quantum.openstack.common import cfg +from quantum.openstack.common import uuidutils class SecurityGroup(model_base.BASEV2, models_v2.HasId, models_v2.HasTenant): @@ -173,10 +171,10 @@ class SecurityGroupDbMixin(ext_sg.SecurityGroupPluginBase): def _get_security_group(self, context, id): try: query = self._model_query(context, SecurityGroup) - if not re.match(attributes.UUID_PATTERN, str(id)): - sg = query.filter(SecurityGroup.external_id == id).one() - else: + if uuidutils.is_uuid_like(id): sg = query.filter(SecurityGroup.id == id).one() + else: + sg = query.filter(SecurityGroup.external_id == id).one() except exc.NoResultFound: raise ext_sg.SecurityGroupNotFound(id=id) @@ -392,12 +390,12 @@ class SecurityGroupDbMixin(ext_sg.SecurityGroupPluginBase): def _get_security_group_rule(self, context, id): try: - if not re.match(attributes.UUID_PATTERN, id): + if uuidutils.is_uuid_like(id): query = self._model_query(context, SecurityGroupRule) - sgr = query.filter(SecurityGroupRule.external_id == id).one() + sgr = query.filter(SecurityGroupRule.id == id).one() else: query = self._model_query(context, SecurityGroupRule) - sgr = query.filter(SecurityGroupRule.id == id).one() + sgr = query.filter(SecurityGroupRule.external_id == id).one() except exc.NoResultFound: raise ext_sg.SecurityGroupRuleNotFound(id=id) return sgr -- 2.45.2