Merge "Updated schema,docker-compose, README.md"

3 files changed, 6 insertions, 1 deletions

diff --git a/test/mocks/pnfsimulator/README.md b/test/mocks/pnfsimulator/README.md
index aaed3cf1c..b1ff56035 100644
--- a/test/mocks/pnfsimulator/README.md
+++ b/test/mocks/pnfsimulator/README.md
@@ -14,6 +14,7 @@ The configuration for simulator is stored in */config/config.json* file.
 It contains all parameters for simulation such as duration time,interval between messages and values of the configurable fields of VES message. 
 If you want to change duration or value of message sending to VES collector you just need to edit this file. 
 The message that is being sent to VES is built inside the simulator and it's content can be found in log of the simulator. 
+Proper config must contain *simulatorParams*, *commonEventHeaderParams* and *pnfRegistrationParams* or notificationParams. 
 
 ###Running simulator   
 The recommended way is to checkout PNF Simulator project from ONAP Git repository and use *simulator*.sh script
@@ -32,6 +33,7 @@ Connection to SFTP server is being done with usage of SSH keys. Private key is s
 In order to download *sftp-file.txt* file simply run *sftp -P 2222 -i ssh/ssh_host_rsa_key sftp-user@localhost:sftp/sftp-file.txt*
 In order to add a new file (e.g. test.zip), put the file into *sftp* directory and run simulator.
 After that again execute sftp command: *sftp -P 2222 -i ssh/ssh_host_rsa_key sftp-user@localhost:sftp/test.zip*
+In order to disable usage of SSH keys and start using password, change in *docker-compose.yml* service *sftp-service* entry *command* from *sftp-user::1001* to *sftp-user:password:1001*
 
 ###FTPES support
 PNF Simulator allows to serve files via FTPES server. FTPES server has predefined user: onap with password: pano. 
diff --git a/test/mocks/pnfsimulator/docker-compose.yml b/test/mocks/pnfsimulator/docker-compose.yml
index aa9f00191..f3500d248 100644
--- a/test/mocks/pnfsimulator/docker-compose.yml
+++ b/test/mocks/pnfsimulator/docker-compose.yml
@@ -27,6 +27,7 @@ services:
     restart: on-failure
     depends_on:
       - sftp-server
+      - ftpes-server
 
   sftp-server:
     container_name: sftp-server
@@ -40,8 +41,8 @@ services:
     command: sftp-user::1001
 
   ftpes-server:
-    image: stilliard/pure-ftpd:latest
     container_name: ftpes-server
+    image: stilliard/pure-ftpd:latest
     ports:
       - "2221:21"
 #      - "30000-30009:30000-30009"
diff --git a/test/mocks/pnfsimulator/json_schema/input_validator.json b/test/mocks/pnfsimulator/json_schema/input_validator.json
index d278bfc87..f5573af49 100644
--- a/test/mocks/pnfsimulator/json_schema/input_validator.json
+++ b/test/mocks/pnfsimulator/json_schema/input_validator.json
@@ -190,12 +190,14 @@
     {
       "required": [
         "simulatorParams",
+        "commonEventHeaderParams",
         "pnfRegistrationParams"
       ]
     },
     {
       "required": [
         "simulatorParams",
+        "commonEventHeaderParams",
         "notificationParams"
       ]
     }