Merge "Support list deleted servers for admin"

novaclient/tests/v1_1/test_shell.py

@@ -688,6 +688,10 @@ class ShellTest(utils.TestCase):
         self.run_command('list --minimal')
         self.assert_called('GET', '/servers')
 
+    def test_list_deleted(self):
+        self.run_command('list --deleted')
+        self.assert_called('GET', '/servers/detail?deleted=True')
+
     def test_list_with_images(self):
         self.run_command('list --image 1')
         self.assert_called('GET', '/servers/detail?image=1')

novaclient/tests/v3/test_shell.py

@@ -78,6 +78,10 @@ class ShellTest(utils.TestCase):
     def assert_called_anytime(self, method, url, body=None):
         return self.shell.cs.assert_called_anytime(method, url, body)
 
+    def test_list_deleted(self):
+        self.run_command('list --deleted')
+        self.assert_called('GET', '/servers/detail?deleted=True')
+
     def test_aggregate_list(self):
         self.run_command('aggregate-list')
         self.assert_called('GET', '/os-aggregates')

novaclient/v1_1/shell.py

@@ -1090,6 +1090,11 @@ def do_image_delete(cs, args):
     metavar='<tenant>',
     nargs='?',
     help='Display information from single tenant (Admin only).')
+@utils.arg('--deleted',
+    dest='deleted',
+    action="store_true",
+    default=False,
+    help='Only display deleted servers (Admin only).')
 @utils.arg('--fields',
     default=None,
     metavar='<fields>',
@@ -1119,6 +1124,7 @@ def do_list(cs, args):
             'status': args.status,
             'tenant_id': args.tenant,
             'host': args.host,
+            'deleted': args.deleted,
             'instance_name': args.instance_name}
 
     filters = {'flavor': lambda f: f['id'],

novaclient/v3/shell.py

@@ -954,6 +954,11 @@ def do_image_delete(cs, args):
     metavar='<fields>',
     help='Comma-separated list of fields to display. '
          'Use the show command to see which fields are available.')
+@utils.arg('--deleted',
+    dest='deleted',
+    action="store_true",
+    default=False,
+    help='Only display deleted servers (Admin only).')
 @utils.arg('--minimal',
     dest='minimal',
     action="store_true",
@@ -978,6 +983,7 @@ def do_list(cs, args):
             'status': args.status,
             'tenant_id': args.tenant,
             'host': args.host,
+            'deleted': args.deleted,
             'instance_name': args.instance_name}
 
     filters = {'flavor': lambda f: f['id'],