From e6fb6586063195188e185260786e8f4f1fd94d7f Mon Sep 17 00:00:00 2001 From: Yan Xing'an Date: Wed, 19 Oct 2016 21:21:25 -0700 Subject: [PATCH] Correct help string of the subnet pool list options Correct help string of subnet pool list options, from "subnets" to "subnet pools". Change-Id: Ic6dd6649f411748cd0c6e6b08f0451c8a0fa220f Partially-Implements: blueprint network-commands-options --- doc/source/command-objects/subnet-pool.rst | 14 +++++++------- openstackclient/network/v2/subnet_pool.py | 18 ++++++++++-------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/doc/source/command-objects/subnet-pool.rst b/doc/source/command-objects/subnet-pool.rst index 28a735d613..bd1356f394 100644 --- a/doc/source/command-objects/subnet-pool.rst +++ b/doc/source/command-objects/subnet-pool.rst @@ -121,23 +121,23 @@ List subnet pools .. option:: --share - List subnets shared between projects + List subnet pools shared between projects .. option:: --no-share - List subnets not shared between projects + List subnet pools not shared between projects .. option:: --default - List subnets used as the default external subnet pool + List subnet pools used as the default external subnet pool .. option:: --no-default - List subnets not used as the default external subnet pool + List subnet pools not used as the default external subnet pool .. option:: --project - List subnets according to their project (name or ID) + List subnet pools according to their project (name or ID) .. option:: --project-domain @@ -146,11 +146,11 @@ List subnet pools .. option:: --name - List only subnets of given name in output + List only subnet pools of given name in output .. option:: --address-scope - List only subnets of given address scope (name or ID) in output + List only subnet pools of given address scope (name or ID) in output subnet pool set --------------- diff --git a/openstackclient/network/v2/subnet_pool.py b/openstackclient/network/v2/subnet_pool.py index a01d2f7ba2..a29c451859 100644 --- a/openstackclient/network/v2/subnet_pool.py +++ b/openstackclient/network/v2/subnet_pool.py @@ -238,40 +238,42 @@ class ListSubnetPool(command.Lister): shared_group.add_argument( '--share', action='store_true', - help=_("List subnets shared between projects"), + help=_("List subnet pools shared between projects"), ) shared_group.add_argument( '--no-share', action='store_true', - help=_("List subnets not shared between projects"), + help=_("List subnet pools not shared between projects"), ) default_group = parser.add_mutually_exclusive_group() default_group.add_argument( '--default', action='store_true', - help=_("List subnets used as the default external subnet pool"), + help=_("List subnet pools used as the default external " + "subnet pool"), ) default_group.add_argument( '--no-default', action='store_true', - help=_("List subnets not used as the default external subnet pool") + help=_("List subnet pools not used as the default external " + "subnet pool") ) parser.add_argument( '--project', metavar='', - help=_("List subnets according to their project (name or ID)") + help=_("List subnet pools according to their project (name or ID)") ) identity_common.add_project_domain_option_to_parser(parser) parser.add_argument( '--name', metavar='', - help=_("List only subnets of given name in output") + help=_("List only subnet pools of given name in output") ) parser.add_argument( '--address-scope', metavar='', - help=_("List only subnets of given address scope (name or ID) " - "in output") + help=_("List only subnet pools of given address scope " + "(name or ID) in output") ) return parser