From 87f26929ee8e17d132c6d8c719e97e6795675caf Mon Sep 17 00:00:00 2001
From: Sandhya Dasu <sadasu@cisco.com>
Date: Fri, 30 Jan 2015 15:46:55 -0500
Subject: [PATCH] Remove duplicate logging of attribute validation errors

Removed logging at top level function _validate_dict() and
added logging at the lower level functions wherever necessary.

Change-Id: I09ec62ef5998aea5735ff641166cbc5b469775e9
Closes-bug: #1397310
---
 neutron/api/v2/attributes.py | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/neutron/api/v2/attributes.py b/neutron/api/v2/attributes.py
index d270c797b..023b434e0 100644
--- a/neutron/api/v2/attributes.py
+++ b/neutron/api/v2/attributes.py
@@ -44,6 +44,7 @@ def _verify_dict_keys(expected_keys, target_dict, strict=True):
         msg = (_("Invalid input. '%(target_dict)s' must be a dictionary "
                  "with keys: %(expected_keys)s") %
                {'target_dict': target_dict, 'expected_keys': expected_keys})
+        LOG.debug(msg)
         return msg
 
     expected_keys = set(expected_keys)
@@ -57,6 +58,7 @@ def _verify_dict_keys(expected_keys, target_dict, strict=True):
                  "Provided keys: %(provided_keys)s") %
                {'expected_keys': expected_keys,
                 'provided_keys': provided_keys})
+        LOG.debug(msg)
         return msg
 
 
@@ -82,7 +84,9 @@ def _validate_not_empty_string(data, max_len=None):
     if msg:
         return msg
     if not data.strip():
-        return _("'%s' Blank strings are not permitted") % data
+        msg = _("'%s' Blank strings are not permitted") % data
+        LOG.debug(msg)
+        return msg
 
 
 def _validate_string_or_none(data, max_len=None):
@@ -208,12 +212,10 @@ def _validate_ip_pools(data, valid_values=None):
     for ip_pool in data:
         msg = _verify_dict_keys(expected_keys, ip_pool)
         if msg:
-            LOG.debug(msg)
             return msg
         for k in expected_keys:
             msg = _validate_ip_address(ip_pool[k])
             if msg:
-                LOG.debug(msg)
                 return msg
 
 
@@ -235,16 +237,15 @@ def _validate_fixed_ips(data, valid_values=None):
             fixed_ip_address = fixed_ip['ip_address']
             if fixed_ip_address in ips:
                 msg = _("Duplicate IP address '%s'") % fixed_ip_address
+                LOG.debug(msg)
             else:
                 msg = _validate_ip_address(fixed_ip_address)
             if msg:
-                LOG.debug(msg)
                 return msg
             ips.append(fixed_ip_address)
         if 'subnet_id' in fixed_ip:
             msg = _validate_uuid(fixed_ip['subnet_id'])
             if msg:
-                LOG.debug(msg)
                 return msg
 
 
@@ -258,6 +259,7 @@ def _validate_ip_or_hostname(host):
     msg = _("%(host)s is not a valid IP or hostname. Details: "
             "%(ip_err)s, %(name_err)s") % {'ip_err': ip_err, 'host': host,
                                            'name_err': name_err}
+    LOG.debug(msg)
     return msg
 
 
@@ -274,6 +276,7 @@ def _validate_nameservers(data, valid_values=None):
         if msg:
             msg = _("'%(host)s' is not a valid nameserver. %(msg)s") % {
                 'host': host, 'msg': msg}
+            LOG.debug(msg)
             return msg
         if host in hosts:
             msg = _("Duplicate nameserver '%s'") % host
@@ -293,15 +296,12 @@ def _validate_hostroutes(data, valid_values=None):
     for hostroute in data:
         msg = _verify_dict_keys(expected_keys, hostroute)
         if msg:
-            LOG.debug(msg)
             return msg
         msg = _validate_subnet(hostroute['destination'])
         if msg:
-            LOG.debug(msg)
             return msg
         msg = _validate_ip_address(hostroute['nexthop'])
         if msg:
-            LOG.debug(msg)
             return msg
         if hostroute in hostroutes:
             msg = _("Duplicate hostroute '%s'") % hostroute
@@ -430,7 +430,6 @@ def _validate_uuid_list(data, valid_values=None):
     for item in data:
         msg = _validate_uuid(item)
         if msg:
-            LOG.debug(msg)
             return msg
 
     if len(set(data)) != len(data):
@@ -454,7 +453,9 @@ def _validate_dict_item(key, key_validator, data):
             try:
                 val_func = validators[k]
             except KeyError:
-                return _("Validator '%s' does not exist.") % k
+                msg = _("Validator '%s' does not exist.") % k
+                LOG.debug(msg)
+                return msg
             val_params = v
             break
     # Process validation
@@ -478,7 +479,6 @@ def _validate_dict(data, key_specs=None):
     if required_keys:
         msg = _verify_dict_keys(required_keys, data, False)
         if msg:
-            LOG.debug(msg)
             return msg
 
     # Perform validation and conversion of all values
@@ -487,7 +487,6 @@ def _validate_dict(data, key_specs=None):
                                if k in data]:
         msg = _validate_dict_item(key, key_validator, data)
         if msg:
-            LOG.debug(msg)
             return msg
 
 
-- 
2.45.2