From 1f2d62dd48694fa78041572a200b3e5d04bd268e Mon Sep 17 00:00:00 2001 From: sebdet Date: Wed, 7 Apr 2021 10:10:45 +0200 Subject: Update dependencies Update dependencies to remove some issues reported by Nexus-IQ. Issue-ID: POLICY-3169 Issue-ID: POLICY-3120 Signed-off-by: sebdet Change-Id: Ia8939f0c85ac4087c3fc2c71b66914d6c7178347 --- .../resources/clds/camel/rest/clamp-api-v2.xml | 161 +++++++++---------- .../resources/clds/camel/rest/clds-services.xml | 2 +- src/main/resources/clds/camel/routes/cds-flows.xml | 12 +- .../resources/clds/camel/routes/dcae-flows.xml | 152 +++++++++--------- .../resources/clds/camel/routes/loop-flows.xml | 74 ++++----- .../resources/clds/camel/routes/policy-flows.xml | 175 +++++++++++---------- .../resources/clds/camel/routes/utils-flows.xml | 4 +- 7 files changed, 297 insertions(+), 283 deletions(-) (limited to 'src/main/resources/clds/camel') 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 7129c2828..fe94460c4 100644 --- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml +++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml @@ -23,7 +23,7 @@ - + 500 @@ -56,7 +56,7 @@ - + 500 @@ -77,7 +77,7 @@ uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update the global properties')"/> - + ${body} @@ -97,7 +97,7 @@ - + 500 @@ -117,7 +117,7 @@ uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update operational policies')"/> - + ${body} @@ -139,7 +139,7 @@ - + 500 @@ -161,7 +161,7 @@ uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Update Microservice policies')"/> - + ${body} @@ -183,7 +183,7 @@ message="UPDATE MicroService policy FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/> - + 500 @@ -200,9 +200,6 @@ - - true - - - + 500 @@ -273,7 +269,7 @@ message="REFRESH json schema request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/> - + 500 @@ -316,7 +312,7 @@ message="REFRESH json schema request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/> - + 500 @@ -333,9 +329,6 @@ - - true - - + 500 @@ -379,7 +372,7 @@ - + true - + 500 @@ -425,9 +418,6 @@ - - true - - + 500 @@ -472,7 +462,7 @@ - + true - + false @@ -491,12 +481,12 @@ ${exchangeProperty[loopObject].getMicroServicePolicies()} - + ${body} - + false @@ -507,12 +497,12 @@ ${exchangeProperty[loopObject].getOperationalPolicies()} - + ${body} - + false @@ -543,7 +533,7 @@ message="SUBMIT request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/> - + 500 @@ -559,7 +549,7 @@ - + true ${exchangeProperty[loopObject].getMicroServicePolicies()} - + ${body} - + false @@ -591,12 +581,12 @@ ${exchangeProperty[loopObject].getOperationalPolicies()} - + ${body} - + false @@ -618,7 +608,7 @@ message="DELETE request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/> - + 500 @@ -666,7 +656,7 @@ ${exchangeProperty[loopObject]} - + 200 @@ -701,7 +691,7 @@ message="ADD operational policy request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/> - + 500 @@ -724,17 +714,17 @@ - + ${header.policyName} - + ${exchangeProperty[loopObject].getOperationalPolicy(header.policyName)} - + false - + false @@ -755,7 +745,7 @@ message="REMOVE operational policy request FAILED for loop: ${header.loopName}, ${exception.stacktrace}"/> - + 500 @@ -793,7 +783,7 @@ message="CREATE Loop from Template request failed for loop: ${header.loopName}, ${exception.stacktrace}"/> - + 500 @@ -826,7 +816,7 @@ uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/> - + 500 @@ -860,7 +850,7 @@ uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/> - + 500 @@ -892,7 +882,7 @@ uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/> - + 500 @@ -926,7 +916,7 @@ uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/> - + 500 @@ -959,7 +949,7 @@ uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/> - + 500 @@ -992,7 +982,7 @@ uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/> - + 500 @@ -1011,7 +1001,7 @@ uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add New or Update Dictionary')"/> - + ${body} - + 500 @@ -1049,7 +1039,7 @@ uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Add New or Update Dictionary Element')"/> - + ${body} - + 500 @@ -1097,7 +1087,7 @@ uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/> - + 500 @@ -1131,7 +1121,7 @@ uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/> - + 500 @@ -1165,7 +1155,7 @@ uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/> - + 500 @@ -1198,7 +1188,7 @@ uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/> - + 500 @@ -1231,7 +1221,7 @@ uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/> - + 500 @@ -1253,7 +1243,7 @@ uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Upload New or Update Tosca Policy Model')"/> - + ${body} - + 500 @@ -1291,7 +1281,7 @@ uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'Upload New or Update Tosca Policy Model')"/> - + ${body} - + 500 @@ -1327,13 +1317,15 @@ uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Policies List ')"/> - + + true + - + ${body} - + ${body} @@ -1351,7 +1343,7 @@ uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/> - + 500 @@ -1376,13 +1368,16 @@ uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'CREATE a new Policy ')"/> - + + true + + ${header.policyModelType} - + ${header.policyModelVersion} - + ${body} - + 500 @@ -1424,19 +1419,22 @@ uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'DELETE a Policy ')"/> - + + true + + ${header.policyModelType} - + ${header.policyModelVersion} - + ${header.policyName} - + ${header.policyVersion} - + false @@ -1452,7 +1450,7 @@ uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/> - + 500 @@ -1478,6 +1476,9 @@ + + false + @@ -1490,7 +1491,7 @@ uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/> - + 500 diff --git a/src/main/resources/clds/camel/rest/clds-services.xml b/src/main/resources/clds/camel/rest/clds-services.xml index 61e1efbdc..aa4c3cbee 100644 --- a/src/main/resources/clds/camel/rest/clds-services.xml +++ b/src/main/resources/clds/camel/rest/clds-services.xml @@ -9,7 +9,7 @@ ${body} == 'NOT-OK' - + 404 diff --git a/src/main/resources/clds/camel/routes/cds-flows.xml b/src/main/resources/clds/camel/routes/cds-flows.xml index 73f8cb849..10fcb091e 100644 --- a/src/main/resources/clds/camel/routes/cds-flows.xml +++ b/src/main/resources/clds/camel/routes/cds-flows.xml @@ -5,15 +5,15 @@ message="Getting blueprint workflow list from CDS"/> - + GET - + application/json - + java.lang.Exception @@ -36,15 +36,15 @@ message="Getting blueprint input properties for workflow"/> - + POST - + application/json - + java.lang.Exception diff --git a/src/main/resources/clds/camel/routes/dcae-flows.xml b/src/main/resources/clds/camel/routes/dcae-flows.xml index 1a0eb7b9a..d74bd91bf 100644 --- a/src/main/resources/clds/camel/routes/dcae-flows.xml +++ b/src/main/resources/clds/camel/routes/dcae-flows.xml @@ -5,11 +5,17 @@ ${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == true + + true + ${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == false + + true + @@ -24,51 +30,51 @@ ${exchangeProperty[loopObject].getMicroServicePolicies()} - + ${body} - + false - + - + PUT - + application/json - + ${exchangeProperty[X-ONAP-RequestID]} - + ${exchangeProperty[X-ONAP-InvocationID]} - + ${exchangeProperty[X-ONAP-PartnerName]} + uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[dcaeDeploymentId]}?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&authenticationPreemptive=true&connectionClose=true"/> - + - + @@ -82,14 +88,14 @@ false - + DEPLOY micro service failed (MicroService name:${exchangeProperty[microServicePolicy].getName()}), Dep-id:${exchangeProperty[dcaeDeploymentId]}, StatusUrl:${exchangeProperty[dcaeStatusUrl]}) - + DCAE @@ -112,40 +118,40 @@ - + - + PUT - + application/json - + ${exchangeProperty[X-ONAP-RequestID]} - + ${exchangeProperty[X-ONAP-InvocationID]} - + ${exchangeProperty[X-ONAP-PartnerName]} + uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[dcaeDeploymentId]}?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&authenticationPreemptive=true&connectionClose=true"/> - + - + @@ -155,13 +161,13 @@ - + DEPLOY loop status (Dep-id:${exchangeProperty[dcaeDeploymentId]}, StatusUrl:${exchangeProperty[dcaeStatusUrl]}) - + DCAE @@ -174,11 +180,17 @@ ${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == true + + true + ${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == false + + true + @@ -193,7 +205,7 @@ ${exchangeProperty[loopObject].getMicroServicePolicies()} - + ${body} - + DELETE - + application/json - + ${exchangeProperty[X-ONAP-RequestID]} - + ${exchangeProperty[X-ONAP-InvocationID]} - + ${exchangeProperty[X-ONAP-PartnerName]} + uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[microServicePolicy].getDcaeDeploymentId()}?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&authenticationPreemptive=true&connectionClose=true"/> - + - + @@ -244,7 +256,7 @@ uri="bean:org.onap.policy.clamp.loop.log.LoopLogService?method=addLogForComponent('Undeploy for the micro service: ${exchangeProperty[microServicePolicy].getName()} - ${header.CamelHttpResponseCode} : ${header.CamelHttpResponseText}','INFO','DCAE',${exchangeProperty[loopObject]})"/> - @@ -256,12 +268,12 @@ false - + UNDEPLOY micro service failed (MicroService name:${exchangeProperty[microServicePolicy].getName()}) - + DCAE @@ -281,43 +293,41 @@ uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Undeploying the loop')"/> - ${exchangeProperty[loopObject].getDcaeDeploymentId()} - != null - + ${exchangeProperty[loopObject].getDcaeDeploymentId()} != null - + DELETE - + application/json - + ${exchangeProperty[X-ONAP-RequestID]} - + ${exchangeProperty[X-ONAP-InvocationID]} - + ${exchangeProperty[X-ONAP-PartnerName]} + uri="{{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[loopObject].getDcaeDeploymentId()}?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&authenticationPreemptive=true&connectionClose=true"/> - + - + @@ -327,10 +337,10 @@ - + UNDEPLOY loop status - + DCAE @@ -338,7 +348,7 @@ - @@ -352,18 +362,18 @@ - + GET - + ${exchangeProperty[X-ONAP-RequestID]} - + ${exchangeProperty[X-ONAP-InvocationID]} - + ${exchangeProperty[X-ONAP-PartnerName]} @@ -373,18 +383,18 @@ ${exchangeProperty[getStatusUrl].contains("?")} == true - + & - + ? + uri="${exchangeProperty[getStatusUrl]}${exchangeProperty[uriSeparator]}bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&authenticationPreemptive=true&connectionClose=true"/> java.lang.Exception @@ -400,10 +410,10 @@ - + DCAE deployment status - + DCAE @@ -417,25 +427,25 @@ - + GET - + ${exchangeProperty[X-ONAP-RequestID]} - + ${exchangeProperty[X-ONAP-InvocationID]} - + ${exchangeProperty[X-ONAP-PartnerName]} + uri="{{clamp.config.dcae.inventory.url}}/dcae-service-types?asdcResourceId=${exchangeProperty[blueprintResourceId]}&asdcServiceId=${exchangeProperty[blueprintServiceId]}&typeName=${exchangeProperty[blueprintName]}&bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&authenticationPreemptive=true&connectionClose=true"/> @@ -451,33 +461,33 @@ message="Getting all DCAE blueprint from inventory"/> - + GET - + ${exchangeProperty[X-ONAP-RequestID]} - + ${exchangeProperty[X-ONAP-InvocationID]} - + ${exchangeProperty[X-ONAP-PartnerName]} - + - + ${exchangeProperty[dcaeResponseList]} - + ${body} diff --git a/src/main/resources/clds/camel/routes/loop-flows.xml b/src/main/resources/clds/camel/routes/loop-flows.xml index f6a838ef0..4a3cc84b2 100644 --- a/src/main/resources/clds/camel/routes/loop-flows.xml +++ b/src/main/resources/clds/camel/routes/loop-flows.xml @@ -4,13 +4,13 @@ ${header.loopName} - + ${exchangeProperty[loopObject]} == null - + 404 @@ -19,14 +19,14 @@ - + ${exchangeProperty[loopObject].getComponent('POLICY')} - + true - + true ${exchangeProperty[loopObject].getMicroServicePolicies()} - + ${body.getName()} - + ${body.getPolicyModel().getPolicyModelType()} - + ${body.getPolicyModel().getVersion()} - + ${body.getPdpGroup()} - + 1.0.0 @@ -61,19 +61,19 @@ ${exchangeProperty[loopObject].getOperationalPolicies()} - + ${body.getName()} - + ${body.getPolicyModel().getPolicyModelType()} - + ${body.getPolicyModel().getVersion()} - + 1.0.0 - + ${body.getPdpGroup()} @@ -83,7 +83,7 @@ message="Processing Operational Policy: ${exchangeProperty[policyName]} of type ${exchangeProperty[policyType]}" /> - + ${exchangeProperty[policyComponent].getState()} @@ -100,29 +100,29 @@ ${exchangeProperty['loopObject'].getLoopTemplate().getUniqueBlueprint()} == true - + ${exchangeProperty[loopObject].getComponent('DCAE')} ${exchangeProperty[loopObject].getDcaeDeploymentStatusUrl()} != null - + ${exchangeProperty[loopObject].getDcaeDeploymentStatusUrl()} - + false ${header.CamelHttpResponseCode} == 200 - + - + ${exchangeProperty[dcaeComponent].computeState(*)} @@ -137,32 +137,32 @@ ${exchangeProperty[loopObject].getMicroServicePolicies()} - + ${body} - + ${exchangeProperty[loopObject].getComponent('DCAE_' + ${exchangeProperty[microServicePolicy].getName()})} ${exchangeProperty[microServicePolicy].getDcaeDeploymentStatusUrl()} != null - + ${exchangeProperty[microServicePolicy].getDcaeDeploymentStatusUrl()} - + false ${header.CamelHttpResponseCode} == 200 - + - + ${exchangeProperty[dcaeComponent].computeState(*)} @@ -181,14 +181,14 @@ ${exchangeProperty['dcaeState'].getStateName()} == - 'BLUEPRINT_DEPLOYED' and ${exchangeProperty['policyState'].getStateName()} + 'BLUEPRINT_DEPLOYED' && ${exchangeProperty['policyState'].getStateName()} == 'NOT_SENT' - ${exchangeProperty['dcaeState'].getStateName()} == 'IN_ERROR' or + ${exchangeProperty['dcaeState'].getStateName()} == 'IN_ERROR' || ${exchangeProperty['dcaeState'].getStateName()} == 'MICROSERVICE_INSTALLATION_FAILED' @@ -197,7 +197,7 @@ ${exchangeProperty['dcaeState'].getStateName()} == - 'MICROSERVICE_UNINSTALLATION_FAILED' or + 'MICROSERVICE_UNINSTALLATION_FAILED' || ${exchangeProperty['policyState'].getStateName()} == 'IN_ERROR' ${exchangeProperty['dcaeState'].getStateName()} == - 'MICROSERVICE_INSTALLED_SUCCESSFULLY' and + 'MICROSERVICE_INSTALLED_SUCCESSFULLY' && ${exchangeProperty['policyState'].getStateName()} == 'SENT_AND_DEPLOYED' ${exchangeProperty['dcaeState'].getStateName()} == - 'MICROSERVICE_INSTALLED_SUCCESSFULLY' and + 'MICROSERVICE_INSTALLED_SUCCESSFULLY' && ${exchangeProperty['policyState'].getStateName()} == 'SENT' ${exchangeProperty['dcaeState'].getStateName()} == - 'BLUEPRINT_DEPLOYED' or ${exchangeProperty['dcaeState'].getStateName()} == - 'MICROSERVICE_UNINSTALLED_SUCCESSFULLY' and + 'BLUEPRINT_DEPLOYED' || ${exchangeProperty['dcaeState'].getStateName()} == + 'MICROSERVICE_UNINSTALLED_SUCCESSFULLY' && ${exchangeProperty['policyState'].getStateName()} == 'SENT_AND_DEPLOYED' ${exchangeProperty['dcaeState'].getStateName()} == - 'PROCESSING_MICROSERVICE_INSTALLATION' or + 'PROCESSING_MICROSERVICE_INSTALLATION' || ${exchangeProperty['dcaeState'].getStateName()} == - 'PROCESSING_MICROSERVICE_UNINSTALLATION' and + 'PROCESSING_MICROSERVICE_UNINSTALLATION' && ${exchangeProperty['policyState'].getStateName()} == 'SENT_AND_DEPLOYED' ${exchangeProperty['dcaeState'].getStateName()} == - 'MICROSERVICE_INSTALLED_SUCCESSFULLY' and + 'MICROSERVICE_INSTALLED_SUCCESSFULLY' && ${exchangeProperty['policyState'].getStateName()} != 'NOT_SENT' - + false ${header.CamelHttpResponseCode} != 200 - + false - + false ${header.CamelHttpResponseCode} != 200 - + false - + ${exchangeProperty[policyComponent].computeState(*)} @@ -37,25 +37,25 @@ message="Getting Policy: ${exchangeProperty[policyName]}"/> - + GET - + ${exchangeProperty[X-ONAP-RequestID]} - + ${exchangeProperty[X-ONAP-InvocationID]} - + ${exchangeProperty[X-ONAP-PartnerName]} + uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyType]}/versions/${exchangeProperty[policyTypeVersion]}/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&authenticationPreemptive=true&connectionClose=true"/> java.lang.Exception @@ -71,12 +71,12 @@ - + ${exchangeProperty[policyName]} GET Policy status - + POLICY @@ -91,25 +91,25 @@ message="Getting the policy deployment in PDP: ${exchangeProperty[policyName]}"/> - + GET - + ${exchangeProperty[X-ONAP-RequestID]} - + ${exchangeProperty[X-ONAP-InvocationID]} - + ${exchangeProperty[X-ONAP-PartnerName]} + uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/policies/status/${exchangeProperty[policyPdpGroup]}/${exchangeProperty[policyName]}/1.0.0?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&authenticationPreemptive=true&connectionClose=true"/> java.lang.Exception @@ -125,12 +125,12 @@ - + ${exchangeProperty[policyName]} GET Policy deployment status - + POLICY @@ -149,22 +149,22 @@ ${exchangeProperty[policy].createPolicyPayload()} - + ${exchangeProperty[policy].getPolicyModel().getPolicyModelType()} - + ${exchangeProperty[policy].getPolicyModel().getVersion()} - + ${exchangeProperty[policy].getName()} creation status - + POLICY @@ -179,28 +179,28 @@ message="Deleting Policy in a loop: ${exchangeProperty[policy].getName()}"/> - + ${exchangeProperty[policy].getPolicyModel().getPolicyModelType()} - + ${exchangeProperty[policy].getPolicyModel().getVersion()} - + ${exchangeProperty[policy].getName()} - + 1.0.0 - + ${exchangeProperty[policy].getName()} removal status - + POLICY @@ -220,14 +220,17 @@ ${exchangeProperty[loopObject].getComponent("POLICY").createPoliciesPayloadPdpGroup(exchangeProperty[loopObject],"POST")} + + true + - + PDP Group push ALL status - + POLICY @@ -247,37 +250,37 @@ ${exchangeProperty[loopObject].getComponent("POLICY").createPoliciesPayloadPdpGroup(exchangeProperty[loopObject],"DELETE")} - + POST - + application/json - + ${exchangeProperty[X-ONAP-RequestID]} - + ${exchangeProperty[X-ONAP-InvocationID]} - + ${exchangeProperty[X-ONAP-PartnerName]} + uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch?bridgeEndpoint=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&useSystemProperties=true&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&authenticationPreemptive=true&connectionClose=true"/> - + PDP Group remove ALL status - + POLICY @@ -292,15 +295,15 @@ message="Removing policy from active PDP group for loop: ${exchangeProperty[loopObject].getName()}"/> - + 1.0.0 - + ${exchangeProperty[policyName]} PDP Group removal status - + POLICY @@ -309,10 +312,10 @@ false - + PDP Group removal, Error reported: ${exception} - + POLICY @@ -331,25 +334,25 @@ - + GET - + ${exchangeProperty[X-ONAP-RequestID]} - + ${exchangeProperty[X-ONAP-InvocationID]} - + ${exchangeProperty[X-ONAP-PartnerName]} + uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&authenticationPreemptive=true&connectionClose=true"/> @@ -366,25 +369,25 @@ message="Getting the policy tosca model: ${exchangeProperty[policyModelType]}/${exchangeProperty[policyModelVersion]}"/> - + GET - + ${exchangeProperty[X-ONAP-RequestID]} - + ${exchangeProperty[X-ONAP-InvocationID]} - + ${exchangeProperty[X-ONAP-PartnerName]} + uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelType]}/versions/${exchangeProperty[policyModelVersion]}?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&authenticationPreemptive=true&connectionClose=true"/> @@ -401,25 +404,25 @@ message="Getting the list of PDP Groups"/> - + GET - + ${exchangeProperty[X-ONAP-RequestID]} - + ${exchangeProperty[X-ONAP-InvocationID]} - + ${exchangeProperty[X-ONAP-PartnerName]} + uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&authenticationPreemptive=true&connectionClose=true"/> @@ -436,25 +439,25 @@ message="Getting the policies list"/> - + GET - + ${exchangeProperty[X-ONAP-RequestID]} - + ${exchangeProperty[X-ONAP-InvocationID]} - + ${exchangeProperty[X-ONAP-PartnerName]} + uri="{{clamp.config.policy.api.url}}/policy/api/v1/policies?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&authenticationPreemptive=true&connectionClose=true"/> @@ -471,28 +474,28 @@ message="Add policies to PDP group"/> - + POST - + application/json - + ${exchangeProperty[X-ONAP-RequestID]} - + ${exchangeProperty[X-ONAP-InvocationID]} - + ${exchangeProperty[X-ONAP-PartnerName]} + uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/deployments/batch?bridgeEndpoint=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&useSystemProperties=true&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&authenticationPreemptive=true&connectionClose=true"/> null - + DELETE - + ${exchangeProperty[X-ONAP-RequestID]} - + ${exchangeProperty[X-ONAP-InvocationID]} - + ${exchangeProperty[X-ONAP-PartnerName]} + uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&authenticationPreemptive=true&connectionClose=true"/> - + POST - + application/json - + ${exchangeProperty[X-ONAP-RequestID]} - + ${exchangeProperty[X-ONAP-InvocationID]} - + ${exchangeProperty[X-ONAP-PartnerName]} + uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelType]}/versions/${exchangeProperty[policyModelVersion]}/policies?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&authenticationPreemptive=true&connectionClose=true"/> null - + DELETE - + ${exchangeProperty[X-ONAP-RequestID]} - + ${exchangeProperty[X-ONAP-InvocationID]} - + ${exchangeProperty[X-ONAP-PartnerName]} + uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyModelType]}/versions/${exchangeProperty[policyModelVersion]}/policies/${exchangeProperty[policyName]}/versions/${exchangeProperty[policyVersion]}?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&deleteWithBody=false&mapHttpMessageBody=false&mapHttpMessageFormUrlEncodedBody=false&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&authenticationPreemptive=true&connectionClose=true"/> diff --git a/src/main/resources/clds/camel/routes/utils-flows.xml b/src/main/resources/clds/camel/routes/utils-flows.xml index d5da4faee..90900f842 100644 --- a/src/main/resources/clds/camel/routes/utils-flows.xml +++ b/src/main/resources/clds/camel/routes/utils-flows.xml @@ -1,7 +1,7 @@ - + true @@ -19,7 +19,7 @@ - + null -- cgit 1.2.3-korg