Merge "Upload Tosca Model changes to remove policy model type parsing from UI. Dictio...

[clamp.git] / src / main / resources / clds / camel / rest / clamp-api-v2.xml

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 fe3f6bd..3ed272e 100644 (file)
--- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml
+++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
@@ -910,13 +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 +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>