send unqiue request ids to MSO in async instantiation

[vid.git] / vid-automation / src / test / java / org / onap / vid / more / LoggerFormatTest.java

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 50c3db8..2f8215a 100644 (file)
--- a/vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java
+++ b/vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java
@@ -7,6 +7,7 @@ import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.containsInRelativeOrder;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
@@ -18,6 +19,8 @@ import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import org.apache.commons.lang3.StringUtils;
@@ -37,7 +40,7 @@ public class LoggerFormatTest extends BaseApiTest {
     private final Logger logger = LogManager.getLogger(LoggerFormatTest.class);
 
     public enum LogName {
-        audit, error, audit2019, metrics2019, metrics
+        audit2019, error, metrics2019
     }
 
     @BeforeClass
@@ -50,14 +53,9 @@ public class LoggerFormatTest extends BaseApiTest {
         SimulatorApi.registerExpectationFromPreset(new PresetAAIGetSubscribersGet(), SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET);
     }
 
-    @Test
-    public void validateAuditLogsFormat() {
-        validateLogsFormat(LogName.audit);
-    }
-
     @Test
     public void validateAudit2019LogsFormat() {
-        validateLogsFormat(LogName.audit2019, "audit-ELS-2019.11", 0);
+        validateLogsFormat(LogName.audit2019, "audit-ELS-2019.11", 0.8);
     }
 
     @Test(enabled = false) // no total-score is returned for error-log
@@ -65,11 +63,6 @@ public class LoggerFormatTest extends BaseApiTest {
         validateLogsFormat(LogName.error);
     }
 
-    @Test
-    public void validateMetricsLogsFormat() {
-        validateLogsFormat(LogName.metrics, "metric");
-    }
-
     @Test
     public void validateMetrics2019LogsFormat() {
         validateLogsFormat(LogName.metrics2019, "metric-ELS-2019.11");
@@ -104,36 +97,48 @@ public class LoggerFormatTest extends BaseApiTest {
     public static String getLogLines(LogName logname, int maxRows, int minRows, RestTemplate restTemplate, URI uri) {
         String logLines = restTemplate.getForObject(uri + "/logger/" + logname.name() + "?limit={maxRows}", String.class, maxRows);
         assertThat("expecting at least " + minRows + " rows in " + logname.name(),
-                StringUtils.countMatches(logLines, '\n') + 1,
-                is(greaterThanOrEqualTo(minRows)));
+            StringUtils.countMatches(logLines, '\n') + 1,
+            is(greaterThanOrEqualTo(minRows)));
         return logLines;
     }
 
     /**
-     * @return Chronological-ordered list of recent log-lines of a given requestId
+     * @return Chronological-ordered list of recent log-lines
      */
-    public static List<String> getRequestLogLines(String requestId, LogName logname, RestTemplate restTemplate, URI uri) {
-        String logLines = LoggerFormatTest.getLogLines(logname, 30, 1, restTemplate, uri);
+    public static List<String> getLogLinesAsList(LogName logname, int maxRows, int minRows, RestTemplate restTemplate, URI uri) {
+        String logLines = LoggerFormatTest.getLogLines(logname, maxRows, minRows, restTemplate, uri);
 
         // Split
         List<String> lines = new ArrayList<>(Arrays.asList(logLines.split("(\\r?\\n)")));
 
-        // Filter
-        lines.removeIf(line -> !StringUtils.containsIgnoreCase(line, requestId));
-
         // Reverse
         reverse(lines);
 
         return lines;
     }
 
+
+    /**
+     * @return Chronological-ordered list of recent log-lines of a given requestId
+     */
+    public static List<String> getRequestLogLines(String requestId, LogName logname, RestTemplate restTemplate, URI uri) {
+
+        List<String> lines = getLogLinesAsList(logname, 30, 1, restTemplate, uri);
+
+        //Filter
+        lines.removeIf(line -> !StringUtils.containsIgnoreCase(line, requestId));
+
+        return lines;
+    }
+
+
     public static void assertHeadersAndMetricLogs(RestTemplate restTemplate, URI uri, String requestId, String path, int requestsSize) {
         List<String> logLines =
             getRequestLogLines(requestId, LogName.metrics2019, restTemplate, uri);
 
         List<RecordedRequests> requests = retrieveRecordedRequests();
         List<RecordedRequests> underTestRequests =
-            requests.stream().filter(x->x.path.startsWith(path)).collect(toList());
+            requests.stream().filter(x->x.path.contains(path)).collect(toList());
 
         assertThat(underTestRequests, hasSize(requestsSize));
 
@@ -143,25 +148,37 @@ public class LoggerFormatTest extends BaseApiTest {
             assertThat("X-ONAP-PartnerName", request.headers.get("X-ONAP-PartnerName"), contains("VID.VID"));
         });
 
+        List<String> allInvocationIds = new LinkedList<>();
+
         underTestRequests.forEach(request->{
 
-            List<String> invocationIds = request.headers.get("X-ONAP-InvocationID");
+            List<String> invocationIds = request.headers.get("X-InvocationID");
             assertThat(invocationIds, hasSize(1));
 
             String invocationId = invocationIds.get(0);
-            assertThat("request id  and invocation id must be found in exactly two rows",
-                logLines,
-                containsInRelativeOrder(
-                    allOf(
-                        containsString("RequestID="+requestId),
-                        containsString("InvocationID="+ invocationId),
-                        containsString("Invoke")),
-                    allOf(
-                        containsString("RequestID="+requestId),
-                        containsString("InvocationID="+ invocationId),
-                        containsString("InvokeReturn"))
-                ));
+            allInvocationIds.add(invocationId);
+
+            assertIdsInMetricsLog(logLines, requestId, invocationId);
         });
+
+        //make sure no InvocationId is repeated twice
+        assertThat("expect all InvocationIds to be unique",
+            allInvocationIds, containsInAnyOrder(new HashSet<>(allInvocationIds).toArray()));
+    }
+
+    public static void assertIdsInMetricsLog(List<String> logLines, String requestId, String invocationId) {
+        assertThat("request id and invocation id must be found in exactly two rows",
+            logLines,
+            containsInRelativeOrder(
+                allOf(
+                    containsString("RequestID="+requestId),
+                    containsString("InvocationID="+ invocationId),
+                    containsString("Invoke")),
+                allOf(
+                    containsString("RequestID="+requestId),
+                    containsString("InvocationID="+ invocationId),
+                    containsString("InvokeReturn"))
+            ));
     }
 
     private JsonNode getCheckerResults(String logtype, String logLines) {