X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=sim%2Fo1-interface.git;a=blobdiff_plain;f=ntsimulator%2Fntsim-ng%2Futils%2Fnts_utils.c;h=92fac837a3a52052b3dccc28755127175c988b91;hp=49c334610531023f9b362e01a23e586067385d3f;hb=f379349d310d61b27d2c0bf7334d2268cc8f42e2;hpb=f5b69d55ddd03b4e504efdd33e2047901d3be807 diff --git a/ntsimulator/ntsim-ng/utils/nts_utils.c b/ntsimulator/ntsim-ng/utils/nts_utils.c index 49c3346..92fac83 100644 --- a/ntsimulator/ntsim-ng/utils/nts_utils.c +++ b/ntsimulator/ntsim-ng/utils/nts_utils.c @@ -390,6 +390,7 @@ controller_details_t *controller_details_get(sr_session_ctx_t *current_session) ret->protocol = 0; ret->ip = 0; ret->port = 0; + ret->nc_callhome_ip = 0; ret->nc_callhome_port = 0; ret->auth_method = 0; ret->username = 0; @@ -410,6 +411,9 @@ controller_details_t *controller_details_get(sr_session_ctx_t *current_session) else if(strcmp(chd->schema->name, "controller-port") == 0) { ret->port = ((const struct lyd_node_leaf_list *)chd)->value.uint16; } + else if(strcmp(chd->schema->name, "controller-netconf-call-home-ip") == 0) { + ret->nc_callhome_ip = strdup(val); + } else if(strcmp(chd->schema->name, "controller-netconf-call-home-port") == 0) { ret->nc_callhome_port = ((const struct lyd_node_leaf_list *)chd)->value.uint16; } @@ -437,9 +441,10 @@ controller_details_t *controller_details_get(sr_session_ctx_t *current_session) } } - if((ret->protocol == 0) || (ret->ip == 0) || (ret->auth_method == 0) || (ret->username == 0) || (ret->password == 0) || (ret->base_url == 0)) { + if((ret->protocol == 0) || (ret->ip == 0) || (ret->nc_callhome_ip == 0) || (ret->auth_method == 0) || (ret->username == 0) || (ret->password == 0) || (ret->base_url == 0)) { free(ret->protocol); free(ret->ip); + free(ret->nc_callhome_ip); free(ret->auth_method); free(ret->username); free(ret->password); @@ -456,6 +461,7 @@ void controller_details_free(controller_details_t *instance) { free(instance->protocol); free(instance->ip); + free(instance->nc_callhome_ip); free(instance->base_url); free(instance->auth_method); free(instance->username); @@ -591,6 +597,19 @@ int nts_utils_populate_info(sr_session_ctx_t *current_session, const char *funct return NTS_ERR_FAILED; } + if(strlen(framework_environment.sdn_controller.callhome_ip)) { + if(manager) { + rc = sr_set_item_str(current_session, NTS_MANAGER_SDN_CONTROLLER_CONFIG_XPATH"/controller-netconf-call-home-ip", (const char*)framework_environment.sdn_controller.callhome_ip, 0, 0); + } + else { + rc = sr_set_item_str(current_session, NTS_NF_SDN_CONTROLLER_CONFIG_XPATH"/controller-netconf-call-home-ip", (const char*)framework_environment.sdn_controller.callhome_ip, 0, 0); + } + if(rc != SR_ERR_OK) { + log_error("sr_set_item_str failed\n"); + return NTS_ERR_FAILED; + } + } + sprintf(int_to_str, "%d", framework_environment.sdn_controller.callhome_port); if(manager) { rc = sr_set_item_str(current_session, NTS_MANAGER_SDN_CONTROLLER_CONFIG_XPATH"/controller-netconf-call-home-port", (const char*)int_to_str, 0, 0);