From 9dde926417f80d93f4159be8164ed5b3d8790a75 Mon Sep 17 00:00:00 2001 From: Yuli Shlosberg Date: Tue, 12 Sep 2017 14:11:48 +0300 Subject: [PATCH] Build sanity docker execute automation Change-Id: Iab282ea167d12fba4a3f425a5d300397ab435b44 Issue-Id: SDC-315 Signed-off-by: Michael Lando --- onboarding/pom.xml | 2 +- pom.xml | 7 +- sdc-os-chef/pom.xml | 561 +++++++++++---------- sdc-os-chef/scripts/docker_run.sh | 16 +- .../cassandra-actions/attributes/default.rb | 3 +- sdc-os-chef/sdc-sanity/Dockerfile | 7 + .../sdc-sanity/files/default/Files/VNFs/infra.zip | Bin 0 -> 4155 bytes .../sdc-sanity/files/default/Files/VNFs/vbng.zip | Bin 0 -> 3704 bytes .../files/default/Files/VNFs/vbrgemu.zip | Bin 0 -> 3325 bytes .../sdc-sanity/files/default/Files/VNFs/vgmux.zip | Bin 0 -> 3536 bytes .../sdc-sanity/files/default/Files/VNFs/vgw.zip | Bin 0 -> 3469 bytes .../files/default/conf/attsdc-packages.yaml | 12 + .../sdc-sanity/files/default/conf/credentials.yaml | 48 ++ .../sdc-sanity/files/default/conf/log4j.properties | 34 ++ .../sdc-sanity/files/default/startTest.sh | 129 +++++ .../sdc-sanity/recipes/SDC_Simulator_3_logback.rb | 10 + .../recipes/SDC_Simulator_4_locate_keystore.rb | 16 + .../SDC_Simulator_5_create_jetty_modules.rb | 14 + .../recipes/sanityTests_1_cleanup_jettydir.rb | 49 ++ .../recipes/sanityTests_2_setup_configuration.rb | 43 ++ .../recipes/sanityTests_3_sanity_execution.rb | 13 + .../templates/default/BE-titan.properties.erb | 1 + .../sdc-sanity/chef-solo/roles/sanityTests.json | 23 + sdc-os-chef/sdc-sanity/chef-solo/solo.json | 4 +- sdc-os-chef/sdc-sanity/startup.sh | 18 +- .../sdc/ci/tests/api/ComponentBaseTest.java | 74 ++- .../org/openecomp/sdc/ci/tests/sanity/Onboard.java | 4 +- .../sdc/ci/tests/utils/general/FileHandling.java | 2 +- .../ci/tests/utils/general/OnboardingUtils.java | 10 +- .../ci/tests/utils/rest/LifecycleRestUtils.java | 2 +- .../src/main/resources/ci/testSuites/onap.xml | 21 + 31 files changed, 794 insertions(+), 329 deletions(-) create mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/infra.zip create mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vbng.zip create mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vbrgemu.zip create mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vgmux.zip create mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vgw.zip create mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/conf/attsdc-packages.yaml create mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/conf/credentials.yaml create mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/conf/log4j.properties create mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/startTest.sh create mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/SDC_Simulator_3_logback.rb create mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/SDC_Simulator_4_locate_keystore.rb create mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/SDC_Simulator_5_create_jetty_modules.rb create mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_1_cleanup_jettydir.rb create mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_2_setup_configuration.rb create mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_3_sanity_execution.rb create mode 100644 sdc-os-chef/sdc-sanity/chef-solo/roles/sanityTests.json create mode 100644 test-apis-ci/src/main/resources/ci/testSuites/onap.xml diff --git a/onboarding/pom.xml b/onboarding/pom.xml index 0a7f439d7e..b3aa4d6493 100644 --- a/onboarding/pom.xml +++ b/onboarding/pom.xml @@ -35,7 +35,7 @@ 2.1.1 - 1.1.0-SNAPSHOT + ${project.version} 1.1.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 4a9be30637..6aa5c830c5 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,6 @@ 1.2.0-SNAPSHOT pom sdc - @@ -28,10 +27,10 @@ 2.24 2.5 - 1.1.0-SNAPSHOT - 1.1.0-SNAPSHOT + ${project.version} + ${project.version} 1.1.0 - 1.1.0-SNAPSHOT + ${project.version} 2.1.0 diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml index f7e1eaca78..1e24e26d72 100644 --- a/sdc-os-chef/pom.xml +++ b/sdc-os-chef/pom.xml @@ -1,43 +1,45 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 4.0.0 + 4.0.0 - sdc-os-chef + sdc-os-chef - - org.openecomp.sdc - sdc-main + + org.openecomp.sdc + sdc-main 1.2.0-SNAPSHOT - + - - ${project.version}-${maven.build.timestamp} - ${project.version}-latest - + + ${project.version}-${maven.build.timestamp} + ${project.version}-latest + - - - - maven-clean-plugin - 3.0.0 - - - clean.tosca.chef.os.folder - clean - - clean - - - - - ${project.basedir}\sdc-cassandra\chef-repo\cookbooks\cassandra-actions\attributes\ - false - - **/default.rb - - + + + + maven-clean-plugin + 3.0.0 + + + clean.tosca.chef.os.folder + clean + + clean + + + + + + ${project.basedir}\sdc-cassandra\chef-repo\cookbooks\cassandra-actions\attributes\ + + false + + **/default.rb + + ${project.parent.basedir}/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default @@ -48,77 +50,83 @@ logback.xml - - - - - - - ru.yaal.maven - write-text-files-maven-plugin - 1.1 - - UTF-8 - - - ${project.basedir}\sdc-cassandra\chef-repo\cookbooks\cassandra-actions\attributes\default.rb - - normal['version'] = "${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" - - - - - - - write-text-files - prepare-package - - write-text-files - - - - - - + + + + + + + ru.yaal.maven + write-text-files-maven-plugin + 1.1 + + UTF-8 + + + + ${project.basedir}\sdc-cassandra\chef-repo\cookbooks\cassandra-actions\attributes\default.rb + + + normal['version'] = + "${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}" + + + + + + + + write-text-files + prepare-package + + write-text-files + + + + + + - - - docker-staging - - ${project.version}-STAGING-${maven.build.timestamp} - ${project.version}-STAGING-latest - - + + + docker-staging + + ${project.version}-STAGING-${maven.build.timestamp} + ${project.version}-STAGING-latest + + - - docker - - false - - - - - maven-resources-plugin - 3.0.2 - - - copy-resources-apidocs - validate - - copy-resources - - - ${basedir}/sdc-backend - - - ${project.parent.basedir}/openecomp-be/tools/swagger-ui/api-docs - - api-docs.war - - - - - + + docker + + false + + + + + maven-resources-plugin + 3.0.2 + + + copy-resources-apidocs + validate + + copy-resources + + + ${basedir}/sdc-backend + + + + ${project.parent.basedir}/openecomp-be/tools/swagger-ui/api-docs + + + api-docs.war + + + + + copy-static-configuration-files @@ -142,185 +150,224 @@ - - copy-resources-be - validate - - copy-resources - - - ${basedir}/sdc-backend - - - ${project.parent.basedir}/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/target - - onboarding-be-${project.version}.war - - - - - - - copy-resources-fe - validate - - copy-resources - - - ${basedir}/sdc-frontend - - - ${project.parent.basedir}/openecomp-ui/target - - onboarding-fe-${project.version}.war - - - - - - - - + + copy-resources-be + validate + + copy-resources + + + ${basedir}/sdc-backend + + + + ${project.parent.basedir}/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/target + + + onboarding-be-${project.version}.war + + + + + + + copy-resources-fe + validate + + copy-resources + + + ${basedir}/sdc-frontend + + + ${project.parent.basedir}/openecomp-ui/target + + onboarding-fe-${project.version}.war + + + + + + + copy-tests-suites + validate + + copy-resources + + + sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/testSuites + + + ${project.parent.basedir}/test-apis-ci/src/main/resources/ci/testSuites + + * + + + + + + + copy-resources-test-apis-ci + validate + + copy-resources + + + ${basedir}/sdc-sanity + + + ${project.parent.basedir}/test-apis-ci/target + + test-apis-ci-${project.version}-jar-with-dependencies.jar + + + + + + + - - io.fabric8 - docker-maven-plugin - 0.22.1 + + io.fabric8 + docker-maven-plugin + 0.19.1 - - false - 1.23 + + true + 1.23 - + - - - openecomp/sdc-backend - sdc-backend - - try - ${project.basedir}/sdc-backend - - ${docker.tag} - ${docker.latest.tag} - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest - - - + + + openecomp/sdc-backend + sdc-backend + + try + ${project.basedir}/sdc-backend + + ${docker.tag} + ${docker.latest.tag}$sedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest + + + - - - openecomp/sdc-frontend - sdc-frontend - - try - ${project.basedir}/sdc-frontend - - ${docker.tag} - ${docker.latest.tag} - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest - - - + + + openecomp/sdc-frontend + sdc-frontend + + try + ${project.basedir}/sdc-frontend + + ${docker.tag} + ${docker.latest.tag} + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest + + + - - - openecomp/sdc-elasticsearch - sdc-elasticsearch - - try - ${project.basedir}/sdc-elasticsearch - - ${docker.tag} - ${docker.latest.tag} - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest - - - + + + openecomp/sdc-elasticsearch + sdc-elasticsearch + + try + ${project.basedir}/sdc-elasticsearch + + ${docker.tag} + ${docker.latest.tag} + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest + + + - - - openecomp/sdc-kibana - sdc-kibana - - try - ${project.basedir}/sdc-kibana - - ${docker.tag} - ${docker.latest.tag} - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest - - - + + + openecomp/sdc-kibana + sdc-kibana + + try + ${project.basedir}/sdc-kibana + + ${docker.tag} + ${docker.latest.tag} + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest + + + - - - openecomp/sdc-cassandra - sdc-cassandra - - try - ${project.basedir}/sdc-cassandra - - ${docker.tag} - ${docker.latest.tag} - ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest - - - + + + openecomp/sdc-cassandra + sdc-cassandra + + try + ${project.basedir}/sdc-cassandra + + ${docker.tag} + ${docker.latest.tag} + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest + + + - - + + + openecomp/sdc-sanity + sdc-sanity + + try + ${project.basedir}/sdc-sanity + + ${docker.tag} + ${docker.latest.tag} + 1.1-STAGING-latest + + + - - - - + + + + clean-images pre-clean - remove + remove - true + true + openecomp/sdc-backend,openecomp/sdc-frontend,openecomp/sdc-elasticsearch,openecomp/sdc-kibana,openecomp/sdc-sanity - + - - generate-images - package - - build - - + + generate-images + package + + build + + - + push-images deploy - build - push + build + push - openecomp/sdc-backend,openecomp/sdc-frontend,openecomp/sdc-elasticsearch,openecomp/sdc-kibana,openecomp/sdc-cassandra + + openecomp/sdc-backend,openecomp/sdc-frontend,openecomp/sdc-elasticsearch,openecomp/sdc-kibana,openecomp/sdc-sanity - - - - - - - + + + + + + + diff --git a/sdc-os-chef/scripts/docker_run.sh b/sdc-os-chef/scripts/docker_run.sh index c79dad2d56..d645f94b93 100755 --- a/sdc-os-chef/scripts/docker_run.sh +++ b/sdc-os-chef/scripts/docker_run.sh @@ -2,7 +2,7 @@ function usage { - echo "usage: docker_run.sh [ -r|--release ] [ -e|--environment ] [ -p|--port ] [ -l|--local ] [ -h|--help ]" + echo "usage: docker_run.sh [ -r|--release ] [ -e|--environment ] [ -p|--port ] [ -l|--local ] [ -s|--skipTests ] [ -h|--help ]" } @@ -25,6 +25,7 @@ function dir_perms { RELEASE=latest LOCAL=false +SKIPTESTS=false [ -f /opt/config/env_name.txt ] && DEP_ENV=$(cat /opt/config/env_name.txt) || DEP_ENV=__ENV-NAME__ [ -f /opt/config/nexus_username.txt ] && NEXUS_USERNAME=$(cat /opt/config/nexus_username.txt) || NEXUS_USERNAME=release [ -f /opt/config/nexus_password.txt ] && NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt) || NEXUS_PASSWD=sfWU3DFVdBr7GVxB85mTYgAW @@ -48,6 +49,10 @@ while [ "$1" != "" ]; do shift LOCAL=true ;; + -s | --skipTests ) + shift + SKIPTESTS=true + ;; -h | --help ) usage exit @@ -157,3 +162,12 @@ if [ $? -ne 0 ]; then exit 1 fi +# sanityDocker +echo "docker run sdc-frontend..." +if [ ${SKIPTESTS} = false ]; then +echo "Triger sanity docker, please wait..." + if [ ${LOCAL} = false ]; then + docker pull ${PREFIX}/sdc-sanity:${RELEASE} + fi + docker run --detach --name sdc-sanity --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env http_proxy=${http_proxy} --env https_proxy=${https_proxy} --env no_proxy=${no_proxy} --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --memory 512m --memory-swap=512m --ulimit nofile=4096:100000 --volume /etc/localtime:/etc/localtime:ro --volume /data/logs/sdc-sanity/target:/var/lib/tests/target --volume /data/logs/sdc-sanity/ExtentReport:/var/lib/tests/ExtentReport --volume /data/environments:/root/chef-solo/environments --publish 9560:9560 ${PREFIX}/sdc-sanity:${RELEASE} +fi diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb index c7f408f294..dac5853353 100644 --- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb +++ b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb @@ -1 +1,2 @@ -normal['version'] = "1.1.0" +normal['version'] = + "1.1.0" diff --git a/sdc-os-chef/sdc-sanity/Dockerfile b/sdc-os-chef/sdc-sanity/Dockerfile index ea137b401b..38bf26641e 100644 --- a/sdc-os-chef/sdc-sanity/Dockerfile +++ b/sdc-os-chef/sdc-sanity/Dockerfile @@ -4,6 +4,13 @@ COPY chef-solo /root/chef-solo/ COPY chef-repo/cookbooks/. /root/chef-solo/cookbooks/ + +ENV TESTS_BASE /var/lib/tests +RUN mkdir -p "$TESTS_BASE" +WORKDIR $TESTS_BASE + +ADD test-apis-ci-*.jar ${TESTS_BASE}/ + COPY startup.sh /root/ RUN chmod 770 /root/startup.sh diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/infra.zip b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/infra.zip new file mode 100644 index 0000000000000000000000000000000000000000..09eb9cd648d822b811806fa6c05ea3a84bc8a729 GIT binary patch literal 4155 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 B4`BcR literal 0 HcmV?d00001 diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vgmux.zip b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vgmux.zip new file mode 100644 index 0000000000000000000000000000000000000000..56de952150aa828a990854cdbc61e47f3e5d4eca GIT binary patch literal 3536 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 literal 0 HcmV?d00001 diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vgw.zip b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vgw.zip new file mode 100644 index 0000000000000000000000000000000000000000..7a14718c2c68f3bdcf708caf6253bfe45669858b GIT binary patch literal 3469 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 Fe*vNlR>%MV literal 0 HcmV?d00001 diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/conf/attsdc-packages.yaml b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/conf/attsdc-packages.yaml new file mode 100644 index 0000000000..5d1a3e1537 --- /dev/null +++ b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/conf/attsdc-packages.yaml @@ -0,0 +1,12 @@ +packages: + - org.openecomp.sdc.ci.tests.execute.general + - org.openecomp.sdc.ci.tests.execute.user + - org.openecomp.sdc.ci.tests.execute.property + - org.openecomp.sdc.ci.tests.execute.lifecycle + - org.openecomp.sdc.ci.tests.execute.resource + - org.openecomp.sdc.ci.tests.execute.service + - org.openecomp.sdc.ci.tests.execute.artifacts + - org.openecomp.sdc.ci.tests.execute.imports + - org.openecomp.sdc.ci.tests.execute.category + - org.openecomp.sdc.ci.tests.execute.distribution + - org.openecomp.sdc.ci.tests.execute.product \ No newline at end of file diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/conf/credentials.yaml b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/conf/credentials.yaml new file mode 100644 index 0000000000..ab37f7bee8 --- /dev/null +++ b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/conf/credentials.yaml @@ -0,0 +1,48 @@ + designer: { + username: cs0008, + password: 123123a, + firstname: ASDC, + lastname: KASPIN + } + admin: { + username: jh0003, + password: 123123a, + firstname: ASDC, + lastname: KASPIN + } + ops: { + username: af0006, + password: 123123a, + firstname: ASDC, + lastname: KASPIN + } + tester: { + username: kb0004, + password: 123123a, + firstname: ASDC, + lastname: KASPIN + } + governor: { + username: ah0002, + password: 123123a, + firstname: ASDC, + lastname: KASPIN + } + product_strategist: { + username: m99126, + password: 1910-FruitGum, + firstname: ASDC, + lastname: KASPIN + } + product_manager: { + username: m99127, + password: 747-Airplane, + firstname: ASDC, + lastname: KASPIN + } + product_local: { + username: pm0001, + password: 123123a, + firstname: ASDC, + lastname: KASPIN + } \ No newline at end of file diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/conf/log4j.properties b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/conf/log4j.properties new file mode 100644 index 0000000000..d313e92b55 --- /dev/null +++ b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/conf/log4j.properties @@ -0,0 +1,34 @@ +# Define the root logger with appender file +log4j.rootLogger = INFO, FILE, stdout + +# Define the file appender +log4j.appender.FILE=org.apache.log4j.RollingFileAppender +log4j.appender.FILE.File=${targetlog}logs/ci-log.out + +# Define the layout for file appender +log4j.appender.FILE.layout=org.apache.log4j.PatternLayout +log4j.appender.FILE.layout.conversionPattern=%d{yyyy-MM-dd HH:mm:ss} %5p [%10c] : %m%n + +# Set the maximum file size before rollover +log4j.appender.FILE.maxFileSize=5MB + +# Set the the backup index +log4j.appender.FILE.maxBackupIndex=10 + + +############################################################# + +# Direct log messages to stdout +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.Target=System.out +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +#log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n +log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %5p %10c:%L - %m%n + +log4j.logger.org.apache.cassandra.service.StorageProxy=INFO +log4j.logger.com.thinkaurelius.titan.diskstorage.cassandra.CassandraTransaction=INFO, FILE, stdout + +log4j.logger.org.openecomp.sdc.ci.tests.utils=INFO, FILE, stdout +log4j.additivity.org.openecomp.sdc.ci.tests.utils=false + + diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/startTest.sh b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/startTest.sh new file mode 100644 index 0000000000..933f9af6e4 --- /dev/null +++ b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/startTest.sh @@ -0,0 +1,129 @@ +#!/bin/bash +REMOTE_DEBUG=false +RERUN=false +JAVA_OPTION="" +debug_port=8000 +TEST_SUITES=testSuites +fileName=testng-failed.xml + +function help_usage () +{ + echo + echo "$0 ( ) [-r/rerun -d/debug ]" + echo "nohup ./startTest.sh ui-ci-1707.0.5-SNAPSHOT-jar-with-dependencies.jar extendedSanity.xml -r false -d true &" + echo "by default rerun is true and remote debug is false." + echo + exit 2 +} + +function isBoolean () +{ + PARAM_NAME=$1 + VALUE=$2 + if [[ ${VALUE} != "true" ]] && [[ ${VALUE} != "false" ]]; then + echo "Valid parameter" ${PARAM_NAME} "values are: true/false" + help_usage + fi +} + +function prepareFailedXmlFile () +{ + echo "1="$1 "2="$2 "fileName="${fileName} + PATTERN=`grep -w "test name=" ${FULL_PATH}/${TEST_SUITES}/$2 | awk -F'"' '{print $2}'` + sed '/ ${FULL_PATH}/${TEST_SUITES}/${fileName} + sed -i 's/thread-count="[0-9]\+"/thread-count="1"/g' ${FULL_PATH}/${TEST_SUITES}/${fileName} +} + +#main +[ $# -lt 2 ] && help_usage + +JAR_FILE=$1 +SUITE_FILE=$2 + +while [ $# -ne 0 ]; do + case $1 in + -r|rerun) + RERUN=$2 + isBoolean $1 ${RERUN} + shift 1 + shift 1 + ;; + -d|debug) + REMOTE_DEBUG=$2 + isBoolean $1 ${REMOTE_DEBUG} + shift 1 + shift 1 + ;; + *) + shift 1 + ;; + esac +done + +CURRENT_DIR=`pwd` +BASEDIR=$(dirname $0) + +if [ ${BASEDIR:0:1} = "/" ] +then + FULL_PATH=$BASEDIR +else + FULL_PATH=$CURRENT_DIR/$BASEDIR +fi +LOGS_PROP_FILE=file:${FULL_PATH}/conf/log4j.properties +############################################# +TARGET_DIR=${FULL_PATH}/target +CONF_FILE=${FULL_PATH}/conf/sdc.yaml + +DEBUG=true +MainClass=org.openecomp.sdc.ci.tests.run.StartTest + +TESTS_DIR=/opt/app/sdc/ci/resources/tests +COMPONENTS_DIR=/opt/app/sdc/ci/resources/components + + +TARGET_LOG_DIR="${TARGET_DIR}/" + +######ADD USERS################ + +BE_IP=`cat conf/attsdc.yaml | grep catalogBeHost| awk '{print $2}'` + + +if [ ${REMOTE_DEBUG} == "true" ]; then + echo "Debug mode, Listen on port $debug_port"; + JAVA_OPTION="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=${debug_port}" ; +fi + +cmd="java $JAVA_OPTION -DdisplayException=true -Dtargetlog=${TARGET_LOG_DIR} -Dfilepath=${FILES_TEST} -Dconfig.resource=${CONF_FILE} -Ddebug=${DEBUG} -Dlog4j.configuration=${LOGS_PROP_FILE} -cp $JAR_FILE ${MainClass} $SUITE_FILE &" + + +if [ $DEBUG == "true" ] +then + $cmd +else + $cmd >> /dev/null +fi + +if [ ${RERUN} == "true" ]; then + if [ -f ${TARGET_DIR}/${fileName} ]; then + echo "Prepare" ${TARGET_DIR}/${fileName} "file to rerun all failed tests ..."; + prepareFailedXmlFile ${TARGET_DIR}/${fileName} $SUITE_FILE; + SUITE_FILE=${fileName}; + cmd="java $JAVA_OPTION -DdisplayException=true -Dtargetlog=${TARGET_LOG_DIR} -Dfilepath=${FILES_TEST} -Dconfig.resource=${CONF_FILE} -Ddebug=${DEBUG} -Dlog4j.configuration=${LOGS_PROP_FILE} -cp $JAR_FILE ${MainClass} $SUITE_FILE &" + $cmd; + fi +fi + +status=`echo $?` + +source ExtentReport/versions.info +now=$(date +'%Y-%m-%d_%H_%M') +REPORT_NAME=${now} +VERSION=${osVersion} + + + +echo "##################################################" +echo "################# status is ${status} #################" +echo "##################################################" + +exit $status \ No newline at end of file diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/SDC_Simulator_3_logback.rb b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/SDC_Simulator_3_logback.rb new file mode 100644 index 0000000000..0d9282b28a --- /dev/null +++ b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/SDC_Simulator_3_logback.rb @@ -0,0 +1,10 @@ +jetty_base="/var/lib/jetty" + + +cookbook_file "logback.xml" do + path "#{jetty_base}/config/sdc-simulator/logback.xml" + source "logback.xml" + owner "jetty" + group "jetty" + mode "0755" +end \ No newline at end of file diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/SDC_Simulator_4_locate_keystore.rb b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/SDC_Simulator_4_locate_keystore.rb new file mode 100644 index 0000000000..3bb482d89a --- /dev/null +++ b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/SDC_Simulator_4_locate_keystore.rb @@ -0,0 +1,16 @@ +jetty_base="/var/lib/jetty" + +directory "Jetty_etcdir_creation" do + path "/#{jetty_base}/etc" + owner 'jetty' + group 'jetty' + mode '0755' + action :create +end + +cookbook_file "/#{jetty_base}/etc/keystore" do + source "keystore" + owner "jetty" + group "jetty" + mode 0755 +end \ No newline at end of file diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/SDC_Simulator_5_create_jetty_modules.rb b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/SDC_Simulator_5_create_jetty_modules.rb new file mode 100644 index 0000000000..38b87fa65d --- /dev/null +++ b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/SDC_Simulator_5_create_jetty_modules.rb @@ -0,0 +1,14 @@ +jetty_base="/var/lib/jetty" +jetty_home="/usr/local/jetty" + +###### create Jetty modules +bash "create-jetty-modules" do +cwd "#{jetty_base}" +code <<-EOH + cd "#{jetty_base}" + java -jar "/#{jetty_home}"/start.jar --add-to-start=deploy + java -jar "/#{jetty_home}"/start.jar --add-to-startd=http,https,logging,setuid +EOH +not_if "ls /#{jetty_base}/start.d/https.ini" +end + diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_1_cleanup_jettydir.rb b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_1_cleanup_jettydir.rb new file mode 100644 index 0000000000..112cc4c2e7 --- /dev/null +++ b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_1_cleanup_jettydir.rb @@ -0,0 +1,49 @@ +tests_base="/var/lib/tests" + + remote_directory '/var/lib/tests/testSuites' do + source 'testSuites' + owner 'root' + group 'root' + mode '0755' + action :create + end + + remote_directory '/var/lib/tests/Files' do + source 'Files' + owner 'root' + group 'root' + mode '0755' + action :create + end + + remote_directory '/var/lib/tests/conf' do + source 'conf' + owner 'root' + group 'root' + mode '0755' + action :create + end + + directory "create_target_dir" do + path "/var/lib/tests/target" + owner 'root' + group 'root' + mode '0755' + action :create + end + + directory "create_ExtentReport_dir" do + path "/var/lib/tests/ExtentReport" + owner 'root' + group 'root' + mode '0755' + action :create + end + + cookbook_file '/var/lib/tests/startTest.sh' do + source 'startTest.sh' + owner 'root' + group 'root' + mode '0755' + action :create + end \ No newline at end of file diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_2_setup_configuration.rb b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_2_setup_configuration.rb new file mode 100644 index 0000000000..cf6875746e --- /dev/null +++ b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_2_setup_configuration.rb @@ -0,0 +1,43 @@ +tests_base="/var/lib/tests" + +template "sdc-yaml-config" do + path "#{tests_base}/conf/sdc.yaml" + source "sdc-sanity.yaml.erb" + owner "root" + group "root" + mode "0755" + variables ({ + :target_path => "#{tests_base}/target", + :catalogBE_ip => node['Nodes']['BE'], + :catalogBE_port => node['BE'][:http_port], + :webportal_ip => node['Nodes']['FE'], + :webportal_port => node['FE'][:http_port], + :titan_file => "#{tests_base}/conf/titan.properties", + :tests_base_ci => "#{tests_base}/CI/tests", + :components_path => "#{tests_base}/CI/components", + :importResourceConfigDir => "#{tests_base}/CI/importResource", + :importTypesDir => "#{tests_base}/CI/importTypesTest", + :importResourceTestsConfigDir => "#{tests_base}/CI/importResourceTests", + :ConfigurationFile => "#{tests_base}/conf/configuration.yaml", + :errorConfigurationFile => "#{tests_base}/conf/error-configuration.yaml", + :CASSANDRA_IP => node['Nodes']['CS'], + :CASSANDRA_PWD => node['cassandra'][:cassandra_password], + :CASSANDRA_USR => node['cassandra'][:cassandra_user] + }) +end + +replication_factor=1 +template "titan.properties" do + path "/#{tests_base}/conf/titan.properties" + source "BE-titan.properties.erb" + owner "root" + group "root" + mode "0755" + variables({ + :CASSANDRA_IP => node['Nodes']['CS'], + :CASSANDRA_PWD => node['cassandra'][:cassandra_password], + :CASSANDRA_USR => node['cassandra'][:cassandra_user], + :rep_factor => replication_factor, + :DC_NAME => node['cassandra'][:cluster_name]+node.chef_environment + }) +end \ No newline at end of file diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_3_sanity_execution.rb b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_3_sanity_execution.rb new file mode 100644 index 0000000000..6f10a33dd6 --- /dev/null +++ b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/sanityTests_3_sanity_execution.rb @@ -0,0 +1,13 @@ +tests_base="/var/lib/tests" +ci_test_suite="onap.xml" + +bash "run asdc ci sanity tests" do +cwd "#{tests_base}" +code <<-EOH + cd "#{tests_base}" + jar_file=`ls test-apis*-jar-with-dependencies.jar` + ./startTest.sh $jar_file #{ci_test_suite} + echo "return code from startTest.sh = [$?]" +EOH +timeout 72000 +end \ No newline at end of file diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/templates/default/BE-titan.properties.erb b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/templates/default/BE-titan.properties.erb index 27386d47ef..a42c7bf206 100644 --- a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/templates/default/BE-titan.properties.erb +++ b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/templates/default/BE-titan.properties.erb @@ -4,6 +4,7 @@ storage.port=9160 storage.username=<%= @CASSANDRA_USR %> storage.password=<%= @CASSANDRA_PWD %> storage.connection-timeout=10000 +storage.cassandra.keyspace=sdctitan storage.cassandra.ssl.enabled=false storage.cassandra.ssl.truststore.location=/var/lib/jetty/config/.truststore diff --git a/sdc-os-chef/sdc-sanity/chef-solo/roles/sanityTests.json b/sdc-os-chef/sdc-sanity/chef-solo/roles/sanityTests.json new file mode 100644 index 0000000000..74f12c7cc6 --- /dev/null +++ b/sdc-os-chef/sdc-sanity/chef-solo/roles/sanityTests.json @@ -0,0 +1,23 @@ +{ + "name": "sanityTests", + "description": "Execute sanity tests", + "json_class": "Chef::Role", + "default_attributes": { + + }, + "override_attributes": { + + }, + "chef_type": "role", + "run_list": [ + "recipe[sdc-sanity::sanityTests_1_cleanup_jettydir]", + "recipe[sdc-sanity::sanityTests_2_setup_configuration]", + "recipe[sdc-sanity::sanityTests_3_sanity_execution]" +// "recipe[sdc-simulator::SDC_Simulator_3_logback]", +// "recipe[sdc-simulator::SDC_Simulator_4_locate_keystore]", +// "recipe[sdc-simulator::SDC_Simulator_5_create_jetty_modules]" + ], + "env_run_lists": { + } +} + diff --git a/sdc-os-chef/sdc-sanity/chef-solo/solo.json b/sdc-os-chef/sdc-sanity/chef-solo/solo.json index 5bd228127d..6487d4cc4e 100644 --- a/sdc-os-chef/sdc-sanity/chef-solo/solo.json +++ b/sdc-os-chef/sdc-sanity/chef-solo/solo.json @@ -1,4 +1,6 @@ { - "run_list": [ "recipe[sdc-sanity::setup_sanity]" ] + "run_list": [ + "role[sanityTests]" + ] } diff --git a/sdc-os-chef/sdc-sanity/startup.sh b/sdc-os-chef/sdc-sanity/startup.sh index 374a0e8c34..d4316c383f 100644 --- a/sdc-os-chef/sdc-sanity/startup.sh +++ b/sdc-os-chef/sdc-sanity/startup.sh @@ -6,13 +6,15 @@ chef-solo -c solo.rb -E ${CHEFNAME} rc=$? -if [[ $rc != 0 ]]; then - echo "Sanity failed !!!" - exit $rc -else - echo "completed successfully :-)" - exit 0 -fi +#if [[ $rc != 0 ]]; then +# echo "Sanity failed !!!" +# exit $rc +#else +# echo "completed successfully :-)" +# exit 0 +#fi -#/docker-entrypoint.sh +while true; do sleep 2; done + +##/docker-entrypoint.sh diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java index cfd132d5d0..ad1e8dd37d 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/api/ComponentBaseTest.java @@ -20,20 +20,13 @@ package org.openecomp.sdc.ci.tests.api; -import static org.testng.AssertJUnit.assertEquals; -import static org.testng.AssertJUnit.assertNotNull; - -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.function.Consumer; -import java.util.stream.Collectors; - +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.LoggerContext; +import com.aventstack.extentreports.ExtentTest; +import com.aventstack.extentreports.Status; +import com.thinkaurelius.titan.core.TitanFactory; +import com.thinkaurelius.titan.core.TitanGraph; +import com.thinkaurelius.titan.core.TitanVertex; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.ImmutableTriple; @@ -46,11 +39,7 @@ import org.openecomp.sdc.be.dao.neo4j.GraphPropertiesDictionary; import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum; import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum; import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum; -import org.openecomp.sdc.be.model.Component; -import org.openecomp.sdc.be.model.Product; -import org.openecomp.sdc.be.model.Resource; -import org.openecomp.sdc.be.model.Service; -import org.openecomp.sdc.be.model.User; +import org.openecomp.sdc.be.model.*; import org.openecomp.sdc.ci.tests.config.Config; import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails; import org.openecomp.sdc.ci.tests.datatypes.enums.UserRoleEnum; @@ -59,26 +48,21 @@ import org.openecomp.sdc.ci.tests.utils.Utils; import org.openecomp.sdc.ci.tests.utils.cassandra.CassandraUtils; import org.openecomp.sdc.ci.tests.utils.general.AtomicOperationUtils; import org.openecomp.sdc.ci.tests.utils.general.ElementFactory; -import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils; -import org.openecomp.sdc.ci.tests.utils.rest.CatalogRestUtils; -import org.openecomp.sdc.ci.tests.utils.rest.CategoryRestUtils; -import org.openecomp.sdc.ci.tests.utils.rest.ProductRestUtils; -import org.openecomp.sdc.ci.tests.utils.rest.ResourceRestUtils; -import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser; -import org.openecomp.sdc.ci.tests.utils.rest.ServiceRestUtils; +import org.openecomp.sdc.ci.tests.utils.rest.*; import org.slf4j.LoggerFactory; import org.testng.ITestContext; import org.testng.ITestResult; import org.testng.annotations.*; -import com.aventstack.extentreports.ExtentTest; -import com.aventstack.extentreports.Status; -import com.thinkaurelius.titan.core.TitanFactory; -import com.thinkaurelius.titan.core.TitanGraph; -import com.thinkaurelius.titan.core.TitanVertex; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.*; +import java.util.function.Consumer; +import java.util.stream.Collectors; -import ch.qos.logback.classic.Level; -import ch.qos.logback.classic.LoggerContext; +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertNotNull; public abstract class ComponentBaseTest { @@ -138,18 +122,22 @@ public abstract class ComponentBaseTest { @BeforeMethod(alwaysRun = true) public void setBrowserBeforeTest(java.lang.reflect.Method method, ITestContext context) throws Exception { - - boolean emptyDataProvider = method.getAnnotation(Test.class).dataProvider().isEmpty(); - String className = method.getDeclaringClass().getName(); - if (emptyDataProvider && !className.contains("ToscaValidationTest") ) { - System.out.println("ExtentReport instance started from BeforeMethod..."); - String suiteName = ExtentManager.getSuiteName(context); + + String suiteName = ExtentManager.getSuiteName(context); ExtentTestManager.startTest(method.getName()); ExtentTestManager.assignCategory(this.getClass()); - - } else { - System.out.println("ExtentReport instance started from Test..."); - } + +// boolean emptyDataProvider = method.getAnnotation(Test.class).dataProvider().isEmpty(); +// String className = method.getDeclaringClass().getName(); +// if (emptyDataProvider) { +// System.out.println("ExtentReport instance started from BeforeMethod..."); +// String suiteName = ExtentManager.getSuiteName(context); +// ExtentTestManager.startTest(method.getName()); +// ExtentTestManager.assignCategory(this.getClass()); +// +// } else { +// System.out.println("ExtentReport instance started from Test..."); +// } } diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/sanity/Onboard.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/sanity/Onboard.java index 2b341f5cbf..ec83b05be9 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/sanity/Onboard.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/sanity/Onboard.java @@ -115,8 +115,8 @@ public class Onboard extends ComponentBaseTest { ExtentTestActions.log(Status.INFO, String.format("Certify Service")); service = (Service) AtomicOperationUtils.changeComponentState(service, UserRoleEnum.DESIGNER, LifeCycleStatesEnum.CERTIFY, true).getLeft(); - ExtentTestActions.log(Status.INFO, String.format("Distribute Service")); - AtomicOperationUtils.distributeService(service, true); +// ExtentTestActions.log(Status.INFO, String.format("Distribute Service")); +// AtomicOperationUtils.distributeService(service, true); ExtentTestActions.log(Status.INFO, String.format("The onboarding %s test is passed ! ", vnfFile)); } diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/FileHandling.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/FileHandling.java index 77be6df729..b82e6a0f52 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/FileHandling.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/FileHandling.java @@ -284,7 +284,7 @@ public class FileHandling { public static void deleteDirectory(String directoryPath) { File dir = new File(directoryPath); try { - FileUtils.deleteDirectory(dir); + FileUtils.cleanDirectory(dir); } catch (IOException e) { System.out.println("Failed to delete " + dir); ComponentBaseTest.getExtendTest().log(Status.INFO, "Failed to delete " + dir); diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/OnboardingUtils.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/OnboardingUtils.java index a1838b66d1..f6d3e58339 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/OnboardingUtils.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/OnboardingUtils.java @@ -39,24 +39,16 @@ import org.openecomp.sdc.be.model.User; import org.openecomp.sdc.ci.tests.api.ComponentBaseTest; import org.openecomp.sdc.ci.tests.api.ExtentTestActions; import org.openecomp.sdc.ci.tests.config.Config; - import org.openecomp.sdc.ci.tests.datatypes.AmdocsLicenseMembers; -import org.openecomp.sdc.ci.tests.datatypes.HeatMetaFirstLevelDefinition; - import org.openecomp.sdc.ci.tests.datatypes.http.HttpHeaderEnum; import org.openecomp.sdc.ci.tests.datatypes.http.HttpRequest; import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse; -import org.openecomp.sdc.ci.tests.execute.devCI.ArtifactFromCsar; - import org.openecomp.sdc.ci.tests.utils.Utils; import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser; -import org.testng.Assert; - import java.io.*; import java.nio.file.FileSystems; import java.util.*; -import java.util.stream.Collectors; import static org.testng.AssertJUnit.assertEquals; @@ -493,7 +485,7 @@ public class OnboardingUtils { jObject.put("description", "new VSP description"); jObject.put("category", "resourceNewCategory.generic"); jObject.put("subCategory", "resourceNewCategory.generic.database"); - jObject.put("onboardingMethod", "HEAT"); + jObject.put("onboardingMethod", "NetworkPackage"); jObject.put("licensingVersion", jlicensingVersionObj); jObject.put("vendorName", amdocsLicenseMembers.getVendorLicenseName()); jObject.put("vendorId", amdocsLicenseMembers.getVendorId()); diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/LifecycleRestUtils.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/LifecycleRestUtils.java index 22a352cbfe..39afff9022 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/LifecycleRestUtils.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/rest/LifecycleRestUtils.java @@ -372,7 +372,7 @@ public class LifecycleRestUtils extends BaseRestUtils { String userRemarks, DistributionStatusEnum reqDistributionStatus) throws Exception { String uniqueId = serviceDetails.getUniqueId(); Config config = Utils.getConfig(); - String environmentName = "PROD-Andreys-Only"; + String environmentName = "AUTO"; // String environmentName = ConfigurationManager.getConfigurationManager().getDistributionEngineConfiguration().getEnvironments().get(0); DistributionStatusEnum distributionStatusEnum = DistributionStatusEnum.findState(reqDistributionStatus.getValue()); switch(distributionStatusEnum){ diff --git a/test-apis-ci/src/main/resources/ci/testSuites/onap.xml b/test-apis-ci/src/main/resources/ci/testSuites/onap.xml new file mode 100644 index 0000000000..c075f10b11 --- /dev/null +++ b/test-apis-ci/src/main/resources/ci/testSuites/onap.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + \ No newline at end of file -- 2.16.6