2 files changed, 36 insertions, 7 deletions
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