From 55c333b19881a073a3ccc27c3d677dc30bea61b9 Mon Sep 17 00:00:00 2001
From: Juliana Motira <jmotira@lenovo.com>
Date: Wed, 19 Aug 2015 08:13:55 -0300
Subject: [PATCH] Add get firmware information. Show OEM firmware information
 in /nodes/[node]/inventory/firmware/.

---
 confluent_server/confluent/core.py            |  6 +++++
 confluent_server/confluent/messages.py        | 12 +++++++++
 .../plugins/hardwaremanagement/ipmi.py        | 26 ++++++++++++++++---
 3 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/confluent_server/confluent/core.py b/confluent_server/confluent/core.py
index 9a43d16d..823b85a9 100644
--- a/confluent_server/confluent/core.py
+++ b/confluent_server/confluent/core.py
@@ -175,6 +175,12 @@ noderesources = {
                 'default': 'ipmi',
             }),
         },
+        'firmware': {
+            'all': PluginCollection({
+                'pluginattrs': ['hardwaremanagement.method'],
+                'default': 'ipmi',
+            }),
+        },
     },
     'power': {
         'state': PluginRoute({
diff --git a/confluent_server/confluent/messages.py b/confluent_server/confluent/messages.py
index c5441efa..3cd1f83e 100644
--- a/confluent_server/confluent/messages.py
+++ b/confluent_server/confluent/messages.py
@@ -799,6 +799,18 @@ class SensorReadings(ConfluentMessage):
             self.kvpairs = {name: {'sensors': readings}}
 
 
+class Firmware(ConfluentMessage):
+    readonly = True
+
+    def __init__(self, data, name):
+        self.notnode = name is None
+        self.desc = 'Firmware information'
+        if self.notnode:
+            self.kvpairs = {'firmware': data}
+        else:
+            self.kvpairs = {name:  {'firmware': data}}
+
+
 class KeyValueData(ConfluentMessage):
     readonly = True
 
diff --git a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
index 75c2393b..2e7e5ee3 100644
--- a/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
+++ b/confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
@@ -569,11 +569,29 @@ class IpmiHandler(object):
         for component in components:
             self.output.put(msg.ChildCollection(simplify_name(component)))
 
+    def list_firmware(self):
+        self.output.put(msg.ChildCollection('all'))
+        for id, data in self.ipmicmd.get_firmware():
+            self.output.put(msg.ChildCollection(simplify_name(id)))
+
+    def read_firmware(self, component):
+        items = []
+        for id, data in self.ipmicmd.get_firmware():
+            if component == 'all' or component == simplify_name(id):
+                items.append({id: data})
+        self.output.put(msg.Firmware(items, self.node))
+
     def handle_inventory(self):
-        if len(self.element) == 3:  # list things in inventory
-            return self.list_inventory()
-        elif len(self.element) == 4:  # actually read inventory data
-            return self.read_inventory(self.element[-1])
+        if self.element[1] == 'firmware':
+            if len(self.element) == 3:
+                return self.list_firmware()
+            elif len(self.element) == 4:
+                return self.read_firmware(self.element[-1])
+        elif self.element[1] == 'hardware':
+            if len(self.element) == 3:  # list things in inventory
+                return self.list_inventory()
+            elif len(self.element) == 4:  # actually read inventory data
+                return self.read_inventory(self.element[-1])
         raise Exception('Unsupported scenario...')
 
     def read_inventory(self, component):