From d55b10fd9b98f0b4b53c9cff8b1a6539ca573d6a Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Wed, 18 Oct 2017 19:42:17 +0300 Subject: [PATCH] Sanity docker build Sanity docker build & vLB + vCSCF_aligned VNF addition Change-Id: I518c4013d2da033d9bc4c98900d9c347b6056e2b Issue-ID: SDC-478 Signed-off-by: Tal Gitelman --- .gitignore | 2 + .../sdc/asdctool/main/SdcSchemaFileImport.java | 3 -- .../be/components/impl/AttributeBusinessLogic.java | 8 ++-- .../be/components/impl/PropertyBusinessLogic.java | 8 ++-- sdc-os-chef/pom.xml | 16 +++++++- sdc-os-chef/scripts/docker_run.sh | 2 +- .../files/default/Files/VNFs/base_vlb.zip | Bin 5621 -> 0 bytes .../files/default/Files/VNFs/vCSCF_aligned.csar | Bin 0 -> 6511 bytes .../sdc-sanity/files/default/Files/VNFs/vLB.zip | Bin 0 -> 6789 bytes .../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 ------- ...Providers.java => OnboardingDataProviders.java} | 2 +- .../org/openecomp/sdc/ci/tests/sanity/Onboard.java | 4 +- .../sdc/ci/tests/utils/general/FileHandling.java | 44 ++++++++++++++------- 15 files changed, 57 insertions(+), 72 deletions(-) delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vlb.zip create mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vCSCF_aligned.csar create mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vLB.zip delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/SDC_Simulator_3_logback.rb delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/SDC_Simulator_4_locate_keystore.rb delete mode 100644 sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/recipes/SDC_Simulator_5_create_jetty_modules.rb rename test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/dataProviders/{OnbordingDataProviders.java => OnboardingDataProviders.java} (98%) diff --git a/.gitignore b/.gitignore index 639faecf3c..305018a168 100644 --- a/.gitignore +++ b/.gitignore @@ -170,3 +170,5 @@ sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/testSuites/* /sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/tools/* /sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/attributes/default.rb + +/catalog-be/.pydevproject diff --git a/asdctool/src/main/java/org/openecomp/sdc/asdctool/main/SdcSchemaFileImport.java b/asdctool/src/main/java/org/openecomp/sdc/asdctool/main/SdcSchemaFileImport.java index 394683bbc5..0e545f2afd 100644 --- a/asdctool/src/main/java/org/openecomp/sdc/asdctool/main/SdcSchemaFileImport.java +++ b/asdctool/src/main/java/org/openecomp/sdc/asdctool/main/SdcSchemaFileImport.java @@ -22,13 +22,10 @@ package org.openecomp.sdc.asdctool.main; import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.FileFilter; import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; -import java.nio.file.FileSystem; import java.nio.file.FileSystems; import java.nio.file.Files; import java.nio.file.Paths; diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/AttributeBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/AttributeBusinessLogic.java index 4fd4610ef9..5b8a10a03e 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/AttributeBusinessLogic.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/AttributeBusinessLogic.java @@ -83,7 +83,7 @@ public class AttributeBusinessLogic extends BaseBusinessLogic { // Get the resource from DB Either status = toscaOperationFacade.getToscaElement(resourceId); if (status.isRight()) { - return Either.right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_NOT_FOUND, "")); + return Either.right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_NOT_FOUND, resourceId)); } Resource resource = status.left().value(); @@ -151,7 +151,7 @@ public class AttributeBusinessLogic extends BaseBusinessLogic { // Get the resource from DB Either status = toscaOperationFacade.getToscaElement(resourceId); if (status.isRight()) { - return Either.right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_NOT_FOUND, "")); + return Either.right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_NOT_FOUND, resourceId)); } Resource resource = status.left().value(); @@ -195,7 +195,7 @@ public class AttributeBusinessLogic extends BaseBusinessLogic { // Get the resource from DB Either eitherResource = toscaOperationFacade.getToscaElement(resourceId); if (eitherResource.isRight()) { - return Either.right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_NOT_FOUND, "")); + return Either.right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_NOT_FOUND, resourceId)); } Resource resource = eitherResource.left().value(); @@ -273,7 +273,7 @@ public class AttributeBusinessLogic extends BaseBusinessLogic { // Get the resource from DB Either eitherResource = toscaOperationFacade.getToscaElement(resourceId); if (eitherResource.isRight()) { - return Either.right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_NOT_FOUND, "")); + return Either.right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_NOT_FOUND, resourceId)); } Resource resource = eitherResource.left().value(); diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PropertyBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PropertyBusinessLogic.java index 833e6c0b9e..e16b34f389 100644 --- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PropertyBusinessLogic.java +++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/PropertyBusinessLogic.java @@ -121,7 +121,7 @@ public class PropertyBusinessLogic extends BaseBusinessLogic { // Get the resource from DB Either status = toscaOperationFacade.getToscaElement(resourceId); if (status.isRight()) { - result = Either.right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_NOT_FOUND, "")); + result = Either.right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_NOT_FOUND, resourceId)); return result; } Resource resource = status.left().value(); @@ -219,7 +219,7 @@ public class PropertyBusinessLogic extends BaseBusinessLogic { // Get the resource from DB Either status = toscaOperationFacade.getToscaElement(resourceId); if (status.isRight()) { - return Either.right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_NOT_FOUND, "")); + return Either.right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_NOT_FOUND, resourceId)); } Resource resource = status.left().value(); @@ -271,7 +271,7 @@ public class PropertyBusinessLogic extends BaseBusinessLogic { // Get the resource from DB Either getResourceRes = toscaOperationFacade.getToscaElement(resourceId); if (getResourceRes.isRight()) { - result = Either.right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_NOT_FOUND, "")); + result = Either.right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_NOT_FOUND, resourceId)); return result; } Resource resource = getResourceRes.left().value(); @@ -321,7 +321,7 @@ public class PropertyBusinessLogic extends BaseBusinessLogic { Either status = toscaOperationFacade.getToscaElement(resourceId); if (status.isRight()) { - return Either.right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_NOT_FOUND, "")); + return Either.right(componentsUtils.getResponseFormat(ActionStatus.RESOURCE_NOT_FOUND, resourceId)); } Resource resource = status.left().value(); diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml index eb01a97916..5416939dac 100644 --- a/sdc-os-chef/pom.xml +++ b/sdc-os-chef/pom.xml @@ -78,7 +78,19 @@ ${project.basedir}/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/files/default/tools false - + + + ${project.basedir}/sdc-sanity + false + + *.jar + + + + + ${project.basedir}/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/testSuites + false + @@ -410,7 +422,7 @@ ${docker.tag} ${docker.latest.tag} - 1.1-STAGING-latest + ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest diff --git a/sdc-os-chef/scripts/docker_run.sh b/sdc-os-chef/scripts/docker_run.sh index 63f89d1f96..20cde17f57 100755 --- a/sdc-os-chef/scripts/docker_run.sh +++ b/sdc-os-chef/scripts/docker_run.sh @@ -212,5 +212,5 @@ 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} + 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 1g --memory-swap=1g --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 \ No newline at end of file diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vlb.zip b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/base_vlb.zip deleted file mode 100644 index 19c8a7d59933fc2b0d45df39bd6a7c1ca9519904..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5621 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 MBme;UuX6_c4+^F#VE_OC diff --git a/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vCSCF_aligned.csar b/sdc-os-chef/sdc-sanity/chef-repo/cookbooks/sdc-sanity/files/default/Files/VNFs/vCSCF_aligned.csar new file mode 100644 index 0000000000000000000000000000000000000000..ea977bea803d4c29d2db3dcb98990ed7ad503257 GIT binary patch literal 6511 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" + makeDistributionValue); 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 b82e6a0f52..c8f9ee4139 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 @@ -20,25 +20,37 @@ package org.openecomp.sdc.ci.tests.utils.general; -import com.aventstack.extentreports.Status; -import com.clearspring.analytics.util.Pair; -import org.apache.commons.io.FileUtils; -import org.openecomp.sdc.be.model.DataTypeDefinition; -import org.openecomp.sdc.ci.tests.api.ComponentBaseTest; -import org.openecomp.sdc.ci.tests.config.Config; - -import org.openecomp.sdc.common.util.GeneralUtility; -import org.yaml.snakeyaml.Yaml; +import static org.testng.AssertJUnit.assertTrue; -import java.io.*; +import java.io.BufferedOutputStream; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.FileWriter; +import java.io.FilenameFilter; +import java.io.IOException; +import java.io.InputStream; import java.nio.file.Paths; -import java.util.*; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; import java.util.zip.ZipEntry; import java.util.zip.ZipException; import java.util.zip.ZipFile; import java.util.zip.ZipInputStream; -import static org.testng.AssertJUnit.assertTrue; +import org.apache.commons.io.FileUtils; +import org.openecomp.sdc.be.model.DataTypeDefinition; +import org.openecomp.sdc.ci.tests.api.ComponentBaseTest; +import org.openecomp.sdc.ci.tests.config.Config; +import org.openecomp.sdc.common.util.GeneralUtility; +import org.yaml.snakeyaml.Yaml; + +import com.aventstack.extentreports.Status; public class FileHandling { @@ -173,9 +185,9 @@ public class FileHandling { } public static List filterFileNamesListFromFolder(String filepath, String extension) { + List filenames = new ArrayList(); try { File dir = new File(filepath); - List filenames = new ArrayList(); FilenameFilter extensionFilter = new FilenameFilter() { public boolean accept(File dir, String name) { @@ -193,7 +205,7 @@ public class FileHandling { } catch (Exception e) { e.printStackTrace(); } - return null; + return filenames; } public static String[] getArtifactsFromZip(String filepath, String zipFilename){ @@ -233,7 +245,9 @@ public class FileHandling { // } public static List getZipFileNamesFromFolder(String filepath) { - return filterFileNamesListFromFolder(filepath, ".zip"); + List fileNamesListFromFolder = filterFileNamesListFromFolder(filepath, ".zip"); + fileNamesListFromFolder.addAll(filterFileNamesListFromFolder(filepath, ".csar")); + return fileNamesListFromFolder; } public static int countFilesInZipFile(String[] artifactsArr, String reqExtension){ -- 2.16.6