diff options
37 files changed, 393 insertions, 407 deletions
diff --git a/bootstrap/vagrant-onap/lib/aai b/bootstrap/vagrant-onap/lib/aai index a3e56725f..7a68fbbf4 100755 --- a/bootstrap/vagrant-onap/lib/aai +++ b/bootstrap/vagrant-onap/lib/aai @@ -3,12 +3,6 @@ source /var/onap/functions hbase_version=1.2.3 -aai_src_folder=$git_src_folder/aai -aai_repos=("aai/aai-common" "aai/aai-config" "aai/aai-data" "aai/aai-service" \ -"aai/babel" "aai/champ" "aai/data-router" "aai/esr-gui" "aai/esr-server" \ -"aai/gizmo" "aai/logging-service" "aai/model-loader" "aai/resources" \ -"aai/rest-client" "aai/router-core" "aai/search-data-service" \ -"aai/test-config" "aai/traversal" "aai/sparky-fe" "aai/sparky-be") # install_hadoop() - Function that installs Hadoop function install_hadoop { @@ -54,9 +48,9 @@ function install_haproxy { # compile_aai_repos() - Function that compiles AAI source repo. function compile_aai_repos { - local repos=("aai/aai-common" "aai/resources" "aai/logging-service" "aai/traversal") + local repos="aai/aai-common aai/resources aai/logging-service aai/traversal" if [[ "$compile_repo" == "True" ]]; then - repos=("${aai_repos[@]}") + repos="${repos[aai]}" fi for repo in ${repos[@]}; do diff --git a/bootstrap/vagrant-onap/lib/appc b/bootstrap/vagrant-onap/lib/appc index 14ba3cf96..ad01ca53e 100755 --- a/bootstrap/vagrant-onap/lib/appc +++ b/bootstrap/vagrant-onap/lib/appc @@ -3,9 +3,6 @@ source /var/onap/sdnc source /var/onap/functions -appc_src_folder=$git_src_folder/appc -appc_repos=("appc" "appc/deployment") - # _build_appc_images() - Function that creates APPC images from source code. function _build_appc_images { get_sdnc_images diff --git a/bootstrap/vagrant-onap/lib/ccsdk b/bootstrap/vagrant-onap/lib/ccsdk index 9f00e9ad2..112839c69 100755 --- a/bootstrap/vagrant-onap/lib/ccsdk +++ b/bootstrap/vagrant-onap/lib/ccsdk @@ -2,13 +2,6 @@ source /var/onap/functions -ccsdk_src_folder=$git_src_folder/ccsdk -ccsdk_repos=("ccsdk" "ccsdk/dashboard" "ccsdk/distribution" "ccsdk/parent" -"ccsdk/platform/blueprints" "ccsdk/platform/nbapi" "ccsdk/platform/plugins" -"ccsdk/sli" "ccsdk/sli/adaptors" "ccsdk/sli/core" "ccsdk/sli/northbound" -"ccsdk/sli/plugins" "ccsdk/storage" "ccsdk/storage/esaas" "ccsdk/storage/pgaas" -"ccsdk/utils") - # _build_ccsdk_images() - Build CCSDK Docker images from source code function _build_ccsdk_images { install_package unzip diff --git a/bootstrap/vagrant-onap/lib/config/env-vars b/bootstrap/vagrant-onap/lib/config/env-vars new file mode 100755 index 000000000..1eddf673e --- /dev/null +++ b/bootstrap/vagrant-onap/lib/config/env-vars @@ -0,0 +1,77 @@ +#!/bin/bash + +# Source code destination folder +git_src_folder=/opt + +declare -A src_folders +src_folders=( +["aai"]="$git_src_folder/aai" +["appc"]="$git_src_folder/appc" +["ccsdk"]="$git_src_folder/ccsdk" +["dcae"]="$git_src_folder/dcae" +["mr"]="$git_src_folder/dcae/message-router" +["msb"]="$git_src_folder/msb" +["mso"]="$git_src_folder/mso" +["multicloud"]="$git_src_folder/multicloud" +["policy"]="$git_src_folder/policy" +["portal"]="$git_src_folder/portal" +["robot"]="$git_src_folder/testsuite" +["sdc"]="$git_src_folder/sdc" +["sdnc"]="$git_src_folder/openecomp/sdnc" +["vfc"]="$git_src_folder/vfc" +["vid"]="$git_src_folder/vid" +["vnfsdk"]="$git_src_folder/vnfsdk" +["vvp"]="$git_src_folder/vvp" +) + +# Repositories list +declare -A repos +repos=( +["aai"]="aai/aai-common aai/aai-config aai/aai-data aai/aai-service \ +aai/babel aai/champ aai/data-router aai/esr-gui aai/esr-server aai/gizmo \ +aai/logging-service aai/model-loader aai/resources aai/rest-client \ +aai/router-core aai/search-data-service aai/test-config aai/traversal \ +aai/sparky-fe aai/sparky-be" +["appc"]="appc appc/deployment" +["ccsdk"]="ccsdk ccsdk/dashboard ccsdk/distribution ccsdk/parent \ +ccsdk/platform/blueprints ccsdk/platform/nbapi \ +ccsdk/platform/plugins ccsdk/sli ccsdk/sli/adaptors ccsdk/sli/core \ +ccsdk/sli/northbound ccsdk/sli/plugins ccsdk/storage \ +ccsdk/storage/esaas ccsdk/storage/pgaas ccsdk/utils" +["dcae"]="dcae dcae/apod dcae/apod/analytics dcae/apod/buildtools \ +dcae/apod/cdap dcae/collectors dcae/collectors/ves dcae/controller \ +dcae/controller/analytics dcae/dcae-inventory dcae/demo \ +dcae/demo/startup dcae/demo/startup/aaf dcae/demo/startup/controller \ +dcae/demo/startup/message-router dcae/dmaapbc dcae/operation \ +dcae/operation/utils dcae/orch-dispatcher dcae/pgaas dcae/utils \ +dcae/utils/buildtools" +["msb"]="msb/apigateway msb/discovery msb/java-sdk msb/swagger-sdk" +["mso"]="mso mso/chef-repo mso/docker-config mso/libs mso/mso-config" +["multicloud"]="multicloud multicloud/framework multicloud/openstack \ +multicloud/openstack/vmware multicloud/openstack/windriver \ +multicloud/azure" +["policy"]="policy/api policy/common policy/docker \ +policy/drools-applications policy/drools-pdp policy/engine \ +policy/gui policy/pap policy/pdp" +["portal"]="portal portal/sdk ecompsdkos ui/dmaapbc" +["robot"]="testsuite testsuite/heatbridge testsuite/properties \ +testsuite/python-testing-utils" +["sdc"]="sdc sdc/jtosca sdc/sdc-distribution-client \ +sdc/sdc-docker-base sdc/sdc-titan-cassandra sdc/sdc-tosca \ +sdc/sdc-vnfdesign sdc/sdc-workflow-designer sdc/sdc_common" +["sdnc"]="sdnc/adaptors sdnc/architecture sdnc/core sdnc/features \ +sdnc/northbound sdnc/oam sdnc/parent sdnc/plugins" +["vfc"]="vfc/gvnfm vfc/gvnfm/vnflcm vfc/gvnfm/vnfmgr \ +vfc/gvnfm/vnfres vfc/nfvo vfc/nfvo/catalog vfc/nfvo/driver \ +vfc/nfvo/driver/ems vfc/nfvo/driver/sfc vfc/nfvo/driver/vnfm \ +vfc/nfvo/driver/vnfm/gvnfm vfc/nfvo/driver/vnfm/svnfm vfc/nfvo/lcm \ +vfc/nfvo/resmanagement vfc/nfvo/wfengine" +["vid"]="vid vid/asdcclient" +["vnfsdk"]="vnfsdk/compliance vnfsdk/functest vnfsdk/lctest \ +vnfsdk/model vnfsdk/pkgtools vnfsdk/refrepo vnfsdk/validation" +["vvp"]="vvp/ansible-ice-bootstrap vvp/cms vvp/devkit \ +vvp/documentation vvp/engagementmgr vvp/gitlab vvp/image-scanner \ +vvp/jenkins vvp/portal vvp/postgresql vvp/test-engine \ +vvp/validation-scripts" +) + diff --git a/bootstrap/vagrant-onap/lib/dcae b/bootstrap/vagrant-onap/lib/dcae index 9150b37da..d6fdd89b2 100755 --- a/bootstrap/vagrant-onap/lib/dcae +++ b/bootstrap/vagrant-onap/lib/dcae @@ -2,14 +2,6 @@ source /var/onap/functions -dcae_src_folder=$git_src_folder/dcae -dcae_repos=("dcae" "dcae/apod" "dcae/apod/analytics" "dcae/apod/buildtools" -"dcae/apod/cdap" "dcae/collectors" "dcae/collectors/ves" "dcae/controller" -"dcae/controller/analytics" "dcae/dcae-inventory" "dcae/demo" -"dcae/demo/startup" "dcae/demo/startup/aaf" "dcae/demo/startup/controller" -"dcae/demo/startup/message-router" "dcae/dmaapbc" "dcae/operation" -"dcae/operation/utils" "dcae/orch-dispatcher" "dcae/pgaas" "dcae/utils" "dcae/utils/buildtools") - # _create_config_file() - Creates a configuration yaml file for the controller function _create_config_file { cat > $dcae_src_folder/controller/config.yaml << EOL diff --git a/bootstrap/vagrant-onap/lib/functions b/bootstrap/vagrant-onap/lib/functions index 8d906dc68..08c6d916b 100755 --- a/bootstrap/vagrant-onap/lib/functions +++ b/bootstrap/vagrant-onap/lib/functions @@ -1,6 +1,7 @@ #!/bin/bash source /var/onap/commons +source /var/onap/config/env-vars source /var/onap/_composed_functions source /var/onap/_onap_functions @@ -9,7 +10,6 @@ export NIC=$(ip route get 8.8.8.8 | awk '{ print $5; exit }') export IP_ADDRESS=$(ifconfig $NIC | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2) mvn_conf_file=/root/.m2/settings.xml -git_src_folder=/opt # configure_dns() - DNS/GW IP address configuration function configure_dns { @@ -71,13 +71,9 @@ function clone_repo { function clone_repos { local project=$1 local repo_name=${2:-$project} - local name=${project}_repos[@] - local src_name=${project}_src_folder - local repos_list=("${!name}") - local dest_folder=${!src_name} - for repo in ${repos_list[@]}; do - clone_repo $repo $dest_folder${repo#*$repo_name} + for repo in ${repos[$project]}; do + clone_repo $repo ${src_folders[$project]}${repo#*$repo_name} done } @@ -305,13 +301,9 @@ function compile_src { # compile_repos() - Function that compiles source repositories for a given project function compile_repos { local project=$1 - local name=${project}_repos[@] - local repos_list=("${!name}") - local dest_folder=${3:-$git_src_folder/$project} - install_package unzip - for repo in ${repos_list[@]}; do - compile_src $dest_folder${repo#*$project} + for repo in ${repos[$project]}; do + compile_src ${src_folders[$project]}${repo#*$project} done } diff --git a/bootstrap/vagrant-onap/lib/mr b/bootstrap/vagrant-onap/lib/mr index 2ffe69e26..499f53f6a 100755 --- a/bootstrap/vagrant-onap/lib/mr +++ b/bootstrap/vagrant-onap/lib/mr @@ -2,8 +2,6 @@ source /var/onap/functions -mr_src_folder=$git_src_folder/dcae/message-router - # get_mr_images() - Function that retrieves the Message Router Docker images function get_mr_images { pull_docker_image attos/dmaap diff --git a/bootstrap/vagrant-onap/lib/msb b/bootstrap/vagrant-onap/lib/msb index 262b29c0e..a14e8ea6c 100755 --- a/bootstrap/vagrant-onap/lib/msb +++ b/bootstrap/vagrant-onap/lib/msb @@ -2,9 +2,6 @@ source /var/onap/functions -msb_src_folder=$git_src_folder/msb -msb_repos=("msb/apigateway" "msb/discovery" "msb/java-sdk" "msb/swagger-sdk") - # _build_msb_images() - Function that creates Microservices Docker images from source code function _build_msb_images { if [[ "$compile_repo" != "True" ]]; then diff --git a/bootstrap/vagrant-onap/lib/mso b/bootstrap/vagrant-onap/lib/mso index e99bff912..44d4a7b04 100755 --- a/bootstrap/vagrant-onap/lib/mso +++ b/bootstrap/vagrant-onap/lib/mso @@ -2,10 +2,6 @@ source /var/onap/functions -mso_src_folder=$git_src_folder/mso -mso_repos=("mso" "mso/chef-repo" "mso/docker-config" "mso/libs" -"mso/mso-config") - # get_mso_images() - Function that retrieves or create MSO Docker images function get_mso_images { if [[ "$build_image" == "True" ]]; then diff --git a/bootstrap/vagrant-onap/lib/multicloud b/bootstrap/vagrant-onap/lib/multicloud index 4031956e4..377d4dcd7 100755 --- a/bootstrap/vagrant-onap/lib/multicloud +++ b/bootstrap/vagrant-onap/lib/multicloud @@ -2,12 +2,9 @@ source /var/onap/functions -multicloud_src_folder=$git_src_folder/multicloud -multicloud_repos=("multicloud" "multicloud/framework" "multicloud/openstack" \ -"multicloud/openstack/vmware" "multicloud/openstack/windriver" \ -"multicloud/azure") openstack_release="newton" +# _build_images() - Function that builds docker images from source code function _build_images { install_docker install_python_requirements $multicloud_src_folder/openstack/$openstack_release diff --git a/bootstrap/vagrant-onap/lib/policy b/bootstrap/vagrant-onap/lib/policy index 05ad32094..ad982ad95 100755 --- a/bootstrap/vagrant-onap/lib/policy +++ b/bootstrap/vagrant-onap/lib/policy @@ -2,11 +2,6 @@ source /var/onap/functions -policy_src_folder=$git_src_folder/policy -policy_repos=("policy/api" "policy/common" "policy/docker" \ -"policy/drools-applications" "policy/drools-pdp" "policy/engine" \ -"policy/gui" "policy/pap" "policy/pdp") - # _build_policy_images() - Function that build Policy docker images from source code function _build_policy_images { compile_src $policy_src_folder/docker diff --git a/bootstrap/vagrant-onap/lib/portal b/bootstrap/vagrant-onap/lib/portal index 915ccd59a..fe5469822 100755 --- a/bootstrap/vagrant-onap/lib/portal +++ b/bootstrap/vagrant-onap/lib/portal @@ -2,30 +2,27 @@ source /var/onap/functions -portal_src_folder=$git_src_folder/portal -portal_repos=("portal" "portal/sdk" "ecompsdkos" "ui/dmaapbc") - # clone_all_portal_repos() - Function that clones Portal source repo. function clone_all_portal_repos { - for repo in ${portal_repos[@]}; do + for repo in ${repos[portal]}; do if [[ "$repo" == "ui/dmaapbc" ]];then prefix="ui" else prefix="portal" fi - clone_repo $repo $portal_src_folder/${repo#*$prefix} + clone_repo $repo ${src_folders[portal]}/${repo#*$prefix} done } # compile_all_portal_repos() - Function that compiles Portal source repo. function compile_all_portal_repos { - for repo in ${portal_repos[@]}; do + for repo in ${repos[portal]}; do if [[ "$repo" == "ui/dmaapbc" ]];then prefix="ui" else prefix="portal" fi - compile_src $portal_src_folder/${repo#*$prefix} + compile_src ${src_folders[portal]}/${repo#*$prefix} done } @@ -33,7 +30,7 @@ function compile_all_portal_repos { function _build_portal_images { install_maven - pushd $portal_src_folder/deliveries + pushd ${src_folders[portal]}/deliveries chmod +x *.sh export MVN=$(which mvn) export GLOBAL_SETTINGS_FILE=/usr/share/maven3/conf/settings.xml @@ -64,7 +61,7 @@ function install_portal { docker rm -f ecompdb_portal docker rm -f 1610-1 - pushd $portal_src_folder/deliveries + pushd ${src_folders[portal]}/deliveries mkdir -p /PROJECT/OpenSource/UbuntuEP/logs install_package unzip unzip -o etc.zip -d /PROJECT/OpenSource/UbuntuEP/ diff --git a/bootstrap/vagrant-onap/lib/robot b/bootstrap/vagrant-onap/lib/robot index 588da6c1e..90fbcf8c0 100755 --- a/bootstrap/vagrant-onap/lib/robot +++ b/bootstrap/vagrant-onap/lib/robot @@ -2,10 +2,6 @@ source /var/onap/functions -robot_src_folder=$git_src_folder/testsuite -robot_repos=("testsuite" "testsuite/heatbridge" "testsuite/properties" \ -"testsuite/python-testing-utils") - # _setup_ete_folder() - Create and copy ete folder structure function _setup_ete_folder { mkdir -p /opt/eteshare/config diff --git a/bootstrap/vagrant-onap/lib/sdc b/bootstrap/vagrant-onap/lib/sdc index f99e8b204..9b0a69ee4 100755 --- a/bootstrap/vagrant-onap/lib/sdc +++ b/bootstrap/vagrant-onap/lib/sdc @@ -2,11 +2,6 @@ source /var/onap/functions -sdc_src_folder=$git_src_folder/sdc -sdc_repos=("sdc" "sdc/jtosca" "sdc/sdc-distribution-client" -"sdc/sdc-docker-base" "sdc/sdc-titan-cassandra" "sdc/sdc-tosca" -"sdc/sdc-vnfdesign" "sdc/sdc-workflow-designer" "sdc/sdc_common") - # _mount_external_partition() - Create partition and mount the external volume function _mount_external_partition { cat <<EOL > /tmp/sdc_ext_volume_partitions.txt diff --git a/bootstrap/vagrant-onap/lib/sdnc b/bootstrap/vagrant-onap/lib/sdnc index 05165b18b..a8cf756b4 100755 --- a/bootstrap/vagrant-onap/lib/sdnc +++ b/bootstrap/vagrant-onap/lib/sdnc @@ -3,13 +3,9 @@ source /var/onap/functions source /var/onap/ccsdk -sdnc_src_folder=$git_src_folder/openecomp/sdnc -sdnc_repos=("sdnc/adaptors" "sdnc/architecture" "sdnc/core" "sdnc/features" \ -"sdnc/northbound" "sdnc/oam" "sdnc/parent" "sdnc/plugins") - # compile_all_sdnc_repos() - Function that compiles SDNC source repo. function compile_all_sdnc_repos { - for repo in ${sdnc_repos[@]}; do + for repo in ${repos[sdnc]}; do if [[ "$repo" == "sdnc/core" ]]; then compile_src $sdnc_src_folder/core/rootpom fi diff --git a/bootstrap/vagrant-onap/lib/vfc b/bootstrap/vagrant-onap/lib/vfc index 112f9a555..2b5407ca3 100755 --- a/bootstrap/vagrant-onap/lib/vfc +++ b/bootstrap/vagrant-onap/lib/vfc @@ -2,13 +2,6 @@ source /var/onap/functions -vfc_src_folder=$git_src_folder/vfc -vfc_repos=("vfc/gvnfm" "vfc/gvnfm/vnflcm" "vfc/gvnfm/vnfmgr" \ -"vfc/gvnfm/vnfres" "vfc/nfvo" "vfc/nfvo/catalog" "vfc/nfvo/driver" \ -"vfc/nfvo/driver/ems" "vfc/nfvo/driver/sfc" "vfc/nfvo/driver/vnfm" \ -"vfc/nfvo/driver/vnfm/gvnfm" "vfc/nfvo/driver/vnfm/svnfm" "vfc/nfvo/lcm" \ -"vfc/nfvo/resmanagement" "vfc/nfvo/wfengine") - # compile_all_vfc_repos() - Function that compiles VF-C source repo. function compile_all_vfc_repos { install_python_package tox diff --git a/bootstrap/vagrant-onap/lib/vid b/bootstrap/vagrant-onap/lib/vid index f253fdb59..f5ca9d293 100755 --- a/bootstrap/vagrant-onap/lib/vid +++ b/bootstrap/vagrant-onap/lib/vid @@ -2,9 +2,6 @@ source /var/onap/functions -vid_src_folder=$git_src_folder/vid -vid_repos=("vid" "vid/asdcclient") - # _build_vid_images() - Function that builds VID docker images function _build_vid_images { if [[ "$compile_repo" != "True" ]]; then diff --git a/bootstrap/vagrant-onap/lib/vnfsdk b/bootstrap/vagrant-onap/lib/vnfsdk index 020d437da..58e3a9aa2 100755 --- a/bootstrap/vagrant-onap/lib/vnfsdk +++ b/bootstrap/vagrant-onap/lib/vnfsdk @@ -2,10 +2,6 @@ source /var/onap/functions -vnfsdk_src_folder=$git_src_folder/vnfsdk -vnfsdk_repos=("vnfsdk/compliance" "vnfsdk/functest" "vnfsdk/lctest" \ -"vnfsdk/model" "vnfsdk/pkgtools" "vnfsdk/refrepo" "vnfsdk/validation") - # _build_vnfsdk_images() - Builds VNFSDK images from source code function _build_vnfsdk_images { install_package unzip diff --git a/bootstrap/vagrant-onap/lib/vvp b/bootstrap/vagrant-onap/lib/vvp index a924e7a80..f24431ee6 100755 --- a/bootstrap/vagrant-onap/lib/vvp +++ b/bootstrap/vagrant-onap/lib/vvp @@ -2,12 +2,6 @@ source /var/onap/functions -vvp_src_folder=$git_src_folder/vvp -vvp_repos=("vvp/ansible-ice-bootstrap" "vvp/cms" "vvp/devkit" \ -"vvp/documentation" "vvp/engagementmgr" "vvp/gitlab" "vvp/image-scanner" \ -"vvp/jenkins" "vvp/portal" "vvp/postgresql" "vvp/test-engine" \ -"vvp/validation-scripts") - # _build_vvp_images() - Builds VNFSDK images from source code function _build_vvp_images { echo "pass" diff --git a/bootstrap/vagrant-onap/tests/test_aai b/bootstrap/vagrant-onap/tests/test_aai index d9a48697c..65917e092 100755 --- a/bootstrap/vagrant-onap/tests/test_aai +++ b/bootstrap/vagrant-onap/tests/test_aai @@ -30,26 +30,26 @@ function test_install_haproxy { function test_clone_all_aai_repos { clone_repos "aai" - asserts_file_exist $aai_src_folder/aai-common/pom.xml - asserts_file_exist $aai_src_folder/aai-config/cookbooks/aai-resources/runlist-aai-resources.json - asserts_file_exist $aai_src_folder/aai-data/environments/solo.json - asserts_file_exist $aai_src_folder/aai-service/pom.xml - asserts_file_exist $aai_src_folder/babel/README.md - asserts_file_exist $aai_src_folder/champ/pom.xml - asserts_file_exist $aai_src_folder/data-router/pom.xml - asserts_file_exist $aai_src_folder/esr-gui/pom.xml - asserts_file_exist $aai_src_folder/esr-server/pom.xml - asserts_file_exist $aai_src_folder/gizmo/pom.xml - asserts_file_exist $aai_src_folder/logging-service/pom.xml - asserts_file_exist $aai_src_folder/model-loader/pom.xml - asserts_file_exist $aai_src_folder/resources/pom.xml - asserts_file_exist $aai_src_folder/rest-client/pom.xml - asserts_file_exist $aai_src_folder/router-core/pom.xml - asserts_file_exist $aai_src_folder/search-data-service/pom.xml - asserts_file_exist $aai_src_folder/sparky-be/pom.xml - asserts_file_exist $aai_src_folder/sparky-fe/pom.xml - asserts_file_exist $aai_src_folder/test-config/docker-compose-app.yml - asserts_file_exist $aai_src_folder/traversal/pom.xml + asserts_file_exist ${src_folders[aai]}/aai-common/pom.xml + asserts_file_exist ${src_folders[aai]}/aai-config/cookbooks/aai-resources/runlist-aai-resources.json + asserts_file_exist ${src_folders[aai]}/aai-data/environments/solo.json + asserts_file_exist ${src_folders[aai]}/aai-service/pom.xml + asserts_file_exist ${src_folders[aai]}/babel/README.md + asserts_file_exist ${src_folders[aai]}/champ/pom.xml + asserts_file_exist ${src_folders[aai]}/data-router/pom.xml + asserts_file_exist ${src_folders[aai]}/esr-gui/pom.xml + asserts_file_exist ${src_folders[aai]}/esr-server/pom.xml + asserts_file_exist ${src_folders[aai]}/gizmo/pom.xml + asserts_file_exist ${src_folders[aai]}/logging-service/pom.xml + asserts_file_exist ${src_folders[aai]}/model-loader/pom.xml + asserts_file_exist ${src_folders[aai]}/resources/pom.xml + asserts_file_exist ${src_folders[aai]}/rest-client/pom.xml + asserts_file_exist ${src_folders[aai]}/router-core/pom.xml + asserts_file_exist ${src_folders[aai]}/search-data-service/pom.xml + asserts_file_exist ${src_folders[aai]}/sparky-be/pom.xml + asserts_file_exist ${src_folders[aai]}/sparky-fe/pom.xml + asserts_file_exist ${src_folders[aai]}/test-config/docker-compose-app.yml + asserts_file_exist ${src_folders[aai]}/traversal/pom.xml } # test_compile_aai_repos() - Verify that all the AAI Repositories complile properly @@ -58,15 +58,15 @@ function test_compile_aai_repos { compile_aai_repos for common in annotations auth core schema utils; do - asserts_file_exist $aai_src_folder/aai-common/aai-$common/target/aai-$common-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[aai]}/aai-common/aai-$common/target/aai-$common-1.1.0-SNAPSHOT.jar done for service in common-logging eelf-logging logging-api; do - asserts_file_exist $aai_src_folder/logging-service/$service/target/$service-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[aai]}/logging-service/$service/target/$service-1.1.0-SNAPSHOT.jar done - asserts_file_exist $aai_src_folder/resources/aai-resources/target/aai-resources.jar - asserts_file_exist $aai_src_folder/traversal/aai-traversal/target/traversal.jar + asserts_file_exist ${src_folders[aai]}/resources/aai-resources/target/aai-resources.jar + asserts_file_exist ${src_folders[aai]}/traversal/aai-traversal/target/traversal.jar } # test_setup_titan() - Verify that Titan Cassandra DB is up and running diff --git a/bootstrap/vagrant-onap/tests/test_appc b/bootstrap/vagrant-onap/tests/test_appc index 47efa690a..f567d7f1b 100755 --- a/bootstrap/vagrant-onap/tests/test_appc +++ b/bootstrap/vagrant-onap/tests/test_appc @@ -11,8 +11,8 @@ covered_functions=( function test_clone_all_appc_repos { clone_repos "appc" - asserts_file_exist $appc_src_folder/pom.xml - asserts_file_exist $appc_src_folder/deployment/pom.xml + asserts_file_exist ${src_folders[appc]}/pom.xml + asserts_file_exist ${src_folders[appc]}/deployment/pom.xml } # test_compile_all_appc_repos() - Verify that the APPC source code is compiled properly @@ -21,54 +21,54 @@ function test_compile_all_appc_repos { compile_repos "appc" for adapter in appc-ansible-adapter appc-chef-adapter appc-dmaap-adapter appc-iaas-adapter appc-netconf-adapter appc-rest-adapter appc-rest-healthcheck-adapter; do - asserts_file_exist $appc_src_folder/appc-adapters/$adapter/$adapter-bundle/target/$adapter-bundle-*-SNAPSHOT.jar - asserts_file_exist $appc_src_folder/appc-adapters/$adapter/$adapter-features/target/$adapter-features-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[appc]}/appc-adapters/$adapter/$adapter-bundle/target/$adapter-bundle-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[appc]}/appc-adapters/$adapter/$adapter-features/target/$adapter-features-*-SNAPSHOT.jar if [[ "$adapter" == "appc-netconf-adapter" ]]; then - asserts_file_exist $appc_src_folder/appc-adapters/$adapter/appc-netconf-installer/target/$adapter-*-SNAPSHOT.zip + asserts_file_exist ${src_folders[appc]}/appc-adapters/$adapter/appc-netconf-installer/target/$adapter-*-SNAPSHOT.zip else - asserts_file_exist $appc_src_folder/appc-adapters/$adapter/$adapter-installer/target/$adapter-*-SNAPSHOT.zip + asserts_file_exist ${src_folders[appc]}/appc-adapters/$adapter/$adapter-installer/target/$adapter-*-SNAPSHOT.zip fi done - asserts_file_exist $appc_src_folder/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/target/appc-message-adapter-api-*-SNAPSHOT.jar - asserts_file_exist $appc_src_folder/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/target/appc-message-adapter-factory-*-SNAPSHOT.jar - asserts_file_exist $appc_src_folder/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/target/appc-ssh-adapter-api-*-SNAPSHOT.jar - asserts_file_exist $appc_src_folder/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/target/appc-ssh-adapter-features-*-SNAPSHOT.jar - asserts_file_exist $appc_src_folder/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/target/appc-ssh-adapter-sshd-*-SNAPSHOT.jar - asserts_file_exist $appc_src_folder/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/target/appc-ssh-adapter-tests-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[appc]}/appc-adapters/appc-dmaap-adapter/appc-message-adapter-api/target/appc-message-adapter-api-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[appc]}/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/target/appc-message-adapter-factory-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[appc]}/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-api/target/appc-ssh-adapter-api-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[appc]}/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-features/target/appc-ssh-adapter-features-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[appc]}/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/target/appc-ssh-adapter-sshd-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[appc]}/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/target/appc-ssh-adapter-tests-*-SNAPSHOT.jar #for component in appc-event-listener appc-oam appc-provider; do for component in appc-event-listener appc-provider; do - asserts_file_exist $appc_src_folder/$component/$component-bundle/target/$component-bundle-*-SNAPSHOT.jar - asserts_file_exist $appc_src_folder/$component/$component-features/target/$component-features-*-SNAPSHOT.jar - asserts_file_exist $appc_src_folder/$component/$component-installer/target/$component-*-SNAPSHOT.zip + asserts_file_exist ${src_folders[appc]}/$component/$component-bundle/target/$component-bundle-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[appc]}/$component/$component-features/target/$component-features-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[appc]}/$component/$component-installer/target/$component-*-SNAPSHOT.zip done #for component in appc-oam appc-provider; do for component in appc-provider; do - asserts_file_exist $appc_src_folder/$component/$component-model/target/$component-model-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[appc]}/$component/$component-model/target/$component-model-*-SNAPSHOT.jar done - asserts_file_exist $appc_src_folder/appc-common/target/appc-common-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[appc]}/appc-common/target/appc-common-*-SNAPSHOT.jar - asserts_file_exist $appc_src_folder/appc-dg/appc-dg-shared/appc-dg-dependency-model/target/appc-dg-dependency-model-*-SNAPSHOT.jar - asserts_file_exist $appc_src_folder/appc-dg/appc-dg-shared/appc-dg-domain-model-lib/target/appc-dg-domain-model-lib-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[appc]}/appc-dg/appc-dg-shared/appc-dg-dependency-model/target/appc-dg-dependency-model-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[appc]}/appc-dg/appc-dg-shared/appc-dg-domain-model-lib/target/appc-dg-domain-model-lib-*-SNAPSHOT.jar - asserts_file_exist $appc_src_folder/appc-dispatcher/appc-command-executor/appc-command-executor-api/target/appc-command-executor-api-*-SNAPSHOT.jar - asserts_file_exist $appc_src_folder/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/target/appc-data-access-lib-*-SNAPSHOT.jar - asserts_file_exist $appc_src_folder/appc-dispatcher/appc-dispatcher-common/domain-model-lib/target/domain-model-lib-*-SNAPSHOT.jar - asserts_file_exist $appc_src_folder/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/target/execution-queue-management-lib-*-SNAPSHOT.jar - asserts_file_exist $appc_src_folder/appc-dispatcher/appc-license-manager/appc-license-manager-api/target/appc-license-manager-api-*-SNAPSHOT.jar - asserts_file_exist $appc_src_folder/appc-dispatcher/appc-request-handler/appc-request-handler-api/target/appc-request-handler-api-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[appc]}/appc-dispatcher/appc-command-executor/appc-command-executor-api/target/appc-command-executor-api-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[appc]}/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/target/appc-data-access-lib-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[appc]}/appc-dispatcher/appc-dispatcher-common/domain-model-lib/target/domain-model-lib-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[appc]}/appc-dispatcher/appc-dispatcher-common/execution-queue-management-lib/target/execution-queue-management-lib-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[appc]}/appc-dispatcher/appc-license-manager/appc-license-manager-api/target/appc-license-manager-api-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[appc]}/appc-dispatcher/appc-request-handler/appc-request-handler-api/target/appc-request-handler-api-*-SNAPSHOT.jar - #asserts_file_exist $appc_src_folder/appc-lifecycle-management/appc-lifecycle-management-api/target/appc-lifecycle-management-api-*-SNAPSHOT.jar - #asserts_file_exist $appc_src_folder/appc-lifecycle-management/appc-lifecycle-management-core/target/appc-lifecycle-management-core-*-SNAPSHOT.jar - #asserts_file_exist $appc_src_folder/appc-lifecycle-management/appc-lifecycle-management-features/target/appc-lifecycle-management-features-*-SNAPSHOT.jar - #asserts_file_exist $appc_src_folder/appc-lifecycle-management/appc-lifecycle-management-installer/target/appc-lifecycle-management-*-SNAPSHOT.zip - #asserts_file_exist $appc_src_folder/appc-lifecycle-management/state-machine-lib/target/state-machine-lib-*-SNAPSHOT.jar + #asserts_file_exist ${src_folders[appc]}/appc-lifecycle-management/appc-lifecycle-management-api/target/appc-lifecycle-management-api-*-SNAPSHOT.jar + #asserts_file_exist ${src_folders[appc]}/appc-lifecycle-management/appc-lifecycle-management-core/target/appc-lifecycle-management-core-*-SNAPSHOT.jar + #asserts_file_exist ${src_folders[appc]}/appc-lifecycle-management/appc-lifecycle-management-features/target/appc-lifecycle-management-features-*-SNAPSHOT.jar + #asserts_file_exist ${src_folders[appc]}/appc-lifecycle-management/appc-lifecycle-management-installer/target/appc-lifecycle-management-*-SNAPSHOT.zip + #asserts_file_exist ${src_folders[appc]}/appc-lifecycle-management/state-machine-lib/target/state-machine-lib-*-SNAPSHOT.jar - asserts_file_exist $appc_src_folder/appc-metric/appc-metric-bundle/target/appc-metric-bundle-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[appc]}/appc-metric/appc-metric-bundle/target/appc-metric-bundle-*-SNAPSHOT.jar - asserts_file_exist $appc_src_folder/deployment/platform-logic/installer/target/platform-logic-installer-*-SNAPSHOT.zip + asserts_file_exist ${src_folders[appc]}/deployment/platform-logic/installer/target/platform-logic-installer-*-SNAPSHOT.zip } # test_get_appc_images() - Verify that APPC Docker images can be retrieved diff --git a/bootstrap/vagrant-onap/tests/test_ccsdk b/bootstrap/vagrant-onap/tests/test_ccsdk index 489ccdb2d..28de27065 100755 --- a/bootstrap/vagrant-onap/tests/test_ccsdk +++ b/bootstrap/vagrant-onap/tests/test_ccsdk @@ -11,19 +11,19 @@ covered_functions=( function test_clone_ccsdk_repos { clone_repos "ccsdk" - asserts_file_exist $ccsdk_src_folder/dashboard/pom.xml - asserts_file_exist $ccsdk_src_folder/distribution/pom.xml - asserts_file_exist $ccsdk_src_folder/parent/pom.xml - asserts_file_exist $ccsdk_src_folder/platform/blueprints/pom.xml - asserts_file_exist $ccsdk_src_folder/platform/nbapi/pom.xml - asserts_file_exist $ccsdk_src_folder/platform/plugins/pom.xml - asserts_file_exist $ccsdk_src_folder/sli/adaptors/pom.xml - asserts_file_exist $ccsdk_src_folder/sli/core/pom.xml - asserts_file_exist $ccsdk_src_folder/sli/northbound/pom.xml - asserts_file_exist $ccsdk_src_folder/sli/plugins/pom.xml - asserts_file_exist $ccsdk_src_folder/storage/esaas/pom.xml - asserts_file_exist $ccsdk_src_folder/storage/pgaas/pom.xml - asserts_file_exist $ccsdk_src_folder/utils/pom.xml + asserts_file_exist ${src_folders[ccsdk]}/dashboard/pom.xml + asserts_file_exist ${src_folders[ccsdk]}/distribution/pom.xml + asserts_file_exist ${src_folders[ccsdk]}/parent/pom.xml + asserts_file_exist ${src_folders[ccsdk]}/platform/blueprints/pom.xml + asserts_file_exist ${src_folders[ccsdk]}/platform/nbapi/pom.xml + asserts_file_exist ${src_folders[ccsdk]}/platform/plugins/pom.xml + asserts_file_exist ${src_folders[ccsdk]}/sli/adaptors/pom.xml + asserts_file_exist ${src_folders[ccsdk]}/sli/core/pom.xml + asserts_file_exist ${src_folders[ccsdk]}/sli/northbound/pom.xml + asserts_file_exist ${src_folders[ccsdk]}/sli/plugins/pom.xml + asserts_file_exist ${src_folders[ccsdk]}/storage/esaas/pom.xml + asserts_file_exist ${src_folders[ccsdk]}/storage/pgaas/pom.xml + asserts_file_exist ${src_folders[ccsdk]}/utils/pom.xml } # test_compile_ccsdk_repos() - Verify the compilation of CCSDK repositories @@ -31,45 +31,45 @@ function test_compile_ccsdk_repos { clone_repos "ccsdk" compile_repos "ccsdk" - asserts_file_exist $ccsdk_src_folder/dashboard/ccsdk-app-common/target/ccsdk-app-common-1.1.0-SNAPSHOT.jar - asserts_file_exist $ccsdk_src_folder/dashboard/ccsdk-app-os/target/ccsdk-app-os-1.1.0-SNAPSHOT.war - asserts_file_exist $ccsdk_src_folder/dashboard/ccsdk-app-overlay/target/ccsdk-app-overlay-1.1.0-SNAPSHOT.war - asserts_file_exist $ccsdk_src_folder/distribution/dgbuilder/target/dgbuilder.0.1.0-SNAPSHOT.zip - asserts_file_exist $ccsdk_src_folder/distribution/platform-logic/installer/target/platform-logic-installer-0.1.0-SNAPSHOT.zip - asserts_file_exist $ccsdk_src_folder/platform/nbapi/target/commonnbapi-*.war + asserts_file_exist ${src_folders[ccsdk]}/dashboard/ccsdk-app-common/target/ccsdk-app-common-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[ccsdk]}/dashboard/ccsdk-app-os/target/ccsdk-app-os-1.1.0-SNAPSHOT.war + asserts_file_exist ${src_folders[ccsdk]}/dashboard/ccsdk-app-overlay/target/ccsdk-app-overlay-1.1.0-SNAPSHOT.war + asserts_file_exist ${src_folders[ccsdk]}/distribution/dgbuilder/target/dgbuilder.0.1.0-SNAPSHOT.zip + asserts_file_exist ${src_folders[ccsdk]}/distribution/platform-logic/installer/target/platform-logic-installer-0.1.0-SNAPSHOT.zip + asserts_file_exist ${src_folders[ccsdk]}/platform/nbapi/target/commonnbapi-*.war #for adaptor in aai-service mdsal-resource resource-assignment sql-resource; do #for component in features provider; do - #asserts_file_exist $ccsdk_src_folder/sli/adaptors/$adaptor/$component/target/$adaptor-$component-0.1.0-SNAPSHOT.jar + #asserts_file_exist ${src_folders[ccsdk]}/sli/adaptors/$adaptor/$component/target/$adaptor-$component-0.1.0-SNAPSHOT.jar #done - #asserts_file_exist $ccsdk_src_folder/sli/adaptors/$adaptor/installer/target/sdnc-$adaptor-0.1.0-SNAPSHOT-installer.zip + #asserts_file_exist ${src_folders[ccsdk]}/sli/adaptors/$adaptor/installer/target/sdnc-$adaptor-0.1.0-SNAPSHOT-installer.zip #done #for core in dblib filters sli sliapi sliPluginUtils; do for core in dblib; do for component in features provider; do - asserts_file_exist $ccsdk_src_folder/sli/core/$core/$component/target/$core-$component-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[ccsdk]}/sli/core/$core/$component/target/$core-$component-*-SNAPSHOT.jar done - asserts_file_exist $ccsdk_src_folder/sli/core/$core/installer/target/sdnc-$core-*-SNAPSHOT-installer.zip + asserts_file_exist ${src_folders[ccsdk]}/sli/core/$core/installer/target/sdnc-$core-*-SNAPSHOT-installer.zip done - #asserts_file_exist $ccsdk_src_folder/sli/core/sli/common/target/sli-common-*-SNAPSHOT.jar - #asserts_file_exist $ccsdk_src_folder/sli/core/sli/recording/target/sli-recording-*-SNAPSHOT.jar - #asserts_file_exist $ccsdk_src_folder/sli/core/sliapi/model/target/sliapi-model-*-SNAPSHOT.jar + #asserts_file_exist ${src_folders[ccsdk]}/sli/core/sli/common/target/sli-common-*-SNAPSHOT.jar + #asserts_file_exist ${src_folders[ccsdk]}/sli/core/sli/recording/target/sli-recording-*-SNAPSHOT.jar + #asserts_file_exist ${src_folders[ccsdk]}/sli/core/sliapi/model/target/sliapi-model-*-SNAPSHOT.jar for northbound in asdcApi dataChange; do for component in features model provider; do - asserts_file_exist $ccsdk_src_folder/sli/northbound/$northbound/$component/target/$northbound-$component-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[ccsdk]}/sli/northbound/$northbound/$component/target/$northbound-$component-*-SNAPSHOT.jar done - asserts_file_exist $ccsdk_src_folder/sli/northbound/$northbound/installer/target/sdnc-$northbound-*-SNAPSHOT-installer.zip + asserts_file_exist ${src_folders[ccsdk]}/sli/northbound/$northbound/installer/target/sdnc-$northbound-*-SNAPSHOT-installer.zip done - asserts_file_exist $ccsdk_src_folder/sli/northbound/dmaap-listener/target/dmaap-listener-*-SNAPSHOT.jar - asserts_file_exist $ccsdk_src_folder/sli/northbound/ueb-listener/target/ueb-listener-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[ccsdk]}/sli/northbound/dmaap-listener/target/dmaap-listener-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[ccsdk]}/sli/northbound/ueb-listener/target/ueb-listener-*-SNAPSHOT.jar for plugin in properties-node restapi-call-node; do for component in features provider; do - asserts_file_exist $ccsdk_src_folder/sli/plugins/$plugin/$component/target/$plugin-$component-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[ccsdk]}/sli/plugins/$plugin/$component/target/$plugin-$component-*-SNAPSHOT.jar done - asserts_file_exist $ccsdk_src_folder/sli/plugins/$plugin/installer/target/sdnc-$plugin-*-SNAPSHOT-installer.zip + asserts_file_exist ${src_folders[ccsdk]}/sli/plugins/$plugin/installer/target/sdnc-$plugin-*-SNAPSHOT-installer.zip done } diff --git a/bootstrap/vagrant-onap/tests/test_dcae b/bootstrap/vagrant-onap/tests/test_dcae index a4697cefe..3c5400fa1 100755 --- a/bootstrap/vagrant-onap/tests/test_dcae +++ b/bootstrap/vagrant-onap/tests/test_dcae @@ -11,27 +11,27 @@ covered_functions=( function test_clone_all_dcae_repos { clone_repos "dcae" - asserts_file_exist $dcae_src_folder/apod/README.md - asserts_file_exist $dcae_src_folder/apod/analytics/pom.xml - asserts_file_exist $dcae_src_folder/apod/buildtools/LICENSE.txt - asserts_file_exist $dcae_src_folder/apod/cdap/LICENSE.txt - asserts_file_exist $dcae_src_folder/collectors/README.md - asserts_file_exist $dcae_src_folder/collectors/ves/pom.xml - asserts_file_exist $dcae_src_folder/controller/pom.xml - asserts_file_exist $dcae_src_folder/controller/analytics/pom.xml - asserts_file_exist $dcae_src_folder/dcae-inventory/pom.xml - asserts_file_exist $dcae_src_folder/demo/pom.xml - asserts_file_exist $dcae_src_folder/demo/startup/README.md - asserts_file_exist $dcae_src_folder/demo/startup/aaf/LICENSE.txt - asserts_file_exist $dcae_src_folder/demo/startup/controller/LICENSE.txt - asserts_file_exist $dcae_src_folder/demo/startup/message-router/LICENSE.txt - asserts_file_exist $dcae_src_folder/dmaapbc/pom.xml - asserts_file_exist $dcae_src_folder/operation/README.md - asserts_file_exist $dcae_src_folder/operation/utils/pom.xml - asserts_file_exist $dcae_src_folder/orch-dispatcher/LICENSE.txt - asserts_file_exist $dcae_src_folder/pgaas/LICENSE.txt - asserts_file_exist $dcae_src_folder/utils/README.md - asserts_file_exist $dcae_src_folder/utils/buildtools/LICENSE.txt + asserts_file_exist ${src_folders[dcae]}/apod/README.md + asserts_file_exist ${src_folders[dcae]}/apod/analytics/pom.xml + asserts_file_exist ${src_folders[dcae]}/apod/buildtools/LICENSE.txt + asserts_file_exist ${src_folders[dcae]}/apod/cdap/LICENSE.txt + asserts_file_exist ${src_folders[dcae]}/collectors/README.md + asserts_file_exist ${src_folders[dcae]}/collectors/ves/pom.xml + asserts_file_exist ${src_folders[dcae]}/controller/pom.xml + asserts_file_exist ${src_folders[dcae]}/controller/analytics/pom.xml + asserts_file_exist ${src_folders[dcae]}/dcae-inventory/pom.xml + asserts_file_exist ${src_folders[dcae]}/demo/pom.xml + asserts_file_exist ${src_folders[dcae]}/demo/startup/README.md + asserts_file_exist ${src_folders[dcae]}/demo/startup/aaf/LICENSE.txt + asserts_file_exist ${src_folders[dcae]}/demo/startup/controller/LICENSE.txt + asserts_file_exist ${src_folders[dcae]}/demo/startup/message-router/LICENSE.txt + asserts_file_exist ${src_folders[dcae]}/dmaapbc/pom.xml + asserts_file_exist ${src_folders[dcae]}/operation/README.md + asserts_file_exist ${src_folders[dcae]}/operation/utils/pom.xml + asserts_file_exist ${src_folders[dcae]}/orch-dispatcher/LICENSE.txt + asserts_file_exist ${src_folders[dcae]}/pgaas/LICENSE.txt + asserts_file_exist ${src_folders[dcae]}/utils/README.md + asserts_file_exist ${src_folders[dcae]}/utils/buildtools/LICENSE.txt } # test_compile_all_dcae_repos() - Verify that the DCAE source code is compiled properly @@ -39,46 +39,46 @@ function test_compile_all_dcae_repos { clone_repos "dcae" compile_repos "dcae" - asserts_file_exist $dcae_src_folder/collectors/ves/target/VESCollector-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[dcae]}/collectors/ves/target/VESCollector-1.1.0-SNAPSHOT.jar - asserts_file_exist $dcae_src_folder/controller/analytics/dcae-analytics-cdap-common-model/target/dcae-analytics-cdap-common-model-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[dcae]}/controller/analytics/dcae-analytics-cdap-common-model/target/dcae-analytics-cdap-common-model-1.1.0-SNAPSHOT.jar - asserts_file_exist $dcae_src_folder/controller/dcae-controller-core/dcae-controller-core-model/target/dcae-controller-core-model-1.1.0-SNAPSHOT.jar - asserts_file_exist $dcae_src_folder/controller/dcae-controller-core/dcae-controller-core-utils/target/dcae-controller-core-utils-1.1.0-SNAPSHOT.jar - asserts_file_exist $dcae_src_folder/controller/dcae-controller-core/dcae-controller-operation-utils/target/dcae-controller-operation-utils-1.1.0-SNAPSHOT.jar - asserts_file_exist $dcae_src_folder/controller/dcae-controller-core/dcae-controller-platform-model/target/dcae-controller-platform-model-1.1.0-SNAPSHOT.jar - asserts_file_exist $dcae_src_folder/controller/dcae-controller-core/dcae-controller-platform-server/target/dcae-controller-platform-server-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[dcae]}/controller/dcae-controller-core/dcae-controller-core-model/target/dcae-controller-core-model-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[dcae]}/controller/dcae-controller-core/dcae-controller-core-utils/target/dcae-controller-core-utils-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[dcae]}/controller/dcae-controller-core/dcae-controller-operation-utils/target/dcae-controller-operation-utils-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[dcae]}/controller/dcae-controller-core/dcae-controller-platform-model/target/dcae-controller-platform-model-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[dcae]}/controller/dcae-controller-core/dcae-controller-platform-server/target/dcae-controller-platform-server-1.1.0-SNAPSHOT.jar - asserts_file_exist $dcae_src_folder/controller/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/target/dcae-controller-service-dmaap-drsub-manager-1.1.0-SNAPSHOT.jar - asserts_file_exist $dcae_src_folder/controller/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/target/dcae-controller-service-dmaap-drsub-model-1.1.0-SNAPSHOT.jar - asserts_file_exist $dcae_src_folder/controller/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/target/dcae-controller-service-standardeventcollector-manager-1.1.0-SNAPSHOT.jar - asserts_file_exist $dcae_src_folder/controller/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/target/dcae-controller-service-standardeventcollector-model-1.1.0-SNAPSHOT.jar - asserts_file_exist $dcae_src_folder/controller/dcae-controller-service/dcae-controller-service-storage-postgres-model/target/dcae-controller-service-storage-postgres-model-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[dcae]}/controller/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-manager/target/dcae-controller-service-dmaap-drsub-manager-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[dcae]}/controller/dcae-controller-service/dcae-controller-service-dmaap-drsub/dcae-controller-service-dmaap-drsub-model/target/dcae-controller-service-dmaap-drsub-model-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[dcae]}/controller/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-manager/target/dcae-controller-service-standardeventcollector-manager-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[dcae]}/controller/dcae-controller-service/dcae-controller-service-standardeventcollector/dcae-controller-service-standardeventcollector-model/target/dcae-controller-service-standardeventcollector-model-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[dcae]}/controller/dcae-controller-service/dcae-controller-service-storage-postgres-model/target/dcae-controller-service-storage-postgres-model-1.1.0-SNAPSHOT.jar - asserts_file_exist $dcae_src_folder/controller/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/target/dcae-controller-service-cdap-adaptor-1.1.0-SNAPSHOT.jar - asserts_file_exist $dcae_src_folder/controller/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/target/dcae-controller-service-cdap-cluster-manager-1.1.0-SNAPSHOT.jar - asserts_file_exist $dcae_src_folder/controller/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/target/dcae-controller-service-cdap-cluster-model-1.1.0-SNAPSHOT.jar - asserts_file_exist $dcae_src_folder/controller/dcae-controller-service-cdap/dcae-controller-service-cdap-model/target/dcae-controller-service-cdap-model-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[dcae]}/controller/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/target/dcae-controller-service-cdap-adaptor-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[dcae]}/controller/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-manager/target/dcae-controller-service-cdap-cluster-manager-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[dcae]}/controller/dcae-controller-service-cdap/dcae-controller-service-cdap-cluster/dcae-controller-service-cdap-cluster-model/target/dcae-controller-service-cdap-cluster-model-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[dcae]}/controller/dcae-controller-service-cdap/dcae-controller-service-cdap-model/target/dcae-controller-service-cdap-model-1.1.0-SNAPSHOT.jar - asserts_file_exist $dcae_src_folder/controller/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/target/dcae-controller-service-common-docker-manager-1.1.0-SNAPSHOT.jar - asserts_file_exist $dcae_src_folder/controller/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/target/dcae-controller-service-common-docker-model-1.1.0-SNAPSHOT.jar - asserts_file_exist $dcae_src_folder/controller/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/target/dcae-controller-service-docker-adaptor-1.1.0-SNAPSHOT.jar - asserts_file_exist $dcae_src_folder/controller/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/target/dcae-controller-service-docker-host-manager-1.1.0-SNAPSHOT.jar - asserts_file_exist $dcae_src_folder/controller/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/target/dcae-controller-service-docker-host-model-1.1.0-SNAPSHOT.jar - asserts_file_exist $dcae_src_folder/controller/dcae-controller-service-docker/dcae-controller-service-docker-model/target/dcae-controller-service-docker-model-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[dcae]}/controller/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-manager/target/dcae-controller-service-common-docker-manager-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[dcae]}/controller/dcae-controller-service-docker/dcae-controller-service-common-docker/dcae-controller-service-common-docker-model/target/dcae-controller-service-common-docker-model-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[dcae]}/controller/dcae-controller-service-docker/dcae-controller-service-docker-adaptor/target/dcae-controller-service-docker-adaptor-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[dcae]}/controller/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/target/dcae-controller-service-docker-host-manager-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[dcae]}/controller/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-model/target/dcae-controller-service-docker-host-model-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[dcae]}/controller/dcae-controller-service-docker/dcae-controller-service-docker-model/target/dcae-controller-service-docker-model-1.1.0-SNAPSHOT.jar - asserts_file_exist $dcae_src_folder/controller/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/target/dcae-controller-service-common-vm-manager-1.1.0-SNAPSHOT.jar - asserts_file_exist $dcae_src_folder/controller/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-model/target/dcae-controller-service-common-vm-model-1.1.0-SNAPSHOT.jar - asserts_file_exist $dcae_src_folder/controller/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/target/dcae-controller-service-vm-adaptor-1.1.0-SNAPSHOT.jar - asserts_file_exist $dcae_src_folder/controller/dcae-controller-service-vm/dcae-controller-service-vm-model/target/dcae-controller-service-vm-model-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[dcae]}/controller/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-manager/target/dcae-controller-service-common-vm-manager-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[dcae]}/controller/dcae-controller-service-vm/dcae-controller-service-common-vm/dcae-controller-service-common-vm-model/target/dcae-controller-service-common-vm-model-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[dcae]}/controller/dcae-controller-service-vm/dcae-controller-service-vm-adaptor/target/dcae-controller-service-vm-adaptor-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[dcae]}/controller/dcae-controller-service-vm/dcae-controller-service-vm-model/target/dcae-controller-service-vm-model-1.1.0-SNAPSHOT.jar - asserts_file_exist $dcae_src_folder/dcae-inventory/target/dcae-inventory-1.1.0.jar + asserts_file_exist ${src_folders[dcae]}/dcae-inventory/target/dcae-inventory-1.1.0.jar - asserts_file_exist $dcae_src_folder/demo/dcae-demo-controller/target/dcae-demo-controller-1.1.0-SNAPSHOT-runtime.zip + asserts_file_exist ${src_folders[dcae]}/demo/dcae-demo-controller/target/dcae-demo-controller-1.1.0-SNAPSHOT-runtime.zip - asserts_file_exist $dcae_src_folder/dmaapbc/target/dcae_dmaapbc.jar + asserts_file_exist ${src_folders[dcae]}/dmaapbc/target/dcae_dmaapbc.jar - asserts_file_exist $dcae_src_folder/operation/utils/operation-utils/target/operation-utils-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[dcae]}/operation/utils/operation-utils/target/operation-utils-1.1.0-SNAPSHOT.jar } # test_get_dcae_images() - Function that verifies DCAE images are retrieved properly diff --git a/bootstrap/vagrant-onap/tests/test_functions b/bootstrap/vagrant-onap/tests/test_functions index a6d225bc6..9411b46f4 100755 --- a/bootstrap/vagrant-onap/tests/test_functions +++ b/bootstrap/vagrant-onap/tests/test_functions @@ -158,18 +158,12 @@ function test_build_docker_image { # test_coverity_repos() - Verify that all the repos are covered by scripts function test_coverity_repos { - # Get repositories list from source code files - repos_list=() - for module in $( stat -c "%F %n" /var/onap/* | grep -v "_\|functions\|commons\|files" | cut -d' ' -f 3-); do - source $module - module_repo_list=$(eval echo \${$(basename $module)_repos[@]}) - repos_list=(${repos_list[@]} ${module_repo_list[@]}) - done - pushd /var/onap_tests/ cp projects.txt remaining_projects.txt - for covered_repo in "${repos_list[@]}"; do - sed -i '/^'${covered_repo//\//\\/}'$/d' remaining_projects.txt + for project in "${repos[@]}"; do + for covered_repo in $project; do + sed -i '/^'${covered_repo//\//\\/}'$/d' remaining_projects.txt + done done threshold=75 diff --git a/bootstrap/vagrant-onap/tests/test_mr b/bootstrap/vagrant-onap/tests/test_mr index c08d2e66b..ad1bcd2f5 100755 --- a/bootstrap/vagrant-onap/tests/test_mr +++ b/bootstrap/vagrant-onap/tests/test_mr @@ -9,9 +9,9 @@ covered_functions=( # test_clone_mr_repos() - Verify that Message Router repositories are cloned properly function test_clone_mr_repos { - clone_repo dcae/demo/startup/message-router $mr_src_folder + clone_repo dcae/demo/startup/message-router ${src_folders[mr]} - asserts_file_exist $mr_src_folder/deploy.sh + asserts_file_exist ${src_folders[mr]}/deploy.sh } # test_get_mr_images() - Verify that Message Router Docker images are retrieved @@ -24,7 +24,7 @@ function test_get_mr_images { # test_install_message_router() - Verify the built and start of Message Router services function test_install_message_router { - clone_repo dcae/demo/startup/message-router $mr_src_folder + clone_repo dcae/demo/startup/message-router ${src_folders[mr]} get_mr_images install_message_router diff --git a/bootstrap/vagrant-onap/tests/test_msb b/bootstrap/vagrant-onap/tests/test_msb index e8bb24606..0848d333b 100755 --- a/bootstrap/vagrant-onap/tests/test_msb +++ b/bootstrap/vagrant-onap/tests/test_msb @@ -11,10 +11,10 @@ covered_functions=( function test_clone_all_msb_repos { clone_repos "msb" - asserts_file_exist $msb_src_folder/apigateway/pom.xml - asserts_file_exist $msb_src_folder/discovery/pom.xml - asserts_file_exist $msb_src_folder/java-sdk/pom.xml - asserts_file_exist $msb_src_folder/swagger-sdk/pom.xml + asserts_file_exist ${src_folders[msb]}/apigateway/pom.xml + asserts_file_exist ${src_folders[msb]}/discovery/pom.xml + asserts_file_exist ${src_folders[msb]}/java-sdk/pom.xml + asserts_file_exist ${src_folders[msb]}/swagger-sdk/pom.xml } # test_compile_all_msb_repos() - Verify the correct compilation of MSB project @@ -22,12 +22,12 @@ function test_compile_all_msb_repos { clone_repos "msb" compile_repos "msb" - asserts_file_exist $msb_src_folder/apigateway/apiroute/apiroute-service/target/original-apiroute-service-1.1.0-SNAPSHOT.jar - asserts_file_exist $msb_src_folder/apigateway/apiroute/apiroute-standalone/target/apiroute-1.1.0-SNAPSHOT.zip - asserts_file_exist $msb_src_folder/discovery/discovery-ui/target/discovery-ui-1.1.0-SNAPSHOT.jar - asserts_file_exist $msb_src_folder/discovery/sdclient/discovery-service/target/original-discovery-service-1.1.0-SNAPSHOT.jar - asserts_file_exist $msb_src_folder/java-sdk/target/msb-java-sdk-1.1.0-SNAPSHOT.jar - asserts_file_exist $msb_src_folder/swagger-sdk/target/swagger-sdk-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[msb]}/apigateway/apiroute/apiroute-service/target/original-apiroute-service-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[msb]}/apigateway/apiroute/apiroute-standalone/target/apiroute-1.1.0-SNAPSHOT.zip + asserts_file_exist ${src_folders[msb]}/discovery/discovery-ui/target/discovery-ui-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[msb]}/discovery/sdclient/discovery-service/target/original-discovery-service-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[msb]}/java-sdk/target/msb-java-sdk-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[msb]}/swagger-sdk/target/swagger-sdk-1.1.0-SNAPSHOT.jar } # test_get_msb_images() - Verify the creation of MSB Docker images diff --git a/bootstrap/vagrant-onap/tests/test_mso b/bootstrap/vagrant-onap/tests/test_mso index 384944c77..6a6bef772 100755 --- a/bootstrap/vagrant-onap/tests/test_mso +++ b/bootstrap/vagrant-onap/tests/test_mso @@ -11,11 +11,11 @@ covered_functions=( function test_clone_all_mso_repos { clone_repos "mso" - asserts_file_exist $mso_src_folder/pom.xml - asserts_file_exist $mso_src_folder/chef-repo/LICENSE.txt - asserts_file_exist $mso_src_folder/docker-config/LICENSE.txt - asserts_file_exist $mso_src_folder/libs/pom.xml - asserts_file_exist $mso_src_folder/mso-config/LICENSE.txt + asserts_file_exist ${src_folders[mso]}/pom.xml + asserts_file_exist ${src_folders[mso]}/chef-repo/LICENSE.txt + asserts_file_exist ${src_folders[mso]}/docker-config/LICENSE.txt + asserts_file_exist ${src_folders[mso]}/libs/pom.xml + asserts_file_exist ${src_folders[mso]}/mso-config/LICENSE.txt } # test_compile_all_mso_repos() - Verify the correct compilation of MSO projects @@ -23,21 +23,21 @@ function test_compile_all_mso_repos { clone_repos "mso" compile_repos "mso" - asserts_file_exist $mso_src_folder/libs/ceilometer-client/target/ceilometer-client-1.1.0-SNAPSHOT.jar - asserts_file_exist $mso_src_folder/libs/ceilometer-model/target/ceilometer-model-1.1.0-SNAPSHOT.jar - asserts_file_exist $mso_src_folder/libs/glance-client/target/glance-client-1.1.0-SNAPSHOT.jar - asserts_file_exist $mso_src_folder/libs/glance-model/target/glance-model-1.1.0-SNAPSHOT.jar - asserts_file_exist $mso_src_folder/libs/heat-client/target/heat-client-1.1.0-SNAPSHOT.jar - asserts_file_exist $mso_src_folder/libs/heat-model/target/heat-model-1.1.0-SNAPSHOT.jar - asserts_file_exist $mso_src_folder/libs/keystone-client/target/keystone-client-1.1.0-SNAPSHOT.jar - asserts_file_exist $mso_src_folder/libs/keystone-model/target/keystone-model-1.1.0-SNAPSHOT.jar - asserts_file_exist $mso_src_folder/libs/nova-client/target/nova-client-1.1.0-SNAPSHOT.jar - asserts_file_exist $mso_src_folder/libs/nova-model/target/nova-model-1.1.0-SNAPSHOT.jar - asserts_file_exist $mso_src_folder/libs/openstack-client/target/openstack-client-1.1.0-SNAPSHOT.jar - asserts_file_exist $mso_src_folder/libs/quantum-client/target/quantum-client-1.1.0-SNAPSHOT.jar - asserts_file_exist $mso_src_folder/libs/quantum-model/target/quantum-model-1.1.0-SNAPSHOT.jar - asserts_file_exist $mso_src_folder/libs/swift-client/target/swift-client-1.1.0-SNAPSHOT.jar - asserts_file_exist $mso_src_folder/libs/swift-model/target/swift-model-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[mso]}/libs/ceilometer-client/target/ceilometer-client-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[mso]}/libs/ceilometer-model/target/ceilometer-model-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[mso]}/libs/glance-client/target/glance-client-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[mso]}/libs/glance-model/target/glance-model-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[mso]}/libs/heat-client/target/heat-client-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[mso]}/libs/heat-model/target/heat-model-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[mso]}/libs/keystone-client/target/keystone-client-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[mso]}/libs/keystone-model/target/keystone-model-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[mso]}/libs/nova-client/target/nova-client-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[mso]}/libs/nova-model/target/nova-model-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[mso]}/libs/openstack-client/target/openstack-client-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[mso]}/libs/quantum-client/target/quantum-client-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[mso]}/libs/quantum-model/target/quantum-model-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[mso]}/libs/swift-client/target/swift-client-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[mso]}/libs/swift-model/target/swift-model-1.1.0-SNAPSHOT.jar } # test_get_mso_images() - Verify the creation of MSO Docker images diff --git a/bootstrap/vagrant-onap/tests/test_multicloud b/bootstrap/vagrant-onap/tests/test_multicloud index 23e12b1ac..1b5b85de6 100755 --- a/bootstrap/vagrant-onap/tests/test_multicloud +++ b/bootstrap/vagrant-onap/tests/test_multicloud @@ -11,12 +11,12 @@ covered_functions=( function test_clone_multicloud_repos { clone_repos "multicloud" - #asserts_file_exist $multicloud_src_folder/ - asserts_file_exist $multicloud_src_folder/framework/pom.xml - asserts_file_exist $multicloud_src_folder/openstack/pom.xml - asserts_file_exist $multicloud_src_folder/openstack/vmware/pom.xml - asserts_file_exist $multicloud_src_folder/openstack/windriver/pom.xml - #asserts_file_exist $multicloud_src_folder/azure/ + #asserts_file_exist ${src_folders[multicloud]}/ + asserts_file_exist ${src_folders[multicloud]}/framework/pom.xml + asserts_file_exist ${src_folders[multicloud]}/openstack/pom.xml + asserts_file_exist ${src_folders[multicloud]}/openstack/vmware/pom.xml + asserts_file_exist ${src_folders[multicloud]}/openstack/windriver/pom.xml + #asserts_file_exist ${src_folders[multicloud]}/azure/ } # test_compile_multicloud_repos() - @@ -24,9 +24,9 @@ function test_compile_multicloud_repos { clone_repos "multicloud" compile_repos "multicloud" - asserts_file_exist $multicloud_src_folder/openstack/newton/target/multicloud-openstack-newton-1.0.0-SNAPSHOT.zip - asserts_file_exist $multicloud_src_folder/openstack/ocata/target/multicloud-openstack-ocata-1.0.0-SNAPSHOT.zip - asserts_file_exist $multicloud_src_folder/openstack/windriver/target/multicloud-openstack-windriver-1.0.0-SNAPSHOT.zip + asserts_file_exist ${src_folders[multicloud]}/openstack/newton/target/multicloud-openstack-newton-1.0.0-SNAPSHOT.zip + asserts_file_exist ${src_folders[multicloud]}/openstack/ocata/target/multicloud-openstack-ocata-1.0.0-SNAPSHOT.zip + asserts_file_exist ${src_folders[multicloud]}/openstack/windriver/target/multicloud-openstack-windriver-1.0.0-SNAPSHOT.zip } # test_get_multicloud_images() - diff --git a/bootstrap/vagrant-onap/tests/test_policy b/bootstrap/vagrant-onap/tests/test_policy index 88d5e9dc9..b666cf9db 100755 --- a/bootstrap/vagrant-onap/tests/test_policy +++ b/bootstrap/vagrant-onap/tests/test_policy @@ -14,15 +14,15 @@ covered_functions=( function test_clone_all_policy_repos { clone_repos "policy" - asserts_file_exist $policy_src_folder/api/pom.xml - asserts_file_exist $policy_src_folder/common/pom.xml - asserts_file_exist $policy_src_folder/docker/pom.xml - asserts_file_exist $policy_src_folder/drools-applications/pom.xml - asserts_file_exist $policy_src_folder/drools-pdp/pom.xml - asserts_file_exist $policy_src_folder/engine/pom.xml - asserts_file_exist $policy_src_folder/gui/pom.xml - asserts_file_exist $policy_src_folder/pap/pom.xml - asserts_file_exist $policy_src_folder/pdp/pom.xml + asserts_file_exist ${src_folders[policy]}/api/pom.xml + asserts_file_exist ${src_folders[policy]}/common/pom.xml + asserts_file_exist ${src_folders[policy]}/docker/pom.xml + asserts_file_exist ${src_folders[policy]}/drools-applications/pom.xml + asserts_file_exist ${src_folders[policy]}/drools-pdp/pom.xml + asserts_file_exist ${src_folders[policy]}/engine/pom.xml + asserts_file_exist ${src_folders[policy]}/gui/pom.xml + asserts_file_exist ${src_folders[policy]}/pap/pom.xml + asserts_file_exist ${src_folders[policy]}/pdp/pom.xml } # test_compile_all_policy_repos() - Verify compiling of Policy source code @@ -30,46 +30,46 @@ function test_compile_all_policy_repos { clone_repos "policy" compile_repos "policy" - asserts_file_exist $policy_src_folder/common/common-logging/target/ONAP-Logging-*-SNAPSHOT.jar - asserts_file_exist $policy_src_folder/common/integrity-audit/target/integrity-audit-*-SNAPSHOT.jar - asserts_file_exist $policy_src_folder/common/integrity-monitor/target/integrity-monitor-*-SNAPSHOT.jar - asserts_file_exist $policy_src_folder/common/site-manager/target/site-manager-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[policy]}/common/common-logging/target/ONAP-Logging-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[policy]}/common/integrity-audit/target/integrity-audit-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[policy]}/common/integrity-monitor/target/integrity-monitor-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[policy]}/common/site-manager/target/site-manager-*-SNAPSHOT.jar for actor in appc appclcm so test vfc; do - asserts_file_exist $policy_src_folder/drools-applications/controlloop/common/actors/actor.$actor/target/actor.$actor-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[policy]}/drools-applications/controlloop/common/actors/actor.$actor/target/actor.$actor-*-SNAPSHOT.jar done - asserts_file_exist $policy_src_folder/drools-applications/controlloop/common/actors/actorServiceProvider/target/actorServiceProvider-*-SNAPSHOT.jar - asserts_file_exist $policy_src_folder/drools-applications/controlloop/common/eventmanager/target/eventmanager-*-SNAPSHOT.jar - asserts_file_exist $policy_src_folder/drools-applications/controlloop/common/guard/target/guard-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[policy]}/drools-applications/controlloop/common/actors/actorServiceProvider/target/actorServiceProvider-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[policy]}/drools-applications/controlloop/common/eventmanager/target/eventmanager-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[policy]}/drools-applications/controlloop/common/guard/target/guard-*-SNAPSHOT.jar for module in aai appc appclcm events rest sdc so trafficgenerator vfc; do - asserts_file_exist $policy_src_folder/drools-applications/controlloop/common/model-impl/$module/target/$module-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[policy]}/drools-applications/controlloop/common/model-impl/$module/target/$module-*-SNAPSHOT.jar done - asserts_file_exist $policy_src_folder/drools-applications/controlloop/common/policy-yaml/target/policy-yaml-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[policy]}/drools-applications/controlloop/common/policy-yaml/target/policy-yaml-*-SNAPSHOT.jar for package in apps artifacts; do - asserts_file_exist $policy_src_folder/drools-applications/controlloop/packages/$package/target/$package-*-SNAPSHOT.zip + asserts_file_exist ${src_folders[policy]}/drools-applications/controlloop/packages/$package/target/$package-*-SNAPSHOT.zip done - #asserts_file_exist $policy_src_folder/drools-applications/controlloop/packages/basex/target/basex-*-SNAPSHOT.tar.gz - asserts_file_exist $policy_src_folder/drools-applications/controlloop/templates/template.demo/target/template.demo-*-SNAPSHOT.jar - asserts_file_exist $policy_src_folder/drools-applications/controlloop/templates/template.demo/target/template.demo-*-SNAPSHOT.jar + #asserts_file_exist ${src_folders[policy]}/drools-applications/controlloop/packages/basex/target/basex-*-SNAPSHOT.tar.gz + asserts_file_exist ${src_folders[policy]}/drools-applications/controlloop/templates/template.demo/target/template.demo-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[policy]}/drools-applications/controlloop/templates/template.demo/target/template.demo-*-SNAPSHOT.jar for feature in eelf healthcheck session-persistence; do - asserts_file_exist $policy_src_folder/drools-pdp/feature-$feature/target/feature-$feature-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[policy]}/drools-pdp/feature-$feature/target/feature-$feature-*-SNAPSHOT.jar done - #asserts_file_exist $policy_src_folder/drools-pdp/packages/base/target/base-*-SNAPSHOT.tar.gz - #asserts_file_exist $policy_src_folder/drools-pdp/packages/install/target/install-drools-*-SNAPSHOT.zip + #asserts_file_exist ${src_folders[policy]}/drools-pdp/packages/base/target/base-*-SNAPSHOT.tar.gz + #asserts_file_exist ${src_folders[policy]}/drools-pdp/packages/install/target/install-drools-*-SNAPSHOT.zip for policy in core endpoints management utils; do - asserts_file_exist $policy_src_folder/drools-pdp/policy-$policy/target/policy-$policy-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[policy]}/drools-pdp/policy-$policy/target/policy-$policy-*-SNAPSHOT.jar done for engine in BRMSGateway LogParser ONAP-PDP ONAP-XACML ONAP-REST; do - asserts_file_exist $policy_src_folder/engine/$engine/target/$engine-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[policy]}/engine/$engine/target/$engine-*-SNAPSHOT.jar done for engine in ONAP-PAP-REST ONAP-PDP-REST ONAP-SDK-APP; do - asserts_file_exist $policy_src_folder/engine/$engine/target/$engine-*-SNAPSHOT.war + asserts_file_exist ${src_folders[policy]}/engine/$engine/target/$engine-*-SNAPSHOT.war done - asserts_file_exist $policy_src_folder/engine/packages/base/target/base-*-SNAPSHOT.tar.gz - asserts_file_exist $policy_src_folder/engine/packages/install/target/install-*-SNAPSHOT.zip - asserts_file_exist $policy_src_folder/engine/POLICY-SDK-APP/target/POLICY-SDK-APP-*-SNAPSHOT.war - asserts_file_exist $policy_src_folder/engine/PolicyEngineAPI/target/PolicyEngineAPI-*-SNAPSHOT.jar - asserts_file_exist $policy_src_folder/engine/PolicyEngineClient/target/PolicyEngineClient-*-SNAPSHOT.jar - asserts_file_exist $policy_src_folder/engine/PolicyEngineUtils/target/PolicyEngineUtils-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[policy]}/engine/packages/base/target/base-*-SNAPSHOT.tar.gz + asserts_file_exist ${src_folders[policy]}/engine/packages/install/target/install-*-SNAPSHOT.zip + asserts_file_exist ${src_folders[policy]}/engine/POLICY-SDK-APP/target/POLICY-SDK-APP-*-SNAPSHOT.war + asserts_file_exist ${src_folders[policy]}/engine/PolicyEngineAPI/target/PolicyEngineAPI-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[policy]}/engine/PolicyEngineClient/target/PolicyEngineClient-*-SNAPSHOT.jar + asserts_file_exist ${src_folders[policy]}/engine/PolicyEngineUtils/target/PolicyEngineUtils-*-SNAPSHOT.jar } # test_get_policy_images() - Verify that Policy Docker images are retrieved properly diff --git a/bootstrap/vagrant-onap/tests/test_portal b/bootstrap/vagrant-onap/tests/test_portal index ebfd21de8..d20f173ce 100755 --- a/bootstrap/vagrant-onap/tests/test_portal +++ b/bootstrap/vagrant-onap/tests/test_portal @@ -14,10 +14,10 @@ covered_functions=( function test_clone_all_portal_repos { clone_all_portal_repos - asserts_file_exist $portal_src_folder/pom.xml - asserts_file_exist $portal_src_folder/ecompsdkos/LICENSE.txt - asserts_file_exist $portal_src_folder/dmaapbc/pom.xml - asserts_file_exist $portal_src_folder/sdk/LICENSE.txt + asserts_file_exist ${src_folders[portal]}/pom.xml + asserts_file_exist ${src_folders[portal]}/ecompsdkos/LICENSE.txt + asserts_file_exist ${src_folders[portal]}/dmaapbc/pom.xml + asserts_file_exist ${src_folders[portal]}/sdk/LICENSE.txt } # test_compile_all_portal_repos() - Verify compiling of Portal source code @@ -25,9 +25,9 @@ function test_compile_all_portal_repos { clone_all_portal_repos compile_all_portal_repos - asserts_file_exist $portal_src_folder/ecomp-portal-BE-common/target/ecompportal-be-common.war - asserts_file_exist $portal_src_folder/ecomp-portal-BE-common-test/target/ecomp-portal-BE-common-test.jar - asserts_file_exist $portal_src_folder/ecomp-portal-BE-os/target/ecompportal-be-os.war + asserts_file_exist ${src_folders[portal]}/ecomp-portal-BE-common/target/ecompportal-be-common.war + asserts_file_exist ${src_folders[portal]}/ecomp-portal-BE-common-test/target/ecomp-portal-BE-common-test.jar + asserts_file_exist ${src_folders[portal]}/ecomp-portal-BE-os/target/ecompportal-be-os.war } # test_get_portal_images() - Verify that Portal Docker images are retrieved or built properly diff --git a/bootstrap/vagrant-onap/tests/test_robot b/bootstrap/vagrant-onap/tests/test_robot index dcaf7b286..b96a08848 100755 --- a/bootstrap/vagrant-onap/tests/test_robot +++ b/bootstrap/vagrant-onap/tests/test_robot @@ -11,10 +11,10 @@ covered_functions=( function test_clone_robot_repos { clone_repos "robot" "testsuite" - asserts_file_exist $robot_src_folder/LICENSE.TXT - asserts_file_exist $robot_src_folder/heatbridge/pom.xml - asserts_file_exist $robot_src_folder/properties/LICENSE.TXT - asserts_file_exist $robot_src_folder/python-testing-utils/LICENSE.TXT + asserts_file_exist ${src_folders[robot]}/LICENSE.TXT + asserts_file_exist ${src_folders[robot]}/heatbridge/pom.xml + asserts_file_exist ${src_folders[robot]}/properties/LICENSE.TXT + asserts_file_exist ${src_folders[robot]}/python-testing-utils/LICENSE.TXT } # test_compile_robot_repos() - Verify that Robot source code can be compiled properly diff --git a/bootstrap/vagrant-onap/tests/test_sdc b/bootstrap/vagrant-onap/tests/test_sdc index 6d5470e80..67657803e 100755 --- a/bootstrap/vagrant-onap/tests/test_sdc +++ b/bootstrap/vagrant-onap/tests/test_sdc @@ -11,13 +11,13 @@ covered_functions=( function test_clone_all_sdc_repos { clone_repos "sdc" - asserts_file_exist $sdc_src_folder/pom.xml - asserts_file_exist $sdc_src_folder/sdc-os-chef/pom.xml - asserts_file_exist $sdc_src_folder/jtosca/pom.xml - asserts_file_exist $sdc_src_folder/sdc-distribution-client/pom.xml - asserts_file_exist $sdc_src_folder/sdc-titan-cassandra/pom.xml - asserts_file_exist $sdc_src_folder/sdc-tosca/pom.xml - asserts_file_exist $sdc_src_folder/sdc_common/pom.xml + asserts_file_exist ${src_folders[sdc]}/pom.xml + asserts_file_exist ${src_folders[sdc]}/sdc-os-chef/pom.xml + asserts_file_exist ${src_folders[sdc]}/jtosca/pom.xml + asserts_file_exist ${src_folders[sdc]}/sdc-distribution-client/pom.xml + asserts_file_exist ${src_folders[sdc]}/sdc-titan-cassandra/pom.xml + asserts_file_exist ${src_folders[sdc]}/sdc-tosca/pom.xml + asserts_file_exist ${src_folders[sdc]}/sdc_common/pom.xml } # test_compile_all_sdc_repos() - Verifies the correct compilation of SDC repositories @@ -25,18 +25,18 @@ function test_compile_all_sdc_repos { clone_repos "sdc" compile_repos "sdc" - #asserts_file_exist $sdc_src_folder/jtosca/target/jtosca-1.1.10-SNAPSHOT.jar - #asserts_file_exist $sdc_src_folder/sdc-distribution-client/sdc-distribution-ci/target/sdc-distribution-ci-1.1.*-SNAPSHOT.jar - #asserts_file_exist $sdc_src_folder/sdc-distribution-client/sdc-distribution-client/target/sdc-distribution-client-1.1.*-SNAPSHOT.jar - #asserts_file_exist $sdc_src_folder/sdc-titan-cassandra/target/jamm-0.3.0.jar - #asserts_file_exist $sdc_src_folder/sdc-tosca/target/sdc-tosca-1.1.*-SNAPSHOT.jar + #asserts_file_exist ${src_folders[sdc]}/jtosca/target/jtosca-1.1.10-SNAPSHOT.jar + #asserts_file_exist ${src_folders[sdc]}/sdc-distribution-client/sdc-distribution-ci/target/sdc-distribution-ci-1.1.*-SNAPSHOT.jar + #asserts_file_exist ${src_folders[sdc]}/sdc-distribution-client/sdc-distribution-client/target/sdc-distribution-client-1.1.*-SNAPSHOT.jar + #asserts_file_exist ${src_folders[sdc]}/sdc-titan-cassandra/target/jamm-0.3.0.jar + #asserts_file_exist ${src_folders[sdc]}/sdc-tosca/target/sdc-tosca-1.1.*-SNAPSHOT.jar #for dirc in logging sdc-artifact-generator; do for dirc in logging; do name="openecomp-$dirc" for module in api core; do fullname="$name-$module" - asserts_file_exist $sdc_src_folder/sdc_common/$name-lib/$fullname/target/$fullname-1.1.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[sdc]}/sdc_common/$name-lib/$fullname/target/$fullname-1.1.0-SNAPSHOT.jar done done } diff --git a/bootstrap/vagrant-onap/tests/test_sdnc b/bootstrap/vagrant-onap/tests/test_sdnc index 1a24a72b0..c4ddc56cd 100755 --- a/bootstrap/vagrant-onap/tests/test_sdnc +++ b/bootstrap/vagrant-onap/tests/test_sdnc @@ -11,14 +11,14 @@ covered_functions=( function test_clone_all_sdnc_repos { clone_repos "sdnc" - asserts_file_exist $sdnc_src_folder/adaptors/pom.xml - #asserts_file_exist $sdnc_src_folder/architecture/docs/index.rst - asserts_file_exist $sdnc_src_folder/core/pom.xml - #asserts_file_exist $sdnc_src_folder/features/docs/index.rst - asserts_file_exist $sdnc_src_folder/northbound/pom.xml - asserts_file_exist $sdnc_src_folder/oam/pom.xml - #asserts_file_exist $sdnc_src_folder/parent/docs/index.rst - asserts_file_exist $sdnc_src_folder/plugins/pom.xml + asserts_file_exist ${src_folders[sdnc]}/adaptors/pom.xml + #asserts_file_exist ${src_folders[sdnc]}/architecture/docs/index.rst + asserts_file_exist ${src_folders[sdnc]}/core/pom.xml + #asserts_file_exist ${src_folders[sdnc]}/features/docs/index.rst + asserts_file_exist ${src_folders[sdnc]}/northbound/pom.xml + asserts_file_exist ${src_folders[sdnc]}/oam/pom.xml + #asserts_file_exist ${src_folders[sdnc]}/parent/docs/index.rst + asserts_file_exist ${src_folders[sdnc]}/plugins/pom.xml } # test_compile_all_sdnc_repos() - Verify the correct compilation of SDNC projects @@ -28,15 +28,15 @@ function test_compile_all_sdnc_repos { for component in generic-resource-api vnfapi vnftools; do if [[ "$component" == "vnfapi" ]]; then - asserts_file_exist $sdnc_src_folder/northbound/vnfapi/model/target/vnfapi-model-1.2.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[sdnc]}/northbound/vnfapi/model/target/vnfapi-model-1.2.0-SNAPSHOT.jar fi - asserts_file_exist $sdnc_src_folder/northbound/$component/installer/target/sdnc-$component-1.2.0-SNAPSHOT-installer.zip - asserts_file_exist $sdnc_src_folder/northbound/$component/features/target/$component-features-1.2.0-SNAPSHOT.jar - asserts_file_exist $sdnc_src_folder/northbound/$component/provider/target/$component-provider-1.2.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[sdnc]}/northbound/$component/installer/target/sdnc-$component-1.2.0-SNAPSHOT-installer.zip + asserts_file_exist ${src_folders[sdnc]}/northbound/$component/features/target/$component-features-1.2.0-SNAPSHOT.jar + asserts_file_exist ${src_folders[sdnc]}/northbound/$component/provider/target/$component-provider-1.2.0-SNAPSHOT.jar done - asserts_file_exist $sdnc_src_folder/oam/admportal/target/admportal.*-SNAPSHOT.zip - asserts_file_exist $sdnc_src_folder/oam/dgbuilder/target/dgbuilder.*-SNAPSHOT.zip - asserts_file_exist $sdnc_src_folder/oam/platform-logic/installer/target/platform-logic-installer-*-SNAPSHOT.zip + asserts_file_exist ${src_folders[sdnc]}/oam/admportal/target/admportal.*-SNAPSHOT.zip + asserts_file_exist ${src_folders[sdnc]}/oam/dgbuilder/target/dgbuilder.*-SNAPSHOT.zip + asserts_file_exist ${src_folders[sdnc]}/oam/platform-logic/installer/target/platform-logic-installer-*-SNAPSHOT.zip } # test_get_sdnc_images() - Verify that the SDNC images are created or retrieved diff --git a/bootstrap/vagrant-onap/tests/test_vfc b/bootstrap/vagrant-onap/tests/test_vfc index a675c52a3..3fadeafad 100755 --- a/bootstrap/vagrant-onap/tests/test_vfc +++ b/bootstrap/vagrant-onap/tests/test_vfc @@ -11,21 +11,21 @@ covered_functions=( function test_clone_all_vfc_repos { clone_repos "vfc" - #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 + #asserts_file_exist ${src_folders[vfc]}/pom.xml + #asserts_file_exist ${src_folders[vfc]}/gvnfm + asserts_file_exist ${src_folders[vfc]}/gvnfm/vnflcm/pom.xml + asserts_file_exist ${src_folders[vfc]}/gvnfm/vnfmgr/pom.xml + asserts_file_exist ${src_folders[vfc]}/gvnfm/vnfres/pom.xml + #asserts_file_exist ${src_folders[vfc]}/nfvo + asserts_file_exist ${src_folders[vfc]}/nfvo/catalog/run.sh + #asserts_file_exist ${src_folders[vfc]}/nfvo/driver + asserts_file_exist ${src_folders[vfc]}/nfvo/driver/ems/pom.xml + asserts_file_exist ${src_folders[vfc]}/nfvo/driver/sfc/pom.xml + #asserts_file_exist ${src_folders[vfc]}/nfvo/driver/vnfm + asserts_file_exist ${src_folders[vfc]}/nfvo/driver/vnfm/gvnfm/pom.xml + asserts_file_exist ${src_folders[vfc]}/nfvo/driver/vnfm/svnfm/pom.xml + asserts_file_exist ${src_folders[vfc]}/nfvo/lcm/pom.xml + asserts_file_exist ${src_folders[vfc]}/nfvo/wfengine/wso2/pom.xml } # test_compile_all_vfc_repos() - Verify that all the VFC modules are compiled properly diff --git a/bootstrap/vagrant-onap/tests/test_vid b/bootstrap/vagrant-onap/tests/test_vid index dc6adba99..79a415242 100755 --- a/bootstrap/vagrant-onap/tests/test_vid +++ b/bootstrap/vagrant-onap/tests/test_vid @@ -11,8 +11,8 @@ covered_functions=( function test_clone_all_vid_repos { clone_repos "vid" - asserts_file_exist $vid_src_folder/pom.xml - asserts_file_exist $vid_src_folder/asdcclient/pom.xml + asserts_file_exist ${src_folders[vid]}/pom.xml + asserts_file_exist ${src_folders[vid]}/asdcclient/pom.xml } # test_compile_all_vid_repos() - Verifies that VID source code is compiled properly @@ -20,9 +20,9 @@ function test_compile_all_vid_repos { clone_repos "vid" compile_repos "vid" - asserts_file_exist $vid_src_folder/asdcclient/target/asdcclient-1.0.2-SNAPSHOT.jar - asserts_file_exist $vid_src_folder/epsdk-app-onap/target/vid.war - asserts_file_exist $vid_src_folder/vid-app-common/target/vid-common.war + asserts_file_exist ${src_folders[vid]}/asdcclient/target/asdcclient-1.0.2-SNAPSHOT.jar + asserts_file_exist ${src_folders[vid]}/epsdk-app-onap/target/vid.war + asserts_file_exist ${src_folders[vid]}/vid-app-common/target/vid-common.war } # test_get_vid_images() - Verifies that VID Docker images are built properly diff --git a/bootstrap/vagrant-onap/tests/test_vnfsdk b/bootstrap/vagrant-onap/tests/test_vnfsdk index 6f37904a1..cd29a9733 100755 --- a/bootstrap/vagrant-onap/tests/test_vnfsdk +++ b/bootstrap/vagrant-onap/tests/test_vnfsdk @@ -11,13 +11,13 @@ covered_functions=( function test_clone_all_vnfsdk_repos { clone_repos "vnfsdk" - 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 + asserts_file_exist ${src_folders[vnfsdk]}/compliance/veslibrary/README + asserts_file_exist ${src_folders[vnfsdk]}/functest/pom.xml + asserts_file_exist ${src_folders[vnfsdk]}/lctest/pom.xml + asserts_file_exist ${src_folders[vnfsdk]}/model/docs/index.rst + asserts_file_exist ${src_folders[vnfsdk]}/pkgtools/pom.xml + asserts_file_exist ${src_folders[vnfsdk]}/refrepo/pom.xml + asserts_file_exist ${src_folders[vnfsdk]}/validation/pom.xml } # test_compile_all_vnfsdk_repos () - Verify if VNFSDK source repo compiles correctly. @@ -25,10 +25,10 @@ function test_compile_all_vnfsdk_repos { clone_repos "vnfsdk" compile_repos "vnfsdk" - 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 + asserts_file_exist ${src_folders[vnfsdk]}/lctest/lifecycle-test/target/lifecycle-test-service-1.0.0-SNAPSHOT.war + asserts_file_exist ${src_folders[vnfsdk]}/pkgtools/target/vnf-sdk-pkgtools-1.0.0-SNAPSHOT.zip + asserts_file_exist ${src_folders[vnfsdk]}/refrepo/vnfmarket-be/vnf-sdk-marketplace/target/ROOT.war + asserts_file_exist ${src_folders[vnfsdk]}/validation/csarvalidation/target/validation-csar-1.0.0-SNAPSHOT.jar } # test_get_vnfsdk_images() - Verify that the VNFSDK images are created or retrieved diff --git a/bootstrap/vagrant-onap/tests/test_vvp b/bootstrap/vagrant-onap/tests/test_vvp index 4762e1da2..8e9594dcd 100755 --- a/bootstrap/vagrant-onap/tests/test_vvp +++ b/bootstrap/vagrant-onap/tests/test_vvp @@ -11,16 +11,16 @@ covered_functions=( function test_clone_all_vvp_repos { clone_repos "vvp" - asserts_file_exist $vvp_src_folder/cms/pom.xml - asserts_file_exist $vvp_src_folder/devkit/LICENSE.TXT - asserts_file_exist $vvp_src_folder/engagementmgr/pom.xml - asserts_file_exist $vvp_src_folder/gitlab/pom.xml - asserts_file_exist $vvp_src_folder/image-scanner/pom.xml - asserts_file_exist $vvp_src_folder/jenkins/pom.xml - asserts_file_exist $vvp_src_folder/portal/pom.xml - asserts_file_exist $vvp_src_folder/postgresql/pom.xml - asserts_file_exist $vvp_src_folder/test-engine/pom.xml - asserts_file_exist $vvp_src_folder/validation-scripts/LICENSE.txt + asserts_file_exist ${src_folders[vvp]}/cms/pom.xml + asserts_file_exist ${src_folders[vvp]}/devkit/LICENSE.TXT + asserts_file_exist ${src_folders[vvp]}/engagementmgr/pom.xml + asserts_file_exist ${src_folders[vvp]}/gitlab/pom.xml + asserts_file_exist ${src_folders[vvp]}/image-scanner/pom.xml + asserts_file_exist ${src_folders[vvp]}/jenkins/pom.xml + asserts_file_exist ${src_folders[vvp]}/portal/pom.xml + asserts_file_exist ${src_folders[vvp]}/postgresql/pom.xml + asserts_file_exist ${src_folders[vvp]}/test-engine/pom.xml + asserts_file_exist ${src_folders[vvp]}/validation-scripts/LICENSE.txt } # test_compile_all_vvp_repos () - Verify if VNFSDK source repo compiles correctly. @@ -28,7 +28,7 @@ function test_compile_all_vvp_repos { clone_repos "vvp" compile_repos "vvp" - # asserts_file_exist $vvp_src_folder/ + # asserts_file_exist ${src_folders[vvp]}/ } # test_get_vvp_images() - Verify that the VNFSDK images are created or retrieved |