commit 5d21f64981e69f6a266da1ec30754de5d8d71e26
author Victor Morales <victor.morales@intel.com> Thu Dec 07 11:54:59 2017 -0800
committer Victor Morales <victor.morales@intel.com> Thu Dec 07 12:04:22 2017 -0800
tree 2ac623262e3aabd9238df22af63149405b1d9fa1
parent 303a016e7c35d988add1838faad37f4d0432bc00

Fix Robot UTs

The way to clone robot source code repos was depending on the name
of the project, but given that robot repos name has different
name it was required to handle this exception. This change include

Change-Id: If0f4b1cd7866944166b1e81ed417176049251370
Signed-off-by: Victor Morales <victor.morales@intel.com>
Issue-ID: INT-19

bootstrap/vagrant-onap/lib/functions

diff --git a/bootstrap/vagrant-onap/lib/functions b/bootstrap/vagrant-onap/lib/functions
index 907805e..8d906dc 100755
--- a/bootstrap/vagrant-onap/lib/functions
+++ b/bootstrap/vagrant-onap/lib/functions
@@ -70,13 +70,14 @@
 # clone_repos() - Function that clones source repositories for a given project
 function clone_repos {
     local project=$1
+    local repo_name=${2:-$project}
     local name=${project}_repos[@]
     local src_name=${project}_src_folder
     local repos_list=("${!name}")
-    local dest_folder=${3:-${!src_name}}
+    local dest_folder=${!src_name}
 
     for repo in ${repos_list[@]}; do
-        clone_repo $repo $dest_folder${repo#*$project}
+        clone_repo $repo $dest_folder${repo#*$repo_name}
     done
 }
 

bootstrap/vagrant-onap/lib/robot

diff --git a/bootstrap/vagrant-onap/lib/robot b/bootstrap/vagrant-onap/lib/robot
index 374a256..588da6c 100755
--- a/bootstrap/vagrant-onap/lib/robot
+++ b/bootstrap/vagrant-onap/lib/robot
@@ -2,18 +2,18 @@
 
 source /var/onap/functions
 
-testsuite_src_folder=$git_src_folder/testsuite
-testsuite_repos=("testsuite" "testsuite/heatbridge" "testsuite/properties" \
+robot_src_folder=$git_src_folder/testsuite
+robot_repos=("testsuite" "testsuite/heatbridge" "testsuite/properties" \
 "testsuite/python-testing-utils")
 
 # _setup_ete_folder() - Create and copy ete folder structure
 function _setup_ete_folder {
     mkdir -p /opt/eteshare/config
 
-    cp $testsuite_src_folder/integration_* /opt/eteshare/config
-    cp $testsuite_src_folder/vm_config2robot.sh /opt/eteshare/config
-    cp $testsuite_src_folder/ete.sh /opt
-    cp $testsuite_src_folder/demo.sh /opt
+    cp $robot_src_folder/integration_* /opt/eteshare/config
+    cp $robot_src_folder/vm_config2robot.sh /opt/eteshare/config
+    cp $robot_src_folder/ete.sh /opt
+    cp $robot_src_folder/demo.sh /opt
 
     chmod +x /opt/ete.sh
     chmod +x /opt/demo.sh
@@ -33,10 +33,10 @@
 # init_robot() - Function that initialize Robot services
 function init_robot {
     if [[ "$clone_repo" == "True" ]]; then
-        clone_repos "testsuite"
+        clone_repos "robot" "testsuite"
         _setup_ete_folder
         if [[ "$compile_repo" == "True" ]]; then
-            compile_repos "testsuite"
+            compile_repos "robot"
         fi
     fi