From: Kun Huang <academicgareth@gmail.com>
Date: Thu, 5 Sep 2013 06:20:23 +0000 (+0800)
Subject: fix conversion type missing
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ee26de1ed22fc67591a7b5465132f78af1f1c0f4;p=openstack-build%2Fneutron-build.git

fix conversion type missing

Conversion type is missing in some places which would cause some
unexcepted error. By using 'grep -rn "%(\w\+)\W"', we could find
all cases of '%(variable_a)' and fix them.

Change-Id: I05cbaac73976c70be8428bf5a2d0017ea7059cb3
Closes-Bug: #1221036
---

diff --git a/.mailmap b/.mailmap
index 6d3ec76d0..7bdd06e5e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -4,3 +4,4 @@
 lawrancejing <lawrancejing@gmail.com> <liuqing@windawn.com>
 Jiajun Liu <jiajun@unitedstack.com> <iamljj@gmail.com>
 Zhongyue Luo <zhongyue.nah@intel.com> <lzyeval@gmail.com>
+Kun Huang <gareth@unitedstack.com> <academicgareth@gmail.com>
diff --git a/neutron/plugins/cisco/db/n1kv_db_v2.py b/neutron/plugins/cisco/db/n1kv_db_v2.py
index 6db40fff8..dbc7d334b 100644
--- a/neutron/plugins/cisco/db/n1kv_db_v2.py
+++ b/neutron/plugins/cisco/db/n1kv_db_v2.py
@@ -991,7 +991,7 @@ def delete_profile_binding(tenant_id, profile_id):
             db_session.delete(binding)
     except c_exc.ProfileTenantBindingNotFound:
         LOG.debug(_("Profile-Tenant binding missing for profile ID "
-                  "%(profile_id)s and tenant ID %(tenant_id)") %
+                  "%(profile_id)s and tenant ID %(tenant_id)s") %
                   {"profile_id": profile_id, "tenant_id": tenant_id})
         return
 
diff --git a/neutron/plugins/mlnx/agent/eswitch_neutron_agent.py b/neutron/plugins/mlnx/agent/eswitch_neutron_agent.py
index 637c8f582..e05fac15b 100644
--- a/neutron/plugins/mlnx/agent/eswitch_neutron_agent.py
+++ b/neutron/plugins/mlnx/agent/eswitch_neutron_agent.py
@@ -134,8 +134,8 @@ class EswitchManager(object):
         elif network_type == constants.TYPE_IB:
             LOG.debug(_("creating IB Network"))
         else:
-            LOG.error(_("Unknown network type %(network_type) "
-                        "for network %(network_id)"),
+            LOG.error(_("Unknown network type %(network_type)s "
+                        "for network %(network_id)s"),
                       {'network_type': network_type,
                        'network_id': network_id})
             return
diff --git a/neutron/plugins/nec/common/ofc_client.py b/neutron/plugins/nec/common/ofc_client.py
index 6df8b4f03..4bc49b42a 100644
--- a/neutron/plugins/nec/common/ofc_client.py
+++ b/neutron/plugins/nec/common/ofc_client.py
@@ -97,7 +97,7 @@ class OFCClient(object):
                 return data
             else:
                 LOG.warning(_("Operation on OFC failed: "
-                              "status=%(status), detail=%(detail)"),
+                              "status=%(status)s, detail=%(detail)s"),
                             {'status': res.status, 'detail': data})
                 params = {'reason': _("Operation on OFC failed"),
                           'status': res.status}