aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java34
-rw-r--r--models-interactions/model-impl/aai/src/test/resources/logback-test.xml42
2 files changed, 61 insertions, 15 deletions
diff --git a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java
index eae1dca8e..923b8d329 100644
--- a/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java
+++ b/models-interactions/model-impl/aai/src/main/java/org/onap/policy/aai/AaiManager.java
@@ -148,19 +148,22 @@ public final class AaiManager {
logger.debug("RestManager.put after");
if (httpDetails == null) {
- logger.info("AAI POST Null Response to {}", url);
+ NetLoggerUtil.log(EventType.IN, CommInfrastructure.REST, url, "AAI POST Null Response");
+ logger.debug("AAI POST Null Response to {}", url);
return null;
}
int httpResponseCode = httpDetails.first;
- logger.info(url);
- logger.info("{}", httpResponseCode);
- logger.info(httpDetails.second);
+ NetLoggerUtil.log(EventType.IN, CommInfrastructure.REST, url, "Response code: " + httpResponseCode);
+ NetLoggerUtil.getNetworkLogger().debug(httpDetails.second);
+
+ logger.debug(url);
+ logger.debug("{}", httpResponseCode);
+ logger.debug(httpDetails.second);
if (httpDetails.second != null) {
- String resp = httpDetails.second;
- return new AaiCqResponse(resp);
+ return new AaiCqResponse(httpDetails.second);
}
return null;
}
@@ -188,21 +191,22 @@ public final class AaiManager {
NetLoggerUtil.getNetworkLogger().info("[OUT|{}|{}|]", CommInfrastructure.REST, urlGet);
Pair<Integer, String> httpDetailsGet = restManager.get(urlGet, username, password, headers);
if (httpDetailsGet == null) {
- logger.info("AAI GET Null Response to {}", urlGet);
+ NetLoggerUtil.log(EventType.IN, CommInfrastructure.REST, url, "AAI POST Null Response");
+ logger.debug("AAI GET Null Response to {}", urlGet);
return null;
}
int httpResponseCode = httpDetailsGet.first;
- logger.info(urlGet);
- logger.info("{}", httpResponseCode);
- logger.info(httpDetailsGet.second);
+ NetLoggerUtil.log(EventType.IN, CommInfrastructure.REST, url, "Response code: " + httpResponseCode);
+ NetLoggerUtil.getNetworkLogger().debug(httpDetailsGet.second);
+
+ logger.debug(urlGet);
+ logger.debug("{}", httpResponseCode);
+ logger.debug(httpDetailsGet.second);
- if (httpResponseCode == 200) {
- String responseGet = httpDetailsGet.second;
- if (responseGet != null) {
- return responseGet;
- }
+ if (httpResponseCode == 200 && httpDetailsGet.second != null) {
+ return httpDetailsGet.second;
}
try {
Thread.sleep(1000);
diff --git a/models-interactions/model-impl/aai/src/test/resources/logback-test.xml b/models-interactions/model-impl/aai/src/test/resources/logback-test.xml
new file mode 100644
index 000000000..b5a897433
--- /dev/null
+++ b/models-interactions/model-impl/aai/src/test/resources/logback-test.xml
@@ -0,0 +1,42 @@
+<!--
+ ============LICENSE_START=======================================================
+ Copyright (C) 2019 Nordix Foundation.
+ ================================================================================
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ SPDX-License-Identifier: Apache-2.0
+ ============LICENSE_END=========================================================
+-->
+
+<configuration scan="true" scanPeriod="30 seconds" debug="false">
+
+ <contextName>ModelImplAai</contextName>
+ <statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener" />
+ <property name="LOG_DIR" value="${java.io.tmpdir}/pf_logging/" />
+
+ <!-- USE FOR STD OUT ONLY -->
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <Pattern>%d %contextName [%t] %level %logger{36} - %msg%n</Pattern>
+ </encoder>
+ </appender>
+
+ <root level="info">
+ <appender-ref ref="STDOUT" />
+ </root>
+
+ <logger name="org.onap.policy.aai" level="debug" additivity="false">
+ <appender-ref ref="STDOUT" />
+ </logger>
+
+</configuration>