xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-31 03:12:30 +00:00
Code Issues Releases Wiki Activity

modified depending on comments

Browse Source
This commit is contained in:
XuWei
2018-03-23 04:10:31 -04:00
parent 14bdb8568c
commit fdfd8b4700
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_flash.py
View File

@@ -80,12 +80,17 @@ class OpenBMCFlashTask(ParallelNodesCommand):
def _get_firmware_version(self, target_file):
grep_cmd = '/usr/bin/grep -a'
version_cmd = grep_cmd + ' ^version= ' + target_file
purpose_cmd = grep_cmd + ' purpose= ' + target_file
firmware = os.popen(version_cmd).readlines()[0].split('=')[-1].strip()
purpose = os.popen(purpose_cmd).readlines()[0].split('=')[-1].strip().split('.')[-1]
return { firmware: {'purpose': purpose} }
version = purpose = None
with open(target_file, 'r') as fh:
for line in fh:
if 'version=' in line:
version = line.split('=')[-1].strip()
if 'purpose=' in line:
purpose = line.split('=')[-1].strip().split('.')[-1]
if version and purpose:
break
return { version: {'purpose': purpose} }
def pre_activate_firm(self, task, activate_arg, **kw):

24
xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_inventory.py
View File

@@ -28,22 +28,18 @@ class OpenBMCInventoryTask(ParallelNodesCommand):
target_file = utils.get_full_path(self.cwd, target_file)
grep_cmd = '/usr/bin/grep -a'
version_cmd = grep_cmd + ' ^version= ' + target_file
purpose_cmd = grep_cmd + ' purpose= ' + target_file
purpose_ver = os.popen(purpose_cmd).readlines()
firmware_ver = os.popen(version_cmd).readlines()
if purpose_ver:
purpose_ver = purpose_ver[0].split('=')[-1].strip()
else:
purpose_ver = ''
if firmware_ver:
firmware_ver = firmware_ver[0].split('=')[-1].strip()
else:
firmware_ver = ''
version = purpose = None
with open(target_file, 'r') as fh:
for line in fh:
if 'version=' in line:
version = line.split('=')[-1].strip()
if 'purpose=' in line:
purpose = line.split('=')[-1].strip().split('.')[-1]
if version and purpose:
break
self.callback.info('TAR %s Firmware Product Version: %s' \
% (purpose_ver,firmware_ver))
% (purpose, version))
def _get_firm_info(self, firm_info_list):
(has_functional, firm_obj_dict) = firm_info_list