Fix healthcheck

Fix healthcheck and creds system due to AAF changes

Issue-ID: CLAMP-213
Change-Id: Idcc9a369ab384a1bba86b80f81a75a4631d8604e
Signed-off-by: sebdet <sd378r@intl.att.com>

1 files changed, 179 insertions, 130 deletions

diff --git a/src/main/resources/clds/camel/rest/clds-services.xml b/src/main/resources/clds/camel/rest/clds-services.xml
index b63591f76..e67fb162d 100644
--- a/src/main/resources/clds/camel/rest/clds-services.xml
+++ b/src/main/resources/clds/camel/rest/clds-services.xml
@@ -1,132 +1,181 @@
 <rests xmlns="http://camel.apache.org/schema/spring">
-		<rest>
-				<get uri="/clds/cldsDetails" outType="org.onap.clamp.clds.model.CldsMonitoringDetails" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsService?method=getCLDSDetails()" />
-				</get>
-				<get uri="/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="/healthcheck" produces="application/json">
-					<to
-								uri="bean:org.onap.clamp.clds.service.CldsHealthcheckService?method=gethealthcheck()" />
-				</get>
-				<get uri="/clds/model/bpmn/{modelName}" produces="text/xml">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsService?method=getBpmnXml(${header.modelName})" />
-				</get>
-				<get uri="/clds/model/image/{modelName}" produces="text/xml">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsService?method=getImageXml(${header.modelName})" />
-				</get>
-				<get uri="/clds/model/{modelName}" outType="org.onap.clamp.clds.model.CldsModel" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsService?method=getModel(${header.modelName})" />
-				</get>
-				<put uri="/clds/model/{modelName}" type="org.onap.clamp.clds.model.CldsModel" consumes="application/json" outType="org.onap.clamp.clds.model.CldsModel" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsService?method=putModel(${header.modelName},${body})" />
-				</put>
-				<get uri="/clds/model-names" outType="org.onap.clamp.clds.model.ValueItem" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsService?method=getModelNames()" />
-				</get>
-				<put uri="/clds/action/{action}/{modelName}?test={test}" type="org.onap.clamp.clds.model.CldsModel" consumes="application/json" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsService?method=putModelAndProcessAction(${header.action},${header.modelName},${header.test},${body})" />
-				</put>
-				<post uri="/clds/dcae/event?test={test}" type="org.onap.clamp.clds.model.DcaeEvent" consumes="application/json" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsService?method=postDcaeEvent(${header.test},${body})" />
-				</post>
-				<get uri="/clds/sdc/services" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsService?method=getSdcServices()" />
-				</get>
-				<get uri="/clds/properties" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsService?method=getSdcProperties()" />
-				</get>
-				<get uri="/clds/properties/{serviceInvariantUUID}?refresh={refresh}" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsService?method=getSdcPropertiesByServiceUUIDForRefresh(${header.serviceInvariantUUID},${header.refresh})" />
-				</get>
-				<put uri="/clds/deploy/{modelName}" type="org.onap.clamp.clds.model.CldsModel" consumes="application/json" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsService?method=deployModel(${header.modelName},${body})" />
-				</put>
-				<put uri="/clds/undeploy/{modelName}" type="org.onap.clamp.clds.model.CldsModel" consumes="application/json" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsService?method=unDeployModel(${header.modelName},${body})" />
-				</put>
-				
-				
-				
-				
-				<get uri="/cldsTempate/template/bpmn/{templateName}" produces="text/xml" >
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsTemplateService?method=getBpmnTemplate(${header.templateName})" />
-				</get>
-				<get uri="/cldsTempate/template/image/{templateName}" produces="text/xml">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsTemplateService?method=getImageXml(${header.templateName})" />
-				</get>
-				<get uri="/cldsTempate/template/{templateName}" outType="org.onap.clamp.clds.model.CldsTemplate" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsTemplateService?method=getTemplate(${header.templateName})" />
-				</get>
-				<put uri="/cldsTempate/template/{templateName}" type="org.onap.clamp.clds.model.CldsTemplate" consumes="application/json" outType="org.onap.clamp.clds.model.CldsTemplate" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsTemplateService?method=putTemplate(${header.templateName},${body})" />
-				</put>
-				<get uri="/cldsTempate/template-names" outType="org.onap.clamp.clds.model.ValueItem" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsTemplateService?method=getTemplateNames()" />
-				</get>
-				
-				
-				<put uri="/tosca/models/{toscaModelName}" type="org.onap.clamp.clds.model.CldsToscaModel" consumes="application/json" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsToscaService?method=parseToscaModelAndSave(${header.toscaModelName},${body})" />
-				</put>
-				<get uri="/tosca/models/policyType/{policyType}" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsToscaService?method=getToscaModelsByPolicyType(${header.policyType})" />
-				</get>
-				<get uri="/tosca/models" outType="org.onap.clamp.clds.model.CldsToscaModel" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsToscaService?method=getAllToscaModels()" />
-				</get>	
-				<get uri="/tosca/models/{toscaModelName}" outType="org.onap.clamp.clds.model.CldsToscaModel" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsToscaService?method=getToscaModel(${header.toscaModelName})" />
-				</get>
-				
-				
-				<put uri="/dictionary/{dictionaryName}" type="org.onap.clamp.clds.model.CldsDictionary" outType="org.onap.clamp.clds.model.CldsDictionary" consumes="application/json" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsDictionaryService?method=createOrUpdateDictionary(${header.dictionaryName},${body})" />
-				</put>
-				
-				<get uri="/dictionary" outType="org.onap.clamp.clds.model.CldsDictionary" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsDictionaryService?method=getAllDictionaryNames()" />
-				</get>
-				
-				<put uri="/dictionary/{dictionaryName}/items" type="org.onap.clamp.clds.model.CldsDictionaryItem" outType="org.onap.clamp.clds.model.CldsDictionaryItem" consumes="application/json" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsDictionaryService?method=createOrUpdateDictionaryElements(${header.dictionaryName},${body})" />
-				</put>
-				
-				<get uri="/dictionary/{dictionaryName}/items" outType="org.onap.clamp.clds.model.CldsDictionary" produces="application/json">
-						<to
-								uri="bean:org.onap.clamp.clds.service.CldsDictionaryService?method=getDictionaryElementsByName(${header.dictionaryName})" />
-				</get>
-				
-				<get uri="/user/getUser" produces="text/plain">
-						<to
-								uri="bean:org.onap.clamp.clds.service.UserService?method=getUser()" />
-				</get>
-		</rest>
+	<rest>
+		<get uri="/clds/cldsDetails"
+			outType="org.onap.clamp.clds.model.CldsMonitoringDetails"
+			produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsService?method=getCLDSDetails()" />
+		</get>
+		<get uri="/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="/healthcheck" produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsHealthcheckService?method=gethealthcheck()" />
+		</get>
+		<get uri="/clds/model/bpmn/{modelName}" produces="text/xml">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsService?method=getBpmnXml(${header.modelName})" />
+		</get>
+		<get uri="/clds/model/image/{modelName}" produces="text/xml">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsService?method=getImageXml(${header.modelName})" />
+		</get>
+		<get uri="/clds/model/{modelName}"
+			outType="org.onap.clamp.clds.model.CldsModel"
+			produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsService?method=getModel(${header.modelName})" />
+		</get>
+		<put uri="/clds/model/{modelName}"
+			type="org.onap.clamp.clds.model.CldsModel"
+			consumes="application/json"
+			outType="org.onap.clamp.clds.model.CldsModel"
+			produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsService?method=putModel(${header.modelName},${body})" />
+		</put>
+		<get uri="/clds/model-names"
+			outType="org.onap.clamp.clds.model.ValueItem"
+			produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsService?method=getModelNames()" />
+		</get>
+		<put uri="/clds/action/{action}/{modelName}?test={test}"
+			type="org.onap.clamp.clds.model.CldsModel"
+			consumes="application/json" produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsService?method=putModelAndProcessAction(${header.action},${header.modelName},${header.test},${body})" />
+		</put>
+		<post uri="/clds/dcae/event?test={test}"
+			type="org.onap.clamp.clds.model.DcaeEvent"
+			consumes="application/json" produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsService?method=postDcaeEvent(${header.test},${body})" />
+		</post>
+		<get uri="/clds/sdc/services" produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsService?method=getSdcServices()" />
+		</get>
+		<get uri="/clds/properties" produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsService?method=getSdcProperties()" />
+		</get>
+		<get
+			uri="/clds/properties/{serviceInvariantUUID}?refresh={refresh}"
+			produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsService?method=getSdcPropertiesByServiceUUIDForRefresh(${header.serviceInvariantUUID},${header.refresh})" />
+		</get>
+		<put uri="/clds/deploy/{modelName}"
+			type="org.onap.clamp.clds.model.CldsModel"
+			consumes="application/json" produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsService?method=deployModel(${header.modelName},${body})" />
+		</put>
+		<put uri="/clds/undeploy/{modelName}"
+			type="org.onap.clamp.clds.model.CldsModel"
+			consumes="application/json" produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsService?method=unDeployModel(${header.modelName},${body})" />
+		</put>
+
+
+
+
+		<get uri="/cldsTempate/template/bpmn/{templateName}"
+			produces="text/xml">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsTemplateService?method=getBpmnTemplate(${header.templateName})" />
+		</get>
+		<get uri="/cldsTempate/template/image/{templateName}"
+			produces="text/xml">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsTemplateService?method=getImageXml(${header.templateName})" />
+		</get>
+		<get uri="/cldsTempate/template/{templateName}"
+			outType="org.onap.clamp.clds.model.CldsTemplate"
+			produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsTemplateService?method=getTemplate(${header.templateName})" />
+		</get>
+		<put uri="/cldsTempate/template/{templateName}"
+			type="org.onap.clamp.clds.model.CldsTemplate"
+			consumes="application/json"
+			outType="org.onap.clamp.clds.model.CldsTemplate"
+			produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsTemplateService?method=putTemplate(${header.templateName},${body})" />
+		</put>
+		<get uri="/cldsTempate/template-names"
+			outType="org.onap.clamp.clds.model.ValueItem"
+			produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsTemplateService?method=getTemplateNames()" />
+		</get>
+
+
+		<put uri="/tosca/models/{toscaModelName}"
+			type="org.onap.clamp.clds.model.CldsToscaModel"
+			consumes="application/json" produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsToscaService?method=parseToscaModelAndSave(${header.toscaModelName},${body})" />
+		</put>
+		<get uri="/tosca/models/policyType/{policyType}"
+			produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsToscaService?method=getToscaModelsByPolicyType(${header.policyType})" />
+		</get>
+		<get uri="/tosca/models"
+			outType="org.onap.clamp.clds.model.CldsToscaModel"
+			produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsToscaService?method=getAllToscaModels()" />
+		</get>
+		<get uri="/tosca/models/{toscaModelName}"
+			outType="org.onap.clamp.clds.model.CldsToscaModel"
+			produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsToscaService?method=getToscaModel(${header.toscaModelName})" />
+		</get>
+
+
+		<put uri="/dictionary/{dictionaryName}"
+			type="org.onap.clamp.clds.model.CldsDictionary"
+			outType="org.onap.clamp.clds.model.CldsDictionary"
+			consumes="application/json" produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsDictionaryService?method=createOrUpdateDictionary(${header.dictionaryName},${body})" />
+		</put>
+
+		<get uri="/dictionary"
+			outType="org.onap.clamp.clds.model.CldsDictionary"
+			produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsDictionaryService?method=getAllDictionaryNames()" />
+		</get>
+
+		<put uri="/dictionary/{dictionaryName}/items"
+			type="org.onap.clamp.clds.model.CldsDictionaryItem"
+			outType="org.onap.clamp.clds.model.CldsDictionaryItem"
+			consumes="application/json" produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsDictionaryService?method=createOrUpdateDictionaryElements(${header.dictionaryName},${body})" />
+		</put>
+
+		<get uri="/dictionary/{dictionaryName}/items"
+			outType="org.onap.clamp.clds.model.CldsDictionary"
+			produces="application/json">
+			<to
+				uri="bean:org.onap.clamp.clds.service.CldsDictionaryService?method=getDictionaryElementsByName(${header.dictionaryName})" />
+		</get>
+
+		<get uri="/user/getUser" produces="text/plain">
+			<to
+				uri="bean:org.onap.clamp.clds.service.UserService?method=getUser()" />
+		</get>
+	</rest>
 </rests>