Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WEBPA SET parameter request with empty string value #67

Merged
merged 2 commits into from
Jul 12, 2024
Merged

WEBPA SET parameter request with empty string value #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
794ee23
WEBPA SET parameter request with empty string value
Jul 9, 2024
e351a51
Merge branch 'master' into allow_empty_set
schmidtw Jul 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions src/wdmp_internal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,20 +141,16 @@ void parse_set_request(cJSON *request, req_struct **reqObj, PAYLOAD_TYPE type)
WdmpPrint("(*reqObj)->u.setReq->param[%zu].name : %s\n",i,(*reqObj)->u.setReq->param[i].name);

if (cJSON_GetObjectItem(reqParamObj, "value") != NULL )
{
if(cJSON_GetObjectItem(reqParamObj, "value")->valuestring != NULL && strlen(cJSON_GetObjectItem(reqParamObj, "value")->valuestring) == 0)
{
WdmpError("Parameter value is null\n");
}
else if(cJSON_GetObjectItem(reqParamObj, "value")->valuestring == NULL)
{
WdmpError("Parameter value field is not a string\n");
}
else
{
(*reqObj)->u.setReq->param[i].value = strdup(cJSON_GetObjectItem(reqParamObj, "value")->valuestring);
WdmpPrint("(*reqObj)->u.setReq->param[%zu].value : %s\n",i,(*reqObj)->u.setReq->param[i].value);
}
{
if(cJSON_GetObjectItem(reqParamObj, "value")->valuestring != NULL)
{
(*reqObj)->u.setReq->param[i].value = strdup(cJSON_GetObjectItem(reqParamObj, "value")->valuestring);
WdmpPrint("(*reqObj)->u.setReq->param[%zu].value : %s\n",i,(*reqObj)->u.setReq->param[i].value);
}
else if(cJSON_GetObjectItem(reqParamObj, "value")->valuestring == NULL)
{
WdmpError("Parameter value field is not a string\n");
}
}
else
{
Expand Down
45 changes: 44 additions & 1 deletion tests/simple.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,48 @@ void set_req_parse ()

}

void set_req_parse_with_empty_value()
{
WdmpInfo("\n***************************************************** \n\n");

int i,paramCount;
req_struct *reqObj = NULL;

char * request= "{\"parameters\":[{\"name\":\"Device.DHCPv6.Server.Pool.1.Option.2.Value\",\"value\":\"\",\"dataType\":0},{\"name\":\"Device.X_RDK_WanManager.CPEInterface.2.Selection.TimeOut\",\"value\":\"\",\"dataType\":1},{\"name\":\"Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.Telemetry.DcmRetryConfig.AttemptInterval\",\"value\":\"\",\"dataType\":2},{\"name\":\"Device.DHCPv4.Server.Pool.1.DNSServersEnabled\",\"value\":\"\",\"dataType\":3}],\"command\":\"SET\"}";
wdmp_parse_request(request,&reqObj);

CU_ASSERT( NULL != reqObj);
CU_ASSERT_EQUAL( SET, reqObj->reqType );

WdmpInfo("Request Type : %d\n",reqObj->reqType);
WdmpInfo("Param Count : %zu\n",reqObj->u.setReq->paramCnt);
paramCount = (int)reqObj->u.setReq->paramCnt;
for (i = 0; i < paramCount; i++)
{
WdmpPrint("param[%d].name : %s\n",i,reqObj->u.setReq->param[i].name);
WdmpPrint("param[%d].value : %s\n",i,reqObj->u.setReq->param[i].value);
WdmpPrint("param[%d].type : %d\n",i,reqObj->u.setReq->param[i].type);
}

CU_ASSERT_EQUAL( 4, paramCount );
CU_ASSERT_STRING_EQUAL( "Device.DHCPv6.Server.Pool.1.Option.2.Value", reqObj->u.setReq->param[0].name );
CU_ASSERT_STRING_EQUAL( "Device.X_RDK_WanManager.CPEInterface.2.Selection.TimeOut", reqObj->u.setReq->param[1].name );
CU_ASSERT_STRING_EQUAL( "Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.Telemetry.DcmRetryConfig.AttemptInterval", reqObj->u.setReq->param[2].name );
CU_ASSERT_STRING_EQUAL( "Device.DHCPv4.Server.Pool.1.DNSServersEnabled", reqObj->u.setReq->param[3].name );
CU_ASSERT_STRING_EQUAL( "", reqObj->u.setReq->param[0].value );
CU_ASSERT_STRING_EQUAL( "", reqObj->u.setReq->param[1].value );
CU_ASSERT_STRING_EQUAL( "", reqObj->u.setReq->param[2].value );
CU_ASSERT_STRING_EQUAL( "", reqObj->u.setReq->param[3].value );
CU_ASSERT_EQUAL( WDMP_STRING, reqObj->u.setReq->param[0].type );
CU_ASSERT_EQUAL( WDMP_INT, reqObj->u.setReq->param[1].type );
CU_ASSERT_EQUAL( WDMP_UINT, reqObj->u.setReq->param[2].type );
CU_ASSERT_EQUAL( WDMP_BOOLEAN, reqObj->u.setReq->param[3].type );

if (NULL != reqObj) {
wdmp_free_req_struct(reqObj );
}
}

void set_req_parse_with_attributes ()
{

Expand Down Expand Up @@ -777,7 +819,7 @@ void set_req_null_param_value ()
CU_ASSERT_EQUAL( 2, paramCount );
CU_ASSERT_STRING_EQUAL( "Device.DeviceInfo.HardwareVersion", reqObj->u.setReq->param[0].name );
CU_ASSERT_STRING_EQUAL( "Device.WiFi.SSID.Enable", reqObj->u.setReq->param[1].name );
CU_ASSERT( NULL == reqObj->u.setReq->param[0].value );
CU_ASSERT_STRING_EQUAL( "", reqObj->u.setReq->param[0].value );
CU_ASSERT_STRING_EQUAL( "true" , reqObj->u.setReq->param[1].value );
CU_ASSERT_EQUAL( WDMP_STRING, reqObj->u.setReq->param[0].type );
CU_ASSERT_EQUAL( WDMP_BOOLEAN, reqObj->u.setReq->param[1].type );
Expand Down Expand Up @@ -2469,6 +2511,7 @@ void add_request_parse_suites( CU_pSuite *suite )
CU_add_test( *suite, "Test Get attr Request Parse", get_attr_req_parse );
CU_add_test( *suite, "Test parse_set_request", test_parse_set_request );
CU_add_test( *suite, "Test Set Request Parse", set_req_parse );
CU_add_test( *suite, "Test Set Request Parse with empty value for all data types", set_req_parse_with_empty_value );
CU_add_test( *suite, "Test Set Request Parse with both value and attributes field", set_req_parse_with_attributes );
CU_add_test( *suite, "Test Set attr Request Parse", set_attr_req_parse );
CU_add_test( *suite, "Test Test and set Request Parse", test_and_set_req_parse );
Expand Down
Loading