2 files changed, 23 insertions, 13 deletions
diff --git a/bootstrap/vagrant-onap/lib/mr b/bootstrap/vagrant-onap/lib/mr
index 869994d2d..76b27b1ea 100755
--- a/bootstrap/vagrant-onap/lib/mr
+++ b/bootstrap/vagrant-onap/lib/mr
@@ -3,23 +3,32 @@
 set -o xtrace
 
 source /var/onap/functions
-source /var/onap/asserts
 
 src_folder=$git_src_folder/dcae/message-router
 
-# install_message_router() - Downloads and configure message router source code
-function _install_message_router {
+# clone_mr_repos() - Function that clones the Message Router repositories
+function clone_mr_repos {
     clone_repo dcae/demo/startup/message-router $src_folder
-    pushd $src_folder
+}
+
+# get_mr_images() - Function that retrieves the Message Router Docker images
+function get_mr_images {
     pull_docker_image attos/dmaap
     pull_docker_image wurstmeister/zookeeper
+}
+
+# install_message_router() - Downloads and configure message router source code
+function install_message_router {
     install_docker_compose
+
+    pushd $src_folder
     bash deploy.sh
-    asserts_image dockerfiles_kafka
     popd
 }
 
 # init_mr() - Function that initialize Message Router services
 function init_mr {
-    _install_message_router
+    clone_mr_repos
+    get_mr_images
+    install_message_router
 }
diff --git a/bootstrap/vagrant-onap/lib/vfc b/bootstrap/vagrant-onap/lib/vfc
index 90a73affd..13e301598 100755
--- a/bootstrap/vagrant-onap/lib/vfc
+++ b/bootstrap/vagrant-onap/lib/vfc
@@ -3,8 +3,8 @@
 set -o xtrace
 
 source /var/onap/functions
-src_folder=$git_src_folder/vfc
 
+src_folder=$git_src_folder/vfc
 vfc_repos=("gvnfm/vnflcm" "gvnfm/vnfmgr" "gvnfm/vnfres" "nfvo/catalog" "nfvo/driver/ems" "nfvo/driver/sfc" \
             "nfvo/driver/vnfm/gvnfm" "nfvo/driver/vnfm/svnfm" "nfvo/lcm" "nfvo/resmanagement" "nfvo/wfengine")
 
@@ -44,17 +44,18 @@ function compile_all_vfc_repos {
 
 # install_vfc() - Download and install vfc service from source code
 function install_vfc {
-    clone_all_vfc_repos
-    if [[ "$compile_repo" == "False" ]]; then
-        compile_all_vfc_repos
-    fi
-
     # TODO(sshank): Add further installation steps if necessary.
+    echo ""
 }
 
 # init_vfc() - Function that initialize VF-C services
 function init_vfc {
-    install_python
     install_package libmysqlclient-dev
+
+    clone_all_vfc_repos
+    if [[ "$compile_repo" == "False" ]]; then
+        compile_all_vfc_repos
+    fi
+
     install_vfc
 }