1 files changed, 51 insertions, 3 deletions
diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/message/JSONObjectFactory.java b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/message/JSONObjectFactory.java
index 3ebf5674a..545a56882 100644
--- a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/message/JSONObjectFactory.java
+++ b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/src/main/java/org/onap/pnfsimulator/message/JSONObjectFactory.java
@@ -20,9 +20,18 @@
 
 package org.onap.pnfsimulator.message;
 
+import static org.onap.pnfsimulator.message.MessageConstants.COMPRESSION;
+import static org.onap.pnfsimulator.message.MessageConstants.COMPRESSION_VALUE;
 import static org.onap.pnfsimulator.message.MessageConstants.EVENT_ID;
+import static org.onap.pnfsimulator.message.MessageConstants.FILE_FORMAT_TYPE;
+import static org.onap.pnfsimulator.message.MessageConstants.FILE_FORMAT_TYPE_VALUE;
+import static org.onap.pnfsimulator.message.MessageConstants.FILE_FORMAT_VERSION;
+import static org.onap.pnfsimulator.message.MessageConstants.FILE_FORMAT_VERSION_VALUE;
+import static org.onap.pnfsimulator.message.MessageConstants.HASH_MAP;
 import static org.onap.pnfsimulator.message.MessageConstants.INTERNAL_HEADER_FIELDS;
 import static org.onap.pnfsimulator.message.MessageConstants.LAST_EPOCH_MICROSEC;
+import static org.onap.pnfsimulator.message.MessageConstants.LOCATION;
+import static org.onap.pnfsimulator.message.MessageConstants.NAME;
 import static org.onap.pnfsimulator.message.MessageConstants.NOTIFICATION_FIELDS_VERSION;
 import static org.onap.pnfsimulator.message.MessageConstants.NOTIFICATION_FIELDS_VERSION_VALUE;
 import static org.onap.pnfsimulator.message.MessageConstants.PNF_LAST_SERVICE_DATE;
@@ -31,14 +40,20 @@ import static org.onap.pnfsimulator.message.MessageConstants.PNF_REGISTRATION_FI
 import static org.onap.pnfsimulator.message.MessageConstants.PNF_REGISTRATION_FIELDS_VERSION_VALUE;
 import static org.onap.pnfsimulator.message.MessageConstants.PRIORITY;
 import static org.onap.pnfsimulator.message.MessageConstants.PRIORITY_NORMAL;
+import static org.onap.pnfsimulator.message.MessageConstants.REPORTING_ENTITY_NAME;
 import static org.onap.pnfsimulator.message.MessageConstants.SEQUENCE;
 import static org.onap.pnfsimulator.message.MessageConstants.SEQUENCE_NUMBER;
+import static org.onap.pnfsimulator.message.MessageConstants.SOURCE_NAME;
 import static org.onap.pnfsimulator.message.MessageConstants.START_EPOCH_MICROSEC;
+import static org.onap.pnfsimulator.message.MessageConstants.TIME_ZONE_OFFSET;
 import static org.onap.pnfsimulator.message.MessageConstants.VERSION;
 import static org.onap.pnfsimulator.message.MessageConstants.VERSION_NUMBER;
 import static org.onap.pnfsimulator.message.MessageConstants.VES_EVENT_LISTENER_VERSION;
 import static org.onap.pnfsimulator.message.MessageConstants.VES_EVENT_LISTENER_VERSION_NUMBER;
-
+import java.io.File;
+import java.util.List;
+import java.util.TimeZone;
+import org.json.JSONArray;
 import org.json.JSONObject;
 
 final class JSONObjectFactory {
@@ -47,6 +62,7 @@ final class JSONObjectFactory {
         JSONObject commonEventHeader = new JSONObject();
         long timestamp = System.currentTimeMillis();
         commonEventHeader.put(EVENT_ID, generateEventId());
+        commonEventHeader.put(TIME_ZONE_OFFSET, generateTimeZone(timestamp));
         commonEventHeader.put(LAST_EPOCH_MICROSEC, timestamp);
         commonEventHeader.put(PRIORITY, PRIORITY_NORMAL);
         commonEventHeader.put(SEQUENCE, SEQUENCE_NUMBER);
@@ -54,6 +70,10 @@ final class JSONObjectFactory {
         commonEventHeader.put(INTERNAL_HEADER_FIELDS, new JSONObject());
         commonEventHeader.put(VERSION, VERSION_NUMBER);
         commonEventHeader.put(VES_EVENT_LISTENER_VERSION, VES_EVENT_LISTENER_VERSION_NUMBER);
+        String absPath = System.getProperty("user.dir");
+        String nodeName = absPath.substring(absPath.lastIndexOf(File.separator)+1);
+        commonEventHeader.put(SOURCE_NAME, nodeName);
+        commonEventHeader.put(REPORTING_ENTITY_NAME, nodeName);
         return commonEventHeader;
     }
 
@@ -71,11 +91,39 @@ final class JSONObjectFactory {
         return notificationFields;
     }
 
+    static JSONArray generateArrayOfNamedHashMap(List<String> fileList, String xnfUrl) {
+        JSONArray arrayOfNamedHashMap = new JSONArray();
+
+        for (String fileName : fileList) {
+            JSONObject namedHashMap = new JSONObject();
+            namedHashMap.put(NAME, fileName);
+
+            JSONObject hashMap = new JSONObject();
+            hashMap.put(FILE_FORMAT_TYPE, FILE_FORMAT_TYPE_VALUE);
+            hashMap.put(LOCATION, xnfUrl.concat(fileName));
+            hashMap.put(FILE_FORMAT_VERSION, FILE_FORMAT_VERSION_VALUE);
+            hashMap.put(COMPRESSION, COMPRESSION_VALUE);
+            namedHashMap.put(HASH_MAP, hashMap);
+
+            arrayOfNamedHashMap.put(namedHashMap);
+        }
+
+
+        return arrayOfNamedHashMap;
+    }
+
 
     static String generateEventId() {
         String timeAsString = String.valueOf(System.currentTimeMillis());
-        return String.format("registration_%s",
-            timeAsString.substring(timeAsString.length() - 11, timeAsString.length() - 3));
+        return String.format("FileReady_%s", timeAsString);
+    }
+
+    static String generateTimeZone(long timestamp) {
+        TimeZone timeZone = TimeZone.getDefault();
+        int offsetInMillis = timeZone.getOffset(timestamp);
+        String offsetHHMM = String.format("%02d:%02d", Math.abs(offsetInMillis / 3600000),
+                Math.abs((offsetInMillis / 60000) % 60));
+        return ("UTC" + (offsetInMillis >= 0 ? "+" : "-") + offsetHHMM);
     }
 
     private JSONObjectFactory() {