From 9ac307045cf69dac07137c5926a31826d8423b83 Mon Sep 17 00:00:00 2001 From: xg353y Date: Fri, 19 Apr 2019 13:55:40 +0200 Subject: Fix logging issues Fix the logging issues created by the api defined by camel. Adding the entering/exiting and invoking/invoking return logs as based on the ONAP Logging Requirement. Issue-ID: CLAMP-351 Change-Id: I5cb314ade5a716993206a917dfdbdab3f2572b3a Signed-off-by: xg353y --- .../resources/clds/camel/rest/clamp-api-v2.xml | 666 +++++++++++++++------ .../resources/clds/camel/routes/flexible-flow.xml | 122 +++- src/main/resources/logback-default.xml | 2 +- 3 files changed, 606 insertions(+), 184 deletions(-) (limited to 'src/main/resources') 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 a823c09da..6bd1132cc 100644 --- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml +++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml @@ -5,10 +5,23 @@ outType="java.lang.String[]" produces="application/json"> - - + + + + + + + java.lang.Exception + + false + + + + - - + + + + + + + java.lang.Exception + + false + + + + - - + + + + + + + java.lang.Exception + + false + + + + @@ -41,16 +80,29 @@ outType="org.onap.clamp.loop.Loop" produces="application/json"> - - - ${body} - - - - + + + + + ${body} + + + + + + + java.lang.Exception + + false + + + + - - - ${body} - - - - + + + + + ${body} + + + + + + + java.lang.Exception + + false + + + + - - - ${body} - + + + + + ${body} + - - - + + + + + + java.lang.Exception + + false + + + + - - + + + + + + + java.lang.Exception + + false + + + + - - + + + + + + + java.lang.Exception + + false + + + + - + + + + + + + + + + java.lang.Exception + + false + + + + + + + + + + + + java.lang.Exception + + false + + + + - - - - - - - + + + + + + + + + + java.lang.Exception + + false + + + + + + + + + + + java.lang.Exception + + false + + + + - - - - - - - - - - - - false - - - - - ${header.LoopObject.getMicroServicePolicies()} - - - ${body} - + + message="Receive SUBMIT request for loop: ${header.loopName}" /> + + + + false - - - - + + + + + java.lang.Exception + + false + + + + - - - ${header.LoopObject.getOperationalPolicies()} - - - ${body} - - - false - - + message="Processing all MICRO-SERVICES policies defined in loop ${header.LoopObject.getName()}" /> + + ${header.LoopObject.getMicroServicePolicies()} + + + ${body} + + + + false + + + + + + java.lang.Exception + + false + + + + - + + + + java.lang.Exception + + false + + + + + + + message="Processing all OPERATIONAL policies defined in loop ${header.LoopObject.getName()}" /> - ${header.operationalPolicy.createGuardPolicyPayloads().entrySet()} + ${header.LoopObject.getOperationalPolicies()} - + ${body} - + message="Processing Operational Policy: ${header.operationalPolicy.getName()}" /> false - - + + + + + + java.lang.Exception + + false + + + + + + + + + java.lang.Exception + + false + + + + + + + + + ${header.operationalPolicy.createGuardPolicyPayloads().entrySet()} + + + ${body} + + + + + false + + + + + + java.lang.Exception + + false + + + + - + + + + java.lang.Exception + + false + + + + + + - - + + + + + + java.lang.Exception + + false + + + + + + - - - + + + + + + java.lang.Exception + + false + + + + - - - - - - - ${header.LoopObject.getMicroServicePolicies()} - - - ${body} - + + message="Receive DELETE request for loop: ${header.loopName}" /> + + + + - - + + + + java.lang.Exception + + false + + + + - - - ${header.LoopObject.getOperationalPolicies()} - - - ${body} - - + + + ${header.LoopObject.getMicroServicePolicies()} + + + ${body} + + + + + + + java.lang.Exception + + false + + + + + + - + message="Processing all OPERATIONAL policies defined in loop ${header.LoopObject.getName()}" /> - ${header.operationalPolicy.createGuardPolicyPayloads().entrySet()} + ${header.LoopObject.getOperationalPolicies()} - + ${body} + message="Processing Operational Policy: ${header.operationalPolicy.getName()}" /> + + + + + java.lang.Exception + + false + + + + + + + + ${header.operationalPolicy.createGuardPolicyPayloads().entrySet()} + + + ${body} + + - + + + + java.lang.Exception + + false + + + + + + - - - - + + + + + + java.lang.Exception + + false + + + + - diff --git a/src/main/resources/clds/camel/routes/flexible-flow.xml b/src/main/resources/clds/camel/routes/flexible-flow.xml index 683737af3..808e1d8a1 100644 --- a/src/main/resources/clds/camel/routes/flexible-flow.xml +++ b/src/main/resources/clds/camel/routes/flexible-flow.xml @@ -98,13 +98,14 @@ - + ${header.microServicePolicy.createPolicyPayload()} @@ -119,6 +120,18 @@ {{clamp.config.policy.url}}/policy/api/v1/policyTypes/${header.microServicePolicy.getModelType()}/versions/1.0.0/policies + + ${header.X-ONAP-REAUESTID} + + + + ${header.X-ONAP-InvocationID} + + + + ${header.X-ONAP-PartnerName} + + @@ -127,6 +140,7 @@ + @@ -134,6 +148,8 @@ + null @@ -144,6 +160,18 @@ {{clamp.config.policy.url}}/policy/api/v1/policyTypes/${header.microServicePolicy.getModelType()}/versions/1.0.0/policies/${header.microServicePolicy.getName()} + + ${header.X-ONAP-REAUESTID} + + + + ${header.X-ONAP-InvocationID} + + + + ${header.X-ONAP-PartnerName} + + @@ -152,6 +180,7 @@ + @@ -160,6 +189,8 @@ + ${header.operationalPolicy.createPolicyPayload()} @@ -174,6 +205,18 @@ {{clamp.config.policy.url}}/policy/api/v1/policyTypes/onap.policies.controloop.operational/versions/1.0.0/policies + + ${header.X-ONAP-REAUESTID} + + + + ${header.X-ONAP-InvocationID} + + + + ${header.X-ONAP-PartnerName} + + @@ -182,6 +225,7 @@ + @@ -189,6 +233,8 @@ + null @@ -199,6 +245,18 @@ {{clamp.config.policy.url}}/policy/api/v1/policyTypes/onap.policies.controloop.operational/versions/1.0.0/policies/${header.operationalPolicy.getName()} + + ${header.X-ONAP-REAUESTID} + + + + ${header.X-ONAP-InvocationID} + + + + ${header.X-ONAP-PartnerName} + + @@ -207,6 +265,7 @@ + @@ -215,6 +274,8 @@ + ${header.guardPolicy.getValue()} @@ -229,6 +290,18 @@ {{clamp.config.policy.url}}/policy/api/v1/policyTypes/onap.policies.controlloop.Guard/versions/1.0.0/policies + + ${header.X-ONAP-REAUESTID} + + + + ${header.X-ONAP-InvocationID} + + + + ${header.X-ONAP-PartnerName} + + @@ -237,6 +310,7 @@ + @@ -244,6 +318,8 @@ + null @@ -254,6 +330,18 @@ {{clamp.config.policy.url}}/policy/api/v1/policyTypes/onap.policies.controlloop.Guard/versions/1.0.0/policies/${header.guardPolicy.getKey()} + + ${header.X-ONAP-REAUESTID} + + + + ${header.X-ONAP-InvocationID} + + + + ${header.X-ONAP-PartnerName} + + @@ -262,6 +350,7 @@ + @@ -269,6 +358,8 @@ + ${header.LoopObject.createPoliciesPayloadPdpGroup()} @@ -283,6 +374,18 @@ {{clamp.config.policy.url}}/policy/pap/v1/pdps + + ${header.X-ONAP-REAUESTID} + + + + ${header.X-ONAP-InvocationID} + + + + ${header.X-ONAP-PartnerName} + + @@ -291,6 +394,7 @@ + @@ -298,6 +402,8 @@ + ${header.LoopObject.listPolicyNamesPdpGroup()} @@ -313,6 +419,18 @@ {{clamp.config.policy.url}}/pdps/policies/${header.PolicyName}/versions/1.0.0 + + ${header.X-ONAP-REAUESTID} + + + + ${header.X-ONAP-InvocationID} + + + + ${header.X-ONAP-PartnerName} + + @@ -322,8 +440,8 @@ uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog(${header.PolicyName}' Policy removed from PDP Group successfully','INFO',${header.LoopObject})" /> + - diff --git a/src/main/resources/logback-default.xml b/src/main/resources/logback-default.xml index c2524bec2..2eba127e9 100644 --- a/src/main/resources/logback-default.xml +++ b/src/main/resources/logback-default.xml @@ -144,7 +144,7 @@ - -- cgit 1.2.3-korg