compute: Add missing options for 'server list'

This accepts a large number of options that we weren't exposing. Add the
following options: '--availability-zone', '--key-name',
'--config-drive' and '--no-config-drive', '--progress', '--vm-state',
'--task-state' and '--power-state'.

In addition, refine the 'openstack server list --status' parameter to
restrict users to the actual choices supported by the server.

Change-Id: Ieeb1f22df7092e66a411b6a36eafb3e16efc2fc2
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>

1 files changed, 138 insertions, 2 deletions

diff --git a/openstackclient/tests/unit/compute/v2/test_server.py b/openstackclient/tests/unit/compute/v2/test_server.py
index efc105e5..0eeb2cec 100644
--- a/openstackclient/tests/unit/compute/v2/test_server.py
+++ b/openstackclient/tests/unit/compute/v2/test_server.py
@@ -2986,7 +2986,6 @@ class TestServerList(TestServer):
         super(TestServerList, self).setUp()
 
         self.search_opts = {
-            'availability_zone': None,
             'reservation_id': None,
             'ip': None,
             'ip6': None,
@@ -3431,7 +3430,7 @@ class TestServerList(TestServer):
             'Invalid time value'
         )
 
-    def test_server_with_changes_before_older_version(self):
+    def test_server_with_changes_before_pre_v266(self):
         self.app.client_manager.compute.api_version = (
             api_versions.APIVersion('2.65'))
 
@@ -3587,6 +3586,143 @@ class TestServerList(TestServer):
             '--os-compute-api-version 2.26 or greater is required',
             str(ex))
 
+    def test_server_list_with_availability_zone(self):
+        arglist = [
+            '--availability-zone', 'test-az',
+        ]
+        verifylist = [
+            ('availability_zone', 'test-az'),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.search_opts['availability_zone'] = 'test-az'
+        self.servers_mock.list.assert_called_with(**self.kwargs)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(tuple(self.data), tuple(data))
+
+    def test_server_list_with_key_name(self):
+        arglist = [
+            '--key-name', 'test-key',
+        ]
+        verifylist = [
+            ('key_name', 'test-key'),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.search_opts['key_name'] = 'test-key'
+        self.servers_mock.list.assert_called_with(**self.kwargs)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(tuple(self.data), tuple(data))
+
+    def test_server_list_with_config_drive(self):
+        arglist = [
+            '--config-drive',
+        ]
+        verifylist = [
+            ('has_config_drive', True),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.search_opts['config_drive'] = True
+        self.servers_mock.list.assert_called_with(**self.kwargs)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(tuple(self.data), tuple(data))
+
+    def test_server_list_with_no_config_drive(self):
+        arglist = [
+            '--no-config-drive',
+        ]
+        verifylist = [
+            ('has_config_drive', False),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.search_opts['config_drive'] = False
+        self.servers_mock.list.assert_called_with(**self.kwargs)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(tuple(self.data), tuple(data))
+
+    def test_server_list_with_progress(self):
+        arglist = [
+            '--progress', '100',
+        ]
+        verifylist = [
+            ('progress', 100),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.search_opts['progress'] = '100'
+        self.servers_mock.list.assert_called_with(**self.kwargs)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(tuple(self.data), tuple(data))
+
+    def test_server_list_with_progress_invalid(self):
+        arglist = [
+            '--progress', '101',
+        ]
+
+        self.assertRaises(
+            utils.ParserException,
+            self.check_parser, self.cmd, arglist, verify_args=[])
+
+    def test_server_list_with_vm_state(self):
+        arglist = [
+            '--vm-state', 'active',
+        ]
+        verifylist = [
+            ('vm_state', 'active'),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.search_opts['vm_state'] = 'active'
+        self.servers_mock.list.assert_called_with(**self.kwargs)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(tuple(self.data), tuple(data))
+
+    def test_server_list_with_task_state(self):
+        arglist = [
+            '--task-state', 'deleting',
+        ]
+        verifylist = [
+            ('task_state', 'deleting'),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.search_opts['task_state'] = 'deleting'
+        self.servers_mock.list.assert_called_with(**self.kwargs)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(tuple(self.data), tuple(data))
+
+    def test_server_list_with_power_state(self):
+        arglist = [
+            '--power-state', 'running',
+        ]
+        verifylist = [
+            ('power_state', 'running'),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.search_opts['power_state'] = 1
+        self.servers_mock.list.assert_called_with(**self.kwargs)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(tuple(self.data), tuple(data))
+
 
 class TestServerLock(TestServer):