diff options
Diffstat (limited to 'plans')
| -rw-r--r-- | plans/aaf/aafapi/setup.sh | 225 | ||||
| -rw-r--r-- | plans/aaf/aafapi/teardown.sh | 28 | ||||
| -rw-r--r-- | plans/dcaegen2-collectors-hv-ves/testsuites/.env | 13 | ||||
| -rw-r--r-- | plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml | 65 | ||||
| -rwxr-xr-x | plans/dmaap-datarouter/dr-suite/setup.sh | 21 | ||||
| -rwxr-xr-x | plans/music/music-test-plan/setup.sh | 8 | ||||
| -rwxr-xr-x | plans/music/music-test-plan/teardown.sh | 2 | ||||
| -rw-r--r-- | plans/optf-cmso/cmso/setup.sh | 29 | ||||
| -rw-r--r-- | plans/optf-cmso/cmso/teardown.sh | 24 | ||||
| -rw-r--r-- | plans/optf-cmso/cmso/testplan.txt | 3 | ||||
| -rw-r--r-- | plans/so/integration-testing/docker-compose.yml | 296 | ||||
| -rw-r--r-- | plans/so/integration-testing/setup.sh | 18 | ||||
| -rw-r--r-- | plans/so/integration-testing/teardown.sh | 4 | ||||
| -rw-r--r-- | plans/usecases/5G-bulkpm/setup.sh | 3 |
14 files changed, 530 insertions, 209 deletions
diff --git a/plans/aaf/aafapi/setup.sh b/plans/aaf/aafapi/setup.sh index 33c524da..6c88ceb7 100644 --- a/plans/aaf/aafapi/setup.sh +++ b/plans/aaf/aafapi/setup.sh @@ -18,171 +18,112 @@ # See the License for the specific language governing permissions and # limitations under the License. # ============LICENSE_END============================================ -# =================================================================== -# ECOMP is a trademark and service mark of AT&T Intellectual Property. # -# Place the scripts in run order: -source ${SCRIPTS}/common_functions.sh - -# Clone AAF Authz repo -mkdir -p $WORKSPACE/archives/opt -cd $WORKSPACE/archives/opt - - -HOST_IP=$(ip route get 8.8.8.8 | awk '/8.8.8.8/ {print $NF}') -export HOST_IP=${HOST_IP} -CURRENT_DIR=$(pwd) export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) - -NEXUS_USERNAME=anonymous -NEXUS_PASSWD=anonymous -NEXUS_DOCKER_REPO=nexus3.onap.org:10001 -AAF_DOCKER_VERSION=2.1.5 - -docker login -u $NEXUS_USERNAME -p "$NEXUS_PASSWD" $NEXUS_DOCKER_REPO - -docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_cass:$AAF_DOCKER_VERSION -docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_config:$AAF_DOCKER_VERSION -docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_cm:$AAF_DOCKER_VERSION -docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_fs:$AAF_DOCKER_VERSION -docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_gui:$AAF_DOCKER_VERSION -docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_hello:$AAF_DOCKER_VERSION -docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_locate:$AAF_DOCKER_VERSION -docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_oauth:$AAF_DOCKER_VERSION -docker pull $NEXUS_DOCKER_REPO/onap/aaf/aaf_service:$AAF_DOCKER_VERSION - -docker tag $NEXUS_DOCKER_REPO/onap/aaf/aaf_cass:$AAF_DOCKER_VERSION nexus3.onap.org:10003/onap/aaf/aaf_cass:$AAF_DOCKER_VERSION -docker tag $NEXUS_DOCKER_REPO/onap/aaf/aaf_cass:$AAF_DOCKER_VERSION nexus3.onap.org:10003/onap/aaf/aaf_cass:2.1.6-SNAPSHOT -docker tag $NEXUS_DOCKER_REPO/onap/aaf/aaf_cass:$AAF_DOCKER_VERSION $NEXUS_DOCKER_REPO/onap/aaf/aaf_cass:2.1.6-SNAPSHOT - -git clone --depth 1 http://gerrit.onap.org/r/aaf/authz -b master -git pull -chmod -R 777 authz -cd authz +echo "AAF setup.sh" +# Starting Directory CURRENT_DIR=$(pwd) -pwd - -if [ ! -e auth/csit/d.props ]; then - cp auth/csit/d.props.init auth/csit/d.props -fi - -if [ ! -e auth/docker/d.props ]; then - cp auth/docker/d.props.init auth/docker/d.props +if [ "$(uname)" = "Darwin" ]; then + SED="sed -i .bak" +else + SED="sed -i" fi -NEXUS_USERNAME=anonymous -NEXUS_PASSWD=anonymous -NEXUS_DOCKER_REPO=nexus3.onap.org:10001 -sed -i "s/DOCKER_REPOSITORY=.*/DOCKER_REPOSITORY=$NEXUS_DOCKER_REPO/" auth/csit/d.props -. auth/csit/d.props - - - -HOSTNAME=`hostname` -FQDN=aaf.api.simpledemo.onap.org -HOST_IP=$(ip route get 8.8.8.8 | awk '/8.8.8.8/ {print $NF}') -export HOST_IP=${HOST_IP} - - -CASS_IP=`docker inspect aaf_cass | grep '"IPAddress' | head -1 | cut -d '"' -f 4` -CASS_HOST="cass.aaf.osaaf.org:"$CASS_IP - -cd auth/auth-cass/docker -if [ "`docker container ls | grep aaf_cass`" = "" ]; then - # Cassandra Install - echo Cassandra Install - bash ./dinstall.sh -fi +# Place the scripts in run order: +source ${SCRIPTS}/common_functions.sh -CASS_IP=`docker inspect aaf_cass | grep '"IPAddress' | head -1 | cut -d '"' -f 4` -CASS_HOST="cass.aaf.osaaf.org:"$CASS_IP -if [ ! -e $WORKSPACE/archives/opt/authz/auth/csit/cass.props ]; then - cp $WORKSPACE/archives/opt/authz/auth/csit/cass.props.init $WORKSPACE/archives/opt/authz/auth/csit/cass.props +# Clone AAF Authz repo +CODE_DIR="$WORKSPACE/archives/opt" +mkdir -p $CODE_DIR +cd $CODE_DIR + +# Get or refresh AAF Code set +if [ -e authz ]; then + cd authz + git pull +else + git clone --depth 1 http://gerrit.onap.org/r/aaf/authz -b master + chmod -R 777 authz + cd authz fi -sed -i "s/CASS_HOST=.*/CASS_HOST="$CASS_HOST"/g" $WORKSPACE/archives/opt/authz/auth/csit/cass.props - -# TODO Pull from Config Dir -if [ "$LATITUDE" = "" ]; then - LATITUDE=37.781 - LONGITUDE=-122.261 - sed -i "s/LATITUDE=.*/LATITUDE=$LATITUDE/g" $WORKSPACE/archives/opt/authz/auth/csit/d.props - sed -i "s/LONGITUDE=.*/LONGITUDE=$LONGITUDE/g" $WORKSPACE/archives/opt/authz/auth/csit/d.props +# Locate to Docker dir +cd auth/docker +if [ ! -e d.props ]; then + cp d.props.init d.props fi +source d.props + +# Fill in anything missing +$SED "s/^LATITUDE=.*/LATITUDE=${LATITUDE:=38.0}/" d.props +$SED "s/^LONGITUDE=.*/LONGITUDE=${LONGITUDE:=-72.0}/" d.props +# For Jenkins, gotta use 10001, not 10003 +DOCKER_REPOSITORY=nexus3.onap.org:10001 +$SED "s/DOCKER_REPOSITORY=.*/DOCKER_REPOSITORY=$DOCKER_REPOSITORY/" d.props + +$SED "s/HOSTNAME=.*/HOSTNAME=aaf.api.simpledemo.onap.org/" d.props +DOCKER_NAME=$(docker info | grep Name | awk '{print $2}' ) +echo "Docker Name is $DOCKER_NAME" + +if [ "$DOCKER_NAME" = "minikube" ]; then + echo "Minikube IP" + HOST_IP=$(minikube ip) +else + echo "Trying to get IP from Docker $DOCKER_NAME with 'ip route' method" + # ip route get 8.8.8.8 + HOST_IP=$(ip route get 8.8.8.8 | awk '{print $7}') + if [ -z "$HOST_IP" ]; then + echo "Critical HOST_IP could not be obtained by 2 different methods. Exiting..." + exit + fi + echo +fi +$SED "s/HOST_IP=.*/HOST_IP=$HOST_IP/" d.props -sed -i "s/VERSION=.*/VERSION=$VERSION/g" $WORKSPACE/archives/opt/authz/auth/csit/d.props -sed -i "s/HOSTNAME=.*/HOSTNAME=$HOSTNAME/g" $WORKSPACE/archives/opt/authz/auth/csit/d.props -sed -i "s/HOST_IP=.*/HOST_IP=$HOST_IP/g" $WORKSPACE/archives/opt/authz/auth/csit/d.props -sed -i "s/AAF_REGISTER_AS=.*/AAF_REGISTER_AS=$FQDN/g" $WORKSPACE/archives/opt/authz/auth/csit/d.props - -pwd - -cd ../../ - -pwd - -cd csit -tty -# Need new Deployment system properties -bash ./aaf.sh +cat d.props -# run it +# Pull latest Dockers +AAF_DOCKER_VERSION=${VERSION} +NEXUS_USERNAME=anonymous +NEXUS_PASSWD=anonymous +echo "$NEXUS_PASSWD" | docker login -u $NEXUS_USERNAME --password-stdin $DOCKER_REPOSITORY + +docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_cass:$AAF_DOCKER_VERSION +docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_config:$AAF_DOCKER_VERSION +docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_cm:$AAF_DOCKER_VERSION +docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_fs:$AAF_DOCKER_VERSION +docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_gui:$AAF_DOCKER_VERSION +docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_hello:$AAF_DOCKER_VERSION +docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_locate:$AAF_DOCKER_VERSION +docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_oauth:$AAF_DOCKER_VERSION +docker pull $DOCKER_REPOSITORY/onap/aaf/aaf_service:$AAF_DOCKER_VERSION + +# Cassandra Install/Start +cd ../auth-cass/docker +echo Cassandra Install +bash ./dinstall.sh +cd - + +source d.props +cat d.props + +# AAF Run bash ./drun.sh docker images docker ps -a -cat /etc/sudoers - -docker logs aaf_hello - -docker logs aaf_locate - -docker logs aaf_cm - -docker logs aaf_gui - -docker logs aaf_fs - -docker logs aaf_oauth - -docker logs aaf_service - -# Wait for initialization of Docker containers -for i in {1..50}; do - if [ $(docker inspect --format '{{ .State.Running }}' aaf_hello) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' aaf_cm) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' aaf_fs) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' aaf_gui) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' aaf_oauth) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' aaf_locate) ] && \ - [ $(docker inspect --format '{{ .State.Running }}' aaf_service) ] - then - echo "aaf Service Running" - break - else - echo sleep $i - sleep $i - fi +for C in aaf_service aaf_locate aaf_oauth aaf_cm aaf_gui aaf_hello aaf_fs; do + docker logs $C done - +bash ./aaf.sh wait aaf_service AAF_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' aaf_service) -CASSANDRA_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' aaf_cass) - echo AAF_IP=${AAF_IP} -echo CASSANDRA_IP=${CASSANDRA_IP} - -# Wait for initialization of docker services -for i in {1..12}; do - curl -k -u aaf_admin@people.osaaf.org:demo123456! https://${AAF_IP}:8100/authz/nss/org.osaaf.people && break - echo sleep $i - sleep $i -done #Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v AAF_IP:${AAF_IP}"
\ No newline at end of file +ROBOT_VARIABLES="-v AAF_IP:${AAF_IP}" diff --git a/plans/aaf/aafapi/teardown.sh b/plans/aaf/aafapi/teardown.sh index 742a1b36..f80c3ad2 100644 --- a/plans/aaf/aafapi/teardown.sh +++ b/plans/aaf/aafapi/teardown.sh @@ -1,28 +1,30 @@ #!/bin/bash # -# Copyright 2016-2017 Huawei Technologies Co., Ltd. -# +# ============LICENSE_START======================================================= +# ONAP AAF +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. 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 +# 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. -# -# Modifications copyright (c) 2017 AT&T Intellectual Property +# ============LICENSE_END============================================ # +echo "AAF Teardown" +cd "$WORKSPACE/archives/opt/authz/auth/docker" +bash dstop.sh +bash dstop.sh cass +echo "Y" | docker container prune +docker volume remove aaf_config aaf_cass_data aaf_status +cd - -kill-instance.sh aaf_service -kill-instance.sh aaf_locate -kill-instance.sh aaf_hello -kill-instance.sh aaf_cm -kill-instance.sh aaf_gui -kill-instance.sh aaf_fs -kill-instance.sh aaf_oauth -kill-instance.sh aaf_cass diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/.env b/plans/dcaegen2-collectors-hv-ves/testsuites/.env new file mode 100644 index 00000000..a64ba26a --- /dev/null +++ b/plans/dcaegen2-collectors-hv-ves/testsuites/.env @@ -0,0 +1,13 @@ + +HV_VES_COLLECTOR_NAMESPACE=onap +HV_VES_GROUP_ID=org.onap.dcaegen2.collectors.hv-ves +HV_VES_IMAGE=hv-collector-main +DCAE_APP_SIMULATOR_IMAGE=hv-collector-dcae-app-simulator + +# IF CHANGING BELOW VALUE, REMEMBER TO UPDATE ALSO XNF-SIMULATOR VERSION +# IN XNF_SIMULATOR_LIBRARY PYTHON FILE. +HV_VES_VERSION=1.1-SNAPSHOT + +HV_VES_CONFIG_URL=http://consul:8500/v1/kv/veshv-config?raw=true +HV_VES_HEALTHCHECK_CMD=curl --request GET --fail --silent --show-error localhost:6060/health/ready && nc -vz localhost 6061 +HV_VES_MAIN_CLASS=org.onap.dcae.collectors.veshv.main.MainKt
\ No newline at end of file diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml index 2a928217..9ba27750 100644 --- a/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml +++ b/plans/dcaegen2-collectors-hv-ves/testsuites/docker-compose.yml @@ -9,92 +9,91 @@ services: zookeeper: image: wurstmeister/zookeeper ports: - - "2181:2181" + - "2181:2181" networks: - - ves-hv-default + - ves-hv-default kafka: image: wurstmeister/kafka ports: - - "9092:9092" + - "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 + - /var/run/docker.sock:/var/run/docker.sock depends_on: - - zookeeper + - zookeeper networks: - - ves-hv-default + - ves-hv-default consul: image: progrium/consul ports: - - "8500:8500" + - "8500:8500" environment: - - CONSUL_BIND_INTERFACE=eth0 + - CONSUL_BIND_INTERFACE=eth0 networks: ves-hv-default: aliases: - - consul + - consul command: ["-server", "-bootstrap"] ves-hv-collector: - image: ${DOCKER_REGISTRY_PREFIX}onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:latest + image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${HV_VES_IMAGE}:${HV_VES_VERSION} ports: - - "6060:6060" - - "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", + - "6060:6060" + - "6061:6061/tcp" + entrypoint: ["java", "-Dio.netty.leakDetection.level=paranoid", "-cp", "*:", "${HV_VES_MAIN_CLASS}"] + command: ["--listen-port", "6061","--config-url", "${HV_VES_CONFIG_URL}", "--key-store-password", "onaponap", "--trust-store-password", "onaponap"] healthcheck: interval: 10s timeout: 5s retries: 2 - test: "curl --request GET --fail --silent --show-error localhost:6060/health/ready && nc -vz localhost 6061" + test: ${HV_VES_HEALTHCHECK_CMD} depends_on: - - kafka + - kafka volumes: - - ./ssl/:/etc/ves-hv/ + - ./ssl/:/etc/ves-hv/ networks: - - ves-hv-default + - ves-hv-default unencrypted-ves-hv-collector: - image: ${DOCKER_REGISTRY_PREFIX}onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:latest + image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${HV_VES_IMAGE}:${HV_VES_VERSION} ports: - - "7060:6060" - - "7061: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", "--ssl-disable"] + - "7060:6060" + - "7061:6061/tcp" + entrypoint: ["java", "-Dio.netty.leakDetection.level=paranoid", "-cp", "*:", "${HV_VES_MAIN_CLASS}"] + command: ["--listen-port", "6061","--config-url", "${HV_VES_CONFIG_URL}", "--ssl-disable"] healthcheck: interval: 10s timeout: 5s retries: 2 - test: "curl --request GET --fail --silent --show-error localhost:6060/health/ready && nc -vz localhost 6061" + test: ${HV_VES_HEALTHCHECK_CMD} depends_on: - - kafka + - kafka volumes: - - ./ssl/:/etc/ves-hv/ + - ./ssl/:/etc/ves-hv/ networks: - - ves-hv-default + - ves-hv-default dcae-app-simulator: - image: ${DOCKER_REGISTRY_PREFIX}onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-dcae-app-simulator:latest + image: ${DOCKER_REGISTRY}/${HV_VES_COLLECTOR_NAMESPACE}/${HV_VES_GROUP_ID}.${DCAE_APP_SIMULATOR_IMAGE}:${HV_VES_VERSION} ports: - - "6063:6063/tcp" - command: ["--listen-port", "6063", "--kafka-bootstrap-servers", "kafka:9092", "--kafka-topics", "ves_hvRanMeas"] + - "6063:6063/tcp" + command: ["--listen-port", "6063", "--kafka-bootstrap-servers", "kafka:9092", "--kafka-topics", "non-existing-topic"] healthcheck: interval: 10s timeout: 5s retries: 2 test: "curl --request GET --fail --silent --show-error localhost:6063/healthcheck" depends_on: - - kafka + - kafka networks: ves-hv-default: aliases: - - dcae-app-simulator
\ No newline at end of file + - dcae-app-simulator
\ No newline at end of file diff --git a/plans/dmaap-datarouter/dr-suite/setup.sh b/plans/dmaap-datarouter/dr-suite/setup.sh index dedf15b0..22d727a7 100755 --- a/plans/dmaap-datarouter/dr-suite/setup.sh +++ b/plans/dmaap-datarouter/dr-suite/setup.sh @@ -30,6 +30,27 @@ for i in {1..10}; do fi done +# Wait for healthy container datarouter-prov +for i in {1..10}; do + if [ "$(docker inspect --format '{{ .State.Health.Status }}' datarouter-prov)" = 'healthy' ] + then + echo datarouter-prov.State.Health.Status is $(docker inspect --format '{{ .State.Health.Status }}' datarouter-prov) + echo "DR Service Running, datarouter-prov container is healthy" + break + else + echo datarouter-prov.State.Health.Status is $(docker inspect --format '{{ .State.Health.Status }}' datarouter-prov) + echo sleep $i + sleep $i + if [ $i = 10 ] + then + echo datarouter-prov container is not in healthy state - the test is not made, teardown... + cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-docker-compose/src/main/resources + docker-compose down -v + exit 1 + fi + fi +done + DR_PROV_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' datarouter-prov) DR_NODE_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' datarouter-node) DR_GATEWAY_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.Gateway}}{{end}}' datarouter-prov) diff --git a/plans/music/music-test-plan/setup.sh b/plans/music/music-test-plan/setup.sh index add34b1a..1b4896ef 100755 --- a/plans/music/music-test-plan/setup.sh +++ b/plans/music/music-test-plan/setup.sh @@ -68,17 +68,15 @@ docker run -d --name music-db --network music-net -p "7000:7000" -p "7001:7001" -v $MUSIC_TRIGGER_DIR/$TRIGGER_JAR:/etc/cassandra/triggers/$TRIGGER_JAR \ ${CASS_IMG}; +# See if cassandra is up. +echo "########## Running Test to see if Cassandra is up ##########" CASSA_IP=`docker inspect -f '{{ $network := index .NetworkSettings.Networks "music-net" }}{{ $network.IPAddress}}' music-db` echo "CASSANDRA_IP=${CASSA_IP}" ${WORKSPACE}/scripts/optf-has/has/wait_for_port.sh ${CASSA_IP} 9042 -# See if cassandra is up. -echo "########## Running Test to see if Cassandra is up ##########" -docker run --name music-casstest --network music-net \ -$BUSYBOX_IMG sh -c "until nc -z music-db 9042 && echo "success"; do echo 'No connection .. Sleeping for $TT seconds';sleep $TT; done;" - # Sleep 60 seconds to ensure Cassandra is up and running. sleep 60; + # Check to see if Keyspaces are there. docker exec music-db cqlsh -u cassandra -p cassandra -e "DESCRIBE keyspaces;" diff --git a/plans/music/music-test-plan/teardown.sh b/plans/music/music-test-plan/teardown.sh index e05ef9d1..2e7d707b 100755 --- a/plans/music/music-test-plan/teardown.sh +++ b/plans/music/music-test-plan/teardown.sh @@ -40,14 +40,12 @@ docker stop music-tomcat docker stop music-war docker stop music-zk docker stop music-job -docker stop music-casstest docker stop music-db docker rm music-zk docker rm music-tomcat docker rm music-war docker rm music-job -docker rm music-casstest docker rm music-db docker network rm music-net; diff --git a/plans/optf-cmso/cmso/setup.sh b/plans/optf-cmso/cmso/setup.sh new file mode 100644 index 00000000..c30d8302 --- /dev/null +++ b/plans/optf-cmso/cmso/setup.sh @@ -0,0 +1,29 @@ +#!/bin/bash +# +# ------------------------------------------------------------------------- +# Copyright (c) 2018 AT&T Intellectual Property +# +# 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. +# +# ------------------------------------------------------------------------- +# + +# +# Place the scripts in run order: + +source ${WORKSPACE}/scripts/optf-cmso/cmso/clone_cmso_and_change_dockercompose.sh + +source ${WORKSPACE}/scripts/optf-cmso/cmso/start_cmso_containers.sh + +# Pass any variables required by Robot test suites in ROBOT_VARIABLES +#ROBOT_VARIABLES="-v TEST:${TEST}" diff --git a/plans/optf-cmso/cmso/teardown.sh b/plans/optf-cmso/cmso/teardown.sh new file mode 100644 index 00000000..23f5bf32 --- /dev/null +++ b/plans/optf-cmso/cmso/teardown.sh @@ -0,0 +1,24 @@ +#!/bin/bash +# +# ------------------------------------------------------------------------- +# Copyright (c) 2018 AT&T Intellectual Property +# +# 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. +# +# ------------------------------------------------------------------------- +# + + + +source ${WORKSPACE}/scripts/optf-cmso/cmso/kill_and_remove_cmso_containers.sh + diff --git a/plans/optf-cmso/cmso/testplan.txt b/plans/optf-cmso/cmso/testplan.txt new file mode 100644 index 00000000..7645a858 --- /dev/null +++ b/plans/optf-cmso/cmso/testplan.txt @@ -0,0 +1,3 @@ +# Test suites are relative paths under [integration/csit.git]/tests/. +# Place the suites in run order. +optf-cmso/cmso/testsuites diff --git a/plans/so/integration-testing/docker-compose.yml b/plans/so/integration-testing/docker-compose.yml new file mode 100644 index 00000000..7273c4e4 --- /dev/null +++ b/plans/so/integration-testing/docker-compose.yml @@ -0,0 +1,296 @@ +version: '3' +services: +################################################################################ + mariadb: + image: ${NEXUS_DOCKER_REPO_MSO}/mariadb:10.1.11 + ports: + - "3306:3306" + volumes: + - ./test_lab/volumes/mariadb/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d + - ./test_lab/volumes/mariadb/conf.d:/etc/mysql/conf.d + environment: + - MYSQL_ROOT_PASSWORD=password + hostname: + mariadb.so.testlab.onap.org + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" +################################################################################ + catalog-db-adapter: + image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/catalog-db-adapter:${TAG} + ports: + - "8082:8082" + volumes: + - ./test_lab/volumes/so/ca-certificates/onapheat:/app/ca-certificates + - ./test_lab/volumes/so/config/catalog-db-adapter/onapheat:/app/config + environment: + - APP=catalog-db-adapter + - JVM_ARGS=-Xms64m -Xmx512m + - DB_HOST=mariadb +# - KEYSTORE=msoClientKeyStore-onapheat.jks +# - KEYSTORE_PASSWORD=password +# - TRUSTSTORE=msoTrustStore.jks +# - TRUSTSTORE_PASSWORD=password + hostname: + catalog-db-adapter.so.testlab.onap.org + depends_on: + - mariadb + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + command: + - /app/wait-for.sh + - -q + - -t + - "300" + - mariadb:3306 + - -- + - "/app/start-app.sh" +################################################################################ + request-db-adapter: + image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/request-db-adapter:${TAG} + ports: + - "8083:8083" + volumes: + - ./test_lab/volumes/so/ca-certificates/onapheat:/app/ca-certificates + - ./test_lab/volumes/so/config/request-db-adapter/onapheat:/app/config + environment: + - APP=request-db-adapter + - JVM_ARGS=-Xms64m -Xmx512m + - DB_HOST=mariadb +# - KEYSTORE=msoClientKeyStore-onapheat.jks +# - KEYSTORE_PASSWORD=password +# - TRUSTSTORE=msoTrustStore.jks +# - TRUSTSTORE_PASSWORD=password + hostname: + request-db-adapter.so.testlab.onap.org + depends_on: + - mariadb + - catalog-db-adapter + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + command: + - /app/wait-for.sh + - -q + - -t + - "300" + - catalog-db-adapter:8082 + - -- + - "/app/start-app.sh" +################################################################################ + sdnc-adapter: + image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/sdnc-adapter:${TAG} + ports: + - "8086:8086" + volumes: + - ./test_lab/volumes/so/ca-certificates/onapheat:/app/ca-certificates + - ./test_lab/volumes/so/config/sdnc-adapter/onapheat:/app/config + environment: + - APP=sdnc-adapter + - JVM_ARGS=-Xms64m -Xmx512m + - DB_HOST=mariadb +# - KEYSTORE=msoClientKeyStore-onapheat.jks +# - KEYSTORE_PASSWORD=password +# - TRUSTSTORE=msoTrustStore.jks +# - TRUSTSTORE_PASSWORD=password + hostname: + sdnc-adapter.so.testlab.onap.org + depends_on: + - mariadb + - catalog-db-adapter + - request-db-adapter + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + command: + - /app/wait-for.sh + - -q + - -t + - "300" + - request-db-adapter:8083 + - -- + - "/app/start-app.sh" +################################################################################ + openstack-adapter: + image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/openstack-adapter:${TAG} + ports: + - "8087:8087" + volumes: + - ./test_lab/volumes/so/ca-certificates/onapheat:/app/ca-certificates + - ./test_lab/volumes/so/config/openstack-adapter/onapheat:/app/config + environment: + - APP=openstack-adapter + - JVM_ARGS=-Xms64m -Xmx512m + - DB_HOST=mariadb +# - KEYSTORE=msoClientKeyStore-onapheat.jks +# - KEYSTORE_PASSWORD=password +# - TRUSTSTORE=msoTrustStore.jks +# - TRUSTSTORE_PASSWORD=password + hostname: + openstack-adapter.so.testlab.onap.org + depends_on: + - mariadb + - catalog-db-adapter + - request-db-adapter + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + command: + - /app/wait-for.sh + - -q + - -t + - "300" + - request-db-adapter:8083 + - -- + - "/app/start-app.sh" +################################################################################ + vfc-adapter: + image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/vfc-adapter:${TAG} + ports: + - "8084:8084" + volumes: + - ./test_lab/volumes/so/ca-certificates/onapheat:/app/ca-certificates + - ./test_lab/volumes/so/config/vfc-adapter/onapheat:/app/config + environment: + - APP=vfc-adapter + - JVM_ARGS=-Xms64m -Xmx512m + - DB_HOST=mariadb +# - KEYSTORE=msoClientKeyStore-onapheat.jks +# - KEYSTORE_PASSWORD=password +# - TRUSTSTORE=msoTrustStore.jks +# - TRUSTSTORE_PASSWORD=password + hostname: + vfc-adapter.so.testlab.onap.org + depends_on: + - mariadb + - catalog-db-adapter + - request-db-adapter + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + command: + - /app/wait-for.sh + - -q + - -t + - "300" + - request-db-adapter:8083 + - -- + - "/app/start-app.sh" +################################################################################ + sdc-controller: + image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/sdc-controller:${TAG} + ports: + - "8085:8085" + volumes: + - ./test_lab/volumes/so/ca-certificates/onapheat:/app/ca-certificates + - ./test_lab/volumes/so/config/sdc-controller/onapheat:/app/config + environment: + - APP=sdc-controller + - JVM_ARGS=-Xms64m -Xmx512m + - DB_HOST=mariadb +# - KEYSTORE=msoClientKeyStore-onapheat.jks +# - KEYSTORE_PASSWORD=password +# - TRUSTSTORE=msoTrustStore.jks +# - TRUSTSTORE_PASSWORD=password + hostname: + sdc-controller.so.testlab.onap.org + depends_on: + - mariadb + - catalog-db-adapter + - request-db-adapter + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + command: + - /app/wait-for.sh + - -q + - -t + - "300" + - request-db-adapter:8083 + - -- + - "/app/start-app.sh" +################################################################################ + bpmn-infra: + image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/bpmn-infra:${TAG} + ports: + - "8081:8081" + volumes: + - ./test_lab/volumes/so/ca-certificates/onapheat:/app/ca-certificates + - ./test_lab/volumes/so/config/bpmn-infra/onapheat:/app/config + environment: + - APP=bpmn-infra + - JVM_ARGS=-Xms64m -Xmx512m + - DB_HOST=mariadb +# - KEYSTORE=msoClientKeyStore-onapheat.jks +# - KEYSTORE_PASSWORD=password +# - TRUSTSTORE=msoTrustStore.jks +# - TRUSTSTORE_PASSWORD=password + hostname: + bpmn-infra.so.testlab.onap.org + depends_on: + - mariadb + - catalog-db-adapter + - request-db-adapter + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + command: + - /app/wait-for.sh + - -q + - -t + - "300" + - request-db-adapter:8083 + - -- + - "/app/start-app.sh" +################################################################################ + api-handler-infra: + image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/api-handler-infra:${TAG} + ports: + - "8080:8080" + volumes: + - ./test_lab/volumes/so/ca-certificates/onapheat:/app/ca-certificates + - ./test_lab/volumes/so/config/api-handler-infra/onapheat:/app/config + environment: + - APP=api-handler-infra + - JVM_ARGS=-Xms64m -Xmx512m + - DB_HOST=mariadb +# - KEYSTORE=msoClientKeyStore-onapheat.jks +# - KEYSTORE_PASSWORD=password +# - TRUSTSTORE=msoTrustStore.jks +# - TRUSTSTORE_PASSWORD=password + hostname: + api-handler-infra.so.testlab.onap.org + depends_on: + - mariadb + - catalog-db-adapter + - request-db-adapter + logging: + driver: "json-file" + options: + max-size: "30m" + max-file: "5" + command: + - /app/wait-for.sh + - -q + - -t + - "300" + - request-db-adapter:8083 + - -- + - "/app/start-app.sh" diff --git a/plans/so/integration-testing/setup.sh b/plans/so/integration-testing/setup.sh index 02c21f6e..4a35d0b2 100644 --- a/plans/so/integration-testing/setup.sh +++ b/plans/so/integration-testing/setup.sh @@ -17,20 +17,16 @@ # Place the scripts in run order: # Start all process required for executing test case -#start mariadb -docker run -d --name mariadb -h db.mso.testlab.openecomp.org -e MYSQL_ROOT_PASSWORD=password -p 3306:3306 -v ${WORKSPACE}/scripts/mariadb/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d -v ${WORKSPACE}/scripts/mariadb/conf.d:/etc/mysql/conf.d nexus3.onap.org:10001/mariadb +git clone http://gerrit.onap.org/r/so/docker-config.git test_lab -#start so -docker run -d --name so -h mso.mso.testlab.openecomp.org -e MYSQL_ROOT_PASSWORD=password --link=mariadb:db.mso.testlab.openecomp.org -p 8080:8080 -v ${WORKSPACE}/scripts/so/chef-config:/shared nexus3.onap.org:10001/openecomp/mso:1.1-STAGING-latest +export NEXUS_DOCKER_REPO_MSO=nexus3.onap.org:10001 +export TAG=1.3.1 +# bring the so dockers +docker-compose pull +docker-compose up -d -SO_IP=`get-instance-ip.sh so` -# Wait for initialization -for i in {1..10}; do - curl -sS ${SO_IP}:1080 && break - echo sleep $i - sleep $i -done +sleep 4m #REPO_IP=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' so` REPO_IP='127.0.0.1' diff --git a/plans/so/integration-testing/teardown.sh b/plans/so/integration-testing/teardown.sh index 1696c745..449cb399 100644 --- a/plans/so/integration-testing/teardown.sh +++ b/plans/so/integration-testing/teardown.sh @@ -14,6 +14,4 @@ # See the License for the specific language governing permissions and # limitations under the License. # - -kill-instance.sh mariadb -kill-instance.sh so +docker-compose down diff --git a/plans/usecases/5G-bulkpm/setup.sh b/plans/usecases/5G-bulkpm/setup.sh index 5139cbab..64ffac17 100644 --- a/plans/usecases/5G-bulkpm/setup.sh +++ b/plans/usecases/5G-bulkpm/setup.sh @@ -61,6 +61,7 @@ cp $WORKSPACE/plans/usecases/5G-bulkpm/composefile/docker-compose-e2e.yml $WORKS docker login -u docker -p docker nexus3.onap.org:10001 docker-compose up -d +echo "Disregard the message ERROR: for datarouter-node Container 1234456 is unhealthy, this is expected behaiour at this stage" docker kill datarouter-prov docker kill datarouter-node docker kill vescollector @@ -126,6 +127,8 @@ cp $WORKSPACE/plans/usecases/5G-bulkpm/assets/datafile_endpoints.json /tmp/ sed -i 's/dmaapmrhost/'${DMAAP_MR_IP}'/g' /tmp/datafile_endpoints.json sed -i 's/dmaapdrhost/'${DR_PROV_IP}'/g' /tmp/datafile_endpoints.json docker cp /tmp/datafile_endpoints.json dfc:/config/ +#Increase Logging +docker exec dfc /bin/sh -c " sed -i 's/org.onap.dcaegen2.collectors.datafile: ERROR/org.onap.dcaegen2.collectors.datafile: TRACE/g' /config/application.yaml" docker restart dfc docker exec dfc /bin/sh -c "echo '${DR_NODE_IP}' dmaap-dr-node >> /etc/hosts" |