Merge "Update MSO Unit Tests"
diff --git a/bootstrap/vagrant-onap/lib/mso b/bootstrap/vagrant-onap/lib/mso
index b8d4326..4f88e90 100755
--- a/bootstrap/vagrant-onap/lib/mso
+++ b/bootstrap/vagrant-onap/lib/mso
@@ -3,7 +3,6 @@
set -o xtrace
source /var/onap/functions
-source /var/onap/asserts
src_folder=$git_src_folder/mso
mso_repos=("chef-repo" "docker-config" "libs" "mso-config")
@@ -32,9 +31,6 @@
export GIT_NO_PROJECT=/opt/
compile_src $src_folder
build_docker_image $src_folder/packages/docker docker
- for image in mso mso-arquillian wildfly ubuntu-update jacoco; do
- asserts_image openecomp/$image
- done
fi
}
diff --git a/bootstrap/vagrant-onap/tests/test_mso b/bootstrap/vagrant-onap/tests/test_mso
index 632f6ea..cb7b014 100644
--- a/bootstrap/vagrant-onap/tests/test_mso
+++ b/bootstrap/vagrant-onap/tests/test_mso
@@ -4,7 +4,7 @@
source /var/onap/mso
covered_functions=(
-"clone_all_mso_repos" "compile_all_mso_repos"
+"clone_all_mso_repos" "compile_all_mso_repos" "install_mso" "install_mso_docker_config"
)
# test_clone_all_mso_repos() - Verify the source code retrieve of MSO project
@@ -40,6 +40,25 @@
asserts_file_exist $src_folder/libs/swift-model/target/swift-model-1.1.0-SNAPSHOT.jar
}
+# test_install_mso() - Verify the creation of MSO Docker images
+function test_install_mso {
+ clone_all_mso_repos
+ install_mso
+
+ for image in mso mso-arquillian wildfly ubuntu-update jacoco; do
+ asserts_image openecomp/$image
+ done
+}
+
+# test_install_mso_docker_config - Verify the execution of MSO Docker images
+function test_install_mso_docker_config {
+ clone_all_mso_repos
+ install_mso
+ install_mso_docker_config
+
+ asserts_image_running openecomp/mso
+ asserts_image_running mariadb:10.1.11
+}
if [ "$1" != '*' ]; then
unset covered_functions