aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorkoblosz <sandra.koblosz@nokia.com>2018-10-23 07:32:30 +0200
committerkoblosz <sandra.koblosz@nokia.com>2018-10-23 08:25:47 +0200
commit2ac270a8ee0ecf5357c541deb6e162b4cc26dd98 (patch)
tree4dd8770e719c806af57d252de44df663b06f74bd /scripts
parent5d59d1bf48fa2f0fbd433e8b25a207d62ddf8d22 (diff)
Enhance vid CSIT tests, added for scaleout
Issue-ID: VID-323 Change-Id: I31ad377ee766eaf66c848ad802c33e21ea1dfe76 Signed-off-by: Sandra Koblosz <sandra.koblosz@nokia.com>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/get-instance-ip.sh2
-rw-r--r--scripts/vid/start_vid_containers.sh17
2 files changed, 17 insertions, 2 deletions
diff --git a/scripts/get-instance-ip.sh b/scripts/get-instance-ip.sh
index c4ca82cf..a236c025 100755
--- a/scripts/get-instance-ip.sh
+++ b/scripts/get-instance-ip.sh
@@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-docker inspect --format '{{ .NetworkSettings.IPAddress }}' $1
+docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $1
diff --git a/scripts/vid/start_vid_containers.sh b/scripts/vid/start_vid_containers.sh
index a058e1fb..c8804349 100644
--- a/scripts/vid/start_vid_containers.sh
+++ b/scripts/vid/start_vid_containers.sh
@@ -17,6 +17,8 @@
# 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.
+#
+# Modifications copyright (c) 2018 Nokia Intellectual Property
# ============LICENSE_END============================================
# ===================================================================
# ECOMP is a trademark and service mark of AT&T Intellectual Property.
@@ -33,8 +35,21 @@ docker-compose up -d --build
TIME_OUT=1200
INTERVAL=5
TIME=0
+
+ for i in {1..10}; do
+ if [ $(docker inspect -f '{{ .State.Running }}' vid-server) ]
+ then
+ echo "VID service is running"
+ VID_DOCKER_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' vid-server)
+ break
+ else
+ echo "Waiting for vid-server docker initialization... $i"
+ sleep $i
+ fi
+ done
+
while [ "$TIME" -lt "$TIME_OUT" ]; do
- response=$(curl --write-out '%{http_code}' --silent --output /dev/null http://localhost:8080/vid/healthCheck); echo $response
+ response=$(curl --write-out '%{http_code}' --silent --output /dev/null http://"$VID_DOCKER_IP":8080/vid/healthCheck); echo $response
if [ "$response" == "200" ]; then
echo VID and its database well started in $TIME seconds