summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKun Huang <academicgareth@gmail.com>2013-09-05 14:20:23 +0800
committerKun Huang <gareth@unitedstack.com>2013-09-06 02:16:13 +0800
commitee26de1ed22fc67591a7b5465132f78af1f1c0f4 (patch)
tree2f510dade984a184af5b7ee5ac6d7cf0d7f9b395
parent0f5e2bd607a612a848b6ec674dd5f23a8e4959b7 (diff)
downloadneutron-ee26de1ed22fc67591a7b5465132f78af1f1c0f4.tar.gz
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
-rw-r--r--.mailmap1
-rw-r--r--neutron/plugins/cisco/db/n1kv_db_v2.py2
-rw-r--r--neutron/plugins/mlnx/agent/eswitch_neutron_agent.py4
-rw-r--r--neutron/plugins/nec/common/ofc_client.py2
4 files changed, 5 insertions, 4 deletions
diff --git a/.mailmap b/.mailmap
index 6d3ec76d05..7bdd06e5e3 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 6db40fff80..dbc7d334b7 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 637c8f582d..e05fac15b9 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 6df8b4f030..4bc49b42a9 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}