diff options
author | Kan <kansks@cn.ibm.com> | 2015-05-13 00:54:58 -0700 |
---|---|---|
committer | Kan <kansks@cn.ibm.com> | 2015-05-22 00:25:57 -0700 |
commit | 6fc8493afad8491309f296d13ccdf914050a820a (patch) | |
tree | 5a01bbd6a4780021341ba8e7aaca8f37611a51c5 /ironic/tests/api/v1 | |
parent | 88c0e68e54ca84aab0c6a28c6cd1738bfb23875d (diff) | |
download | ironic-6fc8493afad8491309f296d13ccdf914050a820a.tar.gz |
Disable meaningless sort keys in list command
The sort keys are:
For ports: 'extra'
For chassis: 'extra'
For nodes: 'properties', 'driver_info', 'extra',
'instance_info', 'driver_internal_info'
Disable these sort keys in REST API.
Change-Id: I82d5674d14b4357d04f59187dd30ce8e848bd035
Partial-Bug: #1446146
Diffstat (limited to 'ironic/tests/api/v1')
-rw-r--r-- | ironic/tests/api/v1/test_chassis.py | 13 | ||||
-rw-r--r-- | ironic/tests/api/v1/test_nodes.py | 14 | ||||
-rw-r--r-- | ironic/tests/api/v1/test_ports.py | 13 |
3 files changed, 22 insertions, 18 deletions
diff --git a/ironic/tests/api/v1/test_chassis.py b/ironic/tests/api/v1/test_chassis.py index 70a9a6d7a..140ab8bbf 100644 --- a/ironic/tests/api/v1/test_chassis.py +++ b/ironic/tests/api/v1/test_chassis.py @@ -128,12 +128,13 @@ class TestListChassis(api_base.FunctionalTest): self.assertEqual(sorted(ch_list), uuids) def test_sort_key_invalid(self): - invalid_key = 'foo' - response = self.get_json('/chassis?sort_key=%s' % invalid_key, - expect_errors=True) - self.assertEqual(400, response.status_int) - self.assertEqual('application/json', response.content_type) - self.assertIn(invalid_key, response.json['error_message']) + invalid_keys_list = ['foo', 'extra'] + for invalid_key in invalid_keys_list: + response = self.get_json('/chassis?sort_key=%s' % invalid_key, + expect_errors=True) + self.assertEqual(400, response.status_int) + self.assertEqual('application/json', response.content_type) + self.assertIn(invalid_key, response.json['error_message']) def test_nodes_subresource_link(self): chassis = obj_utils.create_test_chassis(self.context) diff --git a/ironic/tests/api/v1/test_nodes.py b/ironic/tests/api/v1/test_nodes.py index d3893df9d..58e0d4cbf 100644 --- a/ironic/tests/api/v1/test_nodes.py +++ b/ironic/tests/api/v1/test_nodes.py @@ -285,12 +285,14 @@ class TestListNodes(test_api_base.FunctionalTest): self.assertEqual(sorted(nodes), uuids) def test_sort_key_invalid(self): - invalid_key = 'foo' - response = self.get_json('/nodes?sort_key=%s' % invalid_key, - expect_errors=True) - self.assertEqual(400, response.status_int) - self.assertEqual('application/json', response.content_type) - self.assertIn(invalid_key, response.json['error_message']) + invalid_keys_list = ['foo', 'properties', 'driver_info', 'extra', + 'instance_info', 'driver_internal_info'] + for invalid_key in invalid_keys_list: + response = self.get_json('/nodes?sort_key=%s' % invalid_key, + expect_errors=True) + self.assertEqual(400, response.status_int) + self.assertEqual('application/json', response.content_type) + self.assertIn(invalid_key, response.json['error_message']) def test_ports_subresource_link(self): node = obj_utils.create_test_node(self.context) diff --git a/ironic/tests/api/v1/test_ports.py b/ironic/tests/api/v1/test_ports.py index 4111b8a7b..b08c0327f 100644 --- a/ironic/tests/api/v1/test_ports.py +++ b/ironic/tests/api/v1/test_ports.py @@ -196,12 +196,13 @@ class TestListPorts(api_base.FunctionalTest): self.assertEqual(sorted(ports), uuids) def test_sort_key_invalid(self): - invalid_key = 'foo' - response = self.get_json('/ports?sort_key=%s' % invalid_key, - expect_errors=True) - self.assertEqual(400, response.status_int) - self.assertEqual('application/json', response.content_type) - self.assertIn(invalid_key, response.json['error_message']) + invalid_keys_list = ['foo', 'extra'] + for invalid_key in invalid_keys_list: + response = self.get_json('/ports?sort_key=%s' % invalid_key, + expect_errors=True) + self.assertEqual(400, response.status_int) + self.assertEqual('application/json', response.content_type) + self.assertIn(invalid_key, response.json['error_message']) @mock.patch.object(api_utils, 'get_rpc_node') def test_get_all_by_node_name_ok(self, mock_get_rpc_node): |