commit e151e2d662ec647b055a5f4007e0229a6cc8e981
author George Liu <liuxiwei@inspur.com> Tue Feb 11 10:30:37 2020 +0800
committer Deepak Kodihalli <dkodihal@in.ibm.com> Sat Feb 15 05:36:15 2020 -0600
tree 03668ab9b591bf6f2020651a0a0ff337fef56713
parent cdfe114ea9f8f9e70624da92e55ff115cb2555e2

pldm: improve PDR config JSON files

Add the PDR type to the JOSN files so that the PDR type in the code is
unassociated with the JSON file name.
Rename 11.json become state_effecter_pdr.json.

Signed-off-by: George Liu <liuxiwei@inspur.com>
Change-Id: I3194989ecd80ea0d8befa91971bd58ff851dd375

libpldmresponder/examples/pdr/11.json

diff --git a/libpldmresponder/examples/pdr/11.json b/libpldmresponder/examples/pdr/11.json
deleted file mode 100644
index a037ad4..0000000
--- a/libpldmresponder/examples/pdr/11.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "entries" : [{
-        "type" : 33,
-        "instance" : 0,
-        "container" : 0,
-        "effecters" : [{
-            "set" : {
-                "id" : 196,
-                "size" : 1,
-                "states" : [1]
-            },
-            "dbus" : "/foo/bar"
-        }]
-    },
-    {
-        "type" : 100,
-        "instance" : 0,
-        "container" : 0,
-        "effecters" : [{
-            "set" : {
-                "id" : 197,
-                "size" : 1,
-                "states" : [1]
-            },
-            "dbus" : "/foo/bar"
-        },
-        {
-            "set" : {
-                "id" : 198,
-                "size" : 2,
-                "states" : [1,2,5,15]
-            },
-            "dbus" : "/foo/bar/baz"
-        }]
-    }]
-}

libpldmresponder/examples/pdr/state_effecter_pdr.json

diff --git a/libpldmresponder/examples/pdr/state_effecter_pdr.json b/libpldmresponder/examples/pdr/state_effecter_pdr.json
new file mode 100644
index 0000000..2b5d946
--- /dev/null
+++ b/libpldmresponder/examples/pdr/state_effecter_pdr.json
@@ -0,0 +1,52 @@
+{
+  "pdrType": 11,
+  "entries": [
+    {
+      "type": 33,
+      "instance": 0,
+      "container": 0,
+      "effecters": [
+        {
+          "set": {
+            "id": 196,
+            "size": 1,
+            "states": [
+              1
+            ]
+          },
+          "dbus": "/foo/bar"
+        }
+      ]
+    },
+    {
+      "type": 100,
+      "instance": 0,
+      "container": 0,
+      "effecters": [
+        {
+          "set": {
+            "id": 197,
+            "size": 1,
+            "states": [
+              1
+            ]
+          },
+          "dbus": "/foo/bar"
+        },
+        {
+          "set": {
+            "id": 198,
+            "size": 2,
+            "states": [
+              1,
+              2,
+              5,
+              15
+            ]
+          },
+          "dbus": "/foo/bar/baz"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file

libpldmresponder/pdr.hpp

diff --git a/libpldmresponder/pdr.hpp b/libpldmresponder/pdr.hpp
index b32f878..9432f3e 100644
--- a/libpldmresponder/pdr.hpp
+++ b/libpldmresponder/pdr.hpp
@@ -276,7 +276,6 @@
               }
           }}};
 
-    auto eraseLen = strlen(".json");
     Type pdrType{};
     for (const auto& dirEntry : fs::directory_iterator(dir))
     {
@@ -285,9 +284,7 @@
             auto json = readJson(dirEntry.path().string());
             if (!json.empty())
             {
-                auto fileName = dirEntry.path().filename().string();
-                fileName.erase(fileName.end() - eraseLen);
-                pdrType = stoi(fileName);
+                pdrType = json.value("pdrType", 0);
                 generators.at(pdrType)(json, repo);
             }
         }