openstack/python-openstackclient
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2017-02-14 03:52:43 +00:00 committed by Gerrit Code Review
commit 4b4194755a
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstackclient/network/v2/network_segment.py
View File

@ -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)

4
openstackclient/network/v2/router.py
View File

@ -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)

8
openstackclient/network/v2/security_group_rule.py
View File

@ -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:

4
openstackclient/network/v2/subnet.py
View File

@ -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)

4
openstackclient/network/v2/subnet_pool.py
View File

@ -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)