From 74303b71e884cbaf6099031973d6c37e31c55bf3 Mon Sep 17 00:00:00 2001
From: sebdet <sebastien.determe@intl.att.com>
Date: Tue, 8 Oct 2019 17:53:08 +0200
Subject: DCAE inventory calls in camel

Move the HTTP/HTTPS calls to camel so that there is no issue with the
previous code that does not support the config required for HTTP4 Camel

Issue-ID: CLAMP-532
Change-Id: I83db0da5bbe6906890d0d6aa9b529c264e5f9b20
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
---
 .../resources/clds/camel/routes/dcae-flows.xml     | 34 ++++++++++
 .../resources/clds/camel/routes/flexible-flow.xml  | 78 ----------------------
 2 files changed, 34 insertions(+), 78 deletions(-)
 delete mode 100644 src/main/resources/clds/camel/routes/flexible-flow.xml

(limited to 'src/main/resources/clds/camel/routes')

diff --git a/src/main/resources/clds/camel/routes/dcae-flows.xml b/src/main/resources/clds/camel/routes/dcae-flows.xml
index 469358190..fb3bc90ec 100644
--- a/src/main/resources/clds/camel/routes/dcae-flows.xml
+++ b/src/main/resources/clds/camel/routes/dcae-flows.xml
@@ -177,6 +177,40 @@
 				<to uri="direct:dump-loop-log-http-response" />
 			</doFinally>
 		</doTry>
+	</route>
+	<route id="get-dcae-blueprint-inventory">
+		<from uri="direct:get-dcae-blueprint-inventory" />
+		<log loggingLevel="INFO"
+			message="Getting DCAE blueprint id in inventory" />
+		<to
+			uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Getting blueprint id in inventory')" />
+		<doTry>
+			<setHeader headerName="CamelHttpMethod">
+				<constant>GET</constant>
+			</setHeader>
+			<setHeader headerName="X-ONAP-RequestID">
+				<simple>${exchangeProperty[X-ONAP-RequestID]}
+				</simple>
+			</setHeader>
+			<setHeader headerName="X-ONAP-InvocationID">
+				<simple>${exchangeProperty[X-ONAP-InvocationID]}
+				</simple>
+			</setHeader>
+			<setHeader headerName="X-ONAP-PartnerName">
+				<simple>${exchangeProperty[X-ONAP-PartnerName]}
+				</simple>
+			</setHeader>
+			<log loggingLevel="INFO"
+				message="Endpoint to query Dcae inventory Loop status: {{clamp.config.dcae.inventory.url}}/dcae-service-types?${header[CamelHttpQuery]}"></log>
+			<toD
+				uri="{{clamp.config.dcae.inventory.url}}/dcae-service-types?asdcResourceId=${exchangeProperty[blueprintResourceId]}&amp;asdcServiceId=${exchangeProperty[blueprintServiceId]}&amp;typeName=${exchangeProperty[blueprintName]}&amp;bridgeEndpoint=true&amp;useSystemProperties=true&amp;throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&amp;authMethod=Basic&amp;authUsername={{clamp.config.dcae.deployment.userName}}&amp;authPassword={{clamp.config.dcae.deployment.password}}&amp;connectionTimeToLive=5000&amp;httpClient.connectTimeout=10000&amp;httpClient.socketTimeout=30000&amp;authenticationPreemptive=true&amp;connectionClose=true" />
+			<convertBodyTo type="java.lang.String" />
+			<doFinally>
+				<to uri="direct:reset-raise-http-exception-flag" />
+				<to
+					uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()" />
+			</doFinally>
+		</doTry>
 
 	</route>
 </routes>
\ No newline at end of file
diff --git a/src/main/resources/clds/camel/routes/flexible-flow.xml b/src/main/resources/clds/camel/routes/flexible-flow.xml
deleted file mode 100644
index bc79fc211..000000000
--- a/src/main/resources/clds/camel/routes/flexible-flow.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<routes xmlns="http://camel.apache.org/schema/spring">
-	<route id="submit">
-		<from uri="direct:processSubmit" />
-		<choice>
-			<when>
-				<simple> ${exchangeProperty.actionCd} == 'SUBMIT' ||
-					${exchangeProperty.actionCd} == 'RESUBMIT'
-				</simple>
-				<to
-					uri="bean:org.onap.clamp.clds.client.CldsEventDelegate?method=addEvent(*,'INITIATED')" />
-				<to uri="bean:org.onap.clamp.clds.client.TcaPolicyDelegate" />
-				<to uri="bean:org.onap.clamp.clds.client.HolmesPolicyDelegate" />
-				<delay>
-					<constant>30000</constant>
-				</delay>
-				<to
-					uri="bean:org.onap.clamp.clds.client.OperationalPolicyDelegate" />
-				<to uri="bean:org.onap.clamp.clds.client.GuardPolicyDelegate" />
-				<to
-					uri="bean:org.onap.clamp.clds.client.CldsEventDelegate?method=addEvent(*,'COMPLETED')" />
-			</when>
-			<when>
-				<simple> ${exchangeProperty.actionCd} == 'DELETE'</simple>
-				<to
-					uri="bean:org.onap.clamp.clds.client.CldsEventDelegate?method=addEvent(*,'INITIATED')" />
-				<to uri="bean:org.onap.clamp.clds.client.TcaPolicyDeleteDelegate" />
-				<to
-					uri="bean:org.onap.clamp.clds.client.HolmesPolicyDeleteDelegate" />
-				<delay>
-					<constant>30000</constant>
-				</delay>
-				<to
-					uri="bean:org.onap.clamp.clds.client.OperationalPolicyDeleteDelegate" />
-				<to
-					uri="bean:org.onap.clamp.clds.client.GuardPolicyDeleteDelegate" />
-				<to uri="bean:org.onap.clamp.clds.client.ModelDeleteDelegate" />
-				<to
-					uri="bean:org.onap.clamp.clds.client.CldsEventDelegate?method=addEvent(*,'COMPLETED')" />
-			</when>
-			<when>
-				<simple> ${exchangeProperty.actionCd} == 'UPDATE'</simple>
-				<to
-					uri="bean:org.onap.clamp.clds.client.CldsEventDelegate?method=addEvent(*,'INITIATED')" />
-				<to uri="bean:org.onap.clamp.clds.client.TcaPolicyDelegate" />
-				<to uri="bean:org.onap.clamp.clds.client.HolmesPolicyDelegate" />
-				<delay>
-					<constant>30000</constant>
-				</delay>
-				<to
-					uri="bean:org.onap.clamp.clds.client.OperationalPolicyDelegate" />
-				<to uri="bean:org.onap.clamp.clds.client.GuardPolicyDelegate" />
-				<to
-					uri="bean:org.onap.clamp.clds.client.CldsEventDelegate?method=addEvent(*,'COMPLETED')" />
-			</when>
-			<when>
-				<simple> ${exchangeProperty.actionCd} == 'STOP'</simple>
-				<to
-					uri="bean:org.onap.clamp.clds.client.CldsEventDelegate?method=addEvent(*,'INITIATED')" />
-				<to
-					uri="bean:org.onap.clamp.clds.client.OperationalPolicyDeleteDelegate" />
-				<to
-					uri="bean:org.onap.clamp.clds.client.GuardPolicyDeleteDelegate" />
-				<to
-					uri="bean:org.onap.clamp.clds.client.CldsEventDelegate?method=addEvent(*,'COMPLETED')" />
-			</when>
-			<when>
-				<simple> ${exchangeProperty.actionCd} == 'RESTART'</simple>
-				<to
-					uri="bean:org.onap.clamp.clds.client.CldsEventDelegate?method=addEvent(*,'INITIATED')" />
-				<to uri="bean:org.onap.clamp.clds.client.GuardPolicyDelegate" />
-				<to
-					uri="bean:org.onap.clamp.clds.client.OperationalPolicyDelegate" />
-				<to
-					uri="bean:org.onap.clamp.clds.client.CldsEventDelegate?method=addEvent(*,'COMPLETED')" />
-			</when>
-		</choice>
-	</route>
-</routes>
\ No newline at end of file
-- 
cgit 1.2.3-korg