From: Steven Blimkie <Steven.Blimkie@amdocs.com>
Date: Mon, 10 Sep 2018 14:12:29 +0000 (+0000)
Subject: Merge "Add additional fields validation report"
X-Git-Tag: 1.3.0~10
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fdata-router.git;a=commitdiff_plain;h=b04debde97f26ab8dd6eec12c35312b1a4bba27b;hp=58de904df654e2fd39e9d6dc316baff98101ddc0

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
--- 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());
         formattedValidation.addProperty("modelInvariantId", validation.get("entity").getAsJsonObject().get("poa-event").getAsJsonObject().get("modelInvariantId").getAsString());
         formattedValidation.addProperty("serviceInstanceId",validation.get("entity").getAsJsonObject().get("poa-event").getAsJsonObject().get("serviceInstanceId").getAsString());
+        formattedValidation.addProperty("requestId",validation.get("entity").getAsJsonObject().get("poa-event").getAsJsonObject().get("xTransactionId").getAsString());
+        formattedValidation.addProperty("client",validation.get("entity").getAsJsonObject().get("poa-event").getAsJsonObject().get("xFromAppId").getAsString());
 
         try {
             formattedValidation.addProperty("modelName", validation.get("entity").getAsJsonObject().get("context-list").getAsJsonObject().get("sdc").getAsJsonObject().get("service").getAsJsonObject().get("name").getAsString());
diff --git a/src/main/resources/auditservice_validation_schema.json b/src/main/resources/auditservice_validation_schema.json
index 70d6845..6267a8c 100644
--- 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"},
               {"name": "modelInvariantId", "data-type": "string"},
               {"name": "serviceInstanceId", "data-type": "string"},
+              {"name": "requestId", "data-type": "string"},
+              {"name": "client", "data-type": "string"},
               {"name": "result", "data-type": "string"},
               {"name": "violations", "data-type": "nested", "sub-fields": [
                      {"name": "violationId", "data-type": "string", "searchable": "false"},