From: ebo <eliezio.oliveira@est.tech>
Date: Fri, 10 Apr 2020 20:17:17 +0000 (+0100)
Subject: netconf-pnp-simulator: normalized image reference
X-Git-Tag: 6.0.0-ONAP~104
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c06ea62716be250a59bd1d3857baa1a3a927a317;p=integration.git

netconf-pnp-simulator: normalized image reference

Required change for the forthcoming fix on tox execution in
ci-management/jjb/integration/integration-docker.yaml

Issue-ID: INT-1124
Change-Id: I70c3351e5cf691a9eaeb7b49ec276d825016e0fa
Signed-off-by: ebo <eliezio.oliveira@est.tech>
---

diff --git a/test/mocks/netconf-pnp-simulator/engine/tests/settings.py b/test/mocks/netconf-pnp-simulator/engine/tests/settings.py
index 749eb4cfd..716fdb7a2 100644
--- a/test/mocks/netconf-pnp-simulator/engine/tests/settings.py
+++ b/test/mocks/netconf-pnp-simulator/engine/tests/settings.py
@@ -2,9 +2,7 @@ import os
 
 HOST = "127.0.0.1"
 # Set by tox-docker
-# Unexpectedly, tox-docker uses the repository prefix instead of the image name to define the
-# variable prefix.
-PORT = int(os.environ["LOCALHOST_830_TCP_PORT"])
+PORT = int(os.environ["NETCONF_PNP_SIMULATOR_830_TCP_PORT"])
 USERNAME = "netconf"
 KEY_FILENAME = "../config/ssh/id_rsa"
 
diff --git a/test/mocks/netconf-pnp-simulator/engine/tox.ini b/test/mocks/netconf-pnp-simulator/engine/tox.ini
index c4ca5fbdb..4b0ac1efe 100644
--- a/test/mocks/netconf-pnp-simulator/engine/tox.ini
+++ b/test/mocks/netconf-pnp-simulator/engine/tox.ini
@@ -24,7 +24,7 @@ skipsdist = True
 [testenv]
 changedir = tests
 docker =
-  {env:CONTAINER_PUSH_REGISTRY}/{env:DOCKER_NAME}:{env:DOCKER_IMAGE_TAG}
+  netconf-pnp-simulator:latest
 
 deps =
   ncclient