diff options
| author |   Sébastien Determe <sebastien.determe@intl.att.com> | 2019-03-29 09:09:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-03-29 09:09:24 +0000 |
| commit | a3ad7dbdf67559f58af24cb5b361c46a91075c7c (patch) | |
| tree | 54dd2434b9adac0ad348f8d3e7adb7ba253e9871 /src/main/resources | |
| parent | 3ad0ff8210c6d988696efb9cc1f6af38fc3cf32b (diff) | |
| parent | a6d09fbe1046057b72247f97ac72a521949409ce (diff) | |
Merge "Rework the submit operation"
Diffstat (limited to 'src/main/resources')
4 files changed, 25 insertions, 1 deletions
diff --git a/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js b/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js index a71e6caa..90cdc0d7 100644 --- a/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js +++ b/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js @@ -96,7 +96,7 @@ app var def = $q.defer(); var sets = []; var svcAction = uiAction.toLowerCase(); - var svcUrl = "/restservices/clds/v2/loop/" + "action/" + svcAction + "/" + modelName; + var svcUrl = "/restservices/clds/v2/loop/" + svcAction + "/" + modelName; $http.put(svcUrl).success( function(data) { diff --git a/src/main/resources/application-noaaf.properties b/src/main/resources/application-noaaf.properties index 632856e9..f54cbe09 100644 --- a/src/main/resources/application-noaaf.properties +++ b/src/main/resources/application-noaaf.properties @@ -135,6 +135,9 @@ clamp.config.dcae.deployment.template=classpath:/clds/templates/dcae-deployment- # # # Configuration Settings for Policy Engine Components +clamp.config.policy.url=http://localhost:8085/ +clamp.config.policy.userName=test +clamp.config.policy.password=test clamp.config.policy.pdpUrl1=http://policy.api.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123 clamp.config.policy.pdpUrl2=http://policy.api.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123 clamp.config.policy.papUrl=http://policy.api.simpledemo.onap.org:8081/pap/ , testpap, alpha123 diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index d6f21d3f..3a704ebc 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -150,6 +150,9 @@ clamp.config.dcae.deployment.template=classpath:/clds/templates/dcae-deployment- # # # Configuration Settings for Policy Engine Components +clamp.config.policy.url=http://policy.api.simpledemo.onap.org:8081/pdp/ +clamp.config.policy.userName=test +clamp.config.policy.password=test clamp.config.policy.pdpUrl1=http://policy.api.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123 clamp.config.policy.pdpUrl2=http://policy.api.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123 clamp.config.policy.papUrl=http://policy.api.simpledemo.onap.org:8081/pap/ , testpap, alpha123 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 c5828b28..f339d5d7 100644 --- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml +++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml @@ -71,6 +71,24 @@ <to uri="bean:org.onap.clamp.operation.LoopOperation?method=unDeployLoop(${header.loopName})" /> </route> </put> + <put uri="/v2/loop/submit/{loopName}"> + <route> + <to uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" /> + <to uri="bean:org.onap.clamp.operation.LoopOperation?method=submitMsPolicies(${header.loopName})" /> + <!-- <to uri="bean:org.onap.clamp.operation.LoopOperation?method=submitOpPolicy(${header.loopName})" />--> + <!--<to uri="bean:org.onap.clamp.operation.LoopOperation?method=submitGuardPolicy(${header.loopName})" /> --> + </route> + </put> + <put uri="/v2/loop/delete/{loopName}" + outType="org.onap.clamp.loop.Loop" + produces="application/json"> + <route> + <to uri="bean:org.onap.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','update')" /> + <to uri="bean:org.onap.clamp.operation.LoopOperation?method=deleteMsPolicies(${header.loopName})" /> + <to uri="bean:org.onap.clamp.operation.LoopOperation?method=deleteOpPolicy(${header.loopName})" /> + <to uri="bean:org.onap.clamp.operation.LoopOperation?method=deleteGuardPolicy(${header.loopName})" /> + </route> + </put> </rest> </rests> |