From 2f1ee658482437e0c5b45451d20468411e2e2b6a Mon Sep 17 00:00:00 2001 From: "Magnusen, Drew (dm741q)" Date: Thu, 19 Oct 2017 14:26:32 -0500 Subject: Added log output to multiple drools applications. Added logger statments to network.log for AAI, SO, PDPX Guard, and VFC for all inbound/outbound traffic. Issue-Id: POLICY-356 Change-Id: I802d45d8136f987b4304baa8f17e166b1c8df165 Signed-off-by: Magnusen, Drew (dm741q) --- .../so/src/main/java/org/onap/policy/so/SOManager.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'controlloop/common/model-impl/so/src') diff --git a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOManager.java b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOManager.java index 2f5ffdc3e..93c3f4c57 100644 --- a/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOManager.java +++ b/controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOManager.java @@ -29,8 +29,10 @@ import org.onap.policy.drools.system.PolicyEngine; import org.onap.policy.rest.RESTManager; import org.onap.policy.rest.RESTManager.Pair; import org.drools.core.WorkingMemory; + import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,6 +43,7 @@ import com.google.gson.JsonSyntaxException; public final class SOManager { private static final Logger logger = LoggerFactory.getLogger(SOManager.class); + private static final Logger netLogger = LoggerFactory.getLogger(org.onap.policy.drools.event.comm.Topic.NETWORK_LOGGER); private static ExecutorService executors = Executors.newCachedThreadPool(); public static SOResponse createModuleInstance(String url, String urlBase, String username, String password, SORequest request) { @@ -56,8 +59,9 @@ public final class SOManager { // // 201 - CREATED - you are done just return // - - Pair httpDetails = RESTManager.post(url, username, password, headers, "application/json", Serialization.gsonPretty.toJson(request)); + String requestJson = Serialization.gsonPretty.toJson(request); + netLogger.info("[OUT|{}|{}|]{}{}", "SO", url, System.lineSeparator(), requestJson); + Pair httpDetails = RESTManager.post(url, username, password, headers, "application/json", requestJson); if (httpDetails == null) { return null; @@ -82,6 +86,8 @@ public final class SOManager { Pair httpDetailsGet = RESTManager.get(urlGet, username, password, headers); responseGet = Serialization.gsonPretty.fromJson(httpDetailsGet.b, SOResponse.class); + netLogger.info("[IN|{}|{}|]{}{}", "SO", urlGet, System.lineSeparator(), responseGet.toString()); + body = Serialization.gsonPretty.toJson(responseGet); logger.debug("***** Response to get:"); logger.debug(body); @@ -159,7 +165,10 @@ public final class SOManager { String msoJson = gsonPretty.toJson(request); SOResponse mso = new SOResponse(); + netLogger.info("[OUT|{}|{}|]{}{}", "SO", url, System.lineSeparator(), msoJson); Pair httpResponse = RESTManager.post(url, "policy", "policy", headers, "application/json", msoJson); + netLogger.info("[IN|{}|{}|]{}{}", url, "SO", System.lineSeparator(), httpResponse.b); + if (httpResponse != null) { Gson gson = new Gson(); mso = gson.fromJson(httpResponse.b, SOResponse.class); -- cgit 1.2.3-korg