From dd074806ad51761392a9cca3f1f04fbbebd3de22 Mon Sep 17 00:00:00 2001
From: Victor Morales <victor.morales@intel.com>
Date: Wed, 26 Jul 2017 16:06:35 -0500
Subject: Sync latest changes for vagrant-onap

Given some internal procedures was not possible to submit all the
changes.  In the meantime, those changes were placed into an
non-official project. This change syncronizes the latest changes
into the official repository.

Issue-id: INT-17

Change-Id: Ia4125f4b70273401e4ed3cc1908d2e2ad7d1c2e9
Signed-off-by: Victor Morales <victor.morales@intel.com>
---
 bootstrap/vagrant-onap/lib/appc | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

(limited to 'bootstrap/vagrant-onap/lib/appc')

diff --git a/bootstrap/vagrant-onap/lib/appc b/bootstrap/vagrant-onap/lib/appc
index ffec841f4..8ad73561f 100755
--- a/bootstrap/vagrant-onap/lib/appc
+++ b/bootstrap/vagrant-onap/lib/appc
@@ -3,19 +3,44 @@
 set -o xtrace
 
 source /var/onap/sdnc
+source /var/onap/asserts
+
+# clone_all_appc_repos() - Function that clones APPC source repo.
+function clone_all_appc_repos {
+    local src_folder=/opt/appc
+
+    clone_repo appc $src_folder
+    clone_repo appc/deployment $src_folder/deployment
+}
+
+# compile_all_appc_repos() - Function that compiles APPC source repo.
+function compile_all_appc_repos {
+    local src_folder=/opt/appc
+
+    compile_src $src_folder
+    compile_src $src_folder/deployment
+}
 
 # install_appc() - Function that clones and installs the APPC services from source code
 function install_appc {
+    install_package unzip
     local src_folder=/opt/appc
-    clone_repo appc/deployment $src_folder
+
+    clone_all_appc_repos
+    if [[ "$compile_repo" == "True" ]]; then
+        compile_all_appc_repos
+    fi
+
     if [[ "$build_image" == "True" ]]; then
-        build_sdnc_images
+        clone_repo sdnc/oam /opt/sdnc/oam
+        build_sdnc_images /opt/sdnc/oam
         build_docker_image $src_folder/deployment/installation/appc docker
+        asserts_image openecomp/appc-image
     else
         pull_openecomp_image appc-image openecomp/appc-image:latest
         pull_openecomp_image dgbuilder-sdnc-image openecomp/dgbuilder-sdnc-image:latest
     fi
-    pushd $src_folder
+    pushd $src_folder/deployment
     install_docker_compose
     /opt/docker/docker-compose up -d
     popd
-- 
cgit 1.2.3-korg