Update rrdUnitTestRunner.cpp

run_l2.sh

@@ -82,3 +82,6 @@ pytest --json-report --json-report-summary --json-report-file $RESULT_DIR/rrd_ba
 pytest --json-report --json-report-summary --json-report-file $RESULT_DIR/rrd_debug_report_upload.json test/functional-tests/tests/test_rrd_debug_report_upload.py
 pytest --json-report --json-report-summary --json-report-file $RESULT_DIR/rrd_deepsleep_static.json test/functional-tests/tests/test_rrd_deepsleep_static_report.py
 pytest --json-report --json-report-summary --json-report-file $RESULT_DIR/rrd_c_api_upload.json test/functional-tests/tests/test_rrd_c_api_upload.py
+
+cp remote_debugger.json /etc/rrd/
+pytest --json-report --json-report-summary --json-report-file $RESULT_DIR/test.json test/functional-tests/tests/test.py

src/rrdInterface.c

@@ -33,6 +33,73 @@ key_t key = 1234;
 uint32_t gWebCfgBloBVersion = 0;
 rbusHandle_t    rrdRbusHandle;
 
+// Global storage for profile category
+char RRDProfileCategory[256] = "all";
+#define MAX_PROFILE_JSON_SIZE 32768
+
+// Helper functions for profile category file-based storage
+int load_profile_category(void) {
+    FILE *fp = fopen(RRD_PROFILE_CATEGORY_FILE, "r");
+    if (fp) {
+        if (fgets(RRDProfileCategory, sizeof(RRDProfileCategory), fp)) {
+            // Remove trailing newline
+            char *newline = strchr(RRDProfileCategory, '\n');
+            if (newline) *newline = '\0';
+            fclose(fp);
+            return 0;
+        }
+        fclose(fp);
+    }
+    // Default to "all" if file doesn't exist or read fails
+    strncpy(RRDProfileCategory, "all", sizeof(RRDProfileCategory) - 1);
+    RRDProfileCategory[sizeof(RRDProfileCategory) - 1] = '\0';
+    return -1;
+}
+
+int save_profile_category(void) {
+    FILE *fp = fopen(RRD_PROFILE_CATEGORY_FILE, "w");
+    if (fp) {
+        fprintf(fp, "%s\n", RRDProfileCategory);
+        fclose(fp);
+        return 0;
+    }
+    return -1;
+}
+
+#define DATA_HANDLER_SET_MACRO \
+    { \
+        NULL, \
+        rrd_SetHandler, \
+        NULL, \
+        NULL, \
+        NULL, \
+        NULL \
+    }
+
+#define DATA_HANDLER_GET_MACRO \
+    { \
+        rrd_GetHandler, \
+        NULL, \
+        NULL, \
+        NULL, \
+        NULL, \
+        NULL \
+    }
+
+// Data elements for profile data RBUS provider
+rbusDataElement_t profileDataElements[2] = {
+    {
+        RRD_SET_PROFILE_EVENT,
+        RBUS_ELEMENT_TYPE_PROPERTY,
+        DATA_HANDLER_SET_MACRO
+    },
+    {
+        RRD_GET_PROFILE_EVENT,
+        RBUS_ELEMENT_TYPE_PROPERTY, 
+        DATA_HANDLER_GET_MACRO
+    }
+};
+
 /*Function: RRD_subscribe
  *Details: This helps to perform Bus init/connect and event handler registration for receiving
  *events from the TR181 parameter.
@@ -103,6 +170,21 @@ int RRD_subscribe()
         RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: SUCCESS: RBUS Event Subscribe for RRD done! \n", __FUNCTION__, __LINE__);
     }
 
+    // Load profile category from file
+    if (load_profile_category() == 0) {
+        RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Loaded profile category: %s\n", __FUNCTION__, __LINE__, RRDProfileCategory);
+    } else {
+        RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: No stored profile category, defaulting to 'all'\n", __FUNCTION__, __LINE__);
+    }
+
+    // Register RBUS data elements for profile data provider
+    ret = rbus_regDataElements(rrdRbusHandle, 2, profileDataElements);
+    if (ret != RBUS_ERROR_SUCCESS) {
+        RDK_LOG(RDK_LOG_ERROR, LOG_REMDEBUG, "[%s:%d]: RBUS regDataElements failed with error: %d\n", __FUNCTION__, __LINE__, ret);
+    } else {
+        RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: SUCCESS: RBUS profile data elements registered\n", __FUNCTION__, __LINE__);
+    }
+
     webconfigFrameworkInit();
     RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: ...Exiting.. \n", __FUNCTION__, __LINE__);
     return ret;
@@ -428,6 +510,14 @@ int RRD_unsubscribe()
         return ret;
     }
 
+    // Unregister RBUS data elements for profile data provider
+    ret = rbus_unregDataElements(rrdRbusHandle, 2, profileDataElements);
+    if (ret != 0) {
+        RDK_LOG(RDK_LOG_ERROR, LOG_REMDEBUG, "[%s:%d]: RBUS unregDataElements failed with error: %d\n", __FUNCTION__, __LINE__, ret);
+    } else {
+        RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: SUCCESS: RBUS profile data elements unregistered\n", __FUNCTION__, __LINE__);
+    }
+
     ret = rbus_close(rrdRbusHandle);
     if (ret != 0)
     {
@@ -443,3 +533,241 @@ int RRD_unsubscribe()
 #endif
     return ret;
 }
+/**
+ * @brief Set handler for RDK Remote Debugger profile category selection
+ */
+rbusError_t rrd_SetHandler(rbusHandle_t handle, rbusProperty_t prop, rbusSetHandlerOptions_t* opts)
+{
+    (void)handle;
+    (void)opts;
+
+    char const* propertyName = rbusProperty_GetName(prop);
+    rbusValue_t value = rbusProperty_GetValue(prop);
+    rbusValueType_t type = rbusValue_GetType(value);
+
+    RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Set handler called for [%s]\n", __FUNCTION__, __LINE__, propertyName);
+
+    if(strcmp(propertyName, RRD_SET_PROFILE_EVENT) == 0) {
+        if (type == RBUS_STRING) {
+            const char* str = rbusValue_GetString(value, NULL);
+            if(strlen(str) > 255) {
+                RDK_LOG(RDK_LOG_ERROR, LOG_REMDEBUG, "[%s:%d]: String too long for setProfileData\n", __FUNCTION__, __LINE__);
+                return RBUS_ERROR_INVALID_INPUT;
+            }
+
+            strncpy(RRDProfileCategory, str, sizeof(RRDProfileCategory)-1);
+            RRDProfileCategory[sizeof(RRDProfileCategory)-1] = '\0';
+            RDK_LOG(RDK_LOG_INFO, LOG_REMDEBUG, "[%s:%d]: setProfileData value: %s\n", __FUNCTION__, __LINE__, RRDProfileCategory);
+
+            // Store the category selection to file
+            if(save_profile_category() != 0) {
+                RDK_LOG(RDK_LOG_ERROR, LOG_REMDEBUG, "[%s:%d]: Failed to store profile category\n", __FUNCTION__, __LINE__);
+                return RBUS_ERROR_BUS_ERROR;
+            }
+
+            RDK_LOG(RDK_LOG_INFO, LOG_REMDEBUG, "[%s:%d]: Successfully set profile category to: %s\n", __FUNCTION__, __LINE__, RRDProfileCategory);
+            return RBUS_ERROR_SUCCESS;
+        } else {
+            RDK_LOG(RDK_LOG_ERROR, LOG_REMDEBUG, "[%s:%d]: Invalid type for setProfileData\n", __FUNCTION__, __LINE__);
+            return RBUS_ERROR_INVALID_INPUT;
+        }
+    }
+
+    return RBUS_ERROR_INVALID_INPUT;
+}
+
+/**
+ * @brief Check if a category has direct commands (not nested structure)
+ */
+bool has_direct_commands(cJSON *category)
+{
+    cJSON *item = NULL;
+    cJSON_ArrayForEach(item, category) {
+        if (cJSON_IsObject(item)) {
+            cJSON *commands = cJSON_GetObjectItem(item, "Commands");
+            if (commands && cJSON_IsString(commands)) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+/**
+ * @brief Read and validate JSON profile file
+ */
+char* read_profile_json_file(const char* filename, long* file_size)
+{
+    FILE *fp = fopen(filename, "rb");
+    if (!fp) {
+        RDK_LOG(RDK_LOG_ERROR, LOG_REMDEBUG, "[%s:%d]: Unable to read profile file from %s\n", __FUNCTION__, __LINE__, filename);
+        return NULL;
+    }
+
+    fseek(fp, 0L, SEEK_END);
+    long fileSz = ftell(fp);
+    rewind(fp);
+
+    if (fileSz <= 0 || fileSz >= MAX_PROFILE_JSON_SIZE) {
+        RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Invalid file size: %ld\n", __FUNCTION__, __LINE__, fileSz);
+        fclose(fp);
+        return NULL;
+    }
+
+    char *jsonBuffer = malloc(fileSz + 1);
+    if (!jsonBuffer) {
+        RDK_LOG(RDK_LOG_ERROR, LOG_REMDEBUG, "[%s:%d]: Memory allocation failed for JSON buffer\n", __FUNCTION__, __LINE__);
+        fclose(fp);
+        return NULL;
+    }
+
+    size_t bytesRead = fread(jsonBuffer, 1U, (size_t)fileSz, fp);
+    jsonBuffer[bytesRead] = '\0';
+    fclose(fp);
+
+    *file_size = fileSz;
+    return jsonBuffer;
+}
+
+/**
+ * @brief Generate JSON for all categories
+ */
+char* get_all_categories_json(cJSON* json)
+{
+    cJSON *response = cJSON_CreateObject();
+
+    cJSON *category = NULL;
+    cJSON_ArrayForEach(category, json) {
+        if (cJSON_IsObject(category) && category->string) {
+            if (has_direct_commands(category)) {
+                // Create array for this category's issue types
+                cJSON *issueTypesArray = cJSON_CreateArray();
+                cJSON *issueType = NULL;
+                cJSON_ArrayForEach(issueType, category) {
+                    if (cJSON_IsObject(issueType) && issueType->string) {
+                        cJSON_AddItemToArray(issueTypesArray, cJSON_CreateString(issueType->string));
+                    }
+                }
+
+                // Add this category and its issue types to response
+                if (cJSON_GetArraySize(issueTypesArray) > 0) {
+                    cJSON_AddItemToObject(response, category->string, issueTypesArray);
+                } else {
+                    cJSON_Delete(issueTypesArray);
+                }
+            }
+        }
+    }
+
+    char *result_str = cJSON_Print(response);
+    cJSON_Delete(response);
+    return result_str;
+}
+
+/**
+ * @brief Generate JSON for specific category
+ */
+char* get_specific_category_json(cJSON* json, const char* category_name)
+{
+    cJSON *category = cJSON_GetObjectItem(json, category_name);
+    if (!category || !cJSON_IsObject(category)) {
+        RDK_LOG(RDK_LOG_ERROR, LOG_REMDEBUG, "[%s:%d]: Category %s not found \n", __FUNCTION__, __LINE__, category_name);
+        return get_all_categories_json(json);
+    }
+
+    if (!has_direct_commands(category)) {
+        RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Category %s has nested structure, returning empty\n", 
+            __FUNCTION__, __LINE__, category_name);
+        return cJSON_Print(cJSON_CreateArray());
+    }
+
+    cJSON *issueTypes = cJSON_CreateArray();
+    cJSON *issueType = NULL;
+    cJSON_ArrayForEach(issueType, category) {
+        if (cJSON_IsObject(issueType) && issueType->string) {
+            cJSON_AddItemToArray(issueTypes, cJSON_CreateString(issueType->string));
+        }
+    }
+
+    char *result_str = cJSON_Print(issueTypes);
+    cJSON_Delete(issueTypes);
+    return result_str;
+}
+
+/**
+ * @brief Set RBUS property response with JSON string
+ */
+rbusError_t set_rbus_response(rbusProperty_t prop, const char* json_str)
+{
+    if (!json_str) {
+        return RBUS_ERROR_BUS_ERROR;
+    }
+
+    rbusValue_t rbusValue;
+    rbusValue_Init(&rbusValue);
+    rbusValue_SetString(rbusValue, json_str);
+    rbusProperty_SetValue(prop, rbusValue);
+    rbusValue_Release(rbusValue);
+
+    RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Successfully returned profile data\n", __FUNCTION__, __LINE__);
+    return RBUS_ERROR_SUCCESS;
+}
+
+/**
+ * @brief Get handler for RDK Remote Debugger profile data retrieval
+ */
+rbusError_t rrd_GetHandler(rbusHandle_t handle, rbusProperty_t prop, rbusGetHandlerOptions_t* opts)
+{
+    (void)handle;
+    (void)opts;
+
+    char const* propertyName = rbusProperty_GetName(prop);
+    RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Get handler called for [%s]\n", __FUNCTION__, __LINE__, propertyName);
+
+    if(strcmp(propertyName, RRD_GET_PROFILE_EVENT) != 0) {
+        return RBUS_ERROR_INVALID_INPUT;
+    }
+
+    const char *filename = "/etc/rrd/remote_debugger.json";
+    long file_size;
+
+    // Read JSON file
+    char *jsonBuffer = read_profile_json_file(filename, &file_size);
+    if (!jsonBuffer) {
+        return RBUS_ERROR_BUS_ERROR;
+    }
+
+    // Parse JSON
+    cJSON *json = cJSON_Parse(jsonBuffer);
+    if (!json) {
+        RDK_LOG(RDK_LOG_ERROR, LOG_REMDEBUG, "[%s:%d]: Failed to parse JSON from %s\n", __FUNCTION__, __LINE__, filename);
+        free(jsonBuffer);
+        return RBUS_ERROR_BUS_ERROR;
+    }
+
+    RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: JSON parsed successfully, processing categories\n", __FUNCTION__, __LINE__);
+
+    // Generate appropriate JSON response
+    char *result_str = NULL;
+    if (strlen(RRDProfileCategory) == 0 || strcmp(RRDProfileCategory, "all") == 0) {
+        result_str = get_all_categories_json(json);
+    } else {
+        result_str = get_specific_category_json(json, RRDProfileCategory);
+    }
+
+    // Set RBUS response
+    rbusError_t error = set_rbus_response(prop, result_str);
+
+    // Log success if getHandler completed successfully
+    if (error == RBUS_ERROR_SUCCESS) {
+        RDK_LOG(RDK_LOG_INFO, LOG_REMDEBUG, "[%s:%d]: getHandler completed successfully for property [%s] with category [%s]\n", 
+                __FUNCTION__, __LINE__, propertyName, RRDProfileCategory);
+    }
+
+    // Cleanup
+    cJSON_Delete(json);
+    free(jsonBuffer);
+    free(result_str);
+
+    return error;
+}