From: Zhongyue Luo <zhongyue.nah@intel.com>
Date: Mon, 12 Nov 2012 08:18:21 +0000 (+0800)
Subject: Adds tests for attribute._validate_uuid
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ade8d96cd61f42b8684b64b2f5bfc4ad923cde30;p=openstack-build%2Fneutron-build.git

Adds tests for attribute._validate_uuid

Removed redundant condition in _validate_uuid logic
Wrote test cases accordingly

Change-Id: I6ee83bda90cdfeaeaa17da6241f2673d0959baa2
---

diff --git a/quantum/api/v2/attributes.py b/quantum/api/v2/attributes.py
index 77e8e4692..133f58d65 100644
--- a/quantum/api/v2/attributes.py
+++ b/quantum/api/v2/attributes.py
@@ -246,10 +246,8 @@ def _validate_regex(data, valid_values=None):
 
 
 def _validate_uuid(data, valid_values=None):
-    if uuidutils.is_uuid_like(data):
-        return
-    else:
-        msg = _("%s is not a valid UUID") % data
+    if not uuidutils.is_uuid_like(data):
+        msg = _("'%s' is not a valid UUID") % data
         LOG.debug("validate_uuid: %s", msg)
         return msg
 
diff --git a/quantum/tests/unit/test_attributes.py b/quantum/tests/unit/test_attributes.py
index d73aeaa2e..5ef7e30d1 100644
--- a/quantum/tests/unit/test_attributes.py
+++ b/quantum/tests/unit/test_attributes.py
@@ -255,6 +255,13 @@ class TestAttributes(unittest2.TestCase):
         error = "'%s' is not a valid IP subnet" % cidr
         self.assertEquals(msg, error)
 
+    def test_uuid(self):
+        msg = attributes._validate_uuid('true')
+        self.assertEquals(msg, "'true' is not a valid UUID")
+
+        msg = attributes._validate_uuid('00000000-ffff-ffff-ffff-000000000000')
+        self.assertIsNone(msg)
+
 
 class TestConvertToBoolean(unittest2.TestCase):