diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | bootstrap/jenkins/vagrant/jjb/java-jobs.yaml | 14 | ||||
| -rw-r--r-- | bootstrap/vagrant-onap/tests/test_functions | 10 | ||||
| -rwxr-xr-x | test/csit/run-csit.sh | 6 | ||||
| -rw-r--r-- | test/csit/tests/integration/vCPE/test1.robot | 27 | ||||
| -rw-r--r-- | version-manifest/src/main/java/org/onap/integration/versionmanifest/VersionCheckMojo.java | 4 |
6 files changed, 43 insertions, 19 deletions
diff --git a/.gitignore b/.gitignore index f3b07b8d9..ed95eabcc 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ env.properties .vagrant *~ .checkstyle +test/testsuite/ diff --git a/bootstrap/jenkins/vagrant/jjb/java-jobs.yaml b/bootstrap/jenkins/vagrant/jjb/java-jobs.yaml index cea15b668..9662e83d3 100644 --- a/bootstrap/jenkins/vagrant/jjb/java-jobs.yaml +++ b/bootstrap/jenkins/vagrant/jjb/java-jobs.yaml @@ -243,6 +243,9 @@ - 'modeling_toscaparsers_javatoscachecker': repo: 'modeling/toscaparsers' pom: 'javatoscachecker/pom.xml' + - 'modeling_toscaparsers_nfvparser': + repo: 'modeling/toscaparsers' + pom: 'nfvparser/pom.xml' - 'msb_apigateway': repo: 'msb/apigateway' pom: 'pom.xml' @@ -261,9 +264,9 @@ - 'mso_libs': repo: 'mso/libs' pom: 'pom.xml' - - 'multicloud_framework_multivimbroker': + - 'multicloud_framework': repo: 'multicloud/framework' - pom: 'multivimbroker/pom.xml' + pom: 'pom.xml' - 'multicloud_openstack': repo: 'multicloud/openstack' pom: 'pom.xml' @@ -405,9 +408,9 @@ - 'vfc_nfvo_driver_ems': repo: 'vfc/nfvo/driver/ems' pom: 'pom.xml' - - 'vfc_nfvo_driver_sfc_zte_sfc-driver': + - 'vfc_nfvo_driver_sfc': repo: 'vfc/nfvo/driver/sfc' - pom: 'zte/sfc-driver/pom.xml' + pom: 'pom.xml' - 'vfc_nfvo_driver_vnfm_gvnfm': repo: 'vfc/nfvo/driver/vnfm/gvnfm' pom: 'pom.xml' @@ -447,3 +450,6 @@ - 'vnfsdk_refrepo': repo: 'vnfsdk/refrepo' pom: 'pom.xml' + - 'vnfsdk_validation': + repo: 'vnfsdk/validation' + pom: 'pom.xml' 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/test/csit/run-csit.sh b/test/csit/run-csit.sh index 8033f308a..c1f38e3ab 100755 --- a/test/csit/run-csit.sh +++ b/test/csit/run-csit.sh @@ -93,6 +93,12 @@ if ! type pybot > /dev/null; then source ${ROBOT_VENV}/bin/activate fi +# install eteutils +rm -rf ${WORKSPACE}/test/testsuite +git clone https://gerrit.onap.org/r/testsuite/python-testing-utils.git ${WORKSPACE}/test/testsuite/python-testing-utils + + + WORKDIR=`mktemp -d --suffix=-robot-workdir` cd ${WORKDIR} diff --git a/test/csit/tests/integration/vCPE/test1.robot b/test/csit/tests/integration/vCPE/test1.robot index 01a14e62f..3bcd1dde9 100644 --- a/test/csit/tests/integration/vCPE/test1.robot +++ b/test/csit/tests/integration/vCPE/test1.robot @@ -1,17 +1,26 @@ *** Settings *** +Suite Setup Suite Setup +Suite Teardown Suite Teardown Library OperatingSystem Library RequestsLibrary Library Process +Library ../../../../testsuite/python-testing-utils/eteutils/UUID.py + +*** Variables *** +${GLOBAL_APPLICATION_ID} csit-vCPE +${GLOBAL_MSO_USERNAME} InfraPortalClient +${GLOBAL_MSO_PASSWORD} password1$ *** Test Cases *** SO ServiceInstance health check - ${SO_IP}= Run Docker nexus3.onap.org:10001/openecomp/mso i-so - Wait Until Keyword Succeeds 1 min 5 sec CheckUrl http://${SO_IP}:8080 - Create Session refrepo http://${SO_IP}:8080 + ${auth}= Create List ${GLOBAL_MSO_USERNAME} ${GLOBAL_MSO_PASSWORD} + ${session}= Create Session so http://${SO_IP}:8080 + ${uuid}= Generate UUID + ${headers}= Create Dictionary Accept=text/html Content-Type=text/html X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} + ${resp}= Get Request so /ecomp/mso/infra/globalhealthcheck headers=${headers} &{headers}= Create Dictionary Authorization=Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA== Content-Type=application/json Accept=application/json - ${resp}= Get Request refrepo /ecomp/mso/infra/orchestrationRequests/v2 headers=${headers} + ${resp}= Get Request so /ecomp/mso/infra/orchestrationRequests/v2 headers=${headers} Should Not Contain ${resp.content} null - Kill Docker i-so *** Keywords *** Run Docker @@ -41,3 +50,11 @@ CheckUrl Create Session session ${url} disable_warnings=True ${resp}= Get Request session / Should Be Equal As Integers ${resp.status_code} 200 + +Suite Setup + ${SO_IP}= Run Docker nexus3.onap.org:10001/openecomp/mso i-so + Wait Until Keyword Succeeds 1 min 5 sec CheckUrl http://${SO_IP}:8080 + Set Suite Variable ${SO_IP} + +Suite Teardown + Kill Docker i-so diff --git a/version-manifest/src/main/java/org/onap/integration/versionmanifest/VersionCheckMojo.java b/version-manifest/src/main/java/org/onap/integration/versionmanifest/VersionCheckMojo.java index d6e5d4ca6..75da50ff0 100644 --- a/version-manifest/src/main/java/org/onap/integration/versionmanifest/VersionCheckMojo.java +++ b/version-manifest/src/main/java/org/onap/integration/versionmanifest/VersionCheckMojo.java @@ -19,7 +19,6 @@ package org.onap.integration.versionmanifest; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.net.MalformedURLException; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.HashMap; @@ -88,9 +87,6 @@ public class VersionCheckMojo extends AbstractMojo { log.debug("Expected version: " + groupId + ":" + artifactId + ":" + version); expectedVersions.put(groupId + ":" + artifactId, version); } - } catch (MalformedURLException e) { - log.error(e); - throw new MojoExecutionException(e.getMessage()); } catch (IOException e) { log.error(e); throw new MojoExecutionException(e.getMessage()); |