aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-10-23 14:41:21 +0000
committerGerrit Code Review <gerrit@onap.org>2018-10-23 14:41:21 +0000
commitab87f69a5dbcecea8b2b4793568a5623e4a714e3 (patch)
treeb7e63d6248400ff7019f6b1e9aad94d43eaa2aa5 /scripts
parent37e3c0b51e55f84d4f9838c42b7433f2554632ee (diff)
parent2ac270a8ee0ecf5357c541deb6e162b4cc26dd98 (diff)
Merge "Enhance vid CSIT tests, added for scaleout"
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