openstack/ironic
Code Issues Proposed changes

Merge "Refactor common checks when instantiating the ipmitool classes"

Browse Source
This commit is contained in:
Jenkins
2016-09-20 16:25:18 +00:00
committed by Gerrit Code Review
parent ebd1f566c8 79cee4f6fb
commit 9137f53d90
1 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
ironic/drivers/modules/ipmitool.py
View File

@@ -739,17 +739,22 @@ def _check_temp_dir():
TMP_DIR_CHECKED = True TMP_DIR_CHECKED = True
def _constructor_checks(driver):
"""Common checks to be performed when instantiating an ipmitool class."""
try:
_check_option_support(['timing', 'single_bridge', 'dual_bridge'])
except OSError:
raise exception.DriverLoadError(
driver=driver,
reason=_("Unable to locate usable ipmitool command in "
"the system path when checking ipmitool version"))
_check_temp_dir()
class IPMIPower(base.PowerInterface): class IPMIPower(base.PowerInterface):
def __init__(self): def __init__(self):
try: _constructor_checks(driver=self.__class__.__name__)
_check_option_support(['timing', 'single_bridge', 'dual_bridge'])
except OSError:
raise exception.DriverLoadError(
driver=self.__class__.__name__,
reason=_("Unable to locate usable ipmitool command in "
"the system path when checking ipmitool version"))
_check_temp_dir()
def get_properties(self): def get_properties(self):
return COMMON_PROPERTIES return COMMON_PROPERTIES
@@ -841,14 +846,7 @@ class IPMIManagement(base.ManagementInterface):
return COMMON_PROPERTIES return COMMON_PROPERTIES
def __init__(self): def __init__(self):
try: _constructor_checks(driver=self.__class__.__name__)
_check_option_support(['timing', 'single_bridge', 'dual_bridge'])
except OSError:
raise exception.DriverLoadError(
driver=self.__class__.__name__,
reason=_("Unable to locate usable ipmitool command in "
"the system path when checking ipmitool version"))
_check_temp_dir()
@METRICS.timer('IPMIManagement.validate') @METRICS.timer('IPMIManagement.validate')
def validate(self, task): def validate(self, task):
@@ -1041,14 +1039,7 @@ class IPMIManagement(base.ManagementInterface):
class VendorPassthru(base.VendorInterface): class VendorPassthru(base.VendorInterface):
def __init__(self): def __init__(self):
try: _constructor_checks(driver=self.__class__.__name__)
_check_option_support(['single_bridge', 'dual_bridge'])
except OSError:
raise exception.DriverLoadError(
driver=self.__class__.__name__,
reason=_("Unable to locate usable ipmitool command in "
"the system path when checking ipmitool version"))
_check_temp_dir()
@METRICS.timer('VendorPassthru.send_raw') @METRICS.timer('VendorPassthru.send_raw')
@base.passthru(['POST']) @base.passthru(['POST'])
@@ -1138,14 +1129,7 @@ class IPMIConsole(base.ConsoleInterface):
"""A base ConsoleInterface that uses ipmitool.""" """A base ConsoleInterface that uses ipmitool."""
def __init__(self): def __init__(self):
try: _constructor_checks(driver=self.__class__.__name__)
_check_option_support(['timing', 'single_bridge', 'dual_bridge'])
except OSError:
raise exception.DriverLoadError(
driver=self.__class__.__name__,
reason=_("Unable to locate usable ipmitool command in "
"the system path when checking ipmitool version"))
_check_temp_dir()
def get_properties(self): def get_properties(self):
d = COMMON_PROPERTIES.copy() d = COMMON_PROPERTIES.copy()