commit 1e3e6989f8942eee20415e8658db4b952cb43b20
author James Feist <james.feist@linux.intel.com> Fri Aug 03 16:09:28 2018 -0700
committer James Feist <james.feist@linux.intel.com> Wed Aug 22 12:11:52 2018 -0700
tree 019c9055da220c04cb12d43ab8880a3f022706ca
parent 26c27addaad30118fc78bce30916af196f8825c6

Rename all properties to UpperCamelCase

Upstream dbus standard is UpperCamelCase, start matching and
check in json schema to start failing builds that don't match.

Change-Id: I2d2c6fec5a5a0b07c88c843257fa7c88d420c4e5
Signed-off-by: James Feist <james.feist@linux.intel.com>

src/Overlay.cpp

diff --git a/src/Overlay.cpp b/src/Overlay.cpp
index 697456d..6b12ab6 100644
--- a/src/Overlay.cpp
+++ b/src/Overlay.cpp
@@ -130,9 +130,9 @@
             std::experimental::filesystem::canonical(devtreePath);
         symbolPath =
             symbolPath.substr(sizeof("/sys/firmware/devicetree/base") - 1);
-        nlohmann::json configuration = {{"path", symbolPath},
+        nlohmann::json configuration = {{"Path", symbolPath},
                                         {"Type", "Symbol"},
-                                        {"bus", std::stoul(bus)},
+                                        {"Bus", std::stoul(bus)},
                                         {"Name", "i2c" + bus}};
         createOverlay(TEMPLATE_DIR + std::string("/Symbol.template"),
                       configuration);
@@ -160,7 +160,7 @@
         std::string subsituteString;
 
         // device tree symbols are in decimal
-        if (keyPair.key() == "bus" &&
+        if (keyPair.key() == "Bus" &&
             keyPair.value().type() == nlohmann::json::value_t::string)
         {
             unsigned int dec =
@@ -174,7 +174,7 @@
                 keyPair.value().get<std::string>(), ILLEGAL_NAME_REGEX, "_");
             name = subsituteString;
         }
-        else if (keyPair.key() == "address")
+        else if (keyPair.key() == "Address")
         {
             if (keyPair.value().type() == nlohmann::json::value_t::string)
             {
@@ -198,7 +198,7 @@
     }
     // todo: this is a lame way to fill in platform, but we only
     // care about ast2500 right now
-    boost::replace_all(templateStr, TEMPLATE_CHAR + std::string("platform"),
+    boost::replace_all(templateStr, TEMPLATE_CHAR + std::string("Platform"),
                        PLATFORM);
     std::string dtsFilename =
         std::string(OUTPUT_DIR) + "/" + name + "_" + type + ".dts";
@@ -269,7 +269,7 @@
     for (auto entity = systemConfiguration.begin();
          entity != systemConfiguration.end(); entity++)
     {
-        auto findExposes = entity.value().find("exposes");
+        auto findExposes = entity.value().find("Exposes");
         if (findExposes == entity.value().end() ||
             findExposes->type() != nlohmann::json::value_t::array)
         {
@@ -278,7 +278,7 @@
 
         for (auto &configuration : *findExposes)
         {
-            auto findStatus = configuration.find("status");
+            auto findStatus = configuration.find("Status");
             // status missing is assumed to be 'okay'
             if (findStatus != configuration.end() && *findStatus == "disabled")
             {