xCAT/pyghmi
2
0
Fork 0
mirror of https://opendev.org/x/pyghmi synced 2025-01-27 19:37:44 +00:00
Code Issues Projects Releases Wiki Activity

Preserve comma delimited lists

Browse Source 
For attributes that are list format, take the given value and
use ',' to transform to a list.  This fixes the problem where only the
first option survived the candidate evaluation.

Change-Id: I92b921a2e72759c1b45ee7c5bf874a7ad2bc7c6c
This commit is contained in:
Jarrod Johnson 2018-03-05 16:34:20 -05:00
parent 5ed47bf9d0
commit 02e783c1d5
1 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pyghmi/ipmi/oem/lenovo/imm.py
View File

@ -167,24 +167,35 @@ class IMMClient(object):
isinstance(changeset[key], unicode)):
changeset[key] = {'value': changeset[key]}
newvalue = changeset[key]['value']
if (self.fwo[key]['possible'] and
newvalue not in self.fwo[key]['possible']):
candlist = []
for candidate in self.fwo[key]['possible']:
if newvalue.lower().startswith(candidate.lower()):
newvalue = candidate
break
if candidate.lower().startswith(newvalue.lower()):
candlist.append(candidate)
else:
if len(candlist) == 1:
newvalue = candlist[0]
if self.fwo[key]['is_list'] and not isinstance(newvalue, list):
newvalues = newvalue.split(',')
else:
newvalues = [newvalue]
newnewvalues = []
for newvalue in newvalues:
if (self.fwo[key]['possible'] and
newvalue not in self.fwo[key]['possible']):
candlist = []
for candidate in self.fwo[key]['possible']:
if newvalue.lower().startswith(candidate.lower()):
newvalue = candidate
break
if candidate.lower().startswith(newvalue.lower()):
candlist.append(candidate)
else:
raise pygexc.InvalidParameterValue(
'{0} is not a valid value for {1} ({2})'.format(
newvalue, key,
','.join(self.fwo[key]['possible'])))
self.fwo[key]['new_value'] = newvalue
if len(candlist) == 1:
newvalue = candlist[0]
else:
raise pygexc.InvalidParameterValue(
'{0} is not a valid value for {1} '
'({2})'.format(
newvalue, key,
','.join(self.fwo[key]['possible'])))
newnewvalues.append(newvalue)
if len(newnewvalues) == 1:
self.fwo[key]['new_value'] = newnewvalues[0]
else:
self.fwo[key]['new_value'] = newnewvalues
if changeset:
try:
self.fwc.set_fw_options(self.fwo)