Rebase with Develop branch - #298
Merged
Merged
Conversation
* Adding the logic * Update data-model-generic.xml * Update hostIf_main.cpp * Update waldb.cpp * Update hostIf_rbus_Dml_Provider.cpp * Final * Update hostIf_rbus_Dml_Provider.cpp * Update hostIf_main.cpp * Optimize memory management in hostIf_rbus_Dml_Provider Removed redundant memory freeing for parameter names before freeing dataElements. * Update request_handler.h * Update request_handler.h * Update hostIf_rbus_Dml_Provider.cpp * Revert MAX_PARAMETER_LENGTH to 512 Reverted MAX_PARAMETER_LENGTH from 2048 to 512. * Revert MAX_PARAMETER_LENGTH to 512 Reverted MAX_PARAMETER_LENGTH from 2048 to 512. * Update webpa_adapter.h * Update webpa_adapter.h * Implement RDKV and RDKE specific XML merging logic RDK-59579- Reason for change:Refactor XML data model merging logic into separate functions - Extract RDKV-specific merging logic into mergeDataModelRDKV() - Extract RDKE-specific merging logic into mergeDataModelRDKE() * RDK-59202-[RDK-V/E] Data Model Federation For tr69hostif RDK-59202-[RDK-V/E] Data Model Federation For tr69hostif - Extract RDKV-specific merging logic into mergeDataModelRDKV() - Extract RDKE-specific merging logic into mergeDataModelRDKE() - Use conditional compilation flags to call appropriate function - Simplify mergeDataModel() to dispatch to variant-specific handlers - Maintain backward compatibility for both RDKV and RDKE builds RDKV: Two-step merge Build time:Device specific and rdkv specific combination Run time :Build time base+generic+profile-specific during run time RDKE: Single-step merge (generic + profile-specific) * RDK-59579-Implement RDKV and RDKE specific XML merging logic RDK-59579-Implement RDKV and RDKE specific XML merging logic Reason for change:Refactor XML data model merging logic into separate functions - Extract RDKV-specific merging logic into mergeDataModelRDKV() - Extract RDKE-specific merging logic into mergeDataModelRDKE() * RDK-59202-[RDK-V/E] Data Model Federation For tr69hostif RDK-59202-[RDK-V/E] Data Model Federation For tr69hostif - Extract RDKV-specific merging logic into mergeDataModelRDKV() - Extract RDKE-specific merging logic into mergeDataModelRDKE() - Use conditional compilation flags to call appropriate function - Simplify mergeDataModel() to dispatch to variant-specific handlers - Maintain backward compatibility for both RDKV and RDKE builds RDKV: Two-step merge Build time:Device specific and rdkv specific combination Run time :Build time base+generic+profile-specific during run time RDKE: Single-step merge (generic + profile-specific)
yuvaramachandran-gurusamy
merged commit Oct 26, 2025
7076e93
into
topic/RDKEMW-6128
7 of 9 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.