ROP file processing in mass-pnf-simulator

Change-Id: I66203ff66e9d91865f8eee06bef01e55bcd6c39c
Issue-ID: DCAEGEN2-1225
Signed-off-by: TamasBakai <tamas.bakai@est.tech>

5 files changed, 16 insertions, 60 deletions

diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/config.json b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/config.json
index f0ded4c04..8d6342d9d 100644
--- a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/config.json
+++ b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/config.json
@@ -1,7 +1,7 @@
 {
   "simulatorParams": {
-    "vesServerUrl": "http://localhost:10000/eventListener/v7",
-    "testDuration": "10",
+    "vesServerUrl": "http://10.10.1.99:9999/eventListener/v7",
+    "testDuration": "1",
     "messageInterval": "1"
   },
   "commonEventHeaderParams": {
diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/config.yml b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/config.yml
new file mode 100644
index 000000000..206d918a6
--- /dev/null
+++ b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/config.yml
@@ -0,0 +1,7 @@
+---
+vesip: http://localhost:10000
+ipftps: 10.11.0.67
+ipsftp: 10.11.0.68
+#when run in simulator, it does not have own IP
+ippnfsim: localhost  
+...
diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/netconf.env b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/netconf.env
index 6cf310a27..c4f7b4a80 100644
--- a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/netconf.env
+++ b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/netconf.env
@@ -1,4 +1,10 @@
-NETCONF_ADDRESS=netopeer
+
+//to run in simulator
+//NETCONF_ADDRESS=netopeer
+
+//to run in docker
+NETCONF_ADDRESS=localhost
+
 NETCONF_PORT=830
 NETCONF_MODEL=pnf-simulator
 NETCONF_MAIN_CONTAINER=config
diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/singlefile-config-ftps-template.json b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/singlefile-config-ftps-template.json
deleted file mode 100644
index de1e95707..000000000
--- a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/singlefile-config-ftps-template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "simulatorParams": {
-    "vesServerUrl": "http://______$IP_OF_VES_____:_____$PORT_OF_VES/eventListener/v7",
-    "testDuration": "10",
-    "messageInterval": "1"
-  },
-  "commonEventHeaderParams": {
-    "eventName": "pnfRegistration_Nokia_5gDu",
-    "nfNamingCode": "gNB",
-    "nfcNamingCode": "oam",
-    "sourceName": "NOK6061ZW3",
-    "sourceId": "val13",
-    "reportingEntityName": "NOK6061ZW3"
-  },
-  "notificationParams": {
-    "changeIdentifier": "PM_MEAS_FILES",
-    "changeType": "FileReady",
-    "arrayOfNamedHashMap": [
-      {"name": "1MB.tar.gz", "hashMap": {
-        "location": "sftp://$IPSFTP}/1MB.tar.gz",
-        "compression": "gzip",
-        "fileFormatType": "org.3GPP.32.435#measCollec",
-        "fileFormatVersion": "V10"
-      }
-      }
-      }
-    ]
-  }
-}
diff --git a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/singlefile-config-sftp-template.json b/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/singlefile-config-sftp-template.json
deleted file mode 100644
index c8c38b000..000000000
--- a/test/mocks/mass-pnf-sim/pnf-sim-lightweight/config/singlefile-config-sftp-template.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "simulatorParams": {
-    "vesServerUrl": "http://______$IP_OF_VES_____:_____$PORT_OF_VES/eventListener/v7",
-    "testDuration": "10",
-    "messageInterval": "1"
-  },
-  "commonEventHeaderParams": {
-    "eventName": "pnfRegistration_Nokia_5gDu",
-    "nfNamingCode": "gNB",
-    "nfcNamingCode": "oam",
-    "sourceName": "NOK6061ZW3",
-    "sourceId": "val13",
-    "reportingEntityName": "NOK6061ZW3"
-  },
-  "notificationParams": {
-    "changeIdentifier": "PM_MEAS_FILES",
-    "changeType": "FileReady",
-    "arrayOfNamedHashMap": [
-      {"name": "1MB.tar.gz", "hashMap": {
-        "location": "ftps://$IP/1MB.tar.gz",
-        "compression": "gzip",
-        "fileFormatType": "org.3GPP.32.435#measCollec",
-        "fileFormatVersion": "V10"
-      }
-      }
-    ]
-  }
-}