From: Angus Lees <gus@inodes.org>
Date: Wed, 17 Dec 2014 04:44:12 +0000 (+1100)
Subject: Cisco: unsupported format character in log format
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a1a908e815f27f630bc7a7a5dfc06031cfc2bf3b;p=openstack-build%2Fneutron-build.git

Cisco: unsupported format character in log format

CiscoCfgAgent.hosting_devices_removed() contains an error in the
format string used to log errors:

    LOG.error(_LE("Invalid payload format for received RPC message "
		"`hosting_devices_removed`. Error is %{error}s. "
		"Payload is %(payload)s"),
	      {'error': e, 'payload': payload})

"%{error}s" should be "%(error)s"

The existing version raises "ValueError: unsupported format character
'{' (0x7b)" when invoked.

(found via pylint)

Change-Id: Ic5e9db2a19aa7652cbbd1ee04d7e02914e8d0093
Closes-Bug: #1403304
---

diff --git a/neutron/plugins/cisco/cfg_agent/cfg_agent.py b/neutron/plugins/cisco/cfg_agent/cfg_agent.py
index dfc094aca..636fb5c81 100644
--- a/neutron/plugins/cisco/cfg_agent/cfg_agent.py
+++ b/neutron/plugins/cisco/cfg_agent/cfg_agent.py
@@ -228,7 +228,7 @@ class CiscoCfgAgent(manager.Manager):
                     self.process_services(removed_devices_info=payload)
         except KeyError as e:
             LOG.error(_LE("Invalid payload format for received RPC message "
-                        "`hosting_devices_removed`. Error is %{error}s. "
+                        "`hosting_devices_removed`. Error is %(error)s. "
                         "Payload is %(payload)s"),
                       {'error': e, 'payload': payload})