summaryrefslogtreecommitdiff
path: root/ironic/tests/unit/drivers/modules/xclarity
diff options
context:
space:
mode:
authorRushil Chugh <rushil.chugh@gmail.com>2018-03-01 01:35:44 -0500
committerRushil Chugh <rushil.chugh@gmail.com>2018-03-22 14:14:45 -0400
commit4f08f726beb89937ea4cc50ac65e10ab42f849ff (patch)
treeb0b4ef69bb2559a7f3df9213b09fa233f6ebca75 /ironic/tests/unit/drivers/modules/xclarity
parent46ee76aa461cd012a2b39dcb16c414957c463b72 (diff)
downloadironic-4f08f726beb89937ea4cc50ac65e10ab42f849ff.tar.gz
Fix nits in the XClarity Driver codebase.
Follow up to commit 346a9a3bfc5312deb78bda8a82ae238e031413bd * Move exception XClarityError to common/exceptions.py * Update language of the release note. * Specify the kind of power operation being performed. Change-Id: I1dbc49d7d6185ce3c5f37f518bbecd11571a74fb
Diffstat (limited to 'ironic/tests/unit/drivers/modules/xclarity')
-rw-r--r--ironic/tests/unit/drivers/modules/xclarity/test_management.py9
-rw-r--r--ironic/tests/unit/drivers/modules/xclarity/test_power.py9
2 files changed, 10 insertions, 8 deletions
diff --git a/ironic/tests/unit/drivers/modules/xclarity/test_management.py b/ironic/tests/unit/drivers/modules/xclarity/test_management.py
index 1d4fc9209..6e7034a1f 100644
--- a/ironic/tests/unit/drivers/modules/xclarity/test_management.py
+++ b/ironic/tests/unit/drivers/modules/xclarity/test_management.py
@@ -22,6 +22,7 @@ import mock
from oslo_utils import importutils
from ironic.common import boot_devices
+from ironic.common import exception
from ironic.conductor import task_manager
from ironic.drivers.modules.xclarity import common
from ironic.drivers.modules.xclarity import management
@@ -82,9 +83,9 @@ class XClarityManagementDriverTestCase(db_base.DbTestCase):
if 'ironic.drivers.modules.xclarity' in sys.modules:
six.moves.reload_module(
sys.modules['ironic.drivers.modules.xclarity'])
- ex = common.XClarityError('E')
+ ex = exception.XClarityError('E')
mock_get_xc_client.return_value.set_node_boot_info.side_effect = ex
- self.assertRaises(common.XClarityError,
+ self.assertRaises(exception.XClarityError,
task.driver.management.set_boot_device,
task,
"pxe")
@@ -117,9 +118,9 @@ class XClarityManagementDriverTestCase(db_base.DbTestCase):
if 'ironic.drivers.modules.xclarity' in sys.modules:
six.moves.reload_module(
sys.modules['ironic.drivers.modules.xclarity'])
- ex = common.XClarityError('E')
+ ex = exception.XClarityError('E')
mock_xc_client.return_value.get_node_all_boot_info.side_effect = ex
self.assertRaises(
- common.XClarityError,
+ exception.XClarityError,
task.driver.management.get_boot_device,
task)
diff --git a/ironic/tests/unit/drivers/modules/xclarity/test_power.py b/ironic/tests/unit/drivers/modules/xclarity/test_power.py
index 6cec8cd31..b01ee6623 100644
--- a/ironic/tests/unit/drivers/modules/xclarity/test_power.py
+++ b/ironic/tests/unit/drivers/modules/xclarity/test_power.py
@@ -26,6 +26,7 @@ import mock
from oslo_utils import importutils
+from ironic.common import exception
from ironic.common import states
from ironic.conductor import task_manager
from ironic.drivers.modules.xclarity import common
@@ -84,9 +85,9 @@ class XClarityPowerDriverTestCase(db_base.DbTestCase):
if 'ironic.drivers.modules.xclarity' in sys.modules:
six.moves.reload_module(
sys.modules['ironic.drivers.modules.xclarity'])
- ex = common.XClarityError('E')
+ ex = exception.XClarityError('E')
mock_xc_client.return_value.get_node_power_status.side_effect = ex
- self.assertRaises(common.XClarityError,
+ self.assertRaises(exception.XClarityError,
task.driver.power.get_power_state,
task)
@@ -121,9 +122,9 @@ class XClarityPowerDriverTestCase(db_base.DbTestCase):
if 'ironic.drivers.modules.xclarity' in sys.modules:
six.moves.reload_module(
sys.modules['ironic.drivers.modules.xclarity'])
- ex = common.XClarityError('E')
+ ex = exception.XClarityError('E')
mock_xc_client.return_value.set_node_power_status.side_effect = ex
- self.assertRaises(common.XClarityError,
+ self.assertRaises(exception.XClarityError,
task.driver.power.set_power_state,
task, states.POWER_OFF)