diff options
| author |   rajendrajaiswal <rajendra.jaiswal@ericsson.com> | 2020-03-09 15:41:41 +0000 |
|---|---|---|
| committer |   Morgan Richomme <morgan.richomme@orange.com> | 2020-03-12 08:20:52 +0000 |
| commit | 318533f684d73f94eb626902bcf7ff1dd3ad92e4 (patch) | |
| tree | 01187e88dd3e83d261eaf6a05a025914f1e0aa03 | |
| parent | 769a79125d17ded007894464a7151eafbd65f355 (diff) | |
Added python3 and Updated netopeer image
Change-Id: Ib7c21353cff267b847a4d1d7fdcb322e22772062
Issue-ID: INT-1312
Signed-off-by: rajendrajaiswal <rajendra.jaiswal@ericsson.com>
| -rw-r--r-- | test/mocks/pmsh-pnf-sim/docker-compose/docker-compose.yml | 6 | ||||
| -rw-r--r-- | test/mocks/pmsh-pnf-sim/docker-compose/requirements.txt | 2 | ||||
| -rw-r--r-- | test/mocks/pmsh-pnf-sim/docker-compose/schedulepmjob.py | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | test/mocks/pmsh-pnf-sim/docker-compose/subscriber.py | 3 |
4 files changed, 10 insertions, 5 deletions
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 58f22691e..95530558c 100644 --- 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 index 000000000..651d147d2 --- /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 ecbd74417..2c6c587ed 100644 --- 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 index 44109a12d..628b330ac 100644..100755 --- 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 |