openstack/ironic
Code Issues Proposed changes

Merge "Add IPMINative vendor methods to *IPMINative drivers"

Browse Source
This commit is contained in:
Jenkins 2015-09-19 07:13:33 +00:00 committed by Gerrit Code Review
commit ba0d494b06
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ironic/drivers/agent.py
View File

@ -75,7 +75,16 @@ class AgentAndIPMINativeDriver(base.BaseDriver):
self.deploy = agent.AgentDeploy()
self.management = ipminative.NativeIPMIManagement()
self.console = ipminative.NativeIPMIShellinaboxConsole()
self.vendor = agent.AgentVendorInterface()
self.agent_vendor = agent.AgentVendorInterface()
self.ipminative_vendor = ipminative.VendorPassthru()
self.mapping = {
'send_raw': self.ipminative_vendor,
'bmc_reset': self.ipminative_vendor,
'heartbeat': self.agent_vendor,
}
self.driver_passthru_mapping = {'lookup': self.agent_vendor}
self.vendor = utils.MixinVendorInterface(self.mapping,
self.driver_passthru_mapping)
self.raid = agent.AgentRAID()

23
ironic/drivers/pxe.py
View File

@ -67,14 +67,14 @@ class PXEAndIPMIToolDriver(base.BaseDriver):
self.management = ipmitool.IPMIManagement()
self.inspect = inspector.Inspector.create_if_enabled(
'PXEAndIPMIToolDriver')
self.pxe_vendor = iscsi_deploy.VendorPassthru()
self.iscsi_vendor = iscsi_deploy.VendorPassthru()
self.ipmi_vendor = ipmitool.VendorPassthru()
self.mapping = {'send_raw': self.ipmi_vendor,
'bmc_reset': self.ipmi_vendor,
'heartbeat': self.pxe_vendor,
'pass_deploy_info': self.pxe_vendor,
'pass_bootloader_install_info': self.pxe_vendor}
self.driver_passthru_mapping = {'lookup': self.pxe_vendor}
'heartbeat': self.iscsi_vendor,
'pass_deploy_info': self.iscsi_vendor,
'pass_bootloader_install_info': self.iscsi_vendor}
self.driver_passthru_mapping = {'lookup': self.iscsi_vendor}
self.vendor = utils.MixinVendorInterface(
self.mapping,
driver_passthru_mapping=self.driver_passthru_mapping)
@ -122,7 +122,18 @@ class PXEAndIPMINativeDriver(base.BaseDriver):
self.boot = pxe.PXEBoot()
self.deploy = iscsi_deploy.ISCSIDeploy()
self.management = ipminative.NativeIPMIManagement()
self.vendor = iscsi_deploy.VendorPassthru()
self.iscsi_vendor = iscsi_deploy.VendorPassthru()
self.ipminative_vendor = ipminative.VendorPassthru()
self.mapping = {
'send_raw': self.ipminative_vendor,
'bmc_reset': self.ipminative_vendor,
'heartbeat': self.iscsi_vendor,
'pass_bootloader_install_info': self.iscsi_vendor,
'pass_deploy_info': self.iscsi_vendor,
}
self.driver_passthru_mapping = {'lookup': self.iscsi_vendor}
self.vendor = utils.MixinVendorInterface(self.mapping,
self.driver_passthru_mapping)
self.inspect = inspector.Inspector.create_if_enabled(
'PXEAndIPMINativeDriver')