aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartosz Gardziejewski <bartosz.gardziejewski@nokia.com>2021-03-29 07:54:35 +0200
committerBartosz Gardziejewski <bartosz.gardziejewski@nokia.com>2021-03-29 08:09:23 +0200
commitef5f97aafa2928eeba13de1e3bc4bd542066ed49 (patch)
tree8b9c03616782f459e47576ebefcc490750c55103
parent498541413a57e175e4cd695a03c3035a1be10512 (diff)
Change testplan location for Netconf Server CSIT.
Signed-off-by: Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com> Change-Id: I2308b7a881cfc2ea2af499bc1475d3935e19c85b Issue-ID: INT-1869
-rwxr-xr-xplans/integration-simulators-nf-simulator-netconf-server/testsuites/setup.sh37
-rwxr-xr-xplans/integration-simulators-nf-simulator-netconf-server/testsuites/teardown.sh18
-rw-r--r--plans/integration-simulators-nf-simulator-netconf-server/testsuites/testplan.txt4
-rw-r--r--scripts/integration/nfsimulator/netconf-server/docker-compose.yml2
4 files changed, 60 insertions, 1 deletions
diff --git a/plans/integration-simulators-nf-simulator-netconf-server/testsuites/setup.sh b/plans/integration-simulators-nf-simulator-netconf-server/testsuites/setup.sh
new file mode 100755
index 00000000..756696f8
--- /dev/null
+++ b/plans/integration-simulators-nf-simulator-netconf-server/testsuites/setup.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+#
+# Copyright (C) 2021 Nokia. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Start netconf-server image with dependencies
+${WORKSPACE}/scripts/integration/nfsimulator/netconf-server/start-netconf-server.sh
+
+# Setup IP for netconf-server
+NETCONF_SERVER_NAME=netconf-server
+NETCONF_SERVER_REST_PORT=6555
+
+# Wait until container ready
+for i in {1..9}
+do
+ NETCONF_SERVER_IP=`get-instance-ip.sh $NETCONF_SERVER_NAME`
+ RESP_CODE=$(curl -I -s -o /dev/null -w "%{http_code}" http://${NETCONF_SERVER_IP}:${NETCONF_SERVER_REST_PORT}/healthcheck)
+ if [[ "$RESP_CODE" == '200' ]]; then
+ echo 'Netconf Server is ready'
+ export NETCONF_SERVER_IP=${NETCONF_SERVER_IP}
+ export NETCONF_SERVER_REST_PORT=${NETCONF_SERVER_REST_PORT}
+ break
+ fi
+ echo 'Waiting for Netconf Server to start up...'
+ sleep 5s
+done
diff --git a/plans/integration-simulators-nf-simulator-netconf-server/testsuites/teardown.sh b/plans/integration-simulators-nf-simulator-netconf-server/testsuites/teardown.sh
new file mode 100755
index 00000000..9638754a
--- /dev/null
+++ b/plans/integration-simulators-nf-simulator-netconf-server/testsuites/teardown.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+#
+# Copyright (C) 2021 Nokia. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Stop netconf-server image and dependencies
+${WORKSPACE}/scripts/integration/nfsimulator/netconf-server/stop-netconf-server.sh
diff --git a/plans/integration-simulators-nf-simulator-netconf-server/testsuites/testplan.txt b/plans/integration-simulators-nf-simulator-netconf-server/testsuites/testplan.txt
new file mode 100644
index 00000000..aa7f7db2
--- /dev/null
+++ b/plans/integration-simulators-nf-simulator-netconf-server/testsuites/testplan.txt
@@ -0,0 +1,4 @@
+# Test suites are relative paths under [integration/csit.git]/tests/.
+# Place the suites in run order.
+# Temporary change to trigger verify job.
+integration/nfsimulator/netconf-server
diff --git a/scripts/integration/nfsimulator/netconf-server/docker-compose.yml b/scripts/integration/nfsimulator/netconf-server/docker-compose.yml
index bf43ff55..5d51c9a2 100644
--- a/scripts/integration/nfsimulator/netconf-server/docker-compose.yml
+++ b/scripts/integration/nfsimulator/netconf-server/docker-compose.yml
@@ -4,7 +4,7 @@ services:
netconf-server:
container_name: netconf-server
- image: onap/org.onap.integration.nfsimulator.netconfserver:latest
+ image: nexus3.onap.org:10003/onap/org.onap.integration.nfsimulator.netconfserver:latest
environment:
- ENABLE_TLS=true
ports: