summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRatan Gupta <ratagupt@in.ibm.com>2017-02-10 15:59:31 +0530
committerRatan Gupta <ratagupt@in.ibm.com>2017-02-14 22:51:34 +0530
commit6eed4032cb2b08a8b9d41329fc3553a65269cbde (patch)
tree910352e3d3726b4f86c39d7b5bfee166439987a1 /scripts
parent19c617b7dbbcb065b1a283e184310f60096ff180 (diff)
downloadipmi-fru-parser-6eed4032cb2b08a8b9d41329fc3553a65269cbde.zip
ipmi-fru-parser-6eed4032cb2b08a8b9d41329fc3553a65269cbde.tar.gz
Create the generated FRU Map in cpp.
Change-Id: Id83220e5e2876f4112ba76d698b2062e2a08dd3d Signed-off-by: Ratan Gupta <ratagupt@in.ibm.com>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/fru_gen.py8
-rw-r--r--scripts/writefru.mako.cpp (renamed from scripts/writefru.mako.hpp)26
2 files changed, 6 insertions, 28 deletions
diff --git a/scripts/fru_gen.py b/scripts/fru_gen.py
index aca86e8..2771498 100755
--- a/scripts/fru_gen.py
+++ b/scripts/fru_gen.py
@@ -7,7 +7,7 @@ import argparse
from mako.template import Template
-def generate_hpp(inventory_yaml, output_dir):
+def generate_cpp(inventory_yaml, output_dir):
with open(os.path.join(script_dir, inventory_yaml), 'r') as f:
ifile = yaml.safe_load(f)
if not isinstance(ifile, dict):
@@ -17,9 +17,9 @@ def generate_hpp(inventory_yaml, output_dir):
t = Template(filename=os.path.join(
script_dir,
- "writefru.mako.hpp"))
+ "writefru.mako.cpp"))
- output_hpp = os.path.join(output_dir, "fru-gen.hpp")
+ output_hpp = os.path.join(output_dir, "fru-gen.cpp")
with open(output_hpp, 'w') as fd:
fd.write(t.render(fruDict=ifile))
@@ -27,7 +27,7 @@ def generate_hpp(inventory_yaml, output_dir):
def main():
valid_commands = {
- 'generate-hpp': generate_hpp
+ 'generate-cpp': generate_cpp
}
parser = argparse.ArgumentParser(
description="IPMI FRU parser and code generator")
diff --git a/scripts/writefru.mako.hpp b/scripts/writefru.mako.cpp
index a5c2f24..7573862 100644
--- a/scripts/writefru.mako.hpp
+++ b/scripts/writefru.mako.cpp
@@ -1,30 +1,8 @@
// !!! WARNING: This is a GENERATED Code..Please do NOT Edit !!!
-#pragma once
-
#include <iostream>
+#include "frup.hpp"
-#include <string>
-#include <list>
-#include <map>
-
-using IPMIFruMetadata = std::string;
-using IPMIFruMetadataValue = std::string;
-using IPMIFruMap = std::map<IPMIFruMetadata,IPMIFruMetadataValue>;
-
-using DbusProperty = std::string;
-using DbusPropertyMap = std::map<DbusProperty,IPMIFruMap>;
-
-using DbusInterface = std::string;
-using DbusInterfaceMap = std::map<DbusInterface,DbusPropertyMap>;
-
-using FruInstancePath = std::string;
-using FruInstanceMap = std::map<FruInstancePath,DbusInterfaceMap>;
-
-using FruId = uint32_t;
-using FruMap = std::map<FruId,FruInstanceMap>;
-
-
-const FruMap frus = {
+extern const FruMap frus = {
% for key in fruDict.iterkeys():
{${key},{
<%
OpenPOWER on IntegriCloud