summaryrefslogtreecommitdiff
path: root/openstackclient
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-12-01 03:00:52 +0000
committerGerrit Code Review <review@openstack.org>2015-12-01 03:00:52 +0000
commitb221f2ceac6f7b1d9ba381f1a142fc0dbaf4f262 (patch)
treeab432ad4d4e8f4aeb34f56f66e7af69d015ddd27 /openstackclient
parentfc299fd19078e2c705ba1d2be2c5916eb1e1764b (diff)
parent43c11c356b92e11a27179a02d2aab1b56fe3bc07 (diff)
downloadpython-openstackclient-b221f2ceac6f7b1d9ba381f1a142fc0dbaf4f262.tar.gz
Merge "Add --limit option to "server list" command."
Diffstat (limited to 'openstackclient')
-rw-r--r--openstackclient/compute/v2/server.py13
1 files changed, 12 insertions, 1 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index c35f1dd2..9dca7844 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -755,6 +755,16 @@ class ListServer(lister.Lister):
' list of servers after marker. Display all servers if not'
' specified.')
)
+ parser.add_argument(
+ '--limit',
+ metavar='<limit>',
+ type=int,
+ default=None,
+ help=("Maximum number of servers to display. If limit equals -1,"
+ " all servers will be displayed. If limit is greater than"
+ " 'osapi_max_limit' option of Nova API,"
+ " 'osapi_max_limit' will be used instead."),
+ )
return parser
@utils.log_method(log)
@@ -845,7 +855,8 @@ class ListServer(lister.Lister):
parsed_args.marker).id
data = compute_client.servers.list(search_opts=search_opts,
- marker=marker_id)
+ marker=marker_id,
+ limit=parsed_args.limit)
return (column_headers,
(utils.get_item_properties(
s, columns,