1 files changed, 4 insertions, 23 deletions
diff --git a/sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/adapters/XnfApiServer.kt b/sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/adapters/XnfApiServer.kt
index a0785620..654f16a6 100644
--- a/sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/adapters/XnfApiServer.kt
+++ b/sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/impl/adapters/XnfApiServer.kt
@@ -23,10 +23,6 @@ import arrow.core.Either
 import arrow.effects.IO
 import org.onap.dcae.collectors.veshv.simulators.xnf.impl.OngoingSimulations
 import org.onap.dcae.collectors.veshv.simulators.xnf.impl.XnfSimulator
-import org.onap.dcae.collectors.veshv.simulators.xnf.impl.XnfStatus.BUSY
-import org.onap.dcae.collectors.veshv.simulators.xnf.impl.XnfStatus.DETAILED_STATUS_NODE
-import org.onap.dcae.collectors.veshv.simulators.xnf.impl.XnfStatus.IDLE
-import org.onap.dcae.collectors.veshv.utils.http.HttpConstants
 import org.onap.dcae.collectors.veshv.utils.http.Response
 import org.onap.dcae.collectors.veshv.utils.http.Responses
 import org.onap.dcae.collectors.veshv.utils.http.sendAndHandleErrors
@@ -38,8 +34,8 @@ import ratpack.handling.Context
 import ratpack.http.TypedData
 import ratpack.server.RatpackServer
 import ratpack.server.ServerConfig
+import java.net.InetSocketAddress
 import java.util.*
-import javax.json.Json
 
 /**
  * @author Jakub Dudycz <jakub.dudycz@nokia.com>
@@ -49,9 +45,10 @@ internal class XnfApiServer(
         private val xnfSimulator: XnfSimulator,
         private val ongoingSimulations: OngoingSimulations) {
 
-    fun start(port: Int): IO<RatpackServer> = IO {
+    fun start(socketAddress: InetSocketAddress): IO<RatpackServer> = IO {
         RatpackServer.start { server ->
-            server.serverConfig(ServerConfig.embedded().port(port))
+            server.serverConfig(ServerConfig.embedded()
+                    .port(socketAddress.port))
                     .handlers(this::configureHandlers)
         }
     }
@@ -61,7 +58,6 @@ internal class XnfApiServer(
                 .post("simulator", ::startSimulationHandler)
                 .post("simulator/async", ::startSimulationHandler)
                 .get("simulator/:id", ::simulatorStatusHandler)
-                .get("healthcheck", ::healthcheckHandler)
     }
 
     private fun startSimulationHandler(ctx: Context) {
@@ -93,21 +89,6 @@ internal class XnfApiServer(
         ctx.response.sendAndHandleErrors(IO.just(response))
     }
 
-    private fun healthcheckHandler(ctx: Context) {
-        val healthCheckDetailedMessage = createHealthCheckDetailedMessage()
-        val simulatorStatus = HttpConstants.STATUS_OK
-        logger.info { "Returning simulator status: ${simulatorStatus} ${healthCheckDetailedMessage}" }
-        ctx.response.status(simulatorStatus).send(healthCheckDetailedMessage)
-    }
-
-    private fun createHealthCheckDetailedMessage() =
-            Json.createObjectBuilder()
-                    .add(DETAILED_STATUS_NODE, when {
-                        ongoingSimulations.isAnySimulationPending() -> BUSY
-                        else -> IDLE
-                    })
-                    .build().toString()
-
     companion object {
         private val logger = Logger(XnfApiServer::class)
     }