diff options
| author |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-02-09 10:31:21 -0500 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-02-09 10:31:21 -0500 |
| commit | 572ccad46add060508f39df54810de87e9f2647f (patch) | |
| tree | 0d59c3997a96b1469bda5029c68816f78a97a29e /plans/sdnc | |
| parent | 47abceca6dcbb8d559277d92ad9cc0f1ea806196 (diff) | |
Update SDNC CSIT for Dublin/Fluorine
Update SDNC CSIT tests to use Dublin / OpenDaylight Fluorine based containers
Change-Id: I1ae8b6dfbfebc23b9489a0faaba5cb3c8d0f7b63
Issue-ID: SDNC-552
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'plans/sdnc')
| -rwxr-xr-x[-rw-r--r--] | plans/sdnc/healthcheck/setup.sh | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/plans/sdnc/healthcheck/setup.sh b/plans/sdnc/healthcheck/setup.sh index dfbd32cc..7a66351f 100644..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.4-STAGING-latest -export CCSDK_DOCKER_IMAGE_VERSION=0.3-STAGING-latest +export DOCKER_IMAGE_VERSION=1.5-STAGING-latest +export CCSDK_DOCKER_IMAGE_VERSION=0.4-STAGING-latest export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) @@ -100,9 +100,8 @@ while [ "$TIME" -lt "$TIME_OUT" ]; do 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 -num_bundles=$(docker exec sdnc_controller_container /opt/opendaylight/current/bin/client bundle:list | tail -1 | cut -d\| -f1) - if [ "$response" == "Level 100" ] && [ "$num_bundles" -ge 333 ]; then + if [ "$response" == "Level 100" ] ; then echo SDNC karaf started in $TIME seconds break; fi @@ -117,10 +116,8 @@ if [ "$TIME" -ge "$TIME_OUT" ]; then fi response=$(docker exec sdnc_controller_container /opt/opendaylight/current/bin/client system:start-level) -num_bundles=$(docker exec sdnc_controller_container /opt/opendaylight/current/bin/client bundle:list | tail -1 | cut -d\| -f1) - if [ "$response" == "Level 100" ] && [ "$num_bundles" -ge 333 ]; then - num_bundles=$(docker exec sdnc_controller_container /opt/opendaylight/current/bin/client bundle:list | tail -1 | cut -d\| -f1) + if [ "$response" == "Level 100" ] ; 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. |