aboutsummaryrefslogtreecommitdiffstats
path: root/plans
diff options
context:
space:
mode:
Diffstat (limited to 'plans')
-rwxr-xr-xplans/dcaegen2-collectors-hv-ves/testsuites/env.sh5
-rwxr-xr-xplans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh4
-rw-r--r--plans/dcaegen2/prh-testsuites/setup.sh5
-rw-r--r--plans/dcaegen2/prh-testsuites/teardown.sh1
-rwxr-xr-xplans/multicloud-k8s/functionality1/setup.sh3
-rw-r--r--plans/optf-cmso/cmso/testplan.txt2
-rw-r--r--plans/policy/apex-pdp/setup.sh77
-rw-r--r--plans/policy/apex-pdp/teardown.sh8
-rw-r--r--plans/policy/xacml-pdp/setup.sh79
-rw-r--r--plans/policy/xacml-pdp/teardown.sh4
-rw-r--r--plans/sdc/nightly/setup.sh2
-rw-r--r--plans/sdc/sanity/setup.sh2
-rw-r--r--plans/sdc/uiSanity/setup.sh3
-rw-r--r--plans/vfc-nfvo-catalog/sanity-check/setup.sh2
-rw-r--r--plans/vfc-nfvo-catalog/sanity-check/teardown.sh1
15 files changed, 170 insertions, 28 deletions
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/env.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/env.sh
index c9e3ff06..08bbb61e 100755
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/env.sh
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/env.sh
@@ -31,7 +31,7 @@ export DOCKER_REGISTRY_PREFIX="${DOCKER_REGISTRY}/"
export KAFKA_IMAGE_FULL_NAME="${DOCKER_REGISTRY_PREFIX}onap/dmaap/kafka111:0.0.6"
export ZOOKEEPER_IMAGE_FULL_NAME="${DOCKER_REGISTRY_PREFIX}onap/dmaap/zookeeper:4.0.0"
-export CONTAINERS_NETWORK="hv-ves-default"
+export CONTAINERS_NETWORK="hv-ves-${RANDOM}"
export HV_VES_SERVICE_NAME="hv-ves-collector"
export UNENCRYPTED_HV_VES_SERVICE_NAME="unencrypted-hv-ves-collector"
@@ -39,9 +39,8 @@ export HV_VES_GROUP_ID="org.onap.dcaegen2.collectors.hv-ves"
export HV_VES_HOSTNAME="dcae-hv-ves-collector"
export HV_VES_COLLECTOR_NAMESPACE="onap"
export HV_VES_HEALTHCHECK_CMD="curl --request GET --fail --silent --show-error localhost:6060/health/ready && nc -vz localhost 6061"
-export HV_VES_VERSION="1.1-SNAPSHOT"
+export HV_VES_VERSION="1.2-SNAPSHOT"
export HV_VES_IMAGE="hv-collector-main"
export DCAE_APP_SIMULATOR_IMAGE="hv-collector-dcae-app-simulator"
export XNF_SIMULATOR_IMAGE="hv-ves-collector-xnf-simulator"
-
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh
index a2ae3356..1bb70917 100755
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/env_local.sh
@@ -29,9 +29,9 @@ export DOCKER_REGISTRY="docker.io"
export DOCKER_REGISTRY_PREFIX=""
export KAFKA_IMAGE_FULL_NAME="${ONAP_NEXUS_REGISTRY}/onap/dmaap/kafka111:0.0.6"
-export ZOOKEEPER_IMAGE_FULL_NAME="${DOCKER_REGISTRY_PREFIX}onap/dmaap/zookeeper:4.0.0"
+export ZOOKEEPER_IMAGE_FULL_NAME="${ONAP_NEXUS_REGISTRY}/onap/dmaap/zookeeper:4.0.0"
-export CONTAINERS_NETWORK="hv-ves-default"
+export CONTAINERS_NETWORK="hv-ves-${RANDOM}"
export HV_VES_SERVICE_NAME="hv-ves-collector"
export UNENCRYPTED_HV_VES_SERVICE_NAME="unencrypted-hv-ves-collector"
diff --git a/plans/dcaegen2/prh-testsuites/setup.sh b/plans/dcaegen2/prh-testsuites/setup.sh
index 46871fd8..28882c84 100644
--- a/plans/dcaegen2/prh-testsuites/setup.sh
+++ b/plans/dcaegen2/prh-testsuites/setup.sh
@@ -3,7 +3,6 @@
source ${SCRIPTS}/common_functions.sh
export PRH_SERVICE="prh"
-export SSL_PRH_SERVICE="ssl_prh"
export DMAAP_SIMULATOR="dmaap_simulator"
export AAI_SIMULATOR="aai_simulator"
export CONSUL="consul"
@@ -23,7 +22,6 @@ docker-compose up -d --build
# Extract docker images IPs
PRH_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${PRH_SERVICE})
-SSL_PRH_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${SSL_PRH_SERVICE})
DMAAP_SIMULATOR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${DMAAP_SIMULATOR})
AAI_SIMULATOR_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${AAI_SIMULATOR})
CONSUL_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${CONSUL})
@@ -31,7 +29,6 @@ CONSUL_CONFIG_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{
CBS_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${CBS})
bypass_ip_adress ${PRH_IP}
-bypass_ip_adress ${SSL_PRH_IP}
bypass_ip_adress ${DMAAP_SIMULATOR_IP}
bypass_ip_adress ${AAI_SIMULATOR_IP}
bypass_ip_adress ${CONSUL_IP}
@@ -39,7 +36,6 @@ bypass_ip_adress ${CONSUL_CONFIG_IP}
bypass_ip_adress ${CBS_IP}
echo PRH_IP=${PRH_IP}
-echo SSL_PRH_IP=${SSL_PRH_IP}
echo DMAAP_SIMULATOR_IP=${DMAAP_SIMULATOR_IP}
echo AAI_SIMULATOR_IP=${AAI_SIMULATOR_IP}
echo CONSUL_IP=${CONSUL_IP}
@@ -48,7 +44,6 @@ echo CBS_IP=${CBS_IP}
# Wait for initialization of PRH services
wait_for_service_init localhost:8100/heartbeat
-wait_for_service_init localhost:8200/heartbeat
# #Pass any variables required by Robot test suites in ROBOT_VARIABLES
ROBOT_VARIABLES="-v DMAAP_SIMULATOR_SETUP:${DMAAP_SIMULATOR_IP}:2224 -v AAI_SIMULATOR_SETUP:${AAI_SIMULATOR_IP}:3335 -v CONSUL_SETUP:${CONSUL_IP}:8500" \ No newline at end of file
diff --git a/plans/dcaegen2/prh-testsuites/teardown.sh b/plans/dcaegen2/prh-testsuites/teardown.sh
index bb5f8f90..382b22eb 100644
--- a/plans/dcaegen2/prh-testsuites/teardown.sh
+++ b/plans/dcaegen2/prh-testsuites/teardown.sh
@@ -16,7 +16,6 @@
#
kill-instance.sh prh
-kill-instance.sh ssl_prh
kill-instance.sh dmaap_simulator
kill-instance.sh aai_simulator
kill-instance.sh consul
diff --git a/plans/multicloud-k8s/functionality1/setup.sh b/plans/multicloud-k8s/functionality1/setup.sh
index eda24ba4..006a114d 100755
--- a/plans/multicloud-k8s/functionality1/setup.sh
+++ b/plans/multicloud-k8s/functionality1/setup.sh
@@ -19,11 +19,13 @@ MONGO_IP=$(./get-instance-ip.sh multicloud-k8s-mongodb)
# setup multicloud-k8s configuration
CONFIG_FILE=$(pwd)/k8sconfig.json
+SERVICE_PORT=9015
cat << EOF > $CONFIG_FILE
{
"database-address": "$MONGO_IP",
"database-type": "mongo",
"plugin-dir": "plugins",
+ "service-port": "$SERVICE_PORT",
"kube-config-dir": "kubeconfigs"
}
EOF
@@ -34,7 +36,6 @@ cat $CONFIG_FILE
docker run --name multicloud-k8s -v $CONFIG_FILE:/opt/multicloud/k8splugin/k8sconfig.json \
-d nexus3.onap.org:10001/onap/multicloud/k8s:latest
SERVICE_IP=$(./get-instance-ip.sh multicloud-k8s)
-SERVICE_PORT=8081
popd
if [[ $no_proxy && $no_proxy != *$SERVICE_IP* ]]; then
diff --git a/plans/optf-cmso/cmso/testplan.txt b/plans/optf-cmso/cmso/testplan.txt
index 7645a858..42f64f1e 100644
--- a/plans/optf-cmso/cmso/testplan.txt
+++ b/plans/optf-cmso/cmso/testplan.txt
@@ -1,3 +1,3 @@
# Test suites are relative paths under [integration/csit.git]/tests/.
# Place the suites in run order.
-optf-cmso/cmso/testsuites
+optf-cmso/cmso/testsuites \ No newline at end of file
diff --git a/plans/policy/apex-pdp/setup.sh b/plans/policy/apex-pdp/setup.sh
index c97072d4..96396462 100644
--- a/plans/policy/apex-pdp/setup.sh
+++ b/plans/policy/apex-pdp/setup.sh
@@ -1,6 +1,8 @@
#!/bin/bash
# ============LICENSE_START=======================================================
# Copyright (C) 2018 Ericsson. All rights reserved.
+#
+# Modifications copyright (c) 2019 Nordix Foundation.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,16 +19,81 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
-docker run -d --name apex -p 12561:12561 -p 23324:23324 -it nexus3.onap.org:10001/onap/policy-apex-pdp:2.0-SNAPSHOT-latest /bin/bash -c "/opt/app/policy/apex-pdp/bin/apexEngine.sh -c /opt/app/policy/apex-pdp/examples/config/SampleDomain/RESTServerJsonEvent.json"
+echo "Uninstall docker-py and reinstall docker."
+pip uninstall -y docker-py
+pip uninstall -y docker
+pip install -U docker==2.7.0
+
+# the directory of the script
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+echo ${DIR}
+
+# the temp directory used, within $DIR
+# omit the -p parameter to create a temporal directory in the default location
+WORK_DIR=`mktemp -d -p "$DIR"`
+echo ${WORK_DIR}
+
+cd ${WORK_DIR}
+
+# check if tmp dir was created
+if [[ ! "$WORK_DIR" || ! -d "$WORK_DIR" ]]; then
+ echo "Could not create temp dir"
+ exit 1
+fi
+
+# bring down maven
+mkdir maven
+cd maven
+curl -O http://apache.claz.org/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz
+tar -xzvf apache-maven-3.3.9-bin.tar.gz
+ls -l
+export PATH=${PATH}:${WORK_DIR}/maven/apache-maven-3.3.9/bin
+${WORK_DIR}/maven/apache-maven-3.3.9/bin/mvn -v
+cd ..
+
+git clone http://gerrit.onap.org/r/oparent
+git clone --depth 1 https://gerrit.onap.org/r/policy/models -b master
+cd models/models-sim/models-sim-dmaap
+${WORK_DIR}/maven/apache-maven-3.3.9/bin/mvn clean install -DskipTests --settings ${WORK_DIR}/oparent/settings.xml
+bash ./src/main/package/docker/docker_build.sh
+cd ${WORKSPACE}
+rm -rf ${WORK_DIR}
+sleep 3
+
+# Adding this waiting container due to race condition between pap and mariadb
+docker-compose -f ${WORKSPACE}/scripts/policy/policy-apex-pdp/docker-compose-apex.yml run --rm start_dependencies
+docker-compose -f ${WORKSPACE}/scripts/policy/policy-apex-pdp/docker-compose-apex.yml up -d
+
+POLICY_API_IP=`get-instance-ip.sh policy-api`
+POLICY_PAP_IP=`get-instance-ip.sh policy-pap`
+MARIADB_IP=`get-instance-ip.sh mariadb`
+APEX_IP=`get-instance-ip.sh policy-apex-pdp`
+DMAAP_IP=`get-instance-ip.sh dmaap-simulator`
-APEX_IP=`get-instance-ip.sh apex`
+echo PAP IP IS ${POLICY_PAP_IP}
+echo MARIADB IP IS ${MARIADB_IP}
+echo API IP IS ${POLICY_API_IP}
echo APEX IP IS ${APEX_IP}
+echo DMAAP_IP IS ${DMAAP_IP}
+
# Wait for initialization
for i in {1..10}; do
- curl -sS ${APEX_IP}:23324 && break
+ curl -sS ${MARIADB_IP}:3306 && break
+ echo sleep $i
+ sleep $i
+done
+for i in {1..10}; do
+ curl -sS ${APEX_IP}:6969 && break
+ echo sleep $i
+ sleep $i
+done
+for i in {1..10}; do
+ curl -sS ${DMAAP_IP}:3904 && break
echo sleep $i
sleep $i
done
-sleep 10
+#Configure the database
+docker exec -it mariadb chmod +x /docker-entrypoint-initdb.d/db.sh
+docker exec -it mariadb /docker-entrypoint-initdb.d/db.sh
-ROBOT_VARIABLES="-v APEX_IP:${APEX_IP}"
+ROBOT_VARIABLES="-v APEX_IP:${APEX_IP} -v POLICY_API_IP:${POLICY_API_IP} -v POLICY_PAP_IP:${POLICY_PAP_IP}"
diff --git a/plans/policy/apex-pdp/teardown.sh b/plans/policy/apex-pdp/teardown.sh
index ca8e92e6..6c02aea1 100644
--- a/plans/policy/apex-pdp/teardown.sh
+++ b/plans/policy/apex-pdp/teardown.sh
@@ -1,6 +1,8 @@
#!/bin/bash
# ============LICENSE_START=======================================================
# Copyright (C) 2018 Ericsson. All rights reserved.
+#
+# Modifications copyright (c) 2019 Nordix Foundation.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,4 +19,8 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
-kill-instance.sh apex
+kill-instance.sh policy-apex-pdp
+kill-instance.sh policy-pap
+kill-instance.sh policy-api
+kill-instance.sh mariadb
+kill-instance.sh dmaap-simulator
diff --git a/plans/policy/xacml-pdp/setup.sh b/plans/policy/xacml-pdp/setup.sh
index e7882822..96ae4715 100644
--- a/plans/policy/xacml-pdp/setup.sh
+++ b/plans/policy/xacml-pdp/setup.sh
@@ -17,16 +17,85 @@
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
-docker run -d --name policy-xacml-pdp -p 6969:6969 -it nexus3.onap.org:10001/onap/policy-xacml-pdp:2.0.0-SNAPSHOT-latest
-docker ps -a
-sleep 5
+echo "Uninstall docker-py and reinstall docker."
+pip uninstall -y docker-py
+pip uninstall -y docker
+pip install -U docker==2.7.0
+
+# the directory of the script
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+echo ${DIR}
+
+# the temp directory used, within $DIR
+# omit the -p parameter to create a temporal directory in the default location
+WORK_DIR=`mktemp -d -p "$DIR"`
+echo ${WORK_DIR}
+
+cd ${WORK_DIR}
+
+# check if tmp dir was created
+if [[ ! "$WORK_DIR" || ! -d "$WORK_DIR" ]]; then
+ echo "Could not create temp dir"
+ exit 1
+fi
+
+# bring down maven
+mkdir maven
+cd maven
+curl -O http://apache.claz.org/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz
+tar -xzvf apache-maven-3.3.9-bin.tar.gz
+ls -l
+export PATH=${PATH}:${WORK_DIR}/maven/apache-maven-3.3.9/bin
+${WORK_DIR}/maven/apache-maven-3.3.9/bin/mvn -v
+cd ..
+
+git clone http://gerrit.onap.org/r/oparent
+git clone --depth 1 https://gerrit.onap.org/r/policy/models -b master
+cd models/models-sim/models-sim-dmaap
+${WORK_DIR}/maven/apache-maven-3.3.9/bin/mvn clean install -DskipTests --settings ${WORK_DIR}/oparent/settings.xml
+bash ./src/main/package/docker/docker_build.sh
+cd ${WORKSPACE}
+rm -rf ${WORK_DIR}
+sleep 3
+
+# Adding this waiting container due to race condition between pap and mariadb
+docker-compose -f ${WORKSPACE}/scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml run --rm start_dependencies
+docker-compose -f ${WORKSPACE}/scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml up -d
+
+unset http_proxy https_proxy
+
+POLICY_API_IP=`get-instance-ip.sh policy-api`
+MARIADB_IP=`get-instance-ip.sh mariadb`
POLICY_PDPX_IP=`get-instance-ip.sh policy-xacml-pdp`
-echo PDP-X IP IS ${POLICY_PDPX_IP}
+DMAAP_IP=`get-instance-ip.sh dmaap-simulator`
+POLICY_PAP_IP=`get-instance-ip.sh policy-pap`
+
+
+echo PDP IP IS ${POLICY_PDPX_IP}
+echo API IP IS ${POLICY_API_IP}
+echo PAP IP IS ${POLICY_PAP_IP}
+echo MARIADB IP IS ${MARIADB_IP}
+echo DMAAP_IP IS ${DMAAP_IP}
+
# Wait for initialization
for i in {1..10}; do
+ curl -sS ${MARIADB_IP}:3306 && break
+ echo sleep $i
+ sleep $i
+done
+for i in {1..10}; do
curl -sS ${POLICY_PDPX_IP}:6969 && break
echo sleep $i
sleep $i
done
+for i in {1..10}; do
+ curl -sS ${DMAAP_IP}:3904 && break
+ echo sleep $i
+ sleep $i
+done
+
+#Configure the database
+docker exec -it mariadb chmod +x /docker-entrypoint-initdb.d/db.sh
+docker exec -it mariadb /docker-entrypoint-initdb.d/db.sh
-ROBOT_VARIABLES="-v POLICY_PDPX_IP:${POLICY_PDPX_IP}"
+ROBOT_VARIABLES="-v POLICY_PDPX_IP:${POLICY_PDPX_IP} -v POLICY_API_IP:${POLICY_API_IP} -v POLICY_PAP_IP:${POLICY_PAP_IP}"
diff --git a/plans/policy/xacml-pdp/teardown.sh b/plans/policy/xacml-pdp/teardown.sh
index a81ee6b1..270d6cc6 100644
--- a/plans/policy/xacml-pdp/teardown.sh
+++ b/plans/policy/xacml-pdp/teardown.sh
@@ -18,3 +18,7 @@
# ============LICENSE_END=========================================================
kill-instance.sh policy-xacml-pdp
+kill-instance.sh policy-pap
+kill-instance.sh policy-api
+kill-instance.sh mariadb
+kill-instance.sh dmaap-simulator
diff --git a/plans/sdc/nightly/setup.sh b/plans/sdc/nightly/setup.sh
index ff310a5a..7587d096 100644
--- a/plans/sdc/nightly/setup.sh
+++ b/plans/sdc/nightly/setup.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${WORKSPACE}/scripts/sdc/setup_sdc_for_apis_sanity.sh
+source ${WORKSPACE}/scripts/sdc/setup_sdc_for_sanity.sh tad
BE_IP=`get-instance-ip.sh sdc-BE`
echo BE_IP=${BE_IP}
diff --git a/plans/sdc/sanity/setup.sh b/plans/sdc/sanity/setup.sh
index ff310a5a..7587d096 100644
--- a/plans/sdc/sanity/setup.sh
+++ b/plans/sdc/sanity/setup.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-source ${WORKSPACE}/scripts/sdc/setup_sdc_for_apis_sanity.sh
+source ${WORKSPACE}/scripts/sdc/setup_sdc_for_sanity.sh tad
BE_IP=`get-instance-ip.sh sdc-BE`
echo BE_IP=${BE_IP}
diff --git a/plans/sdc/uiSanity/setup.sh b/plans/sdc/uiSanity/setup.sh
index 0a8d56c0..863f8d4d 100644
--- a/plans/sdc/uiSanity/setup.sh
+++ b/plans/sdc/uiSanity/setup.sh
@@ -1,11 +1,10 @@
#!/bin/bash
-source ${WORKSPACE}/scripts/sdc/setup_sdc_for_ui_sanity.sh
+source ${WORKSPACE}/scripts/sdc/setup_sdc_for_sanity.sh tud
BE_IP=`get-instance-ip.sh sdc-BE`
echo BE_IP=${BE_IP}
-
# Pass any variables required by Robot test suites in ROBOT_VARIABLES
ROBOT_VARIABLES="-v BE_IP:${BE_IP}"
diff --git a/plans/vfc-nfvo-catalog/sanity-check/setup.sh b/plans/vfc-nfvo-catalog/sanity-check/setup.sh
index 344214ff..94f21e14 100644
--- a/plans/vfc-nfvo-catalog/sanity-check/setup.sh
+++ b/plans/vfc-nfvo-catalog/sanity-check/setup.sh
@@ -72,5 +72,7 @@ cat config.py
docker cp vfc-catalog:/service/vfc/nfvo/catalog/logs/runtime_catalog.log ./
cat runtime_catalog.log
+docker logs vfc-catalog
+
# Pass any variables required by Robot test suites in ROBOT_VARIABLES
ROBOT_VARIABLES="-v MSB_IP:${MSB_IP} -v CATALOG_IP:${CATALOG_IP} -v MSB_DISCOVERY_IP:${DISCOVERY_IP} -v SCRIPTS:${SCRIPTS}"
diff --git a/plans/vfc-nfvo-catalog/sanity-check/teardown.sh b/plans/vfc-nfvo-catalog/sanity-check/teardown.sh
index cfccb3ff..c328f5ea 100644
--- a/plans/vfc-nfvo-catalog/sanity-check/teardown.sh
+++ b/plans/vfc-nfvo-catalog/sanity-check/teardown.sh
@@ -16,6 +16,7 @@
#
# print log file for catalog
+docker logs vfc-catalog
docker cp vfc-catalog:/service/vfc/nfvo/catalog/logs/runtime_catalog.log ./
cat runtime_catalog.log