diff options
| author |   sebdet <sebastien.determe@intl.att.com> | 2019-08-21 15:27:11 -0700 |
|---|---|---|
| committer | sebdet <sebastien.determe@intl.att.com> | 2019-08-21 15:27:11 -0700 |
| commit | 5e2b077e496ca28e9f91fc12cecb872228c81816 (patch) | |
| tree | 8f7eaf47fbe8437ae7bdb368e401485508a1c78c /src | |
| parent | 38d77f9bbf3239c3616b9b5a4edd9c1f7a77e5b5 (diff) | |
Log component
Set the right log component in the camel xml files routes
Issue-ID: CLAMP-428
Change-Id: I476e5b24f5e772c77998508ad3e90c811838386e
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/resources/clds/camel/routes/dcae-flows.xml | 51 | ||||
| -rw-r--r-- | src/main/resources/clds/camel/routes/policy-flows.xml | 93 | ||||
| -rw-r--r-- | src/main/resources/clds/camel/routes/utils-flows.xml | 19 |
3 files changed, 91 insertions, 72 deletions
diff --git a/src/main/resources/clds/camel/routes/dcae-flows.xml b/src/main/resources/clds/camel/routes/dcae-flows.xml index 395077a8..46935819 100644 --- a/src/main/resources/clds/camel/routes/dcae-flows.xml +++ b/src/main/resources/clds/camel/routes/dcae-flows.xml @@ -2,19 +2,16 @@ <route id="deploy-loop"> <from uri="direct:deploy-loop" /> <doTry> - <log - loggingLevel="INFO" + <log loggingLevel="INFO" message="Deploying the loop: ${exchangeProperty[loopObject].getName()}" /> <to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Deploying the loop')" /> <setBody> - <method - ref="org.onap.clamp.loop.components.external.DcaeComponent" + <method ref="org.onap.clamp.loop.components.external.DcaeComponent" method="getDeployPayload(${exchangeProperty[loopObject]})" /> </setBody> <setProperty propertyName="dcaeDeploymentId"> - <method - ref="org.onap.clamp.loop.components.external.DcaeComponent" + <method ref="org.onap.clamp.loop.components.external.DcaeComponent" method="generateDeploymentId()" /> </setProperty> <setHeader headerName="CamelHttpMethod"> @@ -35,20 +32,17 @@ <simple>${exchangeProperty[X-ONAP-PartnerName]} </simple> </setHeader> - <log - loggingLevel="INFO" + <log loggingLevel="INFO" message="Endpoint to deploy loop: {{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[dcaeDeploymentId]}"></log> <toD 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}}&connectionTimeToLive=5000&httpClient.connectTimeout=10000&httpClient.socketTimeout=300000&authenticationPreemptive=true&connectionClose=true" /> <convertBodyTo type="java.lang.String" /> <setProperty propertyName="dcaeResponse"> - <method - ref="org.onap.clamp.loop.components.external.DcaeComponent" + <method ref="org.onap.clamp.loop.components.external.DcaeComponent" method="convertDcaeResponse(${body})" /> </setProperty> <setProperty propertyName="dcaeStatusUrl"> - <method - ref="org.onap.clamp.loop.components.external.DcaeComponent" + <method ref="org.onap.clamp.loop.components.external.DcaeComponent" method="getStatusUrl(${exchangeProperty[dcaeResponse]})" /> </setProperty> <to @@ -63,6 +57,9 @@ StatusUrl:${exchangeProperty[dcaeStatusUrl]}) </simple> </setProperty> + <setProperty propertyName="logComponent"> + <simple>DCAE</simple> + </setProperty> <to uri="direct:dump-loop-log-http-response" /> </doFinally> </doTry> @@ -70,8 +67,7 @@ <route id="undeploy-loop"> <from uri="direct:undeploy-loop" /> - <log - loggingLevel="INFO" + <log loggingLevel="INFO" message="Undeploying the loop: ${exchangeProperty[loopObject].getName()} : ${exchangeProperty[loopObject].getDcaeDeploymentId()}" /> <to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Undeploying the loop')" /> @@ -82,8 +78,7 @@ </simple> <doTry> <setBody> - <method - ref="org.onap.clamp.loop.components.external.DcaeComponent" + <method ref="org.onap.clamp.loop.components.external.DcaeComponent" method="getUndeployPayload(${exchangeProperty[loopObject]})" /> </setBody> <setHeader headerName="CamelHttpMethod"> @@ -105,20 +100,17 @@ <simple>${exchangeProperty[X-ONAP-PartnerName]} </simple> </setHeader> - <log - loggingLevel="INFO" + <log loggingLevel="INFO" message="Endpoint to undeploy loop: {{clamp.config.dcae.deployment.url}}/dcae-deployments/${exchangeProperty[loopObject].getDcaeDeploymentId()}"></log> <toD 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}}&connectionTimeToLive=5000&httpClient.connectTimeout=10000&httpClient.socketTimeout=300000&authenticationPreemptive=true&connectionClose=true" /> <convertBodyTo type="java.lang.String" /> <setProperty propertyName="dcaeResponse"> - <method - ref="org.onap.clamp.loop.components.external.DcaeComponent" + <method ref="org.onap.clamp.loop.components.external.DcaeComponent" method="convertDcaeResponse(${body})" /> </setProperty> <setProperty propertyName="dcaeStatusUrl"> - <method - ref="org.onap.clamp.loop.components.external.DcaeComponent" + <method ref="org.onap.clamp.loop.components.external.DcaeComponent" method="getStatusUrl(${exchangeProperty[dcaeResponse]})" /> </setProperty> <to @@ -130,13 +122,15 @@ <setProperty propertyName="logMessage"> <simple>UNDEPLOY loop status</simple> </setProperty> + <setProperty propertyName="logComponent"> + <simple>DCAE</simple> + </setProperty> <to uri="direct:dump-loop-log-http-response" /> </doFinally> </doTry> </when> <otherwise> - <log - loggingLevel="WARNING" + <log loggingLevel="WARNING" message="Cannot Undeploy for the loop: ${exchangeProperty[loopObject].getName()}, the Deployment ID does not exist !" /> <to uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('Cannot Undeploy for the loop: ${exchangeProperty[loopObject].getName()}, the Deployment ID does not exist !','WARNING',${exchangeProperty[loopObject]})" /> @@ -146,8 +140,7 @@ </route> <route id="get-dcae-deployment-status"> <from uri="direct:get-dcae-deployment-status" /> - <log - loggingLevel="INFO" + <log loggingLevel="INFO" message="Getting DCAE deployment status for loop: ${exchangeProperty[loopObject].getName()}" /> <to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('DCAE', 'Getting Deployment status')" /> @@ -167,8 +160,7 @@ <simple>${exchangeProperty[X-ONAP-PartnerName]} </simple> </setHeader> - <log - loggingLevel="INFO" + <log loggingLevel="INFO" message="Endpoint to query Closed Loop status: ${exchangeProperty[loopObject].getDcaeDeploymentStatusUrl()}"></log> <toD uri="${exchangeProperty[loopObject].getDcaeDeploymentStatusUrl()}?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.dcae.deployment.userName}}&authPassword={{clamp.config.dcae.deployment.password}}&connectionTimeToLive=5000&httpClient.connectTimeout=10000&httpClient.socketTimeout=30000&authenticationPreemptive=true&connectionClose=true" /> @@ -179,6 +171,9 @@ <setProperty propertyName="logMessage"> <simple>DCAE deployment status</simple> </setProperty> + <setProperty propertyName="logComponent"> + <simple>DCAE</simple> + </setProperty> <to uri="direct:dump-loop-log-http-response" /> </doFinally> </doTry> diff --git a/src/main/resources/clds/camel/routes/policy-flows.xml b/src/main/resources/clds/camel/routes/policy-flows.xml index 537354f1..5d586154 100644 --- a/src/main/resources/clds/camel/routes/policy-flows.xml +++ b/src/main/resources/clds/camel/routes/policy-flows.xml @@ -3,8 +3,7 @@ <route id="get-policy"> <from uri="direct:get-policy" /> <doTry> - <log - loggingLevel="INFO" + <log loggingLevel="INFO" message="Getting Policy: ${exchangeProperty[policyName]}" /> <to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Get Policy')" /> @@ -23,8 +22,7 @@ <simple>${exchangeProperty[X-ONAP-PartnerName]} </simple> </setHeader> - <log - loggingLevel="INFO" + <log loggingLevel="INFO" message="Endpoint to get policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyType]}/versions/1.0.0/policies/${exchangeProperty[policyName]}/versions/1.0.0"></log> <toD uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyType]}/versions/1.0.0/policies/${exchangeProperty[policyName]}/versions/1.0.0?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&connectionTimeToLive=5000&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true" /> @@ -37,6 +35,9 @@ Policy status </simple> </setProperty> + <setProperty propertyName="logComponent"> + <simple>POLICY</simple> + </setProperty> <to uri="direct:dump-loop-log-http-response" /> </doFinally> </doTry> @@ -45,8 +46,7 @@ <route id="get-deployment-policy"> <from uri="direct:get-deployment-policy" /> <doTry> - <log - loggingLevel="INFO" + <log loggingLevel="INFO" message="Getting the policy deployment in PDP: ${exchangeProperty[policyName]}" /> <to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Getting the policy deployment in PDP')" /> @@ -65,8 +65,7 @@ <simple>${exchangeProperty[X-ONAP-PartnerName]} </simple> </setHeader> - <log - loggingLevel="INFO" + <log loggingLevel="INFO" message="Endpoint to get policy deployment status: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyType]}/versions/1.0.0/policies/${exchangeProperty[policyName]}/versions/deployed"></log> <toD uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[policyType]}/versions/1.0.0/policies/${exchangeProperty[policyName]}/versions/deployed?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&connectionTimeToLive=5000&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true" /> @@ -79,6 +78,9 @@ status </simple> </setProperty> + <setProperty propertyName="logComponent"> + <simple>POLICY</simple> + </setProperty> <to uri="direct:dump-loop-log-http-response" /> </doFinally> </doTry> @@ -86,8 +88,7 @@ <route id="create-micro-service-policy"> <from uri="direct:create-micro-service-policy" /> <doTry> - <log - loggingLevel="INFO" + <log loggingLevel="INFO" message="Creating Micro Service Policy: ${exchangeProperty[microServicePolicy].getName()}" /> <to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Create Micro Service Policy')" /> @@ -113,8 +114,7 @@ <simple>${exchangeProperty[X-ONAP-PartnerName]} </simple> </setHeader> - <log - loggingLevel="INFO" + <log loggingLevel="INFO" message="Endpoint to create microservice policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[microServicePolicy].getModelType()}/versions/1.0.0/policies"></log> <toD uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[microServicePolicy].getModelType()}/versions/1.0.0/policies?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&connectionTimeToLive=5000&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true" /> @@ -127,6 +127,9 @@ status </simple> </setProperty> + <setProperty propertyName="logComponent"> + <simple>POLICY</simple> + </setProperty> <to uri="direct:dump-loop-log-http-response" /> </doFinally> </doTry> @@ -135,8 +138,7 @@ <route id="delete-micro-service-policy"> <from uri="direct:delete-micro-service-policy" /> <doTry> - <log - loggingLevel="INFO" + <log loggingLevel="INFO" message="Deleting Micro Service Policy: ${exchangeProperty[microServicePolicy].getName()}" /> <to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Delete Micro Service Policy')" /> @@ -158,8 +160,7 @@ <simple>${exchangeProperty[X-ONAP-PartnerName]} </simple> </setHeader> - <log - loggingLevel="INFO" + <log loggingLevel="INFO" message="Endpoint to delete microservice policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[microServicePolicy].getModelType()}/versions/1.0.0/policies/${exchangeProperty[microServicePolicy].getName()}/versions/1.0.0"></log> <toD uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/${exchangeProperty[microServicePolicy].getModelType()}/versions/1.0.0/policies/${exchangeProperty[microServicePolicy].getName()}/versions/1.0.0?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}}&connectionTimeToLive=5000&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true" /> @@ -173,6 +174,9 @@ status </simple> </setProperty> + <setProperty propertyName="logComponent"> + <simple>POLICY</simple> + </setProperty> <to uri="direct:dump-loop-log-http-response" /> </doFinally> </doTry> @@ -181,8 +185,7 @@ <route id="create-operational-policy"> <from uri="direct:create-operational-policy" /> <doTry> - <log - loggingLevel="INFO" + <log loggingLevel="INFO" message="Creating Operational Policy: ${exchangeProperty[operationalPolicy].getName()}" /> <to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Create Operational Policy')" /> @@ -208,8 +211,7 @@ <simple>${exchangeProperty[X-ONAP-PartnerName]} </simple> </setHeader> - <log - loggingLevel="INFO" + <log loggingLevel="INFO" message="Endpoint to create operational policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies"></log> <toD uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&connectionTimeToLive=5000&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true" /> @@ -222,6 +224,9 @@ status </simple> </setProperty> + <setProperty propertyName="logComponent"> + <simple>POLICY</simple> + </setProperty> <to uri="direct:dump-loop-log-http-response" /> </doFinally> </doTry> @@ -230,8 +235,7 @@ <route id="delete-operational-policy"> <from uri="direct:delete-operational-policy" /> <doTry> - <log - loggingLevel="INFO" + <log loggingLevel="INFO" message="Deleting Operational Policy: ${exchangeProperty[operationalPolicy].getName()}" /> <to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Delete Operational Policy')" /> @@ -253,8 +257,7 @@ <simple>${exchangeProperty[X-ONAP-PartnerName]} </simple> </setHeader> - <log - loggingLevel="INFO" + <log loggingLevel="INFO" message="Endpoint to delete operational policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies/${exchangeProperty[operationalPolicy].getName()}/versions/1"></log> <toD uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/onap.policies.controlloop.Operational/versions/1.0.0/policies/${exchangeProperty[operationalPolicy].getName()}/versions/1?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}}&connectionTimeToLive=5000&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true" /> @@ -267,6 +270,9 @@ status </simple> </setProperty> + <setProperty propertyName="logComponent"> + <simple>POLICY</simple> + </setProperty> <to uri="direct:dump-loop-log-http-response" /> </doFinally> </doTry> @@ -275,8 +281,7 @@ <route id="create-guard-policy"> <from uri="direct:create-guard-policy" /> <doTry> - <log - loggingLevel="INFO" + <log loggingLevel="INFO" message="Creating Guard Policy: ${exchangeProperty[guardPolicy].getKey()}" /> <to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Create Guard Policy')" /> @@ -302,8 +307,7 @@ <simple>${exchangeProperty[X-ONAP-PartnerName]} </simple> </setHeader> - <log - loggingLevel="INFO" + <log loggingLevel="INFO" message="Endpoint to create guard policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/onap.policies.controlloop.Guard/versions/1.0.0/policies"></log> <toD uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/onap.policies.controlloop.Guard/versions/1.0.0/policies?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&connectionTimeToLive=5000&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true" /> @@ -315,6 +319,9 @@ <simple>${exchangeProperty[guardPolicy].getKey()} creation status </simple> </setProperty> + <setProperty propertyName="logComponent"> + <simple>POLICY</simple> + </setProperty> <to uri="direct:dump-loop-log-http-response" /> </doFinally> </doTry> @@ -323,8 +330,7 @@ <route id="delete-guard-policy"> <from uri="direct:delete-guard-policy" /> <doTry> - <log - loggingLevel="INFO" + <log loggingLevel="INFO" message="Deleting Guard Policy: ${exchangeProperty[guardPolicy].getKey()}" /> <to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Delete Guard Policy')" /> @@ -346,8 +352,7 @@ <simple>${exchangeProperty[X-ONAP-PartnerName]} </simple> </setHeader> - <log - loggingLevel="INFO" + <log loggingLevel="INFO" message="Endpoint to delete guard policy: {{clamp.config.policy.api.url}}/policy/api/v1/policytypes/onap.policies.controlloop.Guard/versions/1.0.0/policies/${exchangeProperty[guardPolicy].getKey()}/versions/1"></log> <toD uri="{{clamp.config.policy.api.url}}/policy/api/v1/policytypes/onap.policies.controlloop.Guard/versions/1.0.0/policies/${exchangeProperty[guardPolicy].getKey()}/versions/1?bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&deleteWithBody=false&mapHttpMessageBody=false&mapHttpMessageFormUrlEncodedBody=false&authUsername={{clamp.config.policy.api.userName}}&authPassword={{clamp.config.policy.api.password}}&connectionTimeToLive=5000&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true" /> @@ -360,6 +365,9 @@ <simple>${exchangeProperty[guardPolicy].getKey()} removal status </simple> </setProperty> + <setProperty propertyName="logComponent"> + <simple>POLICY</simple> + </setProperty> <to uri="direct:dump-loop-log-http-response" /> </doFinally> </doTry> @@ -368,8 +376,7 @@ <route id="add-all-to-active-pdp-group"> <from uri="direct:add-all-to-active-pdp-group" /> <doTry> - <log - loggingLevel="INFO" + <log loggingLevel="INFO" message="Adding loop policies to PDP Group: ${exchangeProperty[loopObject].getName()}" /> <to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Add policies to PDP group')" /> @@ -395,8 +402,7 @@ <simple>${exchangeProperty[X-ONAP-PartnerName]} </simple> </setHeader> - <log - loggingLevel="INFO" + <log loggingLevel="INFO" message="Endpoint to add policies to PDP Group: {{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/policies"></log> <toD uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/policies?bridgeEndpoint=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&useSystemProperties=true&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&connectionTimeToLive=5000&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true" /> @@ -408,6 +414,9 @@ <setProperty propertyName="logMessage"> <simple>PDP Group push ALL status</simple> </setProperty> + <setProperty propertyName="logComponent"> + <simple>POLICY</simple> + </setProperty> <to uri="direct:dump-loop-log-http-response" /> </doFinally> </doTry> @@ -416,8 +425,7 @@ <route id="remove-all-policy-from-active-pdp-group"> <from uri="direct:remove-all-policy-from-active-pdp-group" /> <doTry> - <log - loggingLevel="INFO" + <log loggingLevel="INFO" message="Removing policies from active PDP group for loop: ${exchangeProperty[loopObject].getName()}" /> <to uri="bean:org.onap.clamp.flow.log.FlowLogOperation?method=invokeLog('Policy', 'Removing policies PDP group')" /> @@ -445,8 +453,7 @@ <simple>${exchangeProperty[X-ONAP-PartnerName]} </simple> </setHeader> - <log - loggingLevel="INFO" + <log loggingLevel="INFO" message="Endpoint to delete policy from PDP Group: {{clamp.config.policy.pap.url}}/pdps/policies/${exchangeProperty[policyName]}/versions/1.0.0"></log> <toD uri="{{clamp.config.policy.pap.url}}/policy/pap/v1/pdps/policies/${exchangeProperty[policyName]}/versions/1.0.0?bridgeEndpoint=true&useSystemProperties=true&mapHttpMessageHeaders=false&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authUsername={{clamp.config.policy.pap.userName}}&authPassword={{clamp.config.policy.pap.password}}&connectionTimeToLive=5000&httpClient.connectTimeout=10000&httpClient.socketTimeout=20000&authenticationPreemptive=true&connectionClose=true" /> @@ -454,6 +461,9 @@ <simple>${exchangeProperty[policyName]} PDP Group removal status </simple> </setProperty> + <setProperty propertyName="logComponent"> + <simple>POLICY</simple> + </setProperty> <to uri="direct:dump-loop-log-http-response" /> </split> <doCatch> @@ -464,6 +474,9 @@ <setProperty propertyName="logMessage"> <simple>PDP Group removal, Error reported: ${exception}</simple> </setProperty> + <setProperty propertyName="logComponent"> + <simple>POLICY</simple> + </setProperty> <to uri="direct:dump-loop-log-http-response" /> </doCatch> <doFinally> diff --git a/src/main/resources/clds/camel/routes/utils-flows.xml b/src/main/resources/clds/camel/routes/utils-flows.xml index adf843ff..bbbc46a2 100644 --- a/src/main/resources/clds/camel/routes/utils-flows.xml +++ b/src/main/resources/clds/camel/routes/utils-flows.xml @@ -8,10 +8,21 @@ <route id="dump-loop-log-http-response"> <from uri="direct:dump-loop-log-http-response" /> - <log - loggingLevel="INFO" + <log loggingLevel="INFO" message="${exchangeProperty[logMessage]} - ${header.CamelHttpResponseCode} : ${header.CamelHttpResponseText}" /> - <to - uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('${exchangeProperty[logMessage]} - ${header.CamelHttpResponseCode} : ${header.CamelHttpResponseText}','INFO',${exchangeProperty[loopObject]})" /> + <choice> + <when> + <simple>${exchangeProperty[logComponent]} == null</simple> + <to + uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('${exchangeProperty[logMessage]} - ${header.CamelHttpResponseCode} : ${header.CamelHttpResponseText}','INFO',${exchangeProperty[loopObject]})" /> + </when> + <otherwise> + <to + uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLogForComponent('${exchangeProperty[logMessage]} - ${header.CamelHttpResponseCode} : ${header.CamelHttpResponseText}','INFO','${exchangeProperty[logComponent]}',${exchangeProperty[loopObject]})" /> + <setProperty propertyName="logComponent"> + <constant>null</constant> + </setProperty> + </otherwise> + </choice> </route> </routes>
\ No newline at end of file |