From: Zhongyue Luo <zhongyue.nah@intel.com>
Date: Fri, 9 Nov 2012 02:26:53 +0000 (+0800)
Subject: Adds test scripts for _validate_values
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=878176565c540cb987eaf73b760f6840adc0ff2f;p=openstack-build%2Fneutron-build.git

Adds test scripts for _validate_values

Shortened _validate_values logic
Wrote unittests for _validate_values

Change-Id: I0f947d20b73aa96524121257784f9ba42489e477
---

diff --git a/quantum/api/v2/attributes.py b/quantum/api/v2/attributes.py
index 907665763..77e8e4692 100644
--- a/quantum/api/v2/attributes.py
+++ b/quantum/api/v2/attributes.py
@@ -42,11 +42,8 @@ def _validate_boolean(data, valid_values=None):
 
 
 def _validate_values(data, valid_values=None):
-    if data in valid_values:
-        return
-    else:
-        msg_dict = dict(data=data, values=valid_values)
-        msg = _("%(data)s is not in %(values)s") % msg_dict
+    if data not in valid_values:
+        msg = _("'%(data)s' is not in %(valid_values)s") % locals()
         LOG.debug("validate_values: %s", msg)
         return msg
 
diff --git a/quantum/tests/unit/test_attributes.py b/quantum/tests/unit/test_attributes.py
index b53a42027..d73aeaa2e 100644
--- a/quantum/tests/unit/test_attributes.py
+++ b/quantum/tests/unit/test_attributes.py
@@ -63,6 +63,19 @@ class TestAttributes(unittest2.TestCase):
         msg = attributes._validate_boolean(None)
         self.assertEquals(msg, "'None' is not boolean")
 
+    def test_values(self):
+        msg = attributes._validate_values(4, [4, 6])
+        self.assertIsNone(msg)
+
+        msg = attributes._validate_values(4, (4, 6))
+        self.assertIsNone(msg)
+
+        msg = attributes._validate_values(7, [4, 6])
+        self.assertEquals(msg, "'7' is not in [4, 6]")
+
+        msg = attributes._validate_values(7, (4, 6))
+        self.assertEquals(msg, "'7' is not in (4, 6)")
+
     def test_strings(self):
         msg = attributes._validate_string(None, None)
         self.assertEquals(msg, "'None' is not a valid string")