Added python3 and Updated netopeer image

Change-Id: Ib7c21353cff267b847a4d1d7fdcb322e22772062
Issue-ID: INT-1312
Signed-off-by: rajendrajaiswal <rajendra.jaiswal@ericsson.com>

diff --git a/test/mocks/pmsh-pnf-sim/docker-compose/docker-compose.yml b/test/mocks/pmsh-pnf-sim/docker-compose/docker-compose.yml
index 58f2269..9553055 100644 (file)
--- a/test/mocks/pmsh-pnf-sim/docker-compose/docker-compose.yml
+++ b/test/mocks/pmsh-pnf-sim/docker-compose/docker-compose.yml
@@ -2,14 +2,14 @@ version: '3'
 
 services:
   netopeer2:
-    image: registry.gitlab.com/blue-onap/docker/sysrepo-netopeer2:v0.7-r2-5
-    container_name: netopeer2
+    image: nexus3.onap.org:10001/onap/integration/simulators/netconf-pnp-simulator:2.6.1
+    container_name: netconf-pnp-pmsh
     restart: always
     ports:
       - "830:830"
       - "6513:6513"
     volumes:
-      - ./:/config/models/pnf-subscriptions
+      - ./:/config/modules/pnf-subscriptions
   sftp:
     container_name: sftpserver
     image: atmoz/sftp

diff --git a/test/mocks/pmsh-pnf-sim/docker-compose/requirements.txt b/test/mocks/pmsh-pnf-sim/docker-compose/requirements.txt
new file mode 100644 (file)
index 0000000..651d147
--- /dev/null
+++ b/test/mocks/pmsh-pnf-sim/docker-compose/requirements.txt
@@ -0,0 +1,2 @@
+requests
+schedule
\ No newline at end of file

diff --git a/test/mocks/pmsh-pnf-sim/docker-compose/schedulepmjob.py b/test/mocks/pmsh-pnf-sim/docker-compose/schedulepmjob.py
index ecbd744..2c6c587 100644 (file)
--- a/test/mocks/pmsh-pnf-sim/docker-compose/schedulepmjob.py
+++ b/test/mocks/pmsh-pnf-sim/docker-compose/schedulepmjob.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 import time
 import schedule
 from pnf import PNF
@@ -6,7 +8,7 @@ import pnfconfig
 if __name__ == "__main__":
     try:
         pnf = PNF()
-        schedule.every(pnfconfig.rop).seconds.do(lambda: pnf.pm_job(pnfconfig.VES_IP, pnfconfig.VES_PORT))
+        schedule.every(pnfconfig.ROP).seconds.do(pnf.pm_job)
         while True:
             schedule.run_pending()
             time.sleep(1)

diff --git a/test/mocks/pmsh-pnf-sim/docker-compose/subscriber.py b/test/mocks/pmsh-pnf-sim/docker-compose/subscriber.py
old mode 100644 (file)
new mode 100755 (executable)
index 44109a1..628b330
--- a/test/mocks/pmsh-pnf-sim/docker-compose/subscriber.py
+++ b/test/mocks/pmsh-pnf-sim/docker-compose/subscriber.py
@@ -1,4 +1,5 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
+
 import re
 import sysrepo as sr
 from pnf import PNF