RDKEMW-21384: Revert RDKEMW-13335 code changes - #275
Open
KTirumalaSrihari wants to merge 1 commit into
Open
Conversation
Signed-off-by: skondu363 <Srihariraghava_konduritirumala@comcast.com>
Contributor
There was a problem hiding this comment.
Pull request overview
This PR reverts previously introduced logic related to DeviceType RFC handling and secure debug-service gating, returning the codebase to a simpler debug-services enablement model.
Changes:
- Removed
getDeviceTypeRFCAPI surface (production + mocks) and related unit-test coverage. - Removed
isSecureDbgSrvUnlocked()and simplifiedGetServURL()gating to rely on build type +isDebugServicesEnabled(). - Adjusted unit tests/mocks for the reverted behavior (though there is at least one remaining stale expectation).
Reviewed changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| unittest/mocks/deviceutils_mock.h | Removes getDeviceTypeRFC from the mock interface/API. |
| unittest/mocks/deviceutils_mock.cpp | Removes the extern "C" forwarding wrapper for getDeviceTypeRFC. |
| unittest/mocks/dbus_handlers_gmock.cpp | Removes stub getDeviceTypeRFC implementation from gmock handlers. |
| unittest/fwdl_interface_gtest.cpp | Removes unit tests covering getDeviceTypeRFC. |
| unittest/deviceutils/device_api_gtest.cpp | Removes large test coverage for isSecureDbgSrvUnlocked; adds/adjusts expectations around isDebugServicesEnabled in some GetServURL tests. |
| src/rfcInterface/rfcinterface.c | Removes getDeviceTypeRFC implementation and related include. |
| src/include/rfcinterface.h | Removes RFC_DEVICETYPE define and getDeviceTypeRFC declaration. |
| src/deviceutils/device_api.h | Removes isSecureDbgSrvUnlocked declaration and some GTest-only include logic. |
| src/deviceutils/device_api.c | Removes isSecureDbgSrvUnlocked implementation; updates GetServURL gating logic. |
Comments suppressed due to low confidence (1)
unittest/mocks/deviceutils_mock.h:58
getDeviceTypeRFCwas removed fromDeviceUtilsInterface/DeviceUtilsMock, but at least one unit test still expects it (e.g.,unittest/deviceutils/device_api_gtest.cpphas anEXPECT_CALL(*g_DeviceUtilsMock, getDeviceTypeRFC(_, _))). This will fail to compile unless the remaining test expectations are removed/updated to match the reverted production logic.
virtual int getDevicePropertyData(const char *model, char *data, int size) = 0;
virtual int read_RFCProperty(char* type, const char* key, char *out_value, size_t datasize) = 0;
virtual int write_RFCProperty(char* type, const char* key, const char *value, RFCVALDATATYPE datatype) = 0;
virtual int filePresentCheck(const char *filename) = 0;
virtual int getFileSize(const char *filename) = 0;
virtual bool isInStateRed() = 0;
virtual bool isDebugServicesEnabled() = 0;
virtual bool isDirectCDNEnabled() = 0;
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
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.