From c9b1c2ad961a767927c7f0efc3b4df3c11804bc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Antal?= <antal@inf.u-szeged.hu>
Date: Mon, 13 Feb 2017 18:13:29 +0100
Subject: [PATCH] Handle log message interpolation by the logger in network/

According to OpenStack Guideline[1], logged string message should be
interpolated by the logger.

[1]: http://docs.openstack.org/developer/oslo.i18n/guidelines.html#adding-variables-to-log-messages
Related-Bug: #1596829

Change-Id: I17467d01420750c004fbbf2a07730fc2badd62b8
---
 openstackclient/network/v2/network_segment.py     | 4 ++--
 openstackclient/network/v2/router.py              | 4 ++--
 openstackclient/network/v2/security_group_rule.py | 8 ++++----
 openstackclient/network/v2/subnet.py              | 4 ++--
 openstackclient/network/v2/subnet_pool.py         | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/openstackclient/network/v2/network_segment.py b/openstackclient/network/v2/network_segment.py
index 709dc2965..c1a672e2d 100644
--- a/openstackclient/network/v2/network_segment.py
+++ b/openstackclient/network/v2/network_segment.py
@@ -119,8 +119,8 @@ class DeleteNetworkSegment(command.Command):
             except Exception as e:
                 result += 1
                 LOG.error(_("Failed to delete network segment with "
-                            "ID '%(network_segment)s': %(e)s")
-                          % {'network_segment': network_segment, 'e': e})
+                            "ID '%(network_segment)s': %(e)s"),
+                          {'network_segment': network_segment, 'e': e})
 
         if result > 0:
             total = len(parsed_args.network_segment)
diff --git a/openstackclient/network/v2/router.py b/openstackclient/network/v2/router.py
index aad35a9e1..f46c8696a 100644
--- a/openstackclient/network/v2/router.py
+++ b/openstackclient/network/v2/router.py
@@ -249,8 +249,8 @@ class DeleteRouter(command.Command):
             except Exception as e:
                 result += 1
                 LOG.error(_("Failed to delete router with "
-                          "name or ID '%(router)s': %(e)s")
-                          % {'router': router, 'e': e})
+                          "name or ID '%(router)s': %(e)s"),
+                          {'router': router, 'e': e})
 
         if result > 0:
             total = len(parsed_args.router)
diff --git a/openstackclient/network/v2/security_group_rule.py b/openstackclient/network/v2/security_group_rule.py
index 4fb62c7bf..63b80d25e 100644
--- a/openstackclient/network/v2/security_group_rule.py
+++ b/openstackclient/network/v2/security_group_rule.py
@@ -315,7 +315,7 @@ class CreateSecurityGroupRule(common.NetworkAndComputeShowOne):
             if parsed_args.src_group:
                 LOG.warning(
                     _("The %(old)s option is deprecated, "
-                      "please use %(new)s instead.") %
+                      "please use %(new)s instead."),
                     {'old': '--src-group', 'new': '--remote-group'},
                 )
         elif not (parsed_args.remote_ip is None and
@@ -326,7 +326,7 @@ class CreateSecurityGroupRule(common.NetworkAndComputeShowOne):
             if parsed_args.src_ip:
                 LOG.warning(
                     _("The %(old)s option is deprecated, "
-                      "please use %(new)s instead.") %
+                      "please use %(new)s instead."),
                     {'old': '--src-ip', 'new': '--remote-ip'},
                 )
         elif attrs['ethertype'] == 'IPv4':
@@ -370,7 +370,7 @@ class CreateSecurityGroupRule(common.NetworkAndComputeShowOne):
             if parsed_args.src_group:
                 LOG.warning(
                     _("The %(old)s option is deprecated, "
-                      "please use %(new)s instead.") %
+                      "please use %(new)s instead."),
                     {'old': '--src-group', 'new': '--remote-group'},
                 )
         if not (parsed_args.remote_ip is None and
@@ -379,7 +379,7 @@ class CreateSecurityGroupRule(common.NetworkAndComputeShowOne):
             if parsed_args.src_ip:
                 LOG.warning(
                     _("The %(old)s option is deprecated, "
-                      "please use %(new)s instead.") %
+                      "please use %(new)s instead."),
                     {'old': '--src-ip', 'new': '--remote-ip'},
                 )
         else:
diff --git a/openstackclient/network/v2/subnet.py b/openstackclient/network/v2/subnet.py
index 292b7c062..2771858b9 100644
--- a/openstackclient/network/v2/subnet.py
+++ b/openstackclient/network/v2/subnet.py
@@ -365,8 +365,8 @@ class DeleteSubnet(command.Command):
             except Exception as e:
                 result += 1
                 LOG.error(_("Failed to delete subnet with "
-                          "name or ID '%(subnet)s': %(e)s")
-                          % {'subnet': subnet, 'e': e})
+                          "name or ID '%(subnet)s': %(e)s"),
+                          {'subnet': subnet, 'e': e})
 
         if result > 0:
             total = len(parsed_args.subnet)
diff --git a/openstackclient/network/v2/subnet_pool.py b/openstackclient/network/v2/subnet_pool.py
index a5a244240..047311111 100644
--- a/openstackclient/network/v2/subnet_pool.py
+++ b/openstackclient/network/v2/subnet_pool.py
@@ -220,8 +220,8 @@ class DeleteSubnetPool(command.Command):
             except Exception as e:
                 result += 1
                 LOG.error(_("Failed to delete subnet pool with "
-                          "name or ID '%(pool)s': %(e)s")
-                          % {'pool': pool, 'e': e})
+                          "name or ID '%(pool)s': %(e)s"),
+                          {'pool': pool, 'e': e})
 
         if result > 0:
             total = len(parsed_args.subnet_pool)