Skip to content
Merged
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
4 changes: 4 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
History
=======
0.9.16 (2025-03-05)
--------------------
* Bug fixes and Bios updates

0.9.15 (2024-12-09)
--------------------
* Bug fixes
Expand Down
2 changes: 1 addition & 1 deletion imcsdk/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@ def set_log_level(level=logging.DEBUG):

__author__ = 'Cisco Systems'
__email__ = 'ucs-python@cisco.com'
__version__ = '0.9.15'
__version__ = '0.9.16'
18 changes: 18 additions & 0 deletions imcsdk/imcbiostables.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@
"lomPort2state": {"mo_name": "BiosVfLOMPortOptionROM", "prop_name": "vp_lom_port2_state"},
"lomPort3state": {"mo_name": "BiosVfLOMPortOptionROM", "prop_name": "vp_lom_port3_state"},
"lomPortsAllState": {"mo_name": "BiosVfLOMPortOptionROM", "prop_name": "vp_lom_ports_all_state"},
"latencyOptimizedMode": {"mo_name": "BiosVfLatencyOptimizedMode", "prop_name": "vp_latency_optimized_mode"},
"legacyUsbSupport": {"mo_name": "BiosVfLegacyUSBSupport", "prop_name": "vp_legacy_usb_support"},
"lvDdrMode": {"mo_name": "BiosVfLvDIMMSupport", "prop_name": "vp_lv_ddr_mode"},
"mmcfgBase": {"mo_name": "BiosVfMMCFGBase", "prop_name": "vp_mmcfg_base"},
Expand Down Expand Up @@ -286,8 +287,24 @@
"slotFrontNvme23optionRom": {"mo_name": "BiosVfPCISlotOptionROMEnable", "prop_name": "vp_slot_front_nvme23_option_rom"},
"slotFrontNvme24linkSpeed": {"mo_name": "BiosVfPCISlotOptionROMEnable", "prop_name": "vp_slot_front_nvme24_link_speed"},
"slotFrontNvme24optionRom": {"mo_name": "BiosVfPCISlotOptionROMEnable", "prop_name": "vp_slot_front_nvme24_option_rom"},
"slotFrontNvme25linkSpeed": {"mo_name": "BiosVfPCISlotOptionROMEnable", "prop_name": "vp_slot_front_nvme25_link_speed"},
"slotFrontNvme25optionRom": {"mo_name": "BiosVfPCISlotOptionROMEnable", "prop_name": "vp_slot_front_nvme25_option_rom"},
"slotFrontNvme26linkSpeed": {"mo_name": "BiosVfPCISlotOptionROMEnable", "prop_name": "vp_slot_front_nvme26_link_speed"},
"slotFrontNvme26optionRom": {"mo_name": "BiosVfPCISlotOptionROMEnable", "prop_name": "vp_slot_front_nvme26_option_rom"},
"slotFrontNvme27linkSpeed": {"mo_name": "BiosVfPCISlotOptionROMEnable", "prop_name": "vp_slot_front_nvme27_link_speed"},
"slotFrontNvme27optionRom": {"mo_name": "BiosVfPCISlotOptionROMEnable", "prop_name": "vp_slot_front_nvme27_option_rom"},
"slotFrontNvme28linkSpeed": {"mo_name": "BiosVfPCISlotOptionROMEnable", "prop_name": "vp_slot_front_nvme28_link_speed"},
"slotFrontNvme28optionRom": {"mo_name": "BiosVfPCISlotOptionROMEnable", "prop_name": "vp_slot_front_nvme28_option_rom"},
"slotFrontNvme29linkSpeed": {"mo_name": "BiosVfPCISlotOptionROMEnable", "prop_name": "vp_slot_front_nvme29_link_speed"},
"slotFrontNvme29optionRom": {"mo_name": "BiosVfPCISlotOptionROMEnable", "prop_name": "vp_slot_front_nvme29_option_rom"},
"slotFrontNvme2linkSpeed": {"mo_name": "BiosVfPCISlotOptionROMEnable", "prop_name": "vp_slot_front_nvme2_link_speed"},
"slotFrontNvme2optionRom": {"mo_name": "BiosVfPCISlotOptionROMEnable", "prop_name": "vp_slot_front_nvme2_option_rom"},
"slotFrontNvme30linkSpeed": {"mo_name": "BiosVfPCISlotOptionROMEnable", "prop_name": "vp_slot_front_nvme30_link_speed"},
"slotFrontNvme30optionRom": {"mo_name": "BiosVfPCISlotOptionROMEnable", "prop_name": "vp_slot_front_nvme30_option_rom"},
"slotFrontNvme31linkSpeed": {"mo_name": "BiosVfPCISlotOptionROMEnable", "prop_name": "vp_slot_front_nvme31_link_speed"},
"slotFrontNvme31optionRom": {"mo_name": "BiosVfPCISlotOptionROMEnable", "prop_name": "vp_slot_front_nvme31_option_rom"},
"slotFrontNvme32linkSpeed": {"mo_name": "BiosVfPCISlotOptionROMEnable", "prop_name": "vp_slot_front_nvme32_link_speed"},
"slotFrontNvme32optionRom": {"mo_name": "BiosVfPCISlotOptionROMEnable", "prop_name": "vp_slot_front_nvme32_option_rom"},
"slotFrontNvme3linkSpeed": {"mo_name": "BiosVfPCISlotOptionROMEnable", "prop_name": "vp_slot_front_nvme3_link_speed"},
"slotFrontNvme3optionRom": {"mo_name": "BiosVfPCISlotOptionROMEnable", "prop_name": "vp_slot_front_nvme3_option_rom"},
"slotFrontNvme4linkSpeed": {"mo_name": "BiosVfPCISlotOptionROMEnable", "prop_name": "vp_slot_front_nvme4_link_speed"},
Expand Down Expand Up @@ -394,6 +411,7 @@
"pcieSlotsCdnEnable": {"mo_name": "BiosVfPcieSlotsCdnEnable", "prop_name": "vp_pcie_slots_cdn_enable"},
"postPackageRepair": {"mo_name": "BiosVfPostPackageRepair", "prop_name": "vp_post_package_repair"},
"popSupport": {"mo_name": "BiosVfPowerOnPasswordSupport", "prop_name": "vp_pop_support"},
"preBootDmaProtection": {"mo_name": "BiosVfPreBootDMAProtection", "prop_name": "vp_pre_boot_dma_protection"},
"prmrrSize": {"mo_name": "BiosVfPrmrrSize", "prop_name": "vp_prmrr_size"},
"processorC1e": {"mo_name": "BiosVfProcessorC1E", "prop_name": "vp_processor_c1_e"},
"processorC3report": {"mo_name": "BiosVfProcessorC3Report", "prop_name": "vp_processor_c3_report"},
Expand Down
20 changes: 20 additions & 0 deletions imcsdk/imcconstants.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ class NamingId:
BIOS_VF_LLCALLOC = "biosVfLLCAlloc"
BIOS_VF_LLCPREFETCH = "biosVfLLCPrefetch"
BIOS_VF_LOMPORT_OPTION_ROM = "biosVfLOMPortOptionROM"
BIOS_VF_LATENCY_OPTIMIZED_MODE = "biosVfLatencyOptimizedMode"
BIOS_VF_LEGACY_USBSUPPORT = "biosVfLegacyUSBSupport"
BIOS_VF_LV_DIMMSUPPORT = "biosVfLvDIMMSupport"
BIOS_VF_MMCFGBASE = "biosVfMMCFGBase"
Expand Down Expand Up @@ -271,6 +272,7 @@ class NamingId:
BIOS_VF_PCIE_SLOTS_CDN_ENABLE = "biosVfPcieSlotsCdnEnable"
BIOS_VF_POST_PACKAGE_REPAIR = "biosVfPostPackageRepair"
BIOS_VF_POWER_ON_PASSWORD_SUPPORT = "biosVfPowerOnPasswordSupport"
BIOS_VF_PRE_BOOT_DMAPROTECTION = "biosVfPreBootDMAProtection"
BIOS_VF_PRMRR_SIZE = "biosVfPrmrrSize"
BIOS_VF_PROCESSOR_C1_E = "biosVfProcessorC1E"
BIOS_VF_PROCESSOR_C3_REPORT = "biosVfProcessorC3Report"
Expand Down Expand Up @@ -1862,6 +1864,7 @@ class NamingPropertyId:
VP_LOMPORT2_STATE = "vpLOMPort2State"
VP_LOMPORT3_STATE = "vpLOMPort3State"
VP_LOMPORTS_ALL_STATE = "vpLOMPortsAllState"
VP_LATENCY_OPTIMIZED_MODE = "vpLatencyOptimizedMode"
VP_LEGACY_OSREDIRECTION = "vpLegacyOSRedirection"
VP_LEGACY_USBSUPPORT = "vpLegacyUSBSupport"
VP_LV_DDRMODE = "vpLvDDRMode"
Expand Down Expand Up @@ -1932,6 +1935,7 @@ class NamingPropertyId:
VP_PCIE_SLOT_NVME6_OPTION_ROM = "vpPcieSlotNvme6OptionROM"
VP_PCIE_SLOTS_CDN_ENABLE = "vpPcieSlotsCdnEnable"
VP_POST_PACKAGE_REPAIR = "vpPostPackageRepair"
VP_PRE_BOOT_DMAPROTECTION = "vpPreBootDMAProtection"
VP_PRMRR_SIZE = "vpPrmrrSize"
VP_PROCESSOR_C1_E = "vpProcessorC1E"
VP_PROCESSOR_C3_REPORT = "vpProcessorC3Report"
Expand Down Expand Up @@ -2029,8 +2033,24 @@ class NamingPropertyId:
VP_SLOT_FRONT_NVME23_OPTION_ROM = "vpSlotFrontNvme23OptionROM"
VP_SLOT_FRONT_NVME24_LINK_SPEED = "vpSlotFrontNvme24LinkSpeed"
VP_SLOT_FRONT_NVME24_OPTION_ROM = "vpSlotFrontNvme24OptionROM"
VP_SLOT_FRONT_NVME25_LINK_SPEED = "vpSlotFrontNvme25LinkSpeed"
VP_SLOT_FRONT_NVME25_OPTION_ROM = "vpSlotFrontNvme25OptionROM"
VP_SLOT_FRONT_NVME26_LINK_SPEED = "vpSlotFrontNvme26LinkSpeed"
VP_SLOT_FRONT_NVME26_OPTION_ROM = "vpSlotFrontNvme26OptionROM"
VP_SLOT_FRONT_NVME27_LINK_SPEED = "vpSlotFrontNvme27LinkSpeed"
VP_SLOT_FRONT_NVME27_OPTION_ROM = "vpSlotFrontNvme27OptionROM"
VP_SLOT_FRONT_NVME28_LINK_SPEED = "vpSlotFrontNvme28LinkSpeed"
VP_SLOT_FRONT_NVME28_OPTION_ROM = "vpSlotFrontNvme28OptionROM"
VP_SLOT_FRONT_NVME29_LINK_SPEED = "vpSlotFrontNvme29LinkSpeed"
VP_SLOT_FRONT_NVME29_OPTION_ROM = "vpSlotFrontNvme29OptionROM"
VP_SLOT_FRONT_NVME2_LINK_SPEED = "vpSlotFrontNvme2LinkSpeed"
VP_SLOT_FRONT_NVME2_OPTION_ROM = "vpSlotFrontNvme2OptionROM"
VP_SLOT_FRONT_NVME30_LINK_SPEED = "vpSlotFrontNvme30LinkSpeed"
VP_SLOT_FRONT_NVME30_OPTION_ROM = "vpSlotFrontNvme30OptionROM"
VP_SLOT_FRONT_NVME31_LINK_SPEED = "vpSlotFrontNvme31LinkSpeed"
VP_SLOT_FRONT_NVME31_OPTION_ROM = "vpSlotFrontNvme31OptionROM"
VP_SLOT_FRONT_NVME32_LINK_SPEED = "vpSlotFrontNvme32LinkSpeed"
VP_SLOT_FRONT_NVME32_OPTION_ROM = "vpSlotFrontNvme32OptionROM"
VP_SLOT_FRONT_NVME3_LINK_SPEED = "vpSlotFrontNvme3LinkSpeed"
VP_SLOT_FRONT_NVME3_OPTION_ROM = "vpSlotFrontNvme3OptionROM"
VP_SLOT_FRONT_NVME4_LINK_SPEED = "vpSlotFrontNvme4LinkSpeed"
Expand Down
38 changes: 22 additions & 16 deletions imcsdk/imchandle.py
Original file line number Diff line number Diff line change
Expand Up @@ -432,13 +432,7 @@ def add_mo(self, mo, modify_present=True, timeout=None):

validate_mo_version(self, mo)

if modify_present in imcgenutils.AFFIRMATIVE_LIST:
if self.query_dn(mo.dn) is None:
mo.status = "created"
else:
mo.status = "modified"
else:
mo.status = "created"
mo.status = self._get_mo_status(mo, "add", modify_present)

self.__to_commit[mo.dn] = mo
self._commit(timeout=timeout)
Expand All @@ -463,7 +457,7 @@ def set_mo(self, mo, timeout=None):

validate_mo_version(self, mo)

mo.status = "modified"
mo.status = self._get_mo_status(mo, "set")
self.__to_commit[mo.dn] = mo
self._commit(timeout=timeout)

Expand Down Expand Up @@ -583,14 +577,7 @@ def add_mos(self, mos, modify_present=True, timeout=None):
obj = handle.set_mos(mos)
"""
for mo in mos:
if modify_present in imcgenutils.AFFIRMATIVE_LIST:
if self.query_dn(mo.dn) is None:
mo.status = "created"
else:
mo.status = "modified"
else:
mo.status = "created"

mo.status = self._get_mo_status(mo, "add", modify_present)
self.__to_commit[mo.dn] = mo

return self._commit_mos(timeout)
Expand Down Expand Up @@ -743,3 +730,22 @@ def _commit_mos(self, timeout=None):
# Always cleanup the commit buffer
self.__to_commit.clear()
return ret

def _get_mo_status(self, mo, operation, modify_present=True):
"""Method to get mo status based on the type of operation"""
status = None
if operation == "set":
status = "modified"
# When processing vmedia with admin_action="save-unmapped-volume",
# ensure the status is set to an empty string ("").
# This prevents the XML API from throwing an exception due to
# "Invalid request: adminAction and status are not expected in the same configConfMo request of commVMediaMap".
# Keep the default status as "modified" for other admin actions.
from imcsdk.mometa.comm.CommVMediaMap import CommVMediaMap, CommVMediaMapConsts
if all([isinstance(mo, CommVMediaMap), hasattr(mo, 'admin_action'), mo.admin_action == CommVMediaMapConsts.ADMIN_ACTION_SAVE_UNMAPPED_VOLUME]):
status = ""
elif operation == "add":
status = "created"
if modify_present in imcgenutils.AFFIRMATIVE_LIST and self.query_dn(mo.dn) is not None:
status = "modified"
return status
Loading