Merge "Handle log message interpolation by the logger in network/"

Author: Jenkins

openstackclient/network/v2/network_segment.py

@@ -119,8 +119,8 @@ def take_action(self, parsed_args):
             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)

openstackclient/network/v2/router.py

@@ -249,8 +249,8 @@ def take_action(self, parsed_args):
             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)

openstackclient/network/v2/security_group_rule.py

@@ -315,7 +315,7 @@ def take_action_network(self, client, parsed_args):
             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 @@ def take_action_network(self, client, parsed_args):
             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 @@ def take_action_compute(self, client, parsed_args):
             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 @@ def take_action_compute(self, client, parsed_args):
             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:

openstackclient/network/v2/subnet.py

@@ -365,8 +365,8 @@ def take_action(self, parsed_args):
             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)

openstackclient/network/v2/subnet_pool.py

@@ -220,8 +220,8 @@ def take_action(self, parsed_args):
             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)