From c46f9dc501441ef449f41e726ec3cfbbe9f3de9d Mon Sep 17 00:00:00 2001
From: "jiahui.qiang" <jiahui.qiang@easystack.cn>
Date: Thu, 24 Nov 2016 17:05:25 +0800
Subject: Add options to "server list" command

Add "--deleted" and "--changes-since" options to "server list" command.

Change-Id: Id94f6e5831a60b172b6cfcfca29b1d89de8db621
Closes-Bug:#1647242
---
 openstackclient/compute/v2/server.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'openstackclient/compute')

diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index a1330e01..dc32add5 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -26,6 +26,7 @@ from osc_lib.cli import parseractions
 from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
+from oslo_utils import timeutils
 import six
 
 try:
@@ -793,6 +794,20 @@ class ListServer(command.Lister):
                    " 'osapi_max_limit' option of Nova API,"
                    " 'osapi_max_limit' will be used instead."),
         )
+        parser.add_argument(
+            '--deleted',
+            action="store_true",
+            default=False,
+            help=_('Only display deleted servers (Admin only).')
+        )
+        parser.add_argument(
+            '--changes-since',
+            metavar='<changes-since>',
+            default=None,
+            help=_("List only servers changed after a certain point of time."
+                   " The provided time should be an ISO 8061 formatted time."
+                   " ex 2016-03-04T06:27:59Z .")
+        )
         return parser
 
     def take_action(self, parsed_args):
@@ -844,9 +859,19 @@ class ListServer(command.Lister):
             'tenant_id': project_id,
             'all_tenants': parsed_args.all_projects,
             'user_id': user_id,
+            'deleted': parsed_args.deleted,
+            'changes_since': parsed_args.changes_since,
         }
         LOG.debug('search options: %s', search_opts)
 
+        if search_opts['changes_since']:
+            try:
+                timeutils.parse_isotime(search_opts['changes_since'])
+            except ValueError:
+                raise exceptions.CommandError(_('Invalid changes-since value:'
+                                              ' %s') % search_opts['changes'
+                                                                   '_since'])
+
         if parsed_args.long:
             columns = (
                 'ID',
-- 
cgit v1.2.1