From: Sébastien Determe <sebastien.determe@intl.att.com>
Date: Mon, 2 Mar 2020 12:31:54 +0000 (+0000)
Subject: Merge "Upload Tosca Model changes to remove policy model type parsing from UI. Dictio... 
X-Git-Tag: 5.0.0~34
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=47caef3827de362e7b6204b01d73238fb6faa714;hp=-c;p=clamp.git

Merge "Upload Tosca Model changes to remove policy model type parsing from UI. Dictionary API fix to allow bulk create or update of dictionary elements."
---

47caef3827de362e7b6204b01d73238fb6faa714
diff --combined src/main/resources/clds/camel/rest/clamp-api-v2.xml
index fe3f6bda,ce76d300..3ed272e7
--- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml
+++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
@@@ -502,7 -502,7 +502,7 @@@
  						</split>
  					</split>
  					<to
 -						uri="bean:org.onap.clamp.loop.log.LoopService?method=deleteLoop(${header.loopName})" />
 +						uri="bean:org.onap.clamp.loop.log.LoopController?method=deleteLoop(${header.loopName})" />
  					<log loggingLevel="INFO"
  						message="DELETE request successfully executed for loop: ${header.loopName}" />
  					<to
@@@ -569,21 -569,29 +569,21 @@@
  			</route>
  		</get>
  
 -		<put uri="/v2/loop/addOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}"
 -			 outType="org.onap.clamp.loop.Loop" produces="application/json">
 +		<put uri="/v2/loop/addOperationaPolicy/{loopName}/policyModel/{policyType}/{policyVersion}" outType="org.onap.clamp.loop.Loop" produces="application/json">
  			<route>
 -				<removeHeaders pattern="*" excludePattern="loopName" />
 +				<removeHeaders pattern="*" excludePattern="loopName|policyType|policyVersion" />
  				<doTry>
 -					<log loggingLevel="INFO"
 -						 message="ADD OperationalPolicy request for loop: ${header.loopName}" />
  					<to
 -							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'ADD OperationalPolicy request')" />
 +							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add operational Policy')" />
  					<to
 -							uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','write')" />
 +							uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" />
  					<to uri="direct:load-loop" />
  					<to
 -							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('ADD OperationalPolicy request','INFO',${exchangeProperty[loopObject]})" />
 -					<doTry>
 -						<to
 -								uri="bean:org.onap.clamp.loop.LoopService?method=addOperationalPolicy(${loopName},${policyType},${policyVersion})" />
 -
 -						<to
 -								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('ADD OperationalPolicy request successfully executed','INFO',${exchangeProperty[loopObject]})" />
 -						<to
 -								uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
 -					</doTry>
 +							uri="bean:org.onap.clamp.loop.LoopController?method=addOperationalPolicy(${header.loopName},${header.policyType},${header.policyVersion})" />
 +					<to
 +							uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('ADD OperationalPolicy request successfully executed','INFO',${exchangeProperty[loopObject]})" />
 +					<to
 +							uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
  					<doCatch>
  						<exception>java.lang.Exception</exception>
  						<handled>
@@@ -594,8 -602,13 +594,8 @@@
  						<log loggingLevel="ERROR"
  							 message="ADD OperationalPolicy request failed for loop: ${header.loopName}" />
  						<to
 -								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('ADD OperationalPolicy request, Error reported: ${exception} - Body: ${exception.responseBody}','ERROR',${exchangeProperty[loopObject]})" />
 +								uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('ADD OperationalPolicy request failed','ERROR',${exchangeProperty[loopObject]})" />
  					</doCatch>
 -					<doFinally>
 -						<setBody>
 -							<simple>${exchangeProperty[loopObject]}</simple>
 -						</setBody>
 -					</doFinally>
  				</doTry>
  			</route>
  		</put>
@@@ -910,13 -923,12 +910,12 @@@
  			</route>
  		</get>
  
- 		<post uri="/v2/policyToscaModels/{policyModelType}"
+ 		<post uri="/v2/policyToscaModels"
  			type="java.lang.String"
  			outType="org.onap.clamp.loop.template.PolicyModel"
  			consumes="plain/text" produces="application/json">
  			<route>
- 				<removeHeaders pattern="*"
- 					excludePattern="policyModelType" />
+ 				<removeHeaders pattern="*"/>
  				<doTry>
  					<to
  						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Upload New or Update Tosca Policy Model')" />
@@@ -926,7 -938,7 +925,7 @@@
  						<simple>${body}</simple>
  					</setProperty>
  					<to
- 						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=createNewPolicyModelFromTosca(${header.policyModelType},${exchangeProperty[PolicyModelTosca]})" />
+ 						uri="bean:org.onap.clamp.loop.template.PolicyModelsService?method=createNewPolicyModelFromTosca(${exchangeProperty[PolicyModelTosca]})" />
  					<to
  						uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=endLog()" />
  					<doCatch>