From c420d631cfe0d1c60d028d9baf5f7ced1429d934 Mon Sep 17 00:00:00 2001 From: vrvarma Date: Thu, 26 Mar 2020 11:46:50 -0400 Subject: [PATCH] Fix optf has and osdf csit failures CSIT jobs are failing with the latest aaf-sms docker images. Change-Id: Ia7da218d7383ad87cd59b07171a1931cad85f6c7 Signed-off-by: vrvarma Issue-ID: OPTFRA-725 --- plans/optf-has/has/setup.sh | 2 +- plans/optf-has/has/teardown.sh | 3 +- plans/optf-osdf/osdf/setup.sh | 2 +- plans/optf-osdf/osdf/teardown.sh | 3 +- scripts/optf-has/has/has_script.sh | 4 +- scripts/optf-has/has/setup-sms.sh | 71 +++++++++++++++++++++++++++++++++++ scripts/optf-osdf/osdf/osdf_script.sh | 4 +- scripts/optf-osdf/osdf/setup-sms.sh | 71 +++++++++++++++++++++++++++++++++++ 8 files changed, 152 insertions(+), 8 deletions(-) create mode 100755 scripts/optf-has/has/setup-sms.sh create mode 100755 scripts/optf-osdf/osdf/setup-sms.sh diff --git a/plans/optf-has/has/setup.sh b/plans/optf-has/has/setup.sh index 593a6867..db3ec7c7 100755 --- a/plans/optf-has/has/setup.sh +++ b/plans/optf-has/has/setup.sh @@ -15,7 +15,7 @@ # limitations under the License. # echo "# aaf-sms setup.sh script"; -source ${WORKSPACE}/plans/aaf/sms-test-plan/setup.sh +source ${WORKSPACE}/scripts/optf-has/has/setup-sms.sh # # add here eventual scripts needed for music diff --git a/plans/optf-has/has/teardown.sh b/plans/optf-has/has/teardown.sh index 477c7ed2..0b2b6299 100755 --- a/plans/optf-has/has/teardown.sh +++ b/plans/optf-has/has/teardown.sh @@ -33,5 +33,6 @@ echo "# optf/has music scripts calling"; source ${WORKSPACE}/scripts/optf-has/has/music_teardown_script.sh echo "# aaf-sms teardown.sh script"; -source ${WORKSPACE}/plans/aaf/sms-test-plan/teardown.sh +kill-instance.sh sms +kill-instance.sh vault diff --git a/plans/optf-osdf/osdf/setup.sh b/plans/optf-osdf/osdf/setup.sh index d2d45af5..42e9aecf 100755 --- a/plans/optf-osdf/osdf/setup.sh +++ b/plans/optf-osdf/osdf/setup.sh @@ -20,7 +20,7 @@ # echo "# aaf-sms setup.sh script"; -source ${WORKSPACE}/plans/aaf/sms-test-plan/setup.sh +source ${WORKSPACE}/scripts/optf-osdf/osdf/setup-sms.sh echo "# simulator scripts calling"; source ${WORKSPACE}/scripts/optf-osdf/osdf/simulator_script.sh diff --git a/plans/optf-osdf/osdf/teardown.sh b/plans/optf-osdf/osdf/teardown.sh index cae8dcca..3457295d 100755 --- a/plans/optf-osdf/osdf/teardown.sh +++ b/plans/optf-osdf/osdf/teardown.sh @@ -31,5 +31,6 @@ kill-instance.sh optf-osdf kill-instance.sh osdf_sim echo "# aaf-sms teardown.sh script"; -source ${WORKSPACE}/plans/aaf/sms-test-plan/teardown.sh +kill-instance.sh sms +kill-instance.sh vault diff --git a/scripts/optf-has/has/has_script.sh b/scripts/optf-has/has/has_script.sh index 9aa7606f..862691f4 100755 --- a/scripts/optf-has/has/has_script.sh +++ b/scripts/optf-has/has/has_script.sh @@ -72,9 +72,9 @@ sed -i -e "s%localhost:8100/%${AAFSIM_IP}:8100/%g" /tmp/conductor/properties/co #SMS sed -i -e "s%aaf-sms.onap:10443%${SMS_IP}:10443%g" /tmp/conductor/properties/conductor.conf #Preload secrets -docker exec -i sms /bin/sh -c "mkdir -p /preload/config" +docker exec --user root -i sms /bin/sh -c "mkdir -p /preload/config" docker cp /tmp/sms/properties/has.json sms:/preload/config/has.json -docker exec -i sms /bin/sh -c "/sms/bin/preload -cacert /sms/certs/aaf_root_ca.cer -jsondir /preload/config -serviceport 10443 -serviceurl http://localhost" +docker exec --user root -i sms /bin/sh -c "/sms/bin/preload -cacert /sms/certs/aaf_root_ca.cer -jsondir /preload/config -serviceport 10443 -serviceurl http://localhost" docker logs vault #onboard conductor into music diff --git a/scripts/optf-has/has/setup-sms.sh b/scripts/optf-has/has/setup-sms.sh new file mode 100755 index 00000000..e6a4b227 --- /dev/null +++ b/scripts/optf-has/has/setup-sms.sh @@ -0,0 +1,71 @@ +#!/bin/bash +# +# Copyright 2018 Intel Corporation +# +# 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. +# + +# Not sure why this is needed. +source ${SCRIPTS}/common_functions.sh + +CONFIG_FILE=$(pwd)/config/smsconfig.json + +mkdir -p $(pwd)/config + +docker login -u docker -p docker nexus3.onap.org:10001 +docker pull nexus3.onap.org:10001/onap/aaf/sms +docker pull docker.io/vault:1.3.3 + +# +# Running vault in dev server mode here for CSIT +# In HELM it runs in production mode +# +docker run -e "VAULT_DEV_ROOT_TOKEN_ID=aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee" \ + -e SKIP_SETCAP=true \ + --name vault -d -p 8200:8200 vault:1.3.3 + +SMSDB_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' vault) +cat << EOF > $CONFIG_FILE +{ + "cafile": "auth/selfsignedca.pem", + "servercert": "auth/server.cert", + "serverkey": "auth/server.key", + + "smsdbaddress": "http://$SMSDB_IP:8200", + "vaulttoken": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee", + "disable_tls": true +} +EOF + +cat $CONFIG_FILE + +docker run --workdir /sms -v $CONFIG_FILE:/sms/smsconfig.json \ + --name sms -d -p 10443:10443 --user root nexus3.onap.org:10001/onap/aaf/sms + +SMS_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' sms) + +echo "###### WAITING FOR ALL CONTAINERS TO COME UP" +sleep 20 +for i in {1..20}; do + curl -sS -m 1 http://${SMSDB_IP}:8200/v1/sys/seal-status && break + echo sleep $i + sleep $i +done + +# +# add here all ROBOT_VARIABLES settings +# +echo "# sms robot variables settings"; +ROBOT_VARIABLES="-v SMS_HOSTNAME:http://${SMS_IP} -v SMS_PORT:10443" + +echo ${ROBOT_VARIABLES} diff --git a/scripts/optf-osdf/osdf/osdf_script.sh b/scripts/optf-osdf/osdf/osdf_script.sh index db668949..3554b55e 100755 --- a/scripts/optf-osdf/osdf/osdf_script.sh +++ b/scripts/optf-osdf/osdf/osdf_script.sh @@ -52,9 +52,9 @@ sed -i -e "s%127.0.0.1:5000%${OSDF_SIM_IP}:5000%g" $OSDF_CONF sed -i -e "s%aaf-sms.onap:10443%${SMS_IP}:10443%g" $OSDF_CONF #Preload secrets -docker exec -i sms /bin/sh -c "mkdir -p /preload/config" +docker exec --user root -i sms /bin/sh -c "mkdir -p /preload/config" docker cp /tmp/sms/properties/osdf.json sms:/preload/config/osdf.json -docker exec -i sms /bin/sh -c "/sms/bin/preload -cacert /sms/certs/aaf_root_ca.cer -jsondir /preload/config -serviceport 10443 -serviceurl http://localhost" +docker exec --user root -i sms /bin/sh -c "/sms/bin/preload -cacert /sms/certs/aaf_root_ca.cer -jsondir /preload/config -serviceport 10443 -serviceurl http://localhost" docker logs vault docker run -d --name optf-osdf -v ${OSDF_CONF}:/opt/osdf/config/osdf_config.yaml -p "8698:8699" ${IMAGE_NAME}:${IMAGE_VER} diff --git a/scripts/optf-osdf/osdf/setup-sms.sh b/scripts/optf-osdf/osdf/setup-sms.sh new file mode 100755 index 00000000..e6a4b227 --- /dev/null +++ b/scripts/optf-osdf/osdf/setup-sms.sh @@ -0,0 +1,71 @@ +#!/bin/bash +# +# Copyright 2018 Intel Corporation +# +# 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. +# + +# Not sure why this is needed. +source ${SCRIPTS}/common_functions.sh + +CONFIG_FILE=$(pwd)/config/smsconfig.json + +mkdir -p $(pwd)/config + +docker login -u docker -p docker nexus3.onap.org:10001 +docker pull nexus3.onap.org:10001/onap/aaf/sms +docker pull docker.io/vault:1.3.3 + +# +# Running vault in dev server mode here for CSIT +# In HELM it runs in production mode +# +docker run -e "VAULT_DEV_ROOT_TOKEN_ID=aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee" \ + -e SKIP_SETCAP=true \ + --name vault -d -p 8200:8200 vault:1.3.3 + +SMSDB_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' vault) +cat << EOF > $CONFIG_FILE +{ + "cafile": "auth/selfsignedca.pem", + "servercert": "auth/server.cert", + "serverkey": "auth/server.key", + + "smsdbaddress": "http://$SMSDB_IP:8200", + "vaulttoken": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee", + "disable_tls": true +} +EOF + +cat $CONFIG_FILE + +docker run --workdir /sms -v $CONFIG_FILE:/sms/smsconfig.json \ + --name sms -d -p 10443:10443 --user root nexus3.onap.org:10001/onap/aaf/sms + +SMS_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' sms) + +echo "###### WAITING FOR ALL CONTAINERS TO COME UP" +sleep 20 +for i in {1..20}; do + curl -sS -m 1 http://${SMSDB_IP}:8200/v1/sys/seal-status && break + echo sleep $i + sleep $i +done + +# +# add here all ROBOT_VARIABLES settings +# +echo "# sms robot variables settings"; +ROBOT_VARIABLES="-v SMS_HOSTNAME:http://${SMS_IP} -v SMS_PORT:10443" + +echo ${ROBOT_VARIABLES} -- 2.16.6