X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=sim%2Fo1-interface.git;a=blobdiff_plain;f=ntsimulator%2Fsrc%2Fo-ran-notifications%2Fo-ran-notifications.c;h=ad282d1854e0c71103339a9c9da59665091bed24;hp=ae6e0c69eb10dbdca262889db4400bb9ce88ded9;hb=1f1479ff8ce3a268acb7b70a32bb789d859a915b;hpb=34ec819462d5f81ceeb723e47467bf50a8454f34 diff --git a/ntsimulator/src/o-ran-notifications/o-ran-notifications.c b/ntsimulator/src/o-ran-notifications/o-ran-notifications.c index ae6e0c6..ad282d1 100644 --- a/ntsimulator/src/o-ran-notifications/o-ran-notifications.c +++ b/ntsimulator/src/o-ran-notifications/o-ran-notifications.c @@ -85,7 +85,7 @@ static int send_fault_ves_message(char *alarm_condition, char *alarm_object, cha { int rc = SR_ERR_OK; CURLcode res; - static sequence_id = 0; + static int sequence_id = 0; int netconf_port_base = 0; prepare_ves_message_curl(curl); @@ -129,6 +129,10 @@ static int send_fault_ves_message(char *alarm_condition, char *alarm_object, cha if (faultFields == NULL) { printf("Could not create JSON object: faultFields\n"); + if (postDataJson != NULL) + { + cJSON_Delete(postDataJson); + } return 1; } cJSON_AddItemToObject(event, "faultFields", faultFields); @@ -157,41 +161,6 @@ static int send_fault_ves_message(char *alarm_condition, char *alarm_object, cha return SR_ERR_OK; } -static int send_dummy_notif_file_mgmt(sr_session_ctx_t *sess) -{ - int rc; - - sr_val_t *vnotif; - size_t current_num_of_values= 0; - - CREATE_NEW_VALUE(rc, vnotif, current_num_of_values); - - sr_val_build_xpath(&vnotif[current_num_of_values - 1], "%s", "/o-ran-file-management:file-upload-notification/local-logical-file-path"); - sr_val_set_str_data(&vnotif[current_num_of_values - 1], SR_STRING_T, "odsanzucjsdoj"); - - CREATE_NEW_VALUE(rc, vnotif, current_num_of_values); - - sr_val_build_xpath(&vnotif[current_num_of_values - 1], "%s", "/o-ran-file-management:file-upload-notification/remote-file-path"); - sr_val_set_str_data(&vnotif[current_num_of_values - 1], SR_STRING_T, "jsdknvjnkfd"); - - CREATE_NEW_VALUE(rc, vnotif, current_num_of_values); - - sr_val_build_xpath(&vnotif[current_num_of_values - 1], "%s", "/o-ran-file-management:file-upload-notification/status"); - sr_val_set_str_data(&vnotif[current_num_of_values - 1], SR_ENUM_T, "SUCCESS"); - - rc = sr_event_notif_send(sess, "/o-ran-file-management:file-upload-notification", vnotif, current_num_of_values, SR_EV_NOTIF_DEFAULT); - if (rc != SR_ERR_OK) { - printf("Failed to send notification send_dummy_notif_file_mgmt\n"); - return SR_ERR_OPERATION_FAILED; - } - - printf("Successfully sent notification...\n"); - - sr_free_values(vnotif, current_num_of_values); - - return SR_ERR_OK; -} - static int send_dummy_notif(sr_session_ctx_t *sess) { int rc; @@ -358,7 +327,6 @@ main(int argc, char **argv) if (notification_delay_period > 0) { send_dummy_notif(session); -// send_dummy_notif_file_mgmt(session); sleep(notification_delay_period); }