diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-14 03:52:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-14 03:52:43 +0000 |
| commit | 4b4194755a944ca6daf1a7547a334b21f52e3333 (patch) | |
| tree | 435d4523ce408411309d75658bf8af004eb4e280 /openstackclient | |
| parent | f945cf7b5c263ca2fa47c636b498cd286b9767db (diff) | |
| parent | c9b1c2ad961a767927c7f0efc3b4df3c11804bc9 (diff) | |
| download | python-openstackclient-4b4194755a944ca6daf1a7547a334b21f52e3333.tar.gz | |
Merge "Handle log message interpolation by the logger in network/"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/network/v2/network_segment.py | 4 | ||||
| -rw-r--r-- | openstackclient/network/v2/router.py | 4 | ||||
| -rw-r--r-- | openstackclient/network/v2/security_group_rule.py | 8 | ||||
| -rw-r--r-- | openstackclient/network/v2/subnet.py | 4 | ||||
| -rw-r--r-- | 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 709dc296..c1a672e2 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 aad35a9e..f46c8696 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 4fb62c7b..63b80d25 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 292b7c06..2771858b 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 a5a24424..04731111 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) |