summaryrefslogtreecommitdiffstats
path: root/test/csit/plans/portal
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-09-27 10:29:30 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-09-27 12:50:28 -0700
commit2d3d8dcf6ef1bd2a161c69d561c629c5ec3f59c4 (patch)
tree652fd47a183c291e96c6721f550a5f63464f6e66 /test/csit/plans/portal
parente161173e279a73134dda4c2f429605d6c9ee1fe7 (diff)
Move CSIT to integration/csit repo
To facilite branching of CSIT tests, all CSIT test code and scripts are relocated to the integration/csit repo. Change-Id: I6777cd414e43dbf2bfa6215f7e50849e1a6a2e59 Issue-ID: INT-671 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'test/csit/plans/portal')
-rw-r--r--test/csit/plans/portal/testsuite/.env42
-rw-r--r--test/csit/plans/portal/testsuite/docker-compose.yml151
-rw-r--r--test/csit/plans/portal/testsuite/setup.sh184
-rw-r--r--test/csit/plans/portal/testsuite/teardown.sh20
-rw-r--r--test/csit/plans/portal/testsuite/testplan.txt3
5 files changed, 0 insertions, 400 deletions
diff --git a/test/csit/plans/portal/testsuite/.env b/test/csit/plans/portal/testsuite/.env
deleted file mode 100644
index 27e9aa3fb..000000000
--- a/test/csit/plans/portal/testsuite/.env
+++ /dev/null
@@ -1,42 +0,0 @@
-# Environment settings
-# used by docker-compose AND by other shell scripts
-# Host directory with config files
-
-# Following are ALSO used in demo/boot/portal_vm_init.sh
-EP_IMG_NAME=onap/portal-app
-SDK_IMG_NAME=onap/portal-sdk
-DB_IMG_NAME=onap/portal-db
-CDR_IMG_NAME=onap/music/cassandra_music
-ZK_IMG_NAME=zookeeper
-WMS_IMG_NAME=onap/portal-wms
-# Deployed with portal; built elsewhere
-CLI_IMG_NAME=onap/cli
-
-# Tag all images with this
-DOCKER_IMAGE_VERSION=2.1-STAGING-latest
-CLI_DOCKER_VERSION=1.1-STAGING-latest
-CDR_IMAGE_VERSION=latest
-ZK_IMAGE_VERSION=3.4
-NEXUS_DOCKER_REPO=nexus3.onap.org:10003
-
-# This is used during builds and in docker-compose;
-# it is never published to the ONAP registry.
-PORTAL_TAG=beijing
-
-# Name of directory in apps container (NOT host)
-WEBAPPS_DIR=/opt/apache-tomcat-8.0.37/webapps
-
-# Required settings with default values.
-# Export shell environment variables on ALL hosts.
-LOGS_DIR=./logs
-PROPS_DIR=./properties
-
-# Optional settings with no defaults.
-EXTRA_HOST_IP=""
-EXTRA_HOST_NAME=""
-# Export shell environment variables on hosts with no DNS;
-# a line is added to docker container's /etc/hosts.
-# For example:
-#EXTRA_HOST_IP="-i ${HOST_IP}"
-#EXTRA_HOST_NAME="-n portal.api.simpledemo.openecomp.org"
-
diff --git a/test/csit/plans/portal/testsuite/docker-compose.yml b/test/csit/plans/portal/testsuite/docker-compose.yml
deleted file mode 100644
index dda74c91a..000000000
--- a/test/csit/plans/portal/testsuite/docker-compose.yml
+++ /dev/null
@@ -1,151 +0,0 @@
-# docker-compose for ONAP portal containers: database, microservice, portal apps.
-# Relies on .env file, which CANNOT be specified via command-line option
-# Works in multiple environments; does not pull from a Nexus registry.
-# Exposes the portal apps docker (but not DB nor WMS dockers) on the host network.
-# Images must be pulled from ONAP Nexus registry after logging in like this:
-# docker login -u USER -p PASS nexus3.onap.org:10001
-# Uses healthcheck feature added in docker-compose v2.1
-
-version: '2.1'
-
-services:
-
- cli:
- image: ${CLI_IMG_NAME}:${PORTAL_TAG}
- environment:
- CLI_MODE: 'daemon'
- ports:
- - 8080:80
- - 9090:8080
- logging:
- driver: json-file
-
- # Config files may use hostname "portal-db"
- portal-db:
- image: ${DB_IMG_NAME}:${PORTAL_TAG}
- environment:
- MYSQL_ROOT_PASSWORD: 'Aa123456'
- expose:
- - 3306
- volumes:
- # Just specify a path and let the Engine create a volume
- - /var/lib/mysql
- # Inject the onboarding script at start time
- - ./Apps_Users_OnBoarding_Script.sql:/docker-entrypoint-initdb.d/zzz_apps_users_onboarding.sql
- logging:
- driver: json-file
- healthcheck:
- test: [ "CMD", "mysqladmin", "ping", "-h", "localhost" ]
- timeout: 10s
- retries: 30
-
- # Config files may use hostname "portal-cassandra"
- portal-cassandra:
- image: ${CDR_IMG_NAME}:${PORTAL_TAG}
- environment:
- - CASSUSER=root
- - CASSPASS=Aa123456
- expose:
- - 7000
- - 7001
- - 7199
- - 9042
- - 9160
- ports:
- - 7000:7000
- - 7001:7001
- - 7199:7199
- - 9042:9042
- - 9160:9160
- volumes:
- - ./portal.cql:/docker-entrypoint-initdb.d/zzz_portal.cql
- - ./portalsdk.cql:/docker-entrypoint-initdb.d/zzz_portalsdk.cql
- links:
- - portal-db
- depends_on:
- portal-db:
- condition: service_healthy
-
- # Config files may use hostname "portal-zk"
- portal-zk:
- image: ${ZK_IMG_NAME}:${PORTAL_TAG}
- expose:
- - 2181
- ports:
- - 2181:2181
-
- # The app config file uses the docker name above
- portal-wms:
- image: ${WMS_IMG_NAME}:${PORTAL_TAG}
- expose:
- - 8082
- links:
- - portal-db
- depends_on:
- portal-db:
- condition: service_healthy
- volumes:
- - ${PROPS_DIR}/ONAPWIDGETMS/application.properties:/application.properties
- - ${PROPS_DIR}/ONAPWIDGETMS/application.yml:/application.yml
- command:
- - /start-wms.sh
- logging:
- driver: json-file
-
- portal-app:
- image: ${EP_IMG_NAME}:${PORTAL_TAG}
- ports:
- - 8989:8080
- - 8010:8009
- - 8006:8005
- links:
- - portal-db
- - portal-wms
- - portal-zk
- - portal-cassandra
- depends_on:
- portal-db:
- condition: service_healthy
- portal-wms:
- condition: service_started
- volumes:
- - ${PROPS_DIR}/ONAPPORTAL/system.properties:${WEBAPPS_DIR}/ONAPPORTAL/WEB-INF/conf/system.properties
- - ${PROPS_DIR}/ONAPPORTAL/fusion.properties:${WEBAPPS_DIR}/ONAPPORTAL/WEB-INF/fusion/conf/fusion.properties
- - ${PROPS_DIR}/ONAPPORTAL/portal.properties:${WEBAPPS_DIR}/ONAPPORTAL/WEB-INF/classes/portal.properties
- - ${PROPS_DIR}/ONAPPORTAL/music.properties:${WEBAPPS_DIR}/ONAPPORTAL/WEB-INF/classes/music.properties
- - ${PROPS_DIR}/ONAPPORTAL/openid-connect.properties:${WEBAPPS_DIR}/ONAPPORTAL/WEB-INF/classes/openid-connect.properties
- - ${PROPS_DIR}/ONAPPORTAL/logback.xml:${WEBAPPS_DIR}/ONAPPORTAL/WEB-INF/classes/logback.xml
- - ${LOGS_DIR}:/opt/apache-tomcat-8.0.37/logs
- command:
- - /start-apache-tomcat.sh
- # see comments in .env file
- - -i
- - $EXTRA_HOST_IP
- - -n
- - $EXTRA_HOST_NAME
- logging:
- driver: json-file
-
- portal-sdk:
- image: ${SDK_IMG_NAME}:${PORTAL_TAG}
- ports:
- - 8990:8080
- links:
- - portal-db
- - portal-wms
- - portal-zk
- - portal-cassandra
- depends_on:
- portal-db:
- condition: service_healthy
- volumes:
- - ${PROPS_DIR}/ONAPPORTALSDK/fusion.properties:${WEBAPPS_DIR}/ONAPPORTALSDK/WEB-INF/fusion/conf/fusion.properties
- - ${PROPS_DIR}/ONAPPORTALSDK/system.properties:${WEBAPPS_DIR}/ONAPPORTALSDK/WEB-INF/conf/system.properties
- - ${PROPS_DIR}/ONAPPORTALSDK/portal.properties:${WEBAPPS_DIR}/ONAPPORTALSDK/WEB-INF/classes/portal.properties
- - ${PROPS_DIR}/ONAPPORTALSDK/music.properties:${WEBAPPS_DIR}/ONAPPORTALSDK/WEB-INF/classes/music.properties
- - ${PROPS_DIR}/ONAPPORTALSDK/logback.xml:${WEBAPPS_DIR}/ONAPPORTALSDK/WEB-INF/classes/logback.xml
- - ${LOGS_DIR}:/opt/apache-tomcat-8.0.37/logs
- command:
- - /start-apache-tomcat.sh
- logging:
- driver: json-file
diff --git a/test/csit/plans/portal/testsuite/setup.sh b/test/csit/plans/portal/testsuite/setup.sh
deleted file mode 100644
index 76cf5f373..000000000
--- a/test/csit/plans/portal/testsuite/setup.sh
+++ /dev/null
@@ -1,184 +0,0 @@
-#!/bin/bash
-# Starts docker containers for ONAP Portal
-# This version for Amsterdam/R1 of Portal, uses docker-compose.
-# Temporarily maintained in portal/deliveries area;
-# replicated from the ONAP demo/boot area due to release concerns.
-
-# Start Xvfb
-echo -e "Starting Xvfb on display ${DISPLAY} with res ${RES}"
-Xvfb ${DISPLAY} -ac -screen 0 ${RES} +extension RANDR &
-XVFBPID=$!
-# Get pid of this spawned process to make sure we kill the correct process later
-
-#Get current IP of VM
-HOST_IP=$(ip route get 8.8.8.8 | awk '/8.8.8.8/ {print $NF}')
-export HOST_IP=${HOST_IP}
-
-
-
-if ! ifconfig docker0; then
-if ! ifconfig ens3; then
-echo "Could not determine IP address"
-exit 1
-fi
-export DOCKER_IP_IP=`ifconfig ens3 | awk -F: '/inet addr/ {gsub(/ .*/,"",$2); print $2}'`
-else
-export DOCKER_IP=`ifconfig docker0 | awk -F: '/inet addr/ {gsub(/ .*/,"",$2); print $2}'`
-fi
-echo $DOCKER_IP
-
-
-# Pass any variables required by Robot test suites in ROBOT_VARIABLES
-#ROBOT_VARIABLES="-v MOCK_IP:${MOCK_IP} -v IP:${IP} -v POLICY_IP:${POLICY_IP} -v DOCKER_IP:${DOCKER_IP}"
-#export PORTAL_IP=${PORTAL_IP}
-ROBOT_VARIABLES="-v MOCK_IP:${MOCK_IP} -v IP:${IP} -v DOCKER_IP:${DOCKER_IP}"
-export DOCKER_IP=${DOCKER_IP}
-
-
-
-
-# be verbose
-set -x
-
-# Establish environment variables
-NEXUS_USERNAME=docker
-NEXUS_PASSWD=docker
-NEXUS_DOCKER_REPO=nexus3.onap.org:10003
-
-
-
-CURR="$(pwd)"
-git clone http://gerrit.onap.org/r/portal -b "master"
-
-# Refresh configuration and scripts
-cd portal
-git pull
-cd deliveries
-rm .env
-#rm docker-compose.yml
-cp $CURR/.env .
-#cp $CURR/docker-compose.yml .
-#cd properties_simpledemo/ECOMPPORTALAPP
-#rm system.properties
-#cp $CURR/system.properties .
-#cd ../..
-# Get image names used below from docker-compose environment file
-source $CURR/.env
-#source .env
-
-# Make inter-app communication work in CSIT
-export EXTRA_HOST_IP="-i ${HOST_IP}"
-export EXTRA_HOST_NAME="-n portal.api.simpledemo.onap.org"
-
-
-# Copy property files to new directory
-mkdir -p $PROPS_DIR
-cp -r properties_simpledemo/* $PROPS_DIR
-# Also create logs directory
-mkdir -p $LOGS_DIR
-
-
-# Refresh images
-docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
-docker pull $NEXUS_DOCKER_REPO/$DB_IMG_NAME:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/$EP_IMG_NAME:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/$SDK_IMG_NAME:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/$CDR_IMG_NAME:$CDR_IMAGE_VERSION
-docker pull $ZK_IMG_NAME:$ZK_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/$WMS_IMG_NAME:$DOCKER_IMAGE_VERSION
-docker pull $NEXUS_DOCKER_REPO/$CLI_IMG_NAME:$CLI_DOCKER_VERSION
-
-# Tag them as expected by docker-compose file
-docker tag $NEXUS_DOCKER_REPO/$DB_IMG_NAME:$DOCKER_IMAGE_VERSION $DB_IMG_NAME:$PORTAL_TAG
-docker tag $NEXUS_DOCKER_REPO/$EP_IMG_NAME:$DOCKER_IMAGE_VERSION $EP_IMG_NAME:$PORTAL_TAG
-docker tag $NEXUS_DOCKER_REPO/$SDK_IMG_NAME:$DOCKER_IMAGE_VERSION $SDK_IMG_NAME:$PORTAL_TAG
-docker tag $NEXUS_DOCKER_REPO/$CDR_IMG_NAME:$CDR_IMAGE_VERSION $CDR_IMG_NAME:$PORTAL_TAG
-docker tag $ZK_IMG_NAME:$ZK_IMAGE_VERSION $ZK_IMG_NAME:$PORTAL_TAG
-docker tag $NEXUS_DOCKER_REPO/$WMS_IMG_NAME:$DOCKER_IMAGE_VERSION $WMS_IMG_NAME:$PORTAL_TAG
-docker tag $NEXUS_DOCKER_REPO/$CLI_IMG_NAME:$CLI_DOCKER_VERSION $CLI_IMG_NAME:$PORTAL_TAG
-
-
-# compose is not in /usr/bin
-docker-compose down
-docker-compose up -d
-
-#${HOSTNAME}="portal.api.simpledemo.openecomp.org"
-#echo "$HOST_IP ${HOSTNAME}" >> /etc/hosts
-
-#echo "$HOST_IP portal.api.simpledemo.openecomp.org" >> /etc/hosts
-#sudo sed -i "2i$HOST_IP portal.api.simpledemo.openecomp.org" /etc/hosts
-
-#HOST="portal.api.simpledemo.openecomp.org"
-#sudo sed -i "/$HOST/ s/.*/$HOST_IP\t$HOST/g" /etc/hosts
-
-# insert/update hosts entry
-ip_address=$HOST_IP
-host_name="portal.api.simpledemo.onap.org"
-# find existing instances in the host file and save the line numbers
-matches_in_hosts="$(grep -n $host_name /etc/hosts | cut -f1 -d:)"
-host_entry="${ip_address} ${host_name}"
-
-echo "$host_entry"
-
-if [ ! -z "$matches_in_hosts" ]
-then
-echo "Updating existing hosts entry."
-# iterate over the line numbers on which matches were found
-while read -r line_number; do
-# replace the text of each line with the desired host entry
-sudo sed -i '' "${line_number}s/.*/${host_entry} /" /etc/hosts
-echo "${line_number} ${host_entry}"
-done <<< "$matches_in_hosts"
-else
-echo "Adding new hosts entry."
-echo "$host_entry" | sudo tee -a /etc/hosts > /dev/null
-fi
-
-
-
-sleep 6m
-
-# WAIT 5 minutes maximum and test every 5 seconds if Portal up using HealthCheck API
-TIME_OUT=500
-INTERVAL=20
-TIME=0
-while [ "$TIME" -lt "$TIME_OUT" ]; do
- response=$(curl --write-out '%{http_code}' --silent --output /dev/null http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/portalApi/healthCheck); echo $response
-
- if [ "$response" == "200" ]; then
- echo Portal and its database well started in $TIME seconds
- break;
- fi
-
- echo Sleep: $INTERVAL seconds before testing if Portal is up. Total wait time up now is: $TIME seconds. Timeout is: $TIME_OUT seconds
- sleep $INTERVAL
- TIME=$(($TIME+$INTERVAL))
-done
-
-if [ "$TIME" -ge "$TIME_OUT" ]; then
- echo TIME OUT: Docker containers not started in $TIME_OUT seconds... Could cause problems for tests...
-fi
-
-#sleep 3m
-
-
-
-#if [ "$TIME" -ge "$TIME_OUT" ]; then
-# echo TIME OUT: Docker containers not started in $TIME_OUT seconds... Could cause problems for tests...
-#fi
-
-
-
-
-
-#Get current IP of VM
-HOST_IP=$(ip route get 8.8.8.8 | awk '/8.8.8.8/ {print $NF}')
-export HOST_IP=${HOST_IP}
-
-docker logs deliveries_portal-db_1
-docker logs deliveries_portal-app_1
-docker logs deliveries_portal-wms_1
-
-
-
-
diff --git a/test/csit/plans/portal/testsuite/teardown.sh b/test/csit/plans/portal/testsuite/teardown.sh
deleted file mode 100644
index e0431a72f..000000000
--- a/test/csit/plans/portal/testsuite/teardown.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-#
-# Copyright 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
-#
-# 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.
-#
-
-docker kill $(docker ps -q)
-
-
diff --git a/test/csit/plans/portal/testsuite/testplan.txt b/test/csit/plans/portal/testsuite/testplan.txt
deleted file mode 100644
index d7b18a5ce..000000000
--- a/test/csit/plans/portal/testsuite/testplan.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Test suites are relative paths under [integration.git]/test/csit/tests/.
-# Place the suites in run order.
-portal/testsuites