summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlinwwu <wlwwu@cn.ibm.com>2016-01-08 22:51:53 +0800
committerIhar Hrachyshka <ihrachys@redhat.com>2016-03-23 16:12:51 +0000
commit58c990bc45d6fd5951811354c8e0e882d1d29781 (patch)
treef5309c15f785b7c9ef867db2174676a6229ed0ee
parentc1701c1d289beed3710b17653e386bb3fbffb0c7 (diff)
downloadpython-neutronclient-58c990bc45d6fd5951811354c8e0e882d1d29781.tar.gz
Remove 'u' displayed before subnetpool-list's prefixes
There is useless 'u' in the showing of "neutron subnetpool-list", Please check bug/1531418 for details. Add formatter as subnet did in the code. Change-Id: I4e1502c379032da240ad51cce8be8c1ca558ef15 Closes-Bug: #1531418 (cherry picked from commit 09030171037027d54445a6cfa36481b302373cc4)
-rw-r--r--neutronclient/neutron/v2_0/subnetpool.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/neutronclient/neutron/v2_0/subnetpool.py b/neutronclient/neutron/v2_0/subnetpool.py
index bc0bdf0..51c93c0 100644
--- a/neutronclient/neutron/v2_0/subnetpool.py
+++ b/neutronclient/neutron/v2_0/subnetpool.py
@@ -18,6 +18,13 @@ from neutronclient.i18n import _
from neutronclient.neutron import v2_0 as neutronV20
+def _format_prefixes(subnetpool):
+ try:
+ return '\n'.join(pool for pool in subnetpool['prefixes'])
+ except (TypeError, KeyError):
+ return subnetpool['prefixes']
+
+
def add_updatable_arguments(parser):
parser.add_argument(
'--min-prefixlen', type=int,
@@ -43,6 +50,7 @@ def updatable_args2body(parsed_args, body, for_create=True):
class ListSubnetPool(neutronV20.ListCommand):
"""List subnetpools that belong to a given tenant."""
+ _formatters = {'prefixes': _format_prefixes, }
resource = 'subnetpool'
list_columns = ['id', 'name', 'prefixes',
'default_prefixlen', 'address_scope_id']