summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFu Jinhua <fu.jinhua@zte.com.cn>2017-09-26 09:08:32 +0000
committerGerrit Code Review <gerrit@onap.org>2017-09-26 09:08:32 +0000
commit8e6234a0dc88355340873876aee0817b19c2012b (patch)
tree234e3e9b7b08b5371dc7734ff4c2077af787b91d
parente08e1b62f09d7256491601d6bdb4ddc712179b96 (diff)
parent8b8e7398d5e064ae9a75ff6f3bc82a3048832c40 (diff)
Merge "Recheck VFC UTs"
-rwxr-xr-xbootstrap/vagrant-onap/lib/vfc61
-rw-r--r--bootstrap/vagrant-onap/tests/test_vfc46
2 files changed, 49 insertions, 58 deletions
diff --git a/bootstrap/vagrant-onap/lib/vfc b/bootstrap/vagrant-onap/lib/vfc
index fb32708e0..a87944879 100755
--- a/bootstrap/vagrant-onap/lib/vfc
+++ b/bootstrap/vagrant-onap/lib/vfc
@@ -4,14 +4,18 @@ set -o xtrace
source /var/onap/functions
-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")
+vfc_src_folder=$git_src_folder/vfc
+vfc_repos=("gvnfm" "gvnfm/vnflcm" "gvnfm/vnfmgr" "gvnfm/vnfres" "nfvo" \
+"nfvo/catalog" "nfvo/driver" "nfvo/driver/ems" "nfvo/driver/sfc" \
+"nfvo/driver/vnfm" "nfvo/driver/vnfm/gvnfm" "nfvo/driver/vnfm/svnfm" \
+"nfvo/lcm" "nfvo/resmanagement" "nfvo/wfengine")
# clone_all_vfc_repos() - Function that clones VF-C source repo.
function clone_all_vfc_repos {
+ clone_repo vfc $vfc_src_folder
+
for dirc in ${vfc_repos[@]}; do
- clone_repo vfc/$dirc $src_folder/$dirc
+ clone_repo vfc/$dirc $vfc_src_folder/$dirc
done
}
@@ -22,7 +26,7 @@ function compile_all_vfc_repos {
tox_repos=("gvnfm/vnflcm/lcm" "gvnfm/vnfmgr/mgr" "gvnfm/vnfres/res" "nfvo/lcm" \
"nfvo/driver/vnfm/gvnfm/gvnfmadapter" "nfvo/driver/vnfm/svnfm/zte/vmanager")
for dirc in ${tox_repos[@]}; do
- pushd $src_folder/$dirc
+ pushd $vfc_src_folder/$dirc
tox -e py27
popd
done
@@ -39,42 +43,11 @@ function compile_all_vfc_repos {
# nfvo/wfengine
}
-# build_gvnfm_lcm_image() - Build VFC GVNFM VNF LCM docker image
-function build_gvnfm_lcm_image {
- pushd $src_folder/gvnfm/vnflcm/lcm/docker
- sed -i '$ {s/^/#/}' build_image.sh
- ./build_image.sh
- popd
-}
-
-# build_gvnfm_vnfmgr_image() - Build VFC GVNFM VNF Manager docker image
-function build_gvnfm_vnfmgr_image {
- pushd $src_folder/gvnfm/vnfmgr/mgr/docker
- sed -i '$ {s/^/#/}' build_image.sh
- ./build_image.sh
- popd
-}
-
-# build_gvnfm_vnfres_image() - Build VFC GVNFM VNF Resource Management docker image
-function build_gvnfm_vnfres_image {
- pushd $src_folder/gvnfm/vnfres/res/docker
- sed -i '$ {s/^/#/}' build_image.sh
- ./build_image.sh
- popd
-}
-
-# build_nfvo_lcm_image() - Build VFC NFVO LCM docker image
-function build_nfvo_lcm_image {
- pushd $src_folder/nfvo/lcm/docker
- sed -i '$ {s/^/#/}' build_image.sh
- ./build_image.sh
- popd
-}
-
-# build_nfvo_vnfm_gvnfmadapter_image() - Build VFC NFVO General VNF Adapter docker image
-function build_nfvo_vnfm_gvnfmadapter_image {
- pushd $src_folder/nfvo/driver/vnfm/gvnfm/gvnfmadapter/docker
- sed -i '$ {s/^/#/}' build_image.sh
+# _build_vfc_image() - Build VFC docker image
+function _build_vfc_image {
+ pushd $vfc_src_folder/$1/docker
+ sed -i "s/^push_image/#push_image/g" build_image.sh
+ sed -i 's|IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"|IMAGE_NAME=${ORG}/${IMAGE}|g' build_image.sh
./build_image.sh
popd
}
@@ -84,6 +57,12 @@ function get_vfc_images {
if [[ "$build_image" == "True" ]]; then
install_docker
# Separate methods are required since the image build process will change.
+ _build_vfc_image gvnfm/vnflcm/lcm onap/nslcm
+ _build_vfc_image gvnfm/vnfmgr/mgr onap/gvnfmdriver
+ _build_vfc_image gvnfm/vnfres/res onap/vnfres
+ _build_vfc_image nfvo/lcm onap/vnflcm
+ _build_vfc_image nfvo/driver/vnfm/gvnfm/gvnfmadapter
+
build_gvnfm_lcm_image
build_gvnfm_vnfmgr_image
build_gvnfm_vnfres_image
diff --git a/bootstrap/vagrant-onap/tests/test_vfc b/bootstrap/vagrant-onap/tests/test_vfc
index 8392e701f..16e517a5e 100644
--- a/bootstrap/vagrant-onap/tests/test_vfc
+++ b/bootstrap/vagrant-onap/tests/test_vfc
@@ -12,10 +12,23 @@ covered_functions=(
# test_clone_all_vfc_repos() - Verify cloning and pulling source code from repositories
function test_clone_all_vfc_repos {
+ clone_all_vfc_repos
- # TODO(sshank): Add other asserts
- asserts_file_exist $src_folder/nfvo/lcm/run.sh
-
+ #asserts_file_exist $vfc_src_folder/pom.xml
+ #asserts_file_exist $vfc_src_folder/gvnfm
+ asserts_file_exist $vfc_src_folder/gvnfm/vnflcm/pom.xml
+ asserts_file_exist $vfc_src_folder/gvnfm/vnfmgr/pom.xml
+ asserts_file_exist $vfc_src_folder/gvnfm/vnfres/pom.xml
+ #asserts_file_exist $vfc_src_folder/nfvo
+ asserts_file_exist $vfc_src_folder/nfvo/catalog/run.sh
+ #asserts_file_exist $vfc_src_folder/nfvo/driver
+ asserts_file_exist $vfc_src_folder/nfvo/driver/ems/pom.xml
+ asserts_file_exist $vfc_src_folder/nfvo/driver/sfc/pom.xml
+ #asserts_file_exist $vfc_src_folder/nfvo/driver/vnfm
+ asserts_file_exist $vfc_src_folder/nfvo/driver/vnfm/gvnfm/pom.xml
+ asserts_file_exist $vfc_src_folder/nfvo/driver/vnfm/svnfm/pom.xml
+ asserts_file_exist $vfc_src_folder/nfvo/lcm/pom.xml
+ asserts_file_exist $vfc_src_folder/nfvo/wfengine/wso2/pom.xml
}
# test_compile_all_vfc_repos() - Verify that all the VFC modules are compiled properly
@@ -28,28 +41,27 @@ function test_compile_all_vfc_repos {
# test_get_vfc_images() - Verify all VFC images are built correctly.
function test_get_vfc_images {
+ clone_all_vfc_repos
get_vfc_images
- asserts_image nexus3.onap.org:10003/onap/vfc/nslcm
- asserts_image nexus3.onap.org:10003/onap/vfc/gvnfmdriver
- asserts_image nexus3.onap.org:10003/onap/vfc/vnfres
- asserts_image nexus3.onap.org:10003/onap/vfc/vnfmgr
- asserts_image nexus3.onap.org:10003/onap/vfc/vnflcm
-
- # TODO(sshank): Add asserts for other VFC component docker image builds.
+ asserts_image onap/gvnfmdriver
+ asserts_image onap/nslcm
+ asserts_image onap/vnfres
+ asserts_image onap/vnfmgr
+ asserts_image onap/vnflcm
}
# test_install_vfc() - Verify that the VFC are up and running
function test_install_vfc {
+ clone_all_vfc_repos
+ get_vfc_images
install_vfc
- asserts_image_running nexus3.onap.org:10003/onap/vfc/nslcm:latest
- asserts_image_running nexus3.onap.org:10003/onap/vfc/gvnfmdriver:latest
- asserts_image_running nexus3.onap.org:10003/onap/vfc/vnfres:latest
- asserts_image_running nexus3.onap.org:10003/onap/vfc/vnfmgr:latest
- asserts_image_running nexus3.onap.org:10003/onap/vfc/vnflcm:latest
-
- # TODO(sshank): Add asserts for other running VFC component docker images.
+ asserts_image_running onap/nslcm
+ asserts_image_running onap/gvnfmdriver
+ asserts_image_running onap/vnfres
+ asserts_image_running onap/vnfmgr
+ asserts_image_running onap/vnflcm
}
if [ "$1" != '*' ]; then