summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2017-10-23 23:09:36 +0000
committerGerrit Code Review <gerrit@onap.org>2017-10-23 23:09:36 +0000
commitbdcc479956943c40255f7b094337f4728b822bda (patch)
treee7160abda7c3d3f7593502ede3a861416b108583
parent17cd9cbdd575baa9d36ce9f901d7b47cc2e6658e (diff)
parent6d280a1548070d12dee8dae9b3de6ccba6a6e655 (diff)
Merge "Update UTs for VNFSDK"
-rw-r--r--bootstrap/vagrant-onap/README.md1
-rw-r--r--bootstrap/vagrant-onap/lib/vnfsdk13
-rw-r--r--bootstrap/vagrant-onap/tests/test_vnfsdk21
-rw-r--r--bootstrap/vagrant-onap/tox.ini12
4 files changed, 27 insertions, 20 deletions
diff --git a/bootstrap/vagrant-onap/README.md b/bootstrap/vagrant-onap/README.md
index e90e0a724..e1815e7eb 100644
--- a/bootstrap/vagrant-onap/README.md
+++ b/bootstrap/vagrant-onap/README.md
@@ -55,6 +55,7 @@ current options include:
| vfc | Virtual Function Controller |
| multicloud | Multi Cloud |
| ccsdk | Common Controller SDK |
+| vnfsdk | VNF SDK |
| all_in_one | All ONAP services in a VM |
| testing | Unit Test VM |
diff --git a/bootstrap/vagrant-onap/lib/vnfsdk b/bootstrap/vagrant-onap/lib/vnfsdk
index b73e06426..c23ed8581 100644
--- a/bootstrap/vagrant-onap/lib/vnfsdk
+++ b/bootstrap/vagrant-onap/lib/vnfsdk
@@ -5,22 +5,19 @@ set -o xtrace
source /var/onap/functions
vnfsdk_src_folder=$git_src_folder/vnfsdk
-
-vnfsdk_repos=("refrepo")
+vnfsdk_repos=("vnfsdk/compliance" "vnfsdk/functest" "vnfsdk/lctest" "vnfsdk/model" "vnfsdk/pkgtools" "vnfsdk/refrepo" "vnfsdk/validation")
# clone_all_vnfsdk_repos() - Function that clones vnfsdk source repo.
function clone_all_vnfsdk_repos {
-
- for dirc in ${vnfsdk_repos[@]}; do
- clone_repo vnfsdk/$dirc $vnfsdk_src_folder/$dirc
+ for repo in ${vnfsdk_repos[@]}; do
+ clone_repo $repo $vnfsdk_src_folder${repo#*vnfsdk}
done
}
# compile_all_vnfsdk_repos - Function that builds vnfsdk source repo
function compile_all_vnfsdk_repos {
-
- for dirc in ${vnfsdk_repos[@]}; do
- clone_repo vnfsdk/$dirc $vnfsdk_src_folder/$dirc
+ for repo in ${vnfsdk_repos[@]}; do
+ compile_src $vnfsdk_src_folder${repo#*vnfsdk}
done
}
diff --git a/bootstrap/vagrant-onap/tests/test_vnfsdk b/bootstrap/vagrant-onap/tests/test_vnfsdk
index 5aeca45c2..250a9fcc5 100644
--- a/bootstrap/vagrant-onap/tests/test_vnfsdk
+++ b/bootstrap/vagrant-onap/tests/test_vnfsdk
@@ -11,21 +11,28 @@ covered_functions=(
function test_clone_all_vnfsdk_repos {
clone_all_vnfsdk_repos
+ asserts_file_exist $vnfsdk_src_folder/compliance/veslibrary/README
+ asserts_file_exist $vnfsdk_src_folder/functest/pom.xml
+ asserts_file_exist $vnfsdk_src_folder/lctest/pom.xml
+ asserts_file_exist $vnfsdk_src_folder/model/docs/index.rst
+ asserts_file_exist $vnfsdk_src_folder/pkgtools/pom.xml
asserts_file_exist $vnfsdk_src_folder/refrepo/pom.xml
+ asserts_file_exist $vnfsdk_src_folder/validation/pom.xml
}
# test_compile_all_vnfsdk_repos () - Verify if VNFSDK source repo compiles correctly.
function test_compile_all_vnfsdk_repos {
clone_all_vnfsdk_repos
- {
- compile_all_vnfsdk_repos
- } || {
- set -e
- }
+ compile_all_vnfsdk_repos
+
+ asserts_file_exist $vnfsdk_src_folder/lctest/lifecycle-test/target/lifecycle-test-service-1.0.0-SNAPSHOT.war
+ asserts_file_exist $vnfsdk_src_folder/pkgtools/target/vnf-sdk-pkgtools-1.0.0-SNAPSHOT.zip
+ asserts_file_exist $vnfsdk_src_folder/refrepo/vnfmarket-be/vnf-sdk-marketplace/target/ROOT.war
+ asserts_file_exist $vnfsdk_src_folder/validation/csarvalidation/target/validation-csar-1.0.0-SNAPSHOT.jar
}
# test_get_vnfsdk_images() - Verify that the VNFSDK images are created or retrieved
-function test_get_vnfsdk_images {
+function test_get_vnfsdk_images {
clone_all_vnfsdk_repos
get_vnfsdk_images
@@ -47,4 +54,4 @@ if [ "$1" != '*' ]; then
unset covered_functions
covered_functions=$1
fi
-main "${covered_functions[@]}" \ No newline at end of file
+main "${covered_functions[@]}"
diff --git a/bootstrap/vagrant-onap/tox.ini b/bootstrap/vagrant-onap/tox.ini
index 674810006..6ab309fdf 100644
--- a/bootstrap/vagrant-onap/tox.ini
+++ b/bootstrap/vagrant-onap/tox.ini
@@ -12,11 +12,13 @@ install_command = pip install {opts} {packages}
deps =
{env:BASHATE_INSTALL_PATH:bashate}
whitelist_externals = bash
-commands = bash -c "find {toxinidir}/{tests,lib,tools} \
- -not \( -type d -path *files* -prune \) \
- -not \( -type f -name .*.swp* -prune \) \
- -not \( -type f -name *.ps1 -prune \) \
- -type f \
+commands = bash -c "find {toxinidir}/{tests,lib,tools} \
+ -not \( -type d -path *files* -prune \) \
+ -not \( -type f -name .*.swp* -prune \) \
+ -not \( -type f -name *.ps1 -prune \) \
+ -not \( -type f -name installed-software* -prune \) \
+ -not \( -type f -name *projects.txt -prune \) \
+ -type f \
# E005 file does not begin with #! or have a .sh prefix
# E006 check for lines longer than 79 columns
# E042 local declaration hides errors