From 316e5d86e4823ec7ca2bbb44fd025b6c43382259 Mon Sep 17 00:00:00 2001 From: Anton Arefiev Date: Tue, 19 Jul 2016 19:35:18 +0300 Subject: [PATCH] Tempest: wrap instance actions into inspector methods This commit I4fe31ecae3393abc2779a5e80e348899f9113f1b broke inspector tempest tests, it changes boot_instance and terminate_instance signature. This change redefine action methods Change-Id: If6a9b300bd22e7b62b7e53763cb0328ad30f11c7 --- .../test/inspector_tempest_plugin/tests/manager.py | 6 ++++++ .../test/inspector_tempest_plugin/tests/test_basic.py | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ironic_inspector/test/inspector_tempest_plugin/tests/manager.py b/ironic_inspector/test/inspector_tempest_plugin/tests/manager.py index dd2a18ebd..b62473ca8 100644 --- a/ironic_inspector/test/inspector_tempest_plugin/tests/manager.py +++ b/ironic_inspector/test/inspector_tempest_plugin/tests/manager.py @@ -94,6 +94,12 @@ class InspectorScenarioTest(BaremetalScenarioTest): return os.path.join(base_path, "inspector_tempest_plugin", "rules", rule_file) + def boot_instance(self): + return super(InspectorScenarioTest, self).boot_instance() + + def terminate_instance(self, instance): + return super(InspectorScenarioTest, self).terminate_instance(instance) + # TODO(aarefiev): switch to call_until_true def wait_for_introspection_finished(self, node_ids): """Waits for introspection of baremetal nodes to finish. diff --git a/ironic_inspector/test/inspector_tempest_plugin/tests/test_basic.py b/ironic_inspector/test/inspector_tempest_plugin/tests/test_basic.py index 6830b78a5..0e11cf56e 100644 --- a/ironic_inspector/test/inspector_tempest_plugin/tests/test_basic.py +++ b/ironic_inspector/test/inspector_tempest_plugin/tests/test_basic.py @@ -145,5 +145,5 @@ class InspectorBasicTest(manager.InspectorScenarioTest): self.wait_for_nova_aware_of_bvms() self.add_keypair() - self.boot_instance() - self.terminate_instance() + ins, _node = self.boot_instance() + self.terminate_instance(ins)