Merge "Add additional fields validation report"

diff --git a/src/main/java/org/onap/aai/datarouter/policy/ServiceIntegrityValidationPolicy.java b/src/main/java/org/onap/aai/datarouter/policy/ServiceIntegrityValidationPolicy.java
index abdfebb..8960c99 100644 (file)
--- a/src/main/java/org/onap/aai/datarouter/policy/ServiceIntegrityValidationPolicy.java
+++ b/src/main/java/org/onap/aai/datarouter/policy/ServiceIntegrityValidationPolicy.java
@@ -165,6 +165,8 @@ public class ServiceIntegrityValidationPolicy {
         formattedValidation.addProperty("modelVersionId", validation.get("entity").getAsJsonObject().get("poa-event").getAsJsonObject().get("modelVersionId").getAsString());\r
         formattedValidation.addProperty("modelInvariantId", validation.get("entity").getAsJsonObject().get("poa-event").getAsJsonObject().get("modelInvariantId").getAsString());\r
         formattedValidation.addProperty("serviceInstanceId",validation.get("entity").getAsJsonObject().get("poa-event").getAsJsonObject().get("serviceInstanceId").getAsString());\r
+        formattedValidation.addProperty("requestId",validation.get("entity").getAsJsonObject().get("poa-event").getAsJsonObject().get("xTransactionId").getAsString());\r
+        formattedValidation.addProperty("client",validation.get("entity").getAsJsonObject().get("poa-event").getAsJsonObject().get("xFromAppId").getAsString());\r
 \r
         try {\r
             formattedValidation.addProperty("modelName", validation.get("entity").getAsJsonObject().get("context-list").getAsJsonObject().get("sdc").getAsJsonObject().get("service").getAsJsonObject().get("name").getAsString());\r

diff --git a/src/main/resources/auditservice_validation_schema.json b/src/main/resources/auditservice_validation_schema.json
index 70d6845..6267a8c 100644 (file)
--- a/src/main/resources/auditservice_validation_schema.json
+++ b/src/main/resources/auditservice_validation_schema.json
@@ -5,6 +5,8 @@
               {"name": "modelVersionId", "data-type": "string"},\r
               {"name": "modelInvariantId", "data-type": "string"},\r
               {"name": "serviceInstanceId", "data-type": "string"},\r
+              {"name": "requestId", "data-type": "string"},\r
+              {"name": "client", "data-type": "string"},\r
               {"name": "result", "data-type": "string"},\r
               {"name": "violations", "data-type": "nested", "sub-fields": [\r
                      {"name": "violationId", "data-type": "string", "searchable": "false"},\r