From 189c70a48c24274fb7dd6cb910397a9a93233401 Mon Sep 17 00:00:00 2001 From: Izabela Zawadzka Date: Fri, 15 Mar 2019 09:43:56 +0100 Subject: Use Netty HttpServer in XnfApiServer Change-Id: I86e06bd540c961098ee11af99735a5b35ce760fd Issue-ID: DCAEGEN2-1325 Signed-off-by: Izabela Zawadzka --- .../simulators/xnf/impl/adapters/XnfApiServer.kt | 72 ++++++++++++---------- .../dcae/collectors/veshv/simulators/xnf/main.kt | 21 ++++--- 2 files changed, 51 insertions(+), 42 deletions(-) (limited to 'sources/hv-collector-xnf-simulator/src') 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 654f16a6..7df7283b 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 @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * dcaegen2-collectors-veshv * ================================================================================ - * Copyright (C) 2018 NOKIA + * Copyright (C) 2018-2019 NOKIA * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,17 +23,20 @@ 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.utils.NettyServerHandle +import org.onap.dcae.collectors.veshv.utils.ServerHandle 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 import org.onap.dcae.collectors.veshv.utils.http.sendEitherErrorOrResponse import org.onap.dcae.collectors.veshv.utils.logging.Logger import org.onap.dcae.collectors.veshv.ves.message.generator.api.ParsingError -import ratpack.handling.Chain -import ratpack.handling.Context -import ratpack.http.TypedData -import ratpack.server.RatpackServer -import ratpack.server.ServerConfig +import reactor.core.publisher.Mono +import reactor.netty.http.server.HttpServer +import reactor.netty.http.server.HttpServerRequest +import reactor.netty.http.server.HttpServerResponse +import reactor.netty.http.server.HttpServerRoutes +import java.io.InputStream import java.net.InetSocketAddress import java.util.* @@ -45,48 +48,49 @@ internal class XnfApiServer( private val xnfSimulator: XnfSimulator, private val ongoingSimulations: OngoingSimulations) { - fun start(socketAddress: InetSocketAddress): IO = IO { - RatpackServer.start { server -> - server.serverConfig(ServerConfig.embedded() - .port(socketAddress.port)) - .handlers(this::configureHandlers) - } + fun start(socketAddress: InetSocketAddress): IO = IO { + HttpServer.create() + .host(socketAddress.hostName) + .port(socketAddress.port) + .route(::setRoutes) + .let { NettyServerHandle(it.bindNow()) } } - private fun configureHandlers(chain: Chain) { - chain - .post("simulator", ::startSimulationHandler) - .post("simulator/async", ::startSimulationHandler) - .get("simulator/:id", ::simulatorStatusHandler) + private fun setRoutes(route: HttpServerRoutes) { + route + .post("/simulator", ::startSimulationHandler) + .post("/simulator/async", ::startSimulationHandler) + .get("/simulator/:id", ::simulatorStatusHandler) } - private fun startSimulationHandler(ctx: Context) { + private fun startSimulationHandler(req: HttpServerRequest, res: HttpServerResponse): Mono { logger.info { "Attempting to start asynchronous scenario" } - ctx.request.body.then { body -> - val id = startSimulation(body) - when (id) { - is Either.Left -> logger.warn { "Failed to start scenario, ${id.a}" } - is Either.Right -> logger.info { "Scenario started, details: ${id.b}" } - } - ctx.response.sendEitherErrorOrResponse(id) - } + return req.receive().aggregate().asInputStream() + .flatMap { body -> + val id = startSimulation(body) + when (id) { + is Either.Left -> logger.warn { "Failed to start scenario, ${id.a}" } + is Either.Right -> logger.info { "Scenario started, details: ${id.b}" } + } + res.sendEitherErrorOrResponse(id).then() + } } - private fun startSimulation(body: TypedData): Either { - return xnfSimulator.startSimulation(body.inputStream) - .map(ongoingSimulations::startAsynchronousSimulation) - .map(Responses::acceptedResponse) - } + + private fun startSimulation(body: InputStream): Either = + xnfSimulator.startSimulation(body) + .map(ongoingSimulations::startAsynchronousSimulation) + .map(Responses::acceptedResponse) - private fun simulatorStatusHandler(ctx: Context) { + private fun simulatorStatusHandler(req: HttpServerRequest, res: HttpServerResponse): Mono { logger.debug { "Checking task status" } - val id = UUID.fromString(ctx.pathTokens["id"]) + val id = UUID.fromString(req.param("id")) logger.debug { "Checking status for id: $id" } val status = ongoingSimulations.status(id) val response = Responses.statusResponse(status.toString(), status.message) logger.info { "Task $id status: $response" } - ctx.response.sendAndHandleErrors(IO.just(response)) + return res.sendAndHandleErrors(IO.just(response)).then() } companion object { diff --git a/sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/main.kt b/sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/main.kt index 60214de5..a73b39b1 100644 --- a/sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/main.kt +++ b/sources/hv-collector-xnf-simulator/src/main/kotlin/org/onap/dcae/collectors/veshv/simulators/xnf/main.kt @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * dcaegen2-collectors-veshv * ================================================================================ - * Copyright (C) 2018 NOKIA + * Copyright (C) 2018-2019 NOKIA * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,7 +39,6 @@ import org.onap.dcae.collectors.veshv.utils.arrow.ExitFailure import org.onap.dcae.collectors.veshv.utils.arrow.unsafeRunEitherSync import org.onap.dcae.collectors.veshv.utils.logging.Logger import org.onap.dcae.collectors.veshv.ves.message.generator.factory.MessageGeneratorFactory -import ratpack.server.RatpackServer private const val PACKAGE_NAME = "org.onap.dcae.collectors.veshv.simulators.xnf" private val logger = Logger(PACKAGE_NAME) @@ -58,21 +57,27 @@ fun main(args: Array) = ArgXnfSimulatorConfiguration().parse(args) ExitFailure(1) }, { - logger.info { "Started xNF Simulator API server" } - HealthState.INSTANCE.changeState(HealthDescription.IDLE) + logger.info { "Stopping xNF Simulator API server" } } ) -private fun startServers(config: SimulatorConfiguration): IO = +private fun startServers(config: SimulatorConfiguration): IO = IO.monad().binding { logger.info { "Using configuration: $config" } + XnfHealthCheckServer().startServer(config).bind() + val clientConfig = ClientConfiguration(HashSet.of(config.hvVesAddress), config.securityProvider) val xnfSimulator = XnfSimulator( ClientFactory(clientConfig), MessageGeneratorFactory(config.maxPayloadSizeBytes) ) - XnfApiServer(xnfSimulator, OngoingSimulations()) - .start(config.listenAddress) - .bind() + val xnfApiServerHandler = XnfApiServer(xnfSimulator, OngoingSimulations()) + .start(config.listenAddress).bind() + + logger.info { "Started xNF Simulator API server" } + HealthState.INSTANCE.changeState(HealthDescription.IDLE) + + xnfApiServerHandler.await().bind() }.fix() + -- cgit 1.2.3-korg