Adjust Config processing logic and order (#178)

---
Signed-off-by: Kartik Nema <kartnema@qti.qualcomm.com>

Author: kartnema

configs/PropertiesConfig.yaml

@@ -39,4 +39,4 @@ PropertyConfigs:
     Value: "SYSLOG"
 
   - Name: urm.extensions_lib.count
-    Value: "3"
+    Value: "6"

modula/Components/Include/Logger.h

@@ -87,7 +87,6 @@ enum CommonMessageTypes {
     NOTIFY_PARSING_START,
     NOTIFY_PARSING_SUCCESS,
     NOTIFY_PARSING_FAILURE,
-    NOTIFY_CUSTOM_CONFIG_FILE,
     NOTIFY_PARSER_FILE_NOT_FOUND,
     LOGICAL_TO_PHYSICAL_MAPPING_GEN_FAILURE,
     LOGICAL_TO_PHYSICAL_MAPPING_GEN_SUCCESS,

modula/Components/Logger.cpp

@@ -572,7 +572,7 @@ void Logger::typeLog(CommonMessageTypes type, const std::string& funcName, ...)
 
         case CommonMessageTypes::NOTIFY_PARSING_START:
             vsnprintf(buffer, sizeof(buffer),
-                      "Proceeding with [%s] Config Parsing", args);
+                      "Proceeding with [%s] Config Parsing, Path: [%s]", args);
 
             Logger::log(LOG_INFO, "URM_SERVER_INIT", funcName, buffer);
             break;
@@ -591,13 +591,6 @@ void Logger::typeLog(CommonMessageTypes type, const std::string& funcName, ...)
             Logger::log(LOG_ERR, "URM_SERVER_INIT", funcName, buffer);
             break;
 
-        case CommonMessageTypes::NOTIFY_CUSTOM_CONFIG_FILE:
-            vsnprintf(buffer, sizeof(buffer),
-                      "Custom [%s] Config file provided [path: %s]", args);
-
-            Logger::log(LOG_INFO, "URM_SERVER_INIT", funcName, buffer);
-            break;
-
         case CommonMessageTypes::NOTIFY_PARSER_FILE_NOT_FOUND:
             vsnprintf(buffer, sizeof(buffer),
                       "[%s] Config Parsing Failed, Expected File: [%s] not found.", args);

modula/CoreModules/Include/UrmSettings.h

@@ -49,19 +49,31 @@ class UrmSettings {
     static const std::string mTargetConfDir;
 
     // Support both versions: Common and Custom
-    static const std::string mCommonResourceFilePath;
-    static const std::string mCustomResourceFilePath;
-    static const std::string mCommonSignalFilePath;
-    static const std::string mCustomSignalFilePath;
-    static const std::string mCommonPropertiesFilePath;
-    static const std::string mCustomPropertiesFilePath;
-    static const std::string mCommonInitConfigFilePath;
-    static const std::string mCustomInitConfigFilePath;
-
-    // Only Custom Config is supported for Target and Ext Features Config
-    static const std::string mCustomTargetFilePath;
-    static const std::string mCustomExtFeaturesFilePath;
-    static const std::string mCustomAppConfigFilePath;
+    static const std::string mCommonResourcesPath;
+    static const std::string mCustomResourcesPath;
+    static const std::string mDevIndexedResourcesPath;
+
+    static const std::string mCommonSignalsPath;
+    static const std::string mCustomSignalsPath;
+    static const std::string mDevIndexedSignalsPath;
+
+    static const std::string mCommonPropertiesPath;
+    static const std::string mCustomPropertiesPath;
+    static const std::string mDevIndexedPropertiesPath;
+
+    static const std::string mCommonInitPath;
+    static const std::string mCustomInitPath;
+    static const std::string mDevIndexedInitPath;
+
+    // Only Custom Config is supported for Target, Ext Features and App Configs
+    static const std::string mCustomTargetPath;
+    static const std::string mDevIndexedTargetPath;
+
+    static const std::string mCustomExtFeaturesPath;
+    static const std::string mDevIndexedExtFeatPath;
+
+    static const std::string mCustomAppConfigPath;
+    static const std::string mDevIndexedAppPath;
 
     static const std::string focusedCgroup;
     static const std::string mDeviceNamePath;

modula/CoreModules/UrmSettings.cpp

@@ -9,34 +9,48 @@ TargetConfigs UrmSettings::targetConfigs{};
 
 const std::string UrmSettings::mTargetConfDir = "/etc/urm/target/";
 
-const std::string UrmSettings::mCommonResourceFilePath =
+const std::string UrmSettings::mCommonResourcesPath =
                                     "/etc/urm/common/ResourcesConfig.yaml";
-const std::string UrmSettings::mCustomResourceFilePath =
+const std::string UrmSettings::mCustomResourcesPath =
                                     "/etc/urm/custom/ResourcesConfig.yaml";
+const std::string UrmSettings::mDevIndexedResourcesPath =
+                                    "/etc/urm/target/ResourcesConfig.yaml";
 
-const std::string UrmSettings::mCommonSignalFilePath =
+const std::string UrmSettings::mCommonSignalsPath =
                                     "/etc/urm/common/SignalsConfig.yaml";
-const std::string UrmSettings::mCustomSignalFilePath =
+const std::string UrmSettings::mCustomSignalsPath =
                                     "/etc/urm/custom/SignalsConfig.yaml";
+const std::string UrmSettings::mDevIndexedSignalsPath =
+                                    "/etc/urm/target/SignalsConfig.yaml";
 
-const std::string UrmSettings::mCommonInitConfigFilePath =
+const std::string UrmSettings::mCommonInitPath =
                                     "/etc/urm/common/InitConfig.yaml";
-const std::string UrmSettings::mCustomInitConfigFilePath =
+const std::string UrmSettings::mCustomInitPath =
                                     "/etc/urm/custom/InitConfig.yaml";
+const std::string UrmSettings::mDevIndexedInitPath =
+                                    "/etc/urm/target/InitConfig.yaml";
 
-const std::string UrmSettings::mCommonPropertiesFilePath =
+const std::string UrmSettings::mCommonPropertiesPath =
                                     "/etc/urm/common/PropertiesConfig.yaml";
-const std::string UrmSettings::mCustomPropertiesFilePath =
+const std::string UrmSettings::mCustomPropertiesPath =
                                     "/etc/urm/custom/PropertiesConfig.yaml";
+const std::string UrmSettings::mDevIndexedPropertiesPath =
+                                    "/etc/urm/target/PropertiesConfig.yaml";
 
-const std::string UrmSettings::mCustomTargetFilePath =
+const std::string UrmSettings::mCustomTargetPath =
                                     "/etc/urm/custom/TargetConfig.yaml";
+const std::string UrmSettings::mDevIndexedTargetPath =
+                                    "/etc/urm/target/TargetConfig.yaml";
 
-const std::string UrmSettings::mCustomExtFeaturesFilePath =
+const std::string UrmSettings::mCustomExtFeaturesPath =
                                     "/etc/urm/custom/ExtFeaturesConfig.yaml";
+const std::string UrmSettings::mDevIndexedExtFeatPath =
+                                    "/etc/urm/target/ExtFeaturesConfig.yaml";
 
-const std::string UrmSettings::mCustomAppConfigFilePath =
+const std::string UrmSettings::mCustomAppConfigPath =
                                     "/etc/urm/custom/PerApp.yaml";
+const std::string UrmSettings::mDevIndexedAppPath =
+                                    "/etc/urm/target/PerApp.yaml";
 
 const std::string UrmSettings::mExtensionPluginsLibPath =
                                     "/usr/lib/urm/";