Allow CALLOUT_DEVICE_PATH to used as search key
Now that the full device path is in the policy table, we can
use it as a search key as is, and will only fall back to the
old way of doing it if no match was found.
Signed-off-by: Matt Spinler <spinler@us.ibm.com>
diff --git a/thalerj/openbmctool.py b/thalerj/openbmctool.py
old mode 100644
new mode 100755
index 81e944c..6c37750
--- a/thalerj/openbmctool.py
+++ b/thalerj/openbmctool.py
@@ -758,12 +758,17 @@
fruCallout = str(addDataPiece[calloutIndex]).split('=')[1]
if("CALLOUT_DEVICE_PATH" in addDataPiece[i]):
i2creadFail = True
- i2cdevice = str(addDataPiece[i]).strip().split('=')[1]
- i2cdevice = '/'.join(i2cdevice.split('/')[-4:])
- if 'fsi' in str(addDataPiece[calloutIndex]).split('=')[1]:
- fruCallout = 'FSI'
- else:
- fruCallout = 'I2C'
+
+ fruCallout = str(addDataPiece[calloutIndex]).split('=')[1]
+
+ # Fall back to "I2C"/"FSI" if dev path isn't in policy table
+ if (messageID + '||' + fruCallout) not in policyTable:
+ i2cdevice = str(addDataPiece[i]).strip().split('=')[1]
+ i2cdevice = '/'.join(i2cdevice.split('/')[-4:])
+ if 'fsi' in str(addDataPiece[calloutIndex]).split('=')[1]:
+ fruCallout = 'FSI'
+ else:
+ fruCallout = 'I2C'
calloutFound = True
if("CALLOUT_GPIO_NUM" in addDataPiece[i]):
if not calloutFound: