Merge "Add manual clean step ironic standalone test"
diff --git a/ironic_tempest_plugin/manager.py b/ironic_tempest_plugin/manager.py
index 9967a5d..b529e3c 100644
--- a/ironic_tempest_plugin/manager.py
+++ b/ironic_tempest_plugin/manager.py
@@ -81,12 +81,10 @@
cls.security_group_rules_client = (
cls.os_primary.security_group_rules_client)
- if CONF.volume_feature_enabled.api_v2:
- cls.volumes_client = cls.os_primary.volumes_v2_client
- cls.snapshots_client = cls.os_primary.snapshots_v2_client
- else:
- cls.volumes_client = cls.os_primary.volumes_client
- cls.snapshots_client = cls.os_primary.snapshots_client
+ if (CONF.volume_feature_enabled.api_v2 or
+ CONF.volume_feature_enabled.api_v3):
+ cls.volumes_client = cls.os_primary.volumes_client_latest
+ cls.snapshots_client = cls.os_primary.snapshots_client_latest
# ## Test functions library
#
diff --git a/ironic_tempest_plugin/tests/api/admin/test_nodes.py b/ironic_tempest_plugin/tests/api/admin/test_nodes.py
index 75a17ec..d5abd11 100644
--- a/ironic_tempest_plugin/tests/api/admin/test_nodes.py
+++ b/ironic_tempest_plugin/tests/api/admin/test_nodes.py
@@ -165,6 +165,11 @@
self.assertEqual(1, len(body['nodes']))
self.assertIn(self.node['uuid'], [n['uuid'] for n in body['nodes']])
+ @decorators.idempotent_id('b85af8c6-572b-4f20-815e-1cf31844b9f6')
+ def test_fault_hidden(self):
+ _, loaded_node = self.client.show_node(self.node['uuid'])
+ self.assertNotIn('fault', loaded_node)
+
class TestNodesResourceClass(base.BaseBaremetalTest):
@@ -723,3 +728,35 @@
"""Show a node, ensure it has no traits."""
_, body = self.client.show_node(self.node['uuid'])
self.assertNotIn('traits', body)
+
+
+class TestNodeFault(base.BaseBaremetalTest):
+ """Tests for fault of baremetal nodes."""
+
+ min_microversion = '1.42'
+
+ def setUp(self):
+ super(TestNodeFault, self).setUp()
+
+ _, self.chassis = self.create_chassis()
+ _, self.node = self.create_node(self.chassis['uuid'])
+
+ @decorators.idempotent_id('649b4660-4f76-4d67-94df-6631a2cb2cd9')
+ def test_fault_shown(self):
+ _, loaded_node = self.client.show_node(self.node['uuid'])
+ self.assertIn('fault', loaded_node)
+
+ @decorators.idempotent_id('62f453be-8f30-4cfe-a19a-23656068e546')
+ def test_list_nodes_fault(self):
+ _, body = self.client.list_nodes()
+ self.assertIn(self.node['uuid'], [n['uuid'] for n in body['nodes']])
+
+ _, body = self.client.list_nodes(fault='power failure')
+ self.assertNotIn(self.node['uuid'],
+ [n['uuid'] for n in body['nodes']])
+
+ @decorators.idempotent_id('c8fb55f1-873f-4fb9-bd57-6f1de0479873')
+ def test_list_nodes_with_invalid_fault(self):
+ self.assertRaises(
+ lib_exc.BadRequest,
+ self.client.list_nodes, fault='somefake')