summaryrefslogtreecommitdiffstats
path: root/bootstrap/vagrant-onap
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2017-08-18 18:44:07 +0000
committerGerrit Code Review <gerrit@onap.org>2017-08-18 18:44:07 +0000
commitdc9d45aa3a068455b00d08b8f82f7568be32a00a (patch)
treeee7af66180d0e9734535c3b16b22cb28a71e6153 /bootstrap/vagrant-onap
parent7506955e42a3218122b83c673803b65ae301ea7e (diff)
parent94b3e9724e111f2731245277636b4d99f830491b (diff)
Merge "Refactor VFC UTs"
Diffstat (limited to 'bootstrap/vagrant-onap')
-rwxr-xr-xbootstrap/vagrant-onap/lib/vfc15
-rw-r--r--bootstrap/vagrant-onap/tests/test_vfc17
2 files changed, 24 insertions, 8 deletions
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_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