Refactor and complete MR UTs

The Message Router Unit tests were incomplete, this change add news
for covering all its functions.

Change-Id: I02738798e358527ed2b710a192d0a796814b5d69
Signed-off-by: Victor Morales <victor.morales@intel.com>
Issue-Id: INT-104

1 files changed, 15 insertions, 6 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
 }