From c638391d22999bd61243794a1981d7476bfdbd5f Mon Sep 17 00:00:00 2001 From: Eylon Malin Date: Tue, 29 Oct 2019 15:01:17 +0200 Subject: use onap logging 1.6.1 with needed workarounds Issue-ID: VID-253 Onap logging 1.6.1 has some mismatches regards invocationId. This commit fix these mismatches by fixing the MDC when needed. Change-Id: Ic8d35318ae511667dfa6f9c4297d562fd976a717 Signed-off-by: Eylon Malin --- .../simulator/presetGenerator/presets/BasePresets/BaseSDCPreset.java | 2 +- vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'vid-automation/src') diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseSDCPreset.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseSDCPreset.java index ba35299a8..4a1da9e27 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseSDCPreset.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseSDCPreset.java @@ -15,7 +15,7 @@ public abstract class BaseSDCPreset extends BasePreset { public Map getRequestHeaders() { Map map = super.getRequestHeaders(); map.put("X-ONAP-PartnerName", "VID.VID"); - map.put("X-ONAP-InvocationID", "[0-9a-fA-F]{8}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{12}"); + map.put("X-InvocationID", "[0-9a-fA-F]{8}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{12}"); map.put("X-ONAP-RequestID", "[0-9a-fA-F]{8}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{4}\\-[0-9a-fA-F]{12}"); return map; } diff --git a/vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java b/vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java index 50c3db861..11a6932f4 100644 --- a/vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java +++ b/vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java @@ -145,7 +145,7 @@ public class LoggerFormatTest extends BaseApiTest { underTestRequests.forEach(request->{ - List invocationIds = request.headers.get("X-ONAP-InvocationID"); + List invocationIds = request.headers.get("X-InvocationID"); assertThat(invocationIds, hasSize(1)); String invocationId = invocationIds.get(0); -- cgit 1.2.3-korg