From: Zhongyue Luo <zhongyue.nah@intel.com>
Date: Wed, 14 Nov 2012 01:00:03 +0000 (+0800)
Subject: Removes _validate_boolean()
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=2c116766994f4c97b4b9e04f8abcbd8cd1732859;p=openstack-build%2Fneutron-build.git

Removes _validate_boolean()

Removed _validate_boolean function
Removed all type:boolean verifications

Fixes bug #1082256

Change-Id: I68883ff4dd727fa034d57876b46519d637156af6
---

diff --git a/quantum/api/v2/attributes.py b/quantum/api/v2/attributes.py
index 8830b2cdb..203f0d54d 100644
--- a/quantum/api/v2/attributes.py
+++ b/quantum/api/v2/attributes.py
@@ -46,13 +46,6 @@ def is_attr_set(attribute):
     return not (attribute is None or attribute is ATTR_NOT_SPECIFIED)
 
 
-def _validate_boolean(data, valid_values=None):
-    if not isinstance(data, bool):
-        msg = _("'%s' is not boolean") % data
-        LOG.debug("validate_boolean: %s", msg)
-        return msg
-
-
 def _validate_values(data, valid_values=None):
     if data not in valid_values:
         msg = _("'%(data)s' is not in %(valid_values)s") % locals()
@@ -308,8 +301,7 @@ UUID_PATTERN = '-'.join([HEX_ELEM + '{8}', HEX_ELEM + '{4}',
 MAC_PATTERN = "^%s[aceACE02468](:%s{2}){5}$" % (HEX_ELEM, HEX_ELEM)
 
 # Dictionary that maintains a list of validation functions
-validators = {'type:boolean': _validate_boolean,
-              'type:fixed_ips': _validate_fixed_ips,
+validators = {'type:fixed_ips': _validate_fixed_ips,
               'type:hostroutes': _validate_hostroutes,
               'type:ip_address': _validate_ip_address,
               'type:ip_address_or_none': _validate_ip_address_or_none,
@@ -360,7 +352,6 @@ RESOURCE_ATTRIBUTE_MAP = {
         'admin_state_up': {'allow_post': True, 'allow_put': True,
                            'default': True,
                            'convert_to': convert_to_boolean,
-                           'validate': {'type:boolean': None},
                            'is_visible': True},
         'status': {'allow_post': False, 'allow_put': False,
                    'is_visible': True},
@@ -372,7 +363,6 @@ RESOURCE_ATTRIBUTE_MAP = {
                  'allow_put': True,
                  'default': False,
                  'convert_to': convert_to_boolean,
-                 'validate': {'type:boolean': None},
                  'is_visible': True,
                  'required_by_policy': True,
                  'enforce_policy': True},
@@ -391,7 +381,6 @@ RESOURCE_ATTRIBUTE_MAP = {
         'admin_state_up': {'allow_post': True, 'allow_put': True,
                            'default': True,
                            'convert_to': convert_to_boolean,
-                           'validate': {'type:boolean': None},
                            'is_visible': True},
         'mac_address': {'allow_post': True, 'allow_put': False,
                         'default': ATTR_NOT_SPECIFIED,
@@ -461,13 +450,11 @@ RESOURCE_ATTRIBUTE_MAP = {
         'enable_dhcp': {'allow_post': True, 'allow_put': True,
                         'default': True,
                         'convert_to': convert_to_boolean,
-                        'validate': {'type:boolean': None},
                         'is_visible': True},
         SHARED: {'allow_post': False,
                  'allow_put': False,
                  'default': False,
                  'convert_to': convert_to_boolean,
-                 'validate': {'type:boolean': None},
                  'is_visible': False,
                  'required_by_policy': True,
                  'enforce_policy': True},
diff --git a/quantum/extensions/l3.py b/quantum/extensions/l3.py
index 9119d0d45..507133347 100644
--- a/quantum/extensions/l3.py
+++ b/quantum/extensions/l3.py
@@ -1,4 +1,3 @@
-"""
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 #
 # Copyright 2012 Nicira Networks, Inc.  All rights reserved.
@@ -17,7 +16,6 @@
 #
 # @author: Dan Wendlandt, Nicira, Inc
 #
-"""
 
 from abc import abstractmethod
 
@@ -85,7 +83,6 @@ RESOURCE_ATTRIBUTE_MAP = {
         'admin_state_up': {'allow_post': True, 'allow_put': True,
                            'default': True,
                            'convert_to': attr.convert_to_boolean,
-                           'validate': {'type:boolean': None},
                            'is_visible': True},
         'status': {'allow_post': False, 'allow_put': False,
                    'is_visible': True},
@@ -129,7 +126,6 @@ EXTENDED_ATTRIBUTES_2_0 = {
                             'default': attr.ATTR_NOT_SPECIFIED,
                             'is_visible': True,
                             'convert_to': attr.convert_to_boolean,
-                            'validate': {'type:boolean': None},
                             'enforce_policy': True,
                             'required_by_policy': True}}}
 
diff --git a/quantum/plugins/nec/extensions/packetfilter.py b/quantum/plugins/nec/extensions/packetfilter.py
index 18f95328e..c65b0ea25 100644
--- a/quantum/plugins/nec/extensions/packetfilter.py
+++ b/quantum/plugins/nec/extensions/packetfilter.py
@@ -51,7 +51,6 @@ PACKET_FILTER_ATTR_MAP = {
     'admin_state_up': {'allow_post': True, 'allow_put': True,
                        'default': True,
                        'convert_to': attributes.convert_to_boolean,
-                       'validate': {'type:boolean': None},
                        'is_visible': True},
     'status': {'allow_post': False, 'allow_put': False,
                'is_visible': True},
diff --git a/quantum/tests/unit/test_attributes.py b/quantum/tests/unit/test_attributes.py
index 6d2c1c848..5929655bf 100644
--- a/quantum/tests/unit/test_attributes.py
+++ b/quantum/tests/unit/test_attributes.py
@@ -33,28 +33,6 @@ class TestAttributes(unittest2.TestCase):
         data = "I'm set"
         self.assertIs(attributes.is_attr_set(data), True)
 
-    def test_validate_boolean(self):
-        msg = attributes._validate_boolean(True)
-        self.assertIsNone(msg)
-
-        msg = attributes._validate_boolean(False)
-        self.assertIsNone(msg)
-
-        msg = attributes._validate_boolean('True')
-        self.assertEquals(msg, "'True' is not boolean")
-
-        msg = attributes._validate_boolean('False')
-        self.assertEquals(msg, "'False' is not boolean")
-
-        msg = attributes._validate_boolean(0)
-        self.assertEquals(msg, "'0' is not boolean")
-
-        msg = attributes._validate_boolean(1)
-        self.assertEquals(msg, "'1' is not boolean")
-
-        msg = attributes._validate_boolean(None)
-        self.assertEquals(msg, "'None' is not boolean")
-
     def test_validate_values(self):
         msg = attributes._validate_values(4, [4, 6])
         self.assertIsNone(msg)