From 7c238883ccbe8754cdda2d8018bfd2d131d684f5 Mon Sep 17 00:00:00 2001 From: Kun Huang Date: Thu, 5 Sep 2013 14:20:23 +0800 Subject: [PATCH] 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 --- .mailmap | 1 + neutron/plugins/cisco/db/n1kv_db_v2.py | 2 +- neutron/plugins/mlnx/agent/eswitch_neutron_agent.py | 4 ++-- neutron/plugins/nec/common/ofc_client.py | 2 +- 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 Jiajun Liu Zhongyue Luo +Kun Huang 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}