diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-30 18:58:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-30 18:58:14 +0000 |
| commit | e63de0db2d47a95c60395cef7d7cdc22130fa5d1 (patch) | |
| tree | fe38fe5f8292b426afee4f4e6d55adf8ce70893e | |
| parent | cbd4f67b04981b7868f3f41a902a3c6fe8b6389a (diff) | |
| parent | b36b477e8106978669f653e4721ff023006772c6 (diff) | |
| download | python-openstackclient-e63de0db2d47a95c60395cef7d7cdc22130fa5d1.tar.gz | |
Merge "Add --marker option to "server list" command."
| -rw-r--r-- | doc/source/command-objects/server.rst | 6 | ||||
| -rw-r--r-- | openstackclient/compute/v2/server.py | 17 |
2 files changed, 22 insertions, 1 deletions
diff --git a/doc/source/command-objects/server.rst b/doc/source/command-objects/server.rst index 657cc564..405c1830 100644 --- a/doc/source/command-objects/server.rst +++ b/doc/source/command-objects/server.rst @@ -187,6 +187,7 @@ List servers [--all-projects] [--project <project> [--project-domain <project-domain>]] [--long] + [--marker <server>] .. option:: --reservation-id <reservation-id> @@ -250,6 +251,11 @@ List servers List additional fields in output +.. option:: --marker <server> + + The last server (name or ID) of the previous page. Display list of servers + after marker. Display all servers if not specified. + server lock ----------- diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py index 3f39210f..c35f1dd2 100644 --- a/openstackclient/compute/v2/server.py +++ b/openstackclient/compute/v2/server.py @@ -747,6 +747,14 @@ class ListServer(lister.Lister): default=False, help=_('List additional fields in output'), ) + parser.add_argument( + '--marker', + metavar='<marker>', + default=None, + help=('The last server (name or ID) of the previous page. Display' + ' list of servers after marker. Display all servers if not' + ' specified.') + ) return parser @utils.log_method(log) @@ -830,7 +838,14 @@ class ListServer(lister.Lister): 'Networks', ) mixed_case_fields = [] - data = compute_client.servers.list(search_opts=search_opts) + + marker_id = None + if parsed_args.marker: + marker_id = utils.find_resource(compute_client.servers, + parsed_args.marker).id + + data = compute_client.servers.list(search_opts=search_opts, + marker=marker_id) return (column_headers, (utils.get_item_properties( s, columns, |