4 files changed, 59 insertions, 20 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
 }
diff --git a/bootstrap/vagrant-onap/tests/test_mr b/bootstrap/vagrant-onap/tests/test_mr
index 6fad08311..d8db84940 100644
--- a/bootstrap/vagrant-onap/tests/test_mr
+++ b/bootstrap/vagrant-onap/tests/test_mr
@@ -4,19 +4,33 @@ source /var/onap_tests/_test_base
 source /var/onap/mr
 
 covered_functions=(
-"init_mr"
+"clone_mr_repos" "get_mr_images" "install_message_router"
 )
 
-# test_init_mr() - Verify the built and start of Message Router services
-function test_init_mr {
-    init_mr
+# test_clone_mr_repos() - Verify that Message Router repositories are cloned properly
+function test_clone_mr_repos {
+    clone_mr_repos
+
+    asserts_file_exist $src_folder/deploy.sh
+}
+
+# test_get_mr_images() - Verify that Message Router Docker images are retrieved
+function test_get_mr_images {
+    get_mr_images
 
-    asserts_image dockerfiles_kafka
-    asserts_image anapsix/alpine-java
     asserts_image attos/dmaap
     asserts_image wurstmeister/zookeeper
 }
 
+# test_install_message_router() - Verify the built and start of Message Router services
+function test_install_message_router {
+    clone_mr_repos
+    get_mr_images
+    install_message_router
+
+    asserts_image_running dockerfiles_kafka
+}
+
 if [ "$1" != '*' ]; then
     unset covered_functions
     covered_functions=$1
diff --git a/bootstrap/vagrant-onap/tests/test_vfc b/bootstrap/vagrant-onap/tests/test_vfc
index 2f71cf1b0..338280948 100644
--- a/bootstrap/vagrant-onap/tests/test_vfc
+++ b/bootstrap/vagrant-onap/tests/test_vfc
@@ -4,7 +4,7 @@ source /var/onap_tests/_test_base
 source /var/onap/vfc
 
 covered_functions=(
-"clone_all_vfc_repos"
+"clone_all_vfc_repos" "compile_all_vfc_repos" "install_vfc"
 )
 
 # test_clone_all_vfc_repos() - Verify cloning and pulling source code from repositories
@@ -13,6 +13,21 @@ function test_clone_all_vfc_repos {
     echo ""
 }
 
+# test_compile_all_vfc_repos() - Verify that all the VFC modules are compiled properly
+function test_compile_all_vfc_repos {
+    clone_all_vfc_repos
+    compile_all_vfc_repos
+
+    # TODO(electrocucaracha): Add asserts_file_exist
+}
+
+# test_install_vfc() - Verify that the VFC are up and running
+function test_install_vfc {
+    install_vfc
+
+    # TODO(electrocucaracha): Add whatever asserts are needed
+}
+
 if [ "$1" != '*' ]; then
     unset covered_functions
     covered_functions=$1