aboutsummaryrefslogtreecommitdiffstats
path: root/plans/sdnc/healthcheck/setup.sh
diff options
context:
space:
mode:
Diffstat (limited to 'plans/sdnc/healthcheck/setup.sh')
-rwxr-xr-xplans/sdnc/healthcheck/setup.sh15
1 files changed, 6 insertions, 9 deletions
diff --git a/plans/sdnc/healthcheck/setup.sh b/plans/sdnc/healthcheck/setup.sh
index 2614bea3..a11a3aa5 100755
--- a/plans/sdnc/healthcheck/setup.sh
+++ b/plans/sdnc/healthcheck/setup.sh
@@ -24,8 +24,8 @@ export NEXUS_USERNAME=docker
export NEXUS_PASSWD=docker
export NEXUS_DOCKER_REPO=nexus3.onap.org:10001
export DMAAP_TOPIC=AUTO
-export DOCKER_IMAGE_VERSION=1.7-STAGING-latest
-export CCSDK_DOCKER_IMAGE_VERSION=0.6-STAGING-latest
+export DOCKER_IMAGE_VERSION=1.8-STAGING-latest
+export CCSDK_DOCKER_IMAGE_VERSION=0.7-STAGING-latest
export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
@@ -96,12 +96,9 @@ TIME_OUT=1500
INTERVAL=60
TIME=0
while [ "$TIME" -lt "$TIME_OUT" ]; do
+ response=$(docker exec -ti sdnc_controller_container /opt/opendaylight/current/bin/client system:start-level)
-docker exec sdnc_controller_container rm -f /opt/opendaylight/current/etc/host.key
-response=$(docker exec sdnc_controller_container /opt/opendaylight/current/bin/client system:start-level)
-docker exec sdnc_controller_container rm -f /opt/opendaylight/current/etc/host.key
-
- if [ "$response" == "Level 100" ] ; then
+ if grep -q 'Level 100' <<< ${response}; then
echo SDNC karaf started in $TIME seconds
break;
fi
@@ -115,9 +112,9 @@ if [ "$TIME" -ge "$TIME_OUT" ]; then
echo TIME OUT: karaf session not started in $TIME_OUT seconds... Could cause problems for testing activities...
fi
-response=$(docker exec sdnc_controller_container /opt/opendaylight/current/bin/client system:start-level)
+response=$(docker exec -ti sdnc_controller_container /opt/opendaylight/current/bin/client system:start-level)
- if [ "$response" == "Level 100" ] ; then
+if grep -q 'Level 100' <<< ${response} ; then
num_failed_bundles=$(docker exec sdnc_controller_container /opt/opendaylight/current/bin/client bundle:list | grep Failure | wc -l)
failed_bundles=$(docker exec sdnc_controller_container /opt/opendaylight/current/bin/client bundle:list | grep Failure)
echo There is/are $num_failed_bundles failed bundles out of $num_bundles installed bundles.