From c85d40b0cc8f40e5d0e17019878df82170f7bb35 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Tue, 10 Sep 2019 15:57:10 +0200
Subject: Repair healthcheck

HealthCheck was always returning 200 even if the db was not up and
running

Issue-ID: CLAMP-494
Change-Id: I85aa427a212c6cde568d3863d1ab1a1a11c71f16
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 src/main/resources/META-INF/resources/swagger.html |  2 +-
 .../resources/clds/camel/rest/clamp-api-v2.xml     |  2 +-
 .../resources/clds/camel/rest/clds-services.xml    | 26 +++++++++++++++-------
 3 files changed, 20 insertions(+), 10 deletions(-)

(limited to 'src/main/resources')

diff --git a/src/main/resources/META-INF/resources/swagger.html b/src/main/resources/META-INF/resources/swagger.html
index d2ec9660..d3b38b69 100644
--- a/src/main/resources/META-INF/resources/swagger.html
+++ b/src/main/resources/META-INF/resources/swagger.html
@@ -588,7 +588,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b
 <div class="sect2">
 <h3 id="_uri_scheme"><a class="anchor" href="#_uri_scheme"></a><a class="link" href="#_uri_scheme">1.2. URI scheme</a></h3>
 <div class="paragraph">
-<p><em>Host</em> : localhost:40147<br>
+<p><em>Host</em> : localhost:36829<br>
 <em>BasePath</em> : /restservices/clds/<br>
 <em>Schemes</em> : HTTP</p>
 </div>
diff --git a/src/main/resources/clds/camel/rest/clamp-api-v2.xml b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
index 6ee44cad..cf99625e 100644
--- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml
+++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
@@ -68,7 +68,7 @@
 					<to
 						uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','read')" />
 					<to
-						uri="bean:org.onap.clamp.loop.LoopController?method=getSVGRepresentation(${header.loopName})" />
+						uri="bean:org.onap.clamp.loop.LoopController?method=getSvgRepresentation(${header.loopName})" />
 					<to
 						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
 					<doCatch>
diff --git a/src/main/resources/clds/camel/rest/clds-services.xml b/src/main/resources/clds/camel/rest/clds-services.xml
index b3061dc4..dd3a4bfd 100644
--- a/src/main/resources/clds/camel/rest/clds-services.xml
+++ b/src/main/resources/clds/camel/rest/clds-services.xml
@@ -1,19 +1,29 @@
 <rests xmlns="http://camel.apache.org/schema/spring">
-	<rest >
-		<get uri="/v1/clds/cldsInfo"
-			outType="org.onap.clamp.clds.model.CldsInfo"
+	<rest>
+		<get uri="/v1/clds/cldsInfo" outType="org.onap.clamp.clds.model.CldsInfo"
 			produces="application/json">
 			<to
 				uri="bean:org.onap.clamp.clds.service.CldsService?method=getCldsInfo()" />
 		</get>
-		<get uri="/v1/healthcheck" produces="application/json">
-			<to
-				uri="bean:org.onap.clamp.clds.service.CldsHealthcheckService?method=gethealthcheck()" />
+		<get uri="/v1/healthcheck" produces="application/json"
+			outType="org.onap.clamp.clds.model.CldsHealthCheck">
+			<route>
+				<setBody>
+					<method ref="org.onap.clamp.clds.service.CldsHealthcheckService"
+						method="gethealthcheck()" />
+				</setBody>
+				<when>
+					<simple> ${body} == 'NOT-OK'</simple>
+					<setHeader headerName="CamelHttpResponseCode">
+						<constant>404</constant>
+					</setHeader>
+					<log loggingLevel="ERROR" message="HealthCheck failed" />
+				</when>
+			</route>
 		</get>
 
 		<get uri="/v1/user/getUser" produces="text/plain">
-			<to
-				uri="bean:org.onap.clamp.clds.service.UserService?method=getUser()" />
+			<to uri="bean:org.onap.clamp.clds.service.UserService?method=getUser()" />
 		</get>
 	</rest>
 </rests>
-- 
cgit 1.2.3-korg