From 02e783c1d5e2c4afa3857f5bdd72c1c6beee7eb4 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Mon, 5 Mar 2018 16:34:20 -0500
Subject: [PATCH] Preserve comma delimited lists

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
---
 pyghmi/ipmi/oem/lenovo/imm.py | 45 ++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/pyghmi/ipmi/oem/lenovo/imm.py b/pyghmi/ipmi/oem/lenovo/imm.py
index dc43f17f..f524aa27 100644
--- a/pyghmi/ipmi/oem/lenovo/imm.py
+++ b/pyghmi/ipmi/oem/lenovo/imm.py
@@ -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)