From ec20f7f85c3a8ecd788536401eeeb0fef4ef18c2 Mon Sep 17 00:00:00 2001 From: Takashi NATSUME Date: Tue, 26 Jul 2016 15:48:11 +0900 Subject: Fix string interpolation at logging call Skip creating the formatted log message if the message is not going to be emitted because of the log level. Change-Id: I19d985addb2bdc1b5e17ecd5ac90223e5347d7b2 Closes-Bug: #1596829 --- neutronclient/neutron/v2_0/lb/v2/loadbalancer.py | 2 +- neutronclient/neutron/v2_0/subnet.py | 6 +++--- neutronclient/tests/unit/test_cli20_subnet.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/neutronclient/neutron/v2_0/lb/v2/loadbalancer.py b/neutronclient/neutron/v2_0/lb/v2/loadbalancer.py index 76f37fc..32aac87 100644 --- a/neutronclient/neutron/v2_0/lb/v2/loadbalancer.py +++ b/neutronclient/neutron/v2_0/lb/v2/loadbalancer.py @@ -168,7 +168,7 @@ class RetrieveLoadBalancerStatus(neutronV20.NeutronCommand): return parser def take_action(self, parsed_args): - self.log.debug('run(%s)' % parsed_args) + self.log.debug('run(%s)', parsed_args) neutron_client = self.get_client() lb_id = neutronV20.find_resourceid_by_name_or_id( neutron_client, self.resource, parsed_args.loadbalancer) diff --git a/neutronclient/neutron/v2_0/subnet.py b/neutronclient/neutron/v2_0/subnet.py index 952b652..fed0997 100644 --- a/neutronclient/neutron/v2_0/subnet.py +++ b/neutronclient/neutron/v2_0/subnet.py @@ -237,9 +237,9 @@ class CreateSubnet(neutronV20.CreateCommand): self.log.warning(_("An IPv%(ip)d subnet with a %(cidr)s CIDR " "will have only one usable IP address so " "the device attached to it will not have " - "any IP connectivity.") - % {"ip": ip_version, - "cidr": unusable_cidr}) + "any IP connectivity."), + {"ip": ip_version, + "cidr": unusable_cidr}) updatable_args2body(parsed_args, body, ip_version=ip_version) if parsed_args.tenant_id: diff --git a/neutronclient/tests/unit/test_cli20_subnet.py b/neutronclient/tests/unit/test_cli20_subnet.py index 1a9abcd..afaf3f6 100644 --- a/neutronclient/tests/unit/test_cli20_subnet.py +++ b/neutronclient/tests/unit/test_cli20_subnet.py @@ -402,7 +402,7 @@ class CLITestV20SubnetJSON(test_cli20.CLITestV20Base): position_names = ['ip_version', 'network_id', 'cidr', 'gateway_ip'] position_values = [4, netid, cidr, gateway] self.mox.StubOutWithMock(cmd.log, 'warning') - cmd.log.warning(mox.IgnoreArg()) + cmd.log.warning(mox.IgnoreArg(), {'ip': 4, 'cidr': '/32'}) self._test_create_resource(resource, cmd, name, myid, args, position_names, position_values) self.mox.VerifyAll() -- cgit v1.2.1