diff options
| author |   Venkata Harish K Kajur <hkajur93@gmail.com> | 2018-03-14 10:05:27 -0400 |
|---|---|---|
| committer |   Kajur, Harish (vk250x) <vk250x@att.com> | 2018-03-15 11:21:45 -0400 |
| commit | 3918ac5200b6491599469463ceafb3638faa1b8c (patch) | |
| tree | 2a319d3323e8d5adc87bb4c1c130bc23ec209126 /test/csit/plans/aai/traversal/setup.sh | |
| parent | 5ae17fe0c827f93e2065a1648fc7073009fe293e (diff) | |
Change from using chef to local config files
Issue-ID: AAI-96
Change-Id: If0b95a793c490361deac36557fb52b666f355a13
Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>
Diffstat (limited to 'test/csit/plans/aai/traversal/setup.sh')
| -rw-r--r-- | test/csit/plans/aai/traversal/setup.sh | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/test/csit/plans/aai/traversal/setup.sh b/test/csit/plans/aai/traversal/setup.sh index d3635d4ca..118a1bc9c 100644 --- a/test/csit/plans/aai/traversal/setup.sh +++ b/test/csit/plans/aai/traversal/setup.sh @@ -26,6 +26,8 @@ DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt) DOCKER_REGISTRY=${NEXUS_DOCKER_REPO} DOCKER_IMAGE_VERSION=1.2-STAGING-latest +export CURRENT_PWD=$(pwd); + function wait_for_container() { CONTAINER_NAME="$1"; @@ -95,17 +97,21 @@ function check_if_user_exists(){ if [ "${USER_EXISTS}" -eq 0 ]; then export USER_ID=9000; + export GROUP_ID=9000; else export USER_ID=$(id -u aaiadmin); + export GROUP_ID=$(id -g aaiadmin); fi; RESOURCES_CONTAINER_NAME=$(${DOCKER_COMPOSE_CMD} up -d aai-resources.api.simpledemo.onap.org 2>&1 | grep 'Creating' | grep -v 'volume' | grep -v 'network' | awk '{ print $2; }' | head -1); -wait_for_container ${RESOURCES_CONTAINER_NAME} '0.0.0.0:8447'; +wait_for_container $RESOURCES_CONTAINER_NAME 'Resources Microservice Started'; -TRAVERSAL_CONTAINER_NAME=$(${DOCKER_COMPOSE_CMD} up -d aai-traversal.api.simpledemo.onap.org 2>&1 | grep 'Creating' | grep -v 'volume' | grep -v 'network' | awk '{ print $2; }' | head -1); -wait_for_container ${TRAVERSAL_CONTAINER_NAME} '0.0.0.0:8446'; +${DOCKER_COMPOSE_CMD} up -d aai-traversal.api.simpledemo.onap.org aai.api.simpledemo.onap.org +TRAVERSAL_CONTAINER_NAME=$(echo $RESOURCES_CONTAINER_NAME | sed 's/aai-resources/aai-traversal/g'); -${DOCKER_COMPOSE_CMD} up -d aai.api.simpledemo.onap.org echo "A&AI Microservices, resources and traversal, are up and running along with HAProxy"; + +wait_for_container $TRAVERSAL_CONTAINER_NAME 'Traversal Microservice Started'; + # Set the host ip for robot from the haproxy ROBOT_VARIABLES="-v HOST_IP:`ip addr show docker0 | head -3 | tail -1 | cut -d' ' -f6 | cut -d'/' -f1`" |