From f15077f640d033c1eb50d5496b27b6d6739d7e76 Mon Sep 17 00:00:00 2001 From: Filip Krzywka Date: Thu, 30 Aug 2018 12:27:00 +0200 Subject: Move HV-VES CSIT testsuites This is hopefully temporary alignment with other projects made to prevent jenkins job builder from creating unnecessary jobs for dcaegen2-prh-testsuites and dcaegen2-ves-collector-testsuites. Change-Id: I57a9e63fc93bce398c614ffb5ed9a2c2f939b501 Issue-ID: DCAEGEN2-687 Signed-off-by: Filip Krzywka --- .../dcaegen2/hv-ves-testsuites/docker-compose.yml | 72 ---------------------- .../csit/plans/dcaegen2/hv-ves-testsuites/setup.sh | 40 ------------ .../plans/dcaegen2/hv-ves-testsuites/ssl/Makefile | 32 ---------- .../plans/dcaegen2/hv-ves-testsuites/ssl/README.md | 18 ------ .../plans/dcaegen2/hv-ves-testsuites/teardown.sh | 11 ---- .../plans/dcaegen2/hv-ves-testsuites/testplan.txt | 4 -- 6 files changed, 177 deletions(-) delete mode 100644 test/csit/plans/dcaegen2/hv-ves-testsuites/docker-compose.yml delete mode 100755 test/csit/plans/dcaegen2/hv-ves-testsuites/setup.sh delete mode 100644 test/csit/plans/dcaegen2/hv-ves-testsuites/ssl/Makefile delete mode 100644 test/csit/plans/dcaegen2/hv-ves-testsuites/ssl/README.md delete mode 100755 test/csit/plans/dcaegen2/hv-ves-testsuites/teardown.sh delete mode 100644 test/csit/plans/dcaegen2/hv-ves-testsuites/testplan.txt (limited to 'test/csit/plans/dcaegen2') diff --git a/test/csit/plans/dcaegen2/hv-ves-testsuites/docker-compose.yml b/test/csit/plans/dcaegen2/hv-ves-testsuites/docker-compose.yml deleted file mode 100644 index 28cded8cb..000000000 --- a/test/csit/plans/dcaegen2/hv-ves-testsuites/docker-compose.yml +++ /dev/null @@ -1,72 +0,0 @@ -version: "3" - -networks: - ves-hv-default: - external: - name: $CONTAINERS_NETWORK - -services: - zookeeper: - image: wurstmeister/zookeeper - ports: - - "2181:2181" - networks: - - ves-hv-default - - kafka: - image: wurstmeister/kafka - ports: - - "9092:9092" - environment: - KAFKA_ADVERTISED_HOST_NAME: "kafka" - KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'true' - KAFKA_ZOOKEEPER_CONNECT: "zookeeper:2181" - KAFKA_ADVERTISED_LISTENERS: "PLAINTEXT://kafka:9092" - volumes: - - /var/run/docker.sock:/var/run/docker.sock - depends_on: - - zookeeper - networks: - - ves-hv-default - - consul: - image: progrium/consul - ports: - - "8500:8500" - environment: - - CONSUL_BIND_INTERFACE=eth0 - networks: - ves-hv-default: - aliases: - - consul - command: ["-server", "-bootstrap"] - - ves-hv-collector: - image: $DOCKER_REGISTRY/onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main - ports: - - "6061:6061/tcp" - entrypoint: ["java", "-Dio.netty.leakDetection.level=paranoid", "-cp", "*:", "org.onap.dcae.collectors.veshv.main.MainKt"] - command: ["--listen-port", "6061","--config-url", "http://consul:8500/v1/kv/veshv-config"] - depends_on: - - kafka - volumes: - - ./ssl/:/etc/ves-hv/ - networks: - - ves-hv-default - - dcae-app-simulator: - image: $DOCKER_REGISTRY/onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-dcae-app-simulator - ports: - - "6063:6063/tcp" - command: ["--listen-port", "6063", "--kafka-bootstrap-servers", "kafka:9092", "--kafka-topics", "ves_hvRanMeas"] - healthcheck: - interval: 10s - timeout: 5s - retries: 2 - test: ["CMD", "curl", "--request", "GET", "--fail", "--silent", "--show-error", "localhost:6063/healthcheck"] - depends_on: - - kafka - networks: - ves-hv-default: - aliases: - - dcae-app-simulator \ No newline at end of file diff --git a/test/csit/plans/dcaegen2/hv-ves-testsuites/setup.sh b/test/csit/plans/dcaegen2/hv-ves-testsuites/setup.sh deleted file mode 100755 index 48e39807f..000000000 --- a/test/csit/plans/dcaegen2/hv-ves-testsuites/setup.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -pip uninstall -y docker-py -pip install docker - -COMPOSE_VERSION=1.22.0 -COMPOSE_LOCATION='/usr/local/bin/docker-compose' -sudo curl -L https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-$(uname -s)-$(uname -m) -o ${COMPOSE_LOCATION} -sudo chmod +x ${COMPOSE_LOCATION} - - -echo "Removing not used docker networks" -docker network prune -f - -export CONTAINERS_NETWORK=ves-hv-default -echo "Creating network for containers: ${CONTAINERS_NETWORK}" -docker network create ${CONTAINERS_NETWORK} - -cd ssl -make FILE=client -make FILE=server -make FILE=invalid_client CA=invalid_trust -cd .. - -export DOCKER_REGISTRY="nexus3.onap.org:10001" -CURRENT_DIR=${PWD##*/} -VES_HV_CONTAINER_NAME=ves-hv-collector - -# little race condition between container start-up and required files copying below -docker-compose up -d - -COMPOSE_VES_HV_CONTAINER_NAME=${CURRENT_DIR}_${VES_HV_CONTAINER_NAME}_1 -echo "COPY tls authorization files to container: ${COMPOSE_VES_HV_CONTAINER_NAME}" -docker cp ssl/. ${COMPOSE_VES_HV_CONTAINER_NAME}:/etc/ves-hv -# race condition end - - -export ROBOT_VARIABLES="--pythonpath ${WORKSPACE}/test/csit/tests/dcaegen2/hv-ves-testcases/libraries" \ No newline at end of file diff --git a/test/csit/plans/dcaegen2/hv-ves-testsuites/ssl/Makefile b/test/csit/plans/dcaegen2/hv-ves-testsuites/ssl/Makefile deleted file mode 100644 index 5fddc6b1d..000000000 --- a/test/csit/plans/dcaegen2/hv-ves-testsuites/ssl/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -FILE=sample -CA_PASSWD=onap -SUBJ=/C=PL/ST=DL/L=Wroclaw/O=Nokia/OU=MANO -CA=trust - -sign: $(FILE).crt - -clean: - rm -f *.crt *.key *.srl *.csr - -generate-ca-certificate: $(CA).crt - -generate-private-key: $(FILE).key - -create-public-key: $(FILE).pub - -create-sign-request: $(FILE).csr - -$(CA).crt: - openssl req -new -x509 -keyout $(CA).key -out $(CA).crt -days 365 -passout pass:$(CA_PASSWD) -subj "$(SUBJ)" - -$(FILE).key: - openssl genpkey -algorithm RSA -out $(FILE).key -pkeyopt rsa_keygen_bits:2048 - -$(FILE).pub: $(FILE).key - openssl x509 -req -days 360 -in client.csr -CA $(CA).crt -CAkey $(CA).key -CAcreateserial -out client.crt - -$(FILE).csr: $(FILE).key - openssl req -new -sha256 -key $(FILE).key -out $(FILE).csr -subj "$(SUBJ)" - -$(FILE).crt: $(CA).crt $(FILE).csr - openssl x509 -req -days 360 -in $(FILE).csr -CA $(CA).crt -CAkey $(CA).key -out $(FILE).crt -CAcreateserial -passin pass:$(CA_PASSWD) \ No newline at end of file diff --git a/test/csit/plans/dcaegen2/hv-ves-testsuites/ssl/README.md b/test/csit/plans/dcaegen2/hv-ves-testsuites/ssl/README.md deleted file mode 100644 index 174c16641..000000000 --- a/test/csit/plans/dcaegen2/hv-ves-testsuites/ssl/README.md +++ /dev/null @@ -1,18 +0,0 @@ -# Generating SSL certificates - -Typical usage: - -```shell -make FILE=client -make FILE=server -``` - -Will generate CA certificate and signed client and server certificates. - -More "low-level" usage: - -```shell -make generate-ca-certificate -make generate-private-key FILE=client -make sign FILE=client -``` diff --git a/test/csit/plans/dcaegen2/hv-ves-testsuites/teardown.sh b/test/csit/plans/dcaegen2/hv-ves-testsuites/teardown.sh deleted file mode 100755 index 91ad90305..000000000 --- a/test/csit/plans/dcaegen2/hv-ves-testsuites/teardown.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -cd ssl -make clean -cd .. - -docker-compose logs > ${WORKSPACE}/archives/docker-compose.log -docker-compose down -docker-compose rm -f - -docker network rm ${CONTAINERS_NETWORK} \ No newline at end of file diff --git a/test/csit/plans/dcaegen2/hv-ves-testsuites/testplan.txt b/test/csit/plans/dcaegen2/hv-ves-testsuites/testplan.txt deleted file mode 100644 index 3f4f14806..000000000 --- a/test/csit/plans/dcaegen2/hv-ves-testsuites/testplan.txt +++ /dev/null @@ -1,4 +0,0 @@ -# Test suites are relative paths under [integration.git]/test/csit/tests/. -# Place the suites in run order. -dcaegen2/hv-ves-testcases - -- cgit 1.2.3-korg