From 96f40c2c80eee96dc9475d17a7248eeb78ccc383 Mon Sep 17 00:00:00 2001 From: Angus Lees Date: Mon, 22 Dec 2014 15:11:07 +1100 Subject: [PATCH] Cisco: logging incorrectly called with (fmt, arg) tuple cisco.db.n1kv_db_v2._validate_segment_range_uniqueness() includes these lines: msg = (_("NetworkProfile name %s already exists"), net_p["name"]) LOG.error(msg) raise n_exc.InvalidInput(error_message=msg) As written, msg is a tuple, and the various logging lines below print the tuple members without properly expanding the format string as intended. The format in msg should have been expanded using % - as was presumably the intention. This change fixes this and a similar example elsewhere in this file. Change-Id: I993245a18ff3db5d5700fb1298ffc958d5827736 Closes-Bug: #1404785 --- neutron/plugins/cisco/db/n1kv_db_v2.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neutron/plugins/cisco/db/n1kv_db_v2.py b/neutron/plugins/cisco/db/n1kv_db_v2.py index 44c51fbb2..0f8543a10 100644 --- a/neutron/plugins/cisco/db/n1kv_db_v2.py +++ b/neutron/plugins/cisco/db/n1kv_db_v2.py @@ -593,7 +593,7 @@ def sync_vxlan_allocations(db_session, net_p): """ seg_min, seg_max = get_segment_range(net_p) if seg_max + 1 - seg_min > c_const.MAX_VXLAN_RANGE: - msg = (_("Unreasonable vxlan ID range %(vxlan_min)s - %(vxlan_max)s"), + msg = (_("Unreasonable vxlan ID range %(vxlan_min)s - %(vxlan_max)s") % {"vxlan_min": seg_min, "vxlan_max": seg_max}) raise n_exc.InvalidInput(error_message=msg) with db_session.begin(subtransactions=True): @@ -1418,7 +1418,7 @@ class NetworkProfile_db_mixin(object): name = profile.name segment_range = profile.segment_range if net_p["name"] == name: - msg = (_("NetworkProfile name %s already exists"), + msg = (_("NetworkProfile name %s already exists") % net_p["name"]) LOG.error(msg) raise n_exc.InvalidInput(error_message=msg) -- 2.45.2