Refactor clone and compile functions

[integration.git] / bootstrap / vagrant-onap / lib / aai

diff --git a/bootstrap/vagrant-onap/lib/aai b/bootstrap/vagrant-onap/lib/aai
index bd72ae0..828d4d1 100755 (executable)
--- a/bootstrap/vagrant-onap/lib/aai
+++ b/bootstrap/vagrant-onap/lib/aai
@@ -1,12 +1,14 @@
 #!/bin/bash
 
-set -o xtrace
-
 source /var/onap/functions
 
 hbase_version=1.2.3
 aai_src_folder=$git_src_folder/aai
-aai_repos=("aai-common" "aai-config" "aai-data" "aai-service" "data-router" "logging-service" "model-loader" "resources" "rest-client" "router-core" "search-data-service" "test-config" "traversal" "sparky-fe" "sparky-be")
+aai_repos=("aai/aai-common" "aai/aai-config" "aai/aai-data" "aai/aai-service" \
+"aai/babel" "aai/champ" "aai/data-router" "aai/esr-gui" "aai/esr-server" \
+"aai/gizmo" "aai/logging-service" "aai/model-loader" "aai/resources" \
+"aai/rest-client" "aai/router-core" "aai/search-data-service" \
+"aai/test-config" "aai/traversal" "aai/sparky-fe" "aai/sparky-be")
 
 # install_hadoop() - Function that installs Hadoop
 function install_hadoop {
@@ -49,22 +51,16 @@ function install_haproxy {
     service haproxy restart
 }
 
-# clone_all_aai_repos() - Function that clones AAI source repo.
-function clone_all_aai_repos {
-    for dirc in ${aai_repos[@]}; do
-        clone_repo aai/$dirc $aai_src_folder/$dirc
-    done
-}
 
 # compile_aai_repos() - Function that compiles AAI source repo.
 function compile_aai_repos {
-    local repos=("aai-common" "resources" "logging-service" "traversal")
+    local repos=("aai/aai-common" "aai/resources" "aai/logging-service" "aai/traversal")
     if [[ "$compile_repo" == "True" ]]; then
         repos=("${aai_repos[@]}")
     fi
 
-    for dirc in ${repos[@]}; do
-        compile_src $aai_src_folder/$dirc
+    for repo in ${repos[@]}; do
+        compile_src $aai_src_folder${repo#*aai}
     done
 }
 
@@ -180,7 +176,7 @@ function init_aai {
     install_haproxy
 
     if [[ "$clone_repo" == "True" ]]; then
-        clone_all_aai_repos
+        clone_repos "aai"
         if [[ "$compile_repo" == "True" ]]; then
             compile_aai_repos
         fi