diff options
11 files changed, 182 insertions, 11 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..4fc9a358 --- /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}/readiness) + 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/dcaegen2-collectors-datafile/dfc-management/dfc-start.sh b/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-start.sh index b7a595c1..224a5368 100755 --- a/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-start.sh +++ b/scripts/dcaegen2-collectors-datafile/dfc-management/dfc-start.sh @@ -25,17 +25,6 @@ set -x DOCKER_SIM_NWNAME="dfcnet" echo "Creating docker network $DOCKER_SIM_NWNAME, if needed" docker network ls | grep $DOCKER_SIM_NWNAME >/dev/null || docker network create $DOCKER_SIM_NWNAME - -if [ $HTTP_TYPE = "HTTPS" ] - then - docker run \ - --name oom-certservice-post-processor \ - --env-file $SIMGROUP_ROOT/../certservice/merger/merge-certs.env \ - --mount type=bind,src=$SIMGROUP_ROOT/tls,dst=/opt/app/datafile/etc/cert \ - --mount type=bind,src=$SIMGROUP_ROOT/../certservice/generated-certs/dfc-p12,dst=/opt/app/datafile/etc/ \ - nexus3.onap.org:10001/onap/org.onap.oom.platform.cert-service.oom-certservice-post-processor:latest -fi - docker-compose up -d DFC_APP="$(docker ps -q --filter='name=dfc_app0')" diff --git a/scripts/integration/nfsimulator/netconf-server/docker-compose.yml b/scripts/integration/nfsimulator/netconf-server/docker-compose.yml new file mode 100644 index 00000000..b8d4e5a6 --- /dev/null +++ b/scripts/integration/nfsimulator/netconf-server/docker-compose.yml @@ -0,0 +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 + ports: + - "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/scripts/integration/nfsimulator/netconf-server/start-netconf-server.sh b/scripts/integration/nfsimulator/netconf-server/start-netconf-server.sh new file mode 100755 index 00000000..8fadcd1a --- /dev/null +++ b/scripts/integration/nfsimulator/netconf-server/start-netconf-server.sh @@ -0,0 +1,19 @@ +#!/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. + + +echo "Starting netconf server" +docker-compose -f ${WORKSPACE}/scripts/integration/nfsimulator/netconf-server/docker-compose.yml up -d diff --git a/scripts/integration/nfsimulator/netconf-server/stop-netconf-server.sh b/scripts/integration/nfsimulator/netconf-server/stop-netconf-server.sh new file mode 100755 index 00000000..01d38509 --- /dev/null +++ b/scripts/integration/nfsimulator/netconf-server/stop-netconf-server.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. + +echo "Stopping netconf server" +docker-compose -f ${WORKSPACE}/scripts/integration/nfsimulator/netconf-server/docker-compose.yml down diff --git a/tests/integration/nfsimulator/netconf-server/__init__.robot b/tests/integration/nfsimulator/netconf-server/__init__.robot new file mode 100644 index 00000000..aa8babbc --- /dev/null +++ b/tests/integration/nfsimulator/netconf-server/__init__.robot @@ -0,0 +1,2 @@ +*** Settings *** +Documentation Integration - Netconf Server diff --git a/tests/integration/nfsimulator/netconf-server/netconf-server-rest-test.robot b/tests/integration/nfsimulator/netconf-server/netconf-server-rest-test.robot new file mode 100644 index 00000000..0d3ebdec --- /dev/null +++ b/tests/integration/nfsimulator/netconf-server/netconf-server-rest-test.robot @@ -0,0 +1,17 @@ +*** Settings *** +Documentation Run healthcheck +Library RequestsLibrary +Resource ./resources/netconf-server-keywords.robot + + +*** Test Cases *** + +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 new file mode 100644 index 00000000..fd54487a --- /dev/null +++ b/tests/integration/nfsimulator/netconf-server/resources/netconf-server-keywords.robot @@ -0,0 +1,21 @@ +*** Settings *** +Library RequestsLibrary +Resource ./netconf-server-properties.robot + +*** Keywords *** + +Run Healthcheck + [Documentation] Run Healthcheck + Create Session netconf_server_session ${NETCONF_SERVER_URL} + ${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 + + diff --git a/tests/integration/nfsimulator/netconf-server/resources/netconf-server-properties.robot b/tests/integration/nfsimulator/netconf-server/resources/netconf-server-properties.robot new file mode 100644 index 00000000..3903da7d --- /dev/null +++ b/tests/integration/nfsimulator/netconf-server/resources/netconf-server-properties.robot @@ -0,0 +1,3 @@ +*** Variables *** + +${NETCONF_SERVER_URL} http://%{NETCONF_SERVER_IP}:%{NETCONF_SERVER_REST_PORT} |