aboutsummaryrefslogtreecommitdiffstats
path: root/plans
diff options
context:
space:
mode:
authorZebek Bogumil <bogumil.zebek@nokia.com>2021-03-29 11:53:58 +0200
committerZebek Bogumil <bogumil.zebek@nokia.com>2021-03-29 13:15:55 +0200
commita700e2f085776f201b9a24726d3d961981089161 (patch)
tree0efb8a7b86ea6bff33894220ddc39673f91f7e5e /plans
parentef5f97aafa2928eeba13de1e3bc4bd542066ed49 (diff)
Add csit for readiness endpoint
Change-Id: Ic246a5c80ccabefee41553f36ec1741a49d1da7b Signed-off-by: Bogumil Zebek <bogumil.zebek@nokia.com> Issue-ID: INT-1869
Diffstat (limited to 'plans')
-rwxr-xr-xplans/integration-simulators-nf-simulator-netconf-server/testsuites/setup.sh2
-rwxr-xr-xplans/integration/nfsimulator/netconf-server/setup.sh37
-rwxr-xr-xplans/integration/nfsimulator/netconf-server/teardown.sh18
-rw-r--r--plans/integration/nfsimulator/netconf-server/testplan.txt4
4 files changed, 1 insertions, 60 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
index 756696f8..4fc9a358 100755
--- a/plans/integration-simulators-nf-simulator-netconf-server/testsuites/setup.sh
+++ b/plans/integration-simulators-nf-simulator-netconf-server/testsuites/setup.sh
@@ -25,7 +25,7 @@ NETCONF_SERVER_REST_PORT=6555
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)
+ RESP_CODE=$(curl -I -s -o /dev/null -w "%{http_code}" http://${NETCONF_SERVER_IP}:${NETCONF_SERVER_REST_PORT}/readiness)
if [[ "$RESP_CODE" == '200' ]]; then
echo 'Netconf Server is ready'
export NETCONF_SERVER_IP=${NETCONF_SERVER_IP}
diff --git a/plans/integration/nfsimulator/netconf-server/setup.sh b/plans/integration/nfsimulator/netconf-server/setup.sh
deleted file mode 100755
index 3f070434..00000000
--- a/plans/integration/nfsimulator/netconf-server/setup.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/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
-NETCONF_SERVER_IP=`get-instance-ip.sh $NETCONF_SERVER_NAME`
-
-# Wait until container ready
-for i in {1..9}
-do
- 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/nfsimulator/netconf-server/teardown.sh b/plans/integration/nfsimulator/netconf-server/teardown.sh
deleted file mode 100755
index 9638754a..00000000
--- a/plans/integration/nfsimulator/netconf-server/teardown.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/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/nfsimulator/netconf-server/testplan.txt b/plans/integration/nfsimulator/netconf-server/testplan.txt
deleted file mode 100644
index aa7f7db2..00000000
--- a/plans/integration/nfsimulator/netconf-server/testplan.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# 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