From 73f81e029f02a050f4869c7d13ca3a2913ed8355 Mon Sep 17 00:00:00 2001 From: Devananda van der Veen Date: Mon, 6 May 2013 10:34:53 -0700 Subject: [PATCH] Fix IPMI tests. --- ironic/manager/__init__.py | 8 ++--- ironic/manager/base.py | 2 +- ironic/manager/ipmi.py | 6 ++-- ironic/tests/manager/test_ipmi.py | 53 +++++++++++++++---------------- 4 files changed, 34 insertions(+), 35 deletions(-) diff --git a/ironic/manager/__init__.py b/ironic/manager/__init__.py index da37b20654..1380d8092f 100644 --- a/ironic/manager/__init__.py +++ b/ironic/manager/__init__.py @@ -1,4 +1,7 @@ -# Copyright (c) 2012 NTT DOCOMO, INC. +# vim: tabstop=4 shiftwidth=4 softtabstop=4 +# coding=utf-8 + +# Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may @@ -12,6 +15,3 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -from ironic.manager import driver - -BareMetalDriver = driver.BareMetalDriver diff --git a/ironic/manager/base.py b/ironic/manager/base.py index 52e2111ae6..94db5d8cf0 100644 --- a/ironic/manager/base.py +++ b/ironic/manager/base.py @@ -16,7 +16,7 @@ # License for the specific language governing permissions and limitations # under the License. -from ironic import states +from ironic.common import states class NodeDriver(object): diff --git a/ironic/manager/ipmi.py b/ironic/manager/ipmi.py index 8e3d5fadc0..8f00f115a0 100644 --- a/ironic/manager/ipmi.py +++ b/ironic/manager/ipmi.py @@ -131,7 +131,7 @@ class IPMI(base.PowerManager): locals()) return out, err finally: - utils.unlink_without_raise(pwfile) + utils.delete_if_exists(pwfile) def _is_power(self, state): out_err = self._exec_ipmitool("power status") @@ -246,7 +246,7 @@ class IPMI(base.PowerManager): x.append('2>&1') utils.execute(' '.join(x), shell=True) finally: - utils.unlink_without_raise(pwfile) + utils.delete_if_exists(pwfile) def stop_console(self): console_pid = _get_console_pid(self.node_id) @@ -255,4 +255,4 @@ class IPMI(base.PowerManager): utils.execute('kill', '-TERM', str(console_pid), run_as_root=True, check_exit_code=[0, 99]) - utils.unlink_without_raise(_get_console_pid_path(self.node_id)) + utils.delete_if_exists(_get_console_pid_path(self.node_id)) diff --git a/ironic/tests/manager/test_ipmi.py b/ironic/tests/manager/test_ipmi.py index faf800a466..7485d7d24f 100644 --- a/ironic/tests/manager/test_ipmi.py +++ b/ironic/tests/manager/test_ipmi.py @@ -25,12 +25,11 @@ import tempfile from oslo.config import cfg -from nova import test -from nova.tests.baremetal.db import utils as bm_db_utils -from nova import utils -from nova.virt.baremetal import baremetal_states -from nova.virt.baremetal import ipmi -from nova.virt.baremetal import utils as bm_utils +from ironic import test +from ironic.common import states +from ironic.common import utils +from ironic.tests.db import utils as db_utils +from ironic.manager import ipmi CONF = cfg.CONF @@ -39,7 +38,7 @@ class BareMetalIPMITestCase(test.TestCase): def setUp(self): super(BareMetalIPMITestCase, self).setUp() - self.node = bm_db_utils.new_bm_node( + self.node = db_utils.new_bm_node( id=123, pm_address='fake-address', pm_user='fake-user', @@ -68,7 +67,7 @@ class BareMetalIPMITestCase(test.TestCase): self.mox.StubOutWithMock(ipmi, '_make_password_file') self.mox.StubOutWithMock(utils, 'execute') - self.mox.StubOutWithMock(bm_utils, 'unlink_without_raise') + self.mox.StubOutWithMock(utils, 'delete_if_exists') ipmi._make_password_file(self.ipmi.password).AndReturn(pw_file) args = [ 'ipmitool', @@ -79,7 +78,7 @@ class BareMetalIPMITestCase(test.TestCase): 'A', 'B', 'C', ] utils.execute(*args, attempts=3).AndReturn(('', '')) - bm_utils.unlink_without_raise(pw_file).AndReturn(None) + utils.delete_if_exists(pw_file).AndReturn(None) self.mox.ReplayAll() self.ipmi._exec_ipmitool('A B C') @@ -95,20 +94,20 @@ class BareMetalIPMITestCase(test.TestCase): self.mox.VerifyAll() def test_power_already_on(self): - self.flags(ipmi_power_retry=0, group='baremetal') + self.flags(ipmi_power_retry=0) self.mox.StubOutWithMock(self.ipmi, '_exec_ipmitool') self.ipmi._exec_ipmitool("power status").AndReturn( ["Chassis Power is on\n"]) self.mox.ReplayAll() - self.ipmi.state = baremetal_states.DELETED + self.ipmi.state = states.DELETED self.ipmi._power_on() self.mox.VerifyAll() - self.assertEqual(self.ipmi.state, baremetal_states.ACTIVE) + self.assertEqual(self.ipmi.state, states.ACTIVE) def test_power_on_ok(self): - self.flags(ipmi_power_retry=0, group='baremetal') + self.flags(ipmi_power_retry=0) self.mox.StubOutWithMock(self.ipmi, '_exec_ipmitool') self.ipmi._exec_ipmitool("power status").AndReturn( @@ -118,13 +117,13 @@ class BareMetalIPMITestCase(test.TestCase): ["Chassis Power is on\n"]) self.mox.ReplayAll() - self.ipmi.state = baremetal_states.DELETED + self.ipmi.state = states.DELETED self.ipmi._power_on() self.mox.VerifyAll() - self.assertEqual(self.ipmi.state, baremetal_states.ACTIVE) + self.assertEqual(self.ipmi.state, states.ACTIVE) def test_power_on_fail(self): - self.flags(ipmi_power_retry=0, group='baremetal') + self.flags(ipmi_power_retry=0) self.mox.StubOutWithMock(self.ipmi, '_exec_ipmitool') self.ipmi._exec_ipmitool("power status").AndReturn( @@ -134,13 +133,13 @@ class BareMetalIPMITestCase(test.TestCase): ["Chassis Power is off\n"]) self.mox.ReplayAll() - self.ipmi.state = baremetal_states.DELETED + self.ipmi.state = states.DELETED self.ipmi._power_on() self.mox.VerifyAll() - self.assertEqual(self.ipmi.state, baremetal_states.ERROR) + self.assertEqual(self.ipmi.state, states.ERROR) def test_power_on_max_retries(self): - self.flags(ipmi_power_retry=2, group='baremetal') + self.flags(ipmi_power_retry=2) self.mox.StubOutWithMock(self.ipmi, '_exec_ipmitool') self.ipmi._exec_ipmitool("power status").AndReturn( @@ -156,14 +155,14 @@ class BareMetalIPMITestCase(test.TestCase): ["Chassis Power is off\n"]) self.mox.ReplayAll() - self.ipmi.state = baremetal_states.DELETED + self.ipmi.state = states.DELETED self.ipmi._power_on() self.mox.VerifyAll() - self.assertEqual(self.ipmi.state, baremetal_states.ERROR) + self.assertEqual(self.ipmi.state, states.ERROR) self.assertEqual(self.ipmi.retries, 3) def test_power_off_ok(self): - self.flags(ipmi_power_retry=0, group='baremetal') + self.flags(ipmi_power_retry=0) self.mox.StubOutWithMock(self.ipmi, '_exec_ipmitool') self.ipmi._exec_ipmitool("power status").AndReturn( @@ -173,13 +172,13 @@ class BareMetalIPMITestCase(test.TestCase): ["Chassis Power is off\n"]) self.mox.ReplayAll() - self.ipmi.state = baremetal_states.ACTIVE + self.ipmi.state = states.ACTIVE self.ipmi._power_off() self.mox.VerifyAll() - self.assertEqual(self.ipmi.state, baremetal_states.DELETED) + self.assertEqual(self.ipmi.state, states.DELETED) def test_get_console_pid_path(self): - self.flags(terminal_pid_dir='/tmp', group='baremetal') + self.flags(terminal_pid_dir='/tmp') path = ipmi._get_console_pid_path(self.ipmi.node_id) self.assertEqual(path, '/tmp/%s.pid' % self.ipmi.node_id) @@ -193,7 +192,7 @@ class BareMetalIPMITestCase(test.TestCase): self.mox.ReplayAll() pid = ipmi._get_console_pid(self.ipmi.node_id) - bm_utils.unlink_without_raise(path) + utils.delete_if_exists(path) self.mox.VerifyAll() self.assertEqual(pid, 12345) @@ -207,7 +206,7 @@ class BareMetalIPMITestCase(test.TestCase): self.mox.ReplayAll() pid = ipmi._get_console_pid(self.ipmi.node_id) - bm_utils.unlink_without_raise(path) + utils.delete_if_exists(path) self.mox.VerifyAll() self.assertTrue(pid is None)