Add csit for readiness endpoint

Change-Id: Ic246a5c80ccabefee41553f36ec1741a49d1da7b
Signed-off-by: Bogumil Zebek <bogumil.zebek@nokia.com>
Issue-ID: INT-1869

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 756696f..4fc9a35 100755 (executable)
--- 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 (executable)
index 3f07043..0000000
--- 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 (executable)
index 9638754..0000000
--- 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 (file)
index aa7f7db..0000000
--- 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

diff --git a/scripts/integration/nfsimulator/netconf-server/docker-compose.yml b/scripts/integration/nfsimulator/netconf-server/docker-compose.yml
index 5d51c9a..b8d4e5a 100644 (file)
--- a/scripts/integration/nfsimulator/netconf-server/docker-compose.yml
+++ b/scripts/integration/nfsimulator/netconf-server/docker-compose.yml
@@ -1,13 +1,43 @@
 version: '3'
 
 services:
+  zookeeper:
+    image: wurstmeister/zookeeper
+    ports:
+      - "2181:2181"
+    networks:
+      - netconfnetwork
+
+  kafka1:
+    image: wurstmeister/kafka:1.1.0
+    ports:
+      - "9092:9092"
+    hostname: kafka1
+    networks:
+      - netconfnetwork
+    environment:
+      KAFKA_ADVERTISED_PORT: 9092
+      KAFKA_ADVERTISED_HOST_NAME: kafka1
+      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+      KAFKA_CREATE_TOPICS: "config:1:1"
+      KAFKA_DELETE_RETENTION_MS: 604800000
+      KAFKA_LOG_CLEANER_DELETE_RETENTION_MS: 604800000
+    depends_on:
+      - zookeeper
 
   netconf-server:
     container_name: netconf-server
     image: nexus3.onap.org:10003/onap/org.onap.integration.nfsimulator.netconfserver:latest
-    environment:
-     - ENABLE_TLS=true
     ports:
-     - "830:830"
-     - "6513:6513"
-     - "6555:6555"
+      - "830:830"
+      - "6513:6513"
+      - "6555:6555"
+    networks:
+      - netconfnetwork
+    depends_on:
+      - zookeeper
+      - kafka1
+
+networks:
+  netconfnetwork:
+    driver: bridge
\ No newline at end of file

diff --git a/tests/integration/nfsimulator/netconf-server/netconf-server-rest-test.robot b/tests/integration/nfsimulator/netconf-server/netconf-server-rest-test.robot
index 4805d68..0d3ebde 100644 (file)
--- a/tests/integration/nfsimulator/netconf-server/netconf-server-rest-test.robot
+++ b/tests/integration/nfsimulator/netconf-server/netconf-server-rest-test.robot
@@ -10,3 +10,8 @@ Netconf Server Rest API Health Check
     [Tags]      Netconf-Server
     [Documentation]   Run healthcheck
     Run Healthcheck
+
+Netconf Server Rest API Readiness Check
+    [Tags]      Netconf-Server
+    [Documentation]   Run readiness
+    Run Readiness 
\ No newline at end of file

diff --git a/tests/integration/nfsimulator/netconf-server/resources/netconf-server-keywords.robot b/tests/integration/nfsimulator/netconf-server/resources/netconf-server-keywords.robot
index 94be035..fd54487 100644 (file)
--- a/tests/integration/nfsimulator/netconf-server/resources/netconf-server-keywords.robot
+++ b/tests/integration/nfsimulator/netconf-server/resources/netconf-server-keywords.robot
@@ -10,3 +10,12 @@ Run Healthcheck
     ${resp}=  GET On Session  netconf_server_session  /healthcheck
     Should Be Equal As Strings         ${resp.status_code}  200
     Should Be Equal As Strings  ${resp.text}  UP
+
+Run Readiness 
+    [Documentation]  Run Readiness
+    Create Session    netconf_server_session    ${NETCONF_SERVER_URL}
+    ${resp}=  GET On Session  netconf_server_session  /readiness 
+    Should Be Equal As Strings         ${resp.status_code}  200
+    Should Be Equal As Strings  ${resp.text}  Ready
+
+