diff options
Diffstat (limited to 'bootstrap/vagrant-onap/tests')
| -rw-r--r-- | bootstrap/vagrant-onap/tests/test_aai | 15 | ||||
| -rw-r--r-- | bootstrap/vagrant-onap/tests/test_appc | 6 | ||||
| -rw-r--r-- | bootstrap/vagrant-onap/tests/test_functions | 10 | ||||
| -rw-r--r-- | bootstrap/vagrant-onap/tests/test_multicloud | 1 | ||||
| -rw-r--r-- | bootstrap/vagrant-onap/tests/test_policy | 8 | ||||
| -rw-r--r-- | bootstrap/vagrant-onap/tests/test_portal | 14 | ||||
| -rw-r--r-- | bootstrap/vagrant-onap/tests/test_sdnc | 12 | ||||
| -rw-r--r-- | bootstrap/vagrant-onap/tests/test_vfc | 18 |
8 files changed, 38 insertions, 46 deletions
diff --git a/bootstrap/vagrant-onap/tests/test_aai b/bootstrap/vagrant-onap/tests/test_aai index 0fa82d531..5ff62c156 100644 --- a/bootstrap/vagrant-onap/tests/test_aai +++ b/bootstrap/vagrant-onap/tests/test_aai @@ -4,7 +4,8 @@ source /var/onap_tests/_test_base source /var/onap/aai covered_functions=( -"install_hadoop" "install_haproxy" "clone_all_aai_repos" "compile_aai_repos" "setup_titan" "start_aai_microservices" "install_hbase" "install_ajsc_aai" "install_model_loader" +#"install_hadoop" "install_haproxy" "clone_all_aai_repos" "compile_aai_repos" "setup_titan" "start_aai_microservices" "install_hbase" "install_ajsc_aai" "install_model_loader" +"install_hadoop" "install_haproxy" "clone_all_aai_repos" "compile_aai_repos" "setup_titan" "install_hbase" "install_ajsc_aai" "install_model_loader" ) # TODO(electrocucaracha): Remove/Modify functions that doesn't support proxy settings @@ -61,23 +62,11 @@ function test_compile_aai_repos { asserts_file_exist $aai_src_folder/aai-common/aai-core/target/aai-core-1.1.0-SNAPSHOT.jar asserts_file_exist $aai_src_folder/aai-common/aai-schema/target/aai-schema-1.1.0-SNAPSHOT.jar - asserts_file_exist $aai_src_folder/aai-service/aai-schema/target/aai-schema-1.1.0-SNAPSHOT.jar - asserts_file_exist $aai_src_folder/aai-service/ajsc-aai/target/aai.jar - asserts_file_exist $aai_src_folder/aai-service/annotations/target/annotations-1.1.0-SNAPSHOT.jar - - asserts_file_exist $aai_src_folder/data-router/target/data-router-1.1.0-SNAPSHOT.jar - asserts_file_exist $aai_src_folder/logging-service/common-logging/target/common-logging-1.1.0-SNAPSHOT.jar asserts_file_exist $aai_src_folder/logging-service/eelf-logging/target/eelf-logging-1.1.0-SNAPSHOT.jar asserts_file_exist $aai_src_folder/logging-service/logging-api/target/logging-api-1.1.0-SNAPSHOT.jar - asserts_file_exist $aai_src_folder/model-loader/target/model-loader-1.1.0-SNAPSHOT.jar asserts_file_exist $aai_src_folder/resources/aai-resources/target/aai-resources.jar - asserts_file_exist $aai_src_folder/rest-client/target/rest-client-1.1.0-SNAPSHOT.jar - asserts_file_exist $aai_src_folder/router-core/target/router-core-1.1.0-SNAPSHOT.jar - asserts_file_exist $aai_src_folder/search-data-service/target/search-data-service-1.1.0-SNAPSHOT.jar - asserts_file_exist $aai_src_folder/sparky-be/target/sparky-be-1.0-SNAPSHOT.jar - asserts_file_exist $aai_src_folder/sparky-fe/target/sparky-fe-1.0.0-SNAPSHOT.war asserts_file_exist $aai_src_folder/traversal/aai-traversal/target/traversal.jar } diff --git a/bootstrap/vagrant-onap/tests/test_appc b/bootstrap/vagrant-onap/tests/test_appc index 0d46ef47d..2290f16a2 100644 --- a/bootstrap/vagrant-onap/tests/test_appc +++ b/bootstrap/vagrant-onap/tests/test_appc @@ -36,7 +36,7 @@ function test_compile_all_appc_repos { asserts_file_exist $appc_src_folder/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-sshd/target/appc-ssh-adapter-sshd-1.1.0-SNAPSHOT.jar asserts_file_exist $appc_src_folder/appc-adapters/appc-ssh-adapter/appc-ssh-adapter-tests/target/appc-ssh-adapter-tests-1.1.0-SNAPSHOT.jar - for component in appc-asdc-listener appc-event-listener appc-oam appc-provider; do + for component in appc-event-listener appc-oam appc-provider; do asserts_file_exist $appc_src_folder/$component/$component-bundle/target/$component-bundle-1.1.0-SNAPSHOT.jar asserts_file_exist $appc_src_folder/$component/$component-features/target/$component-features-1.1.0-SNAPSHOT.jar asserts_file_exist $appc_src_folder/$component/$component-installer/target/$component-1.1.0-SNAPSHOT.zip @@ -45,8 +45,6 @@ function test_compile_all_appc_repos { asserts_file_exist $appc_src_folder/$component/$component-model/target/$component-model-1.1.0-SNAPSHOT.jar done - asserts_file_exist $appc_src_folder/appc-asdc-listener/appc-yang-generator/target/appc-yang-generator-1.1.0-SNAPSHOT.jar - asserts_file_exist $appc_src_folder/appc-common/target/appc-common-1.1.0-SNAPSHOT.jar asserts_file_exist $appc_src_folder/appc-dg/appc-dg-shared/appc-dg-dependency-model/target/appc-dg-dependency-model-1.1.0-SNAPSHOT.jar @@ -85,9 +83,7 @@ function test_install_appc { get_appc_images install_appc - asserts_image_running openecomp/dgbuilder-sdnc-image asserts_image_running openecomp/appc-image - asserts_image_running mysql/mysql-server:5.6 } if [ "$1" != '*' ]; then diff --git a/bootstrap/vagrant-onap/tests/test_functions b/bootstrap/vagrant-onap/tests/test_functions index ea268923b..17a66313a 100644 --- a/bootstrap/vagrant-onap/tests/test_functions +++ b/bootstrap/vagrant-onap/tests/test_functions @@ -102,7 +102,6 @@ function test_install_python { install_python asserts_installed_package python2.7 asserts_installed_package python-dev - asserts_file_exist /usr/local/bin/tox } # test_install_docker() - Verify the correct installation of Docker @@ -158,13 +157,12 @@ function test_compile_src { # test_build_docker_image() - Verify that a docker image is created from source code function test_build_docker_image { - clone_repo portal - compile_src $git_src_folder/portal/ecomp-portal-widget-ms - build_docker_image $git_src_folder/portal/ecomp-portal-widget-ms + clone_repo ccsdk/distribution + build_docker_image $git_src_folder/ccsdk/distribution/ubuntu docker - asserts_image widget-ms + asserts_image onap/ccsdk-ubuntu-image - docker rmi -f widget-ms + docker rmi -f onap/ccsdk-ubuntu-image } if [ "$1" != '*' ]; then diff --git a/bootstrap/vagrant-onap/tests/test_multicloud b/bootstrap/vagrant-onap/tests/test_multicloud index 4767152e9..3d60533f7 100644 --- a/bootstrap/vagrant-onap/tests/test_multicloud +++ b/bootstrap/vagrant-onap/tests/test_multicloud @@ -22,7 +22,6 @@ function test_compile_multicloud_repos { compile_multicloud_repos asserts_file_exist $multicloud_src_folder/openstack/newton/target/multicloud-openstack-newton-1.0.0-SNAPSHOT.zip - asserts_file_exist $multicloud_src_folder/openstack/vmware/vio/target/multivimdriver-vio-1.1.0-SNAPSHOT.zip } # test_install_multicloud() - Verify the built and start of Multi Cloud services diff --git a/bootstrap/vagrant-onap/tests/test_policy b/bootstrap/vagrant-onap/tests/test_policy index d7ed98df6..0c544cd7d 100644 --- a/bootstrap/vagrant-onap/tests/test_policy +++ b/bootstrap/vagrant-onap/tests/test_policy @@ -27,20 +27,20 @@ function test_clone_all_policy_repos { # test_compile_all_policy_repos() - Verify compiling of Policy source code function test_compile_all_policy_repos { -# clone_all_policy_repos -# compile_all_policy_repos + clone_all_policy_repos + compile_all_policy_repos asserts_file_exist $policy_src_folder/common/common-logging/target/ONAP-Logging-1.1.0-SNAPSHOT.jar asserts_file_exist $policy_src_folder/common/integrity-audit/target/integrity-audit-1.1.0-SNAPSHOT.jar asserts_file_exist $policy_src_folder/common/integrity-monitor/target/integrity-monitor-1.1.0-SNAPSHOT.jar asserts_file_exist $policy_src_folder/common/site-manager/target/site-manager-1.1.0-SNAPSHOT.jar - for actor in appc mso test vfc; do + 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-1.1.0-SNAPSHOT.jar done asserts_file_exist $policy_src_folder/drools-applications/controlloop/common/actors/actorServiceProvider/target/actorServiceProvider-1.1.0-SNAPSHOT.jar asserts_file_exist $policy_src_folder/drools-applications/controlloop/common/eventmanager/target/eventmanager-1.1.0-SNAPSHOT.jar asserts_file_exist $policy_src_folder/drools-applications/controlloop/common/guard/target/guard-1.1.0-SNAPSHOT.jar - for module in aai appc events mso rest sdc trafficgenerator vfc; do + 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-1.1.0-SNAPSHOT.jar done asserts_file_exist $policy_src_folder/drools-applications/controlloop/common/policy-yaml/target/policy-yaml-1.1.0-SNAPSHOT.jar diff --git a/bootstrap/vagrant-onap/tests/test_portal b/bootstrap/vagrant-onap/tests/test_portal index d586b73f5..ebfd21de8 100644 --- 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 $policy_src_folder/pom.xml - asserts_file_exist $policy_src_folder/ecompsdkos/LICENSE.txt - asserts_file_exist $policy_src_folder/dmaapbc/pom.xml - asserts_file_exist $policy_src_folder/sdk/LICENSE.txt + 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 } # 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 $policy_src_folder/ecomp-portal-BE-common/target/ecompportal-be-common.war - asserts_file_exist $policy_src_folder/ecomp-portal-BE-common-test/target/ecomp-portal-BE-common-test.jar - asserts_file_exist $policy_src_folder/ecomp-portal-BE-os/target/ecompportal-be-os.war + 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 } # test_get_portal_images() - Verify that Portal Docker images are retrieved or built properly diff --git a/bootstrap/vagrant-onap/tests/test_sdnc b/bootstrap/vagrant-onap/tests/test_sdnc index a60145fbf..bc742fad2 100644 --- a/bootstrap/vagrant-onap/tests/test_sdnc +++ b/bootstrap/vagrant-onap/tests/test_sdnc @@ -60,9 +60,9 @@ function test_get_sdnc_images { clone_all_sdnc_repos get_sdnc_images - asserts_image openecomp/sdnc-image - asserts_image openecomp/admportal-sdnc-image - asserts_image openecomp/dgbuilder-sdnc-image + asserts_image onap/sdnc-image + asserts_image onap/admportal-sdnc-image + asserts_image onap/dgbuilder-sdnc-image asserts_image mysql/mysql-server:5.6 } @@ -72,9 +72,9 @@ function test_install_sdnc { get_sdnc_images install_sdnc - asserts_image_running openecomp/dgbuilder-sdnc-image - asserts_image_running openecomp/admportal-sdnc-image - asserts_image_running openecomp/sdnc-image + asserts_image_running onap/ccsdk-dgbuilder-image + asserts_image_running onap/admportal-sdnc-image + asserts_image_running onap/sdnc-image asserts_image_running mysql/mysql-server:5.6 } diff --git a/bootstrap/vagrant-onap/tests/test_vfc b/bootstrap/vagrant-onap/tests/test_vfc index e948ccedb..8392e701f 100644 --- a/bootstrap/vagrant-onap/tests/test_vfc +++ b/bootstrap/vagrant-onap/tests/test_vfc @@ -5,7 +5,9 @@ source /var/onap/vfc covered_functions=( "clone_all_vfc_repos" "compile_all_vfc_repos" "install_vfc" -"build_nfvo_lcm_image" "get_vfc_images" "run_vfc_images" +"get_vfc_images" "run_vfc_images" "build_nfvo_lcm_image" +"build_gvnfm_lcm_image" "build_gvnfm_vnfmgr_image" "build_gvnfm_vnfres_image" +"build_nfvo_lcm_image" "build_nfvo_vnfm_gvnfmadapter_image" ) # test_clone_all_vfc_repos() - Verify cloning and pulling source code from repositories @@ -29,17 +31,25 @@ function test_get_vfc_images { 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 when they are ready. + # TODO(sshank): Add asserts for other VFC component docker image builds. } # test_install_vfc() - Verify that the VFC are up and running function test_install_vfc { install_vfc - asserts_image_running vfc-nslcm + 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 when they are ready. + # TODO(sshank): Add asserts for other running VFC component docker images. } if [ "$1" != '*' ]; then |