X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ntsimulator%2Fntsim-ng%2Fcore%2Fapp%2Fmanager_actions.c;h=988e0dbe899cf2c46fe7b8782adf8559fc0e7311;hb=refs%2Fchanges%2F95%2F5895%2F1;hp=a681e0bb03710493b5e3f60134730845017947da;hpb=1af4aebf2f891ff8e1b0396b01803d1788886a99;p=sim%2Fo1-interface.git diff --git a/ntsimulator/ntsim-ng/core/app/manager_actions.c b/ntsimulator/ntsim-ng/core/app/manager_actions.c index a681e0b..988e0db 100644 --- a/ntsimulator/ntsim-ng/core/app/manager_actions.c +++ b/ntsimulator/ntsim-ng/core/app/manager_actions.c @@ -452,7 +452,7 @@ int manager_actions_mount(manager_context_t *ctx) { protocol = "SSH"; protocol_data = "\ \"network-topology:netconf-node-topology:username\": \"netconf\",\ - \"network-topology:netconf-node-topology:password\": \"netconf\""; + \"network-topology:netconf-node-topology:password\": \"netconf!\""; if(instance->mount_point_addressing_method[0] == 'd') { port = instance->container.docker_netconf_ssh_port + i; @@ -496,7 +496,12 @@ int manager_actions_mount(manager_context_t *ctx) { char node_id[128]; char json[4096]; - sprintf(node_id, "%s-%d", instance->container.name, port); + if(framework_environment.settings.ssh_connections + framework_environment.settings.tls_connections > 1) { + sprintf(node_id, "%s-%d", instance->container.name, port); + } + else { + sprintf(node_id, "%s", instance->container.name); + } sprintf(json, json_template, node_id, ip, port, protocol, protocol_data); char url[512]; @@ -560,7 +565,12 @@ int manager_actions_unmount(manager_context_t *ctx) { } } char node_id[128]; - sprintf(node_id, "%s-%d", instance->container.name, port); + if(framework_environment.settings.ssh_connections + framework_environment.settings.tls_connections > 1) { + sprintf(node_id, "%s-%d", instance->container.name, port); + } + else { + sprintf(node_id, "%s", instance->container.name); + } char url[512]; sprintf(url, "%s/rests/data/network-topology:network-topology/topology=topology-netconf/node=%s", controller->base_url, node_id);