Inventory:- making changes in the mako and the C++ structure

As fru yaml would be having extra properties like
entityID,entityInstance so changes were needed to make the
change in the corresponding c++ structure.

Change-Id: I314d1556cf07a3e212996615c1cd2f28fb6d9bba
Signed-off-by: Ratan Gupta <ratagupt@in.ibm.com>
diff --git a/read_fru_data.cpp b/read_fru_data.cpp
index 510f0af..a1bced9 100644
--- a/read_fru_data.cpp
+++ b/read_fru_data.cpp
@@ -82,7 +82,7 @@
         auto& instanceList = fru.second;
         for (auto& instance : instanceList)
         {
-            if(instance.first == path)
+            if(instance.path == path)
             {
                 found = true;
                 break;
@@ -133,10 +133,10 @@
     auto& instanceList = iter->second;
     for (auto& instance : instanceList)
     {
-        for (auto& intf : instance.second)
+        for (auto& intf : instance.interfaces)
         {
             ipmi::PropertyMap allProp = readAllProperties(
-                    intf.first, instance.first);
+                    intf.first, instance.path);
             for (auto& properties : intf.second)
             {
                 auto iter = allProp.find(properties.first);