diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-12-01 03:00:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-12-01 03:00:52 +0000 |
| commit | b221f2ceac6f7b1d9ba381f1a142fc0dbaf4f262 (patch) | |
| tree | ab432ad4d4e8f4aeb34f56f66e7af69d015ddd27 | |
| parent | fc299fd19078e2c705ba1d2be2c5916eb1e1764b (diff) | |
| parent | 43c11c356b92e11a27179a02d2aab1b56fe3bc07 (diff) | |
| download | python-openstackclient-b221f2ceac6f7b1d9ba381f1a142fc0dbaf4f262.tar.gz | |
Merge "Add --limit option to "server list" command."
| -rw-r--r-- | doc/source/command-objects/server.rst | 7 | ||||
| -rw-r--r-- | openstackclient/compute/v2/server.py | 13 |
2 files changed, 19 insertions, 1 deletions
diff --git a/doc/source/command-objects/server.rst b/doc/source/command-objects/server.rst index 405c1830..70b47482 100644 --- a/doc/source/command-objects/server.rst +++ b/doc/source/command-objects/server.rst @@ -188,6 +188,7 @@ List servers [--project <project> [--project-domain <project-domain>]] [--long] [--marker <server>] + [--limit <limit>] .. option:: --reservation-id <reservation-id> @@ -256,6 +257,12 @@ List servers The last server (name or ID) of the previous page. Display list of servers after marker. Display all servers if not specified. +.. option:: --limit <limit> + + 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. + server lock ----------- 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, |