Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions OpTestConfiguration.py
Original file line number Diff line number Diff line change
Expand Up @@ -867,13 +867,9 @@ def objs(self):
else:
raise Exception(
"HMC IP, username and password is required")
bmc = OpTestFSP(self.args.bmc_ip,
self.args.bmc_username,
self.args.bmc_password,
hmc=hmc,
prompt=self.args.fsp_prompt if hasattr(
self.args, 'fsp_prompt') else "$",
)
# For FSP_PHYP, use HMC directly as BMC to avoid FSP operations
# HMC now has get_ipmi(), get_hmc(), bmc_host() methods
bmc = hmc
self.op_system = common.OpTestSystem.OpTestLPARSystem(
state=self.startState,
bmc=bmc,
Expand Down
27 changes: 27 additions & 0 deletions common/OpTestHMC.py
Original file line number Diff line number Diff line change
Expand Up @@ -1063,6 +1063,33 @@ def set_system(self, system):
def get_rest_api(self):
return None

def get_ipmi(self):
'''
Get IPMI interface (not available in PHYP).

Returns:
None: PHYP does not support IPMI
'''
return None

def get_hmc(self):
'''
Get HMC interface (returns self for PHYP).

Returns:
OpTestHMC: self
'''
return self

def bmc_host(self):
'''
Return HMC IP as BMC host.

Returns:
str: HMC IP address
'''
return self.hmc_ip

def has_os_boot_sensor(self):
return False

Expand Down
8 changes: 6 additions & 2 deletions common/OpTestSystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -1396,8 +1396,12 @@ def __init__(self,
conf=None,
bmc_type=None,
state=OpSystemState.UNKNOWN):
if bmc_type in ['FSP_PHYP']:
bmc.fsp_get_console()
# For FSP_PHYP, bmc is HMC object directly (no FSP operations)
# For EBMC_PHYP, bmc is OpTestEBMC (has REST API but console via HMC)
# Skip fsp_get_console() for PHYP environments
if bmc_type in ['FSP_PHYP', 'EBMC_PHYP']:
# Console is managed through HMC, no FSP console setup needed
pass
self.hmc = bmc.get_hmc()
super(OpTestLPARSystem, self).__init__(host=host,
bmc=bmc,
Expand Down