Fix for ves-file-ready event not being sent.
Issue-ID: SIM-70
Change-Id: I39c4c4fdb4f571638455373ee1db3365c412c6ed
Signed-off-by: Alex Stancu <alexandru.stancu@highstreet-technologies.com>
DOCKER_REPO=o-ran-sc/
NTS_MANAGER_PORT=8300
DOCKER_REPO=o-ran-sc/
NTS_MANAGER_PORT=8300
IPv6_ENABLED=false
SSH_CONNECTIONS=1
IPv6_ENABLED=false
SSH_CONNECTIONS=1
-docker-compose -f nts-ng-docker-image-build-ubuntu.yaml build --build-arg NTS_BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') --build-arg NTS_BUILD_VERSION=$NTS_BUILD_VERSION
+docker-compose -f nts-ng-docker-image-build-ubuntu.yaml build --build-arg NTS_BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') --build-arg NTS_BUILD_VERSION=$NTS_BUILD_VERSION --build-arg BUILD_WITH_DEBUG=1
- if(cJSON_AddStringToObject(hostPort, "HostIp", "0.0.0.0") == 0) { //or, future, bind to container->host_ip
- log_error("could not create JSON object: HostIpString\n");
- cJSON_Delete(hostPort);
- return NTS_ERR_FAILED;
- }
-
if(cJSON_AddItemToArray(port, hostPort) == 0) {
log_error("cJSON_AddItemToArray failed\n");
cJSON_Delete(hostPort);
if(cJSON_AddItemToArray(port, hostPort) == 0) {
log_error("cJSON_AddItemToArray failed\n");
cJSON_Delete(hostPort);
static int ves_file_ready_invoke_pm_cb(sr_session_ctx_t *session, const char *path, const sr_val_t *input, const size_t input_cnt, sr_event_t event, uint32_t request_id, sr_val_t **output, size_t *output_cnt, void *private_data) {
int ssh_base_port = 0;
int tls_base_port = 0;
static int ves_file_ready_invoke_pm_cb(sr_session_ctx_t *session, const char *path, const sr_val_t *input, const size_t input_cnt, sr_event_t event, uint32_t request_id, sr_val_t **output, size_t *output_cnt, void *private_data) {
int ssh_base_port = 0;
int tls_base_port = 0;
- nts_mount_point_addressing_method_t mp = nts_mount_point_addressing_method_get(session);
+ sr_session_ctx_t *current_session = 0;
+
+ int rc = sr_session_start(session_connection, SR_DS_RUNNING, ¤t_session);
+ if(rc != SR_ERR_OK) {
+ log_error("could not start sysrepo session\n");
+ return NTS_ERR_FAILED;
+ }
+
+ nts_mount_point_addressing_method_t mp = nts_mount_point_addressing_method_get(current_session);
if(mp == UNKNOWN_MAPPING) {
log_error("mount-point-addressing-method failed\n");
if(mp == UNKNOWN_MAPPING) {
log_error("mount-point-addressing-method failed\n");
+ sr_session_stop(current_session);
return NTS_ERR_FAILED;
}
else if(mp == DOCKER_MAPPING) {
return NTS_ERR_FAILED;
}
else if(mp == DOCKER_MAPPING) {
if((framework_environment.settings.ssh_connections + framework_environment.settings.tls_connections) > 1) {
for(int port = ssh_base_port; port < ssh_base_port + framework_environment.settings.ssh_connections; port++) {
if((framework_environment.settings.ssh_connections + framework_environment.settings.tls_connections) > 1) {
for(int port = ssh_base_port; port < ssh_base_port + framework_environment.settings.ssh_connections; port++) {
- int rc = ves_file_ready_send_message(session, input[0].data.string_val, port);
+ int rc = ves_file_ready_send_message(current_session, input[0].data.string_val, port);
if(rc != NTS_ERR_OK) {
log_error("ves_file_ready_send_message failed\n");
failed++;
if(rc != NTS_ERR_OK) {
log_error("ves_file_ready_send_message failed\n");
failed++;
}
for(int port = tls_base_port; port < tls_base_port + framework_environment.settings.tls_connections; port++) {
}
for(int port = tls_base_port; port < tls_base_port + framework_environment.settings.tls_connections; port++) {
- int rc = ves_file_ready_send_message(session, input[0].data.string_val, port);
+ int rc = ves_file_ready_send_message(current_session, input[0].data.string_val, port);
if(rc != NTS_ERR_OK) {
log_error("ves_file_ready_send_message failed\n");
failed++;
if(rc != NTS_ERR_OK) {
log_error("ves_file_ready_send_message failed\n");
failed++;
- int rc = ves_file_ready_send_message(session, input[0].data.string_val, 0);
+ int rc = ves_file_ready_send_message(current_session, input[0].data.string_val, 0);
if(rc != NTS_ERR_OK) {
log_error("ves_file_ready_send_message failed\n");
failed++;
}
}
if(rc != NTS_ERR_OK) {
log_error("ves_file_ready_send_message failed\n");
failed++;
}
}
+ rc = sr_session_stop(current_session);
+ if(rc != SR_ERR_OK) {
+ log_error("could not stop sysrepo session\n");
+ return NTS_ERR_FAILED;
+ }
- int rc = sr_new_values(*output_cnt, output);
+ rc = sr_new_values(*output_cnt, output);
if(SR_ERR_OK != rc) {
return rc;
}
if(SR_ERR_OK != rc) {
return rc;
}
}
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, header);
}
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, header);
- curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 15L); //seconds timeout for a connection
- curl_easy_setopt(curl, CURLOPT_TIMEOUT, 15L); //seconds timeout for an operation
+ curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 30); //seconds timeout for a connection
+ curl_easy_setopt(curl, CURLOPT_TIMEOUT, 30L); //seconds timeout for an operation
curl_easy_setopt(curl, CURLOPT_FRESH_CONNECT, 1L);
curl_easy_setopt(curl, CURLOPT_VERBOSE, 0L);
curl_easy_setopt(curl, CURLOPT_FRESH_CONNECT, 1L);
curl_easy_setopt(curl, CURLOPT_VERBOSE, 0L);
- rc = sr_get_item(session_running, NTS_NF_NETWORK_FUNCTION_MPAM_SCHEMA_XPATH, 0, &value);
+ rc = sr_get_item(current_session, NTS_NF_NETWORK_FUNCTION_MPAM_SCHEMA_XPATH, 0, &value);
if(rc == SR_ERR_OK) {
if(strcmp(value->data.enum_val, "host-mapping") == 0) {
ret = HOST_MAPPING;
if(rc == SR_ERR_OK) {
if(strcmp(value->data.enum_val, "host-mapping") == 0) {
ret = HOST_MAPPING;