Refactor SimulatorFactory in PnfSimulator

Change-Id: Ie3e17a984d8fa92a68b923b09f759cfd5a4a980a
Issue-ID: INT-1018
Signed-off-by: biniek <lukasz.biniek@nokia.com>
diff --git a/test/mocks/pnfsimulator/config/config.json b/test/mocks/pnfsimulator/config/config.json
index 3b5cd8a..636e013 100644
--- a/test/mocks/pnfsimulator/config/config.json
+++ b/test/mocks/pnfsimulator/config/config.json
@@ -25,30 +25,30 @@
       "attachmentPoint": "bla-bla-30-3",
       "svlan": "1005",
       "cvlan": "678"
-    },
-    "notificationParams": {
-      "changeIdentifier": "PM_MEAS_FILES",
-      "changeType": "FileReady",
-      "arrayOfNamedHashMap": [
-        {
-          "name": "A20161221.1031-1041.bin.gz",
-          "hashMap": {
-            "location": "ftpes://192.169.0.1:22/ftp/rop/A20161224.1030-1045.bin.gz",
-            "compression": "gzip",
-            "fileFormatType": "org.3GPP.32.435#measCollec",
-            "fileFormatVersion": "V10"
-          }
-        },
-        {
-          "name": "A20161222.1042-1102.bin.gz",
-          "hashMap": {
-            "location": "ftpes://192.168.0.102:22/ftp/rop/A20161224.1045-1100.bin.gz",
-            "compression": "gzip",
-            "fileFormatType": "org.3GPP.32.435#measCollec",
-            "fileFormatVersion": "V10"
-          }
-        }
-      ]
     }
+  },
+  "notificationParams": {
+    "changeIdentifier": "PM_MEAS_FILES",
+    "changeType": "FileReady",
+    "arrayOfNamedHashMap": [
+      {
+        "name": "A20161221.1031-1041.bin.gz",
+        "hashMap": {
+          "location": "ftpes://192.169.0.1:22/ftp/rop/A20161224.1030-1045.bin.gz",
+          "compression": "gzip",
+          "fileFormatType": "org.3GPP.32.435#measCollec",
+          "fileFormatVersion": "V10"
+        }
+      },
+      {
+        "name": "A20161222.1042-1102.bin.gz",
+        "hashMap": {
+          "location": "ftpes://192.168.0.102:22/ftp/rop/A20161224.1045-1100.bin.gz",
+          "compression": "gzip",
+          "fileFormatType": "org.3GPP.32.435#measCollec",
+          "fileFormatVersion": "V10"
+        }
+      }
+    ]
   }
 }