From 1cebc6e93630431a1b530a6415d3d1a5996d458d Mon Sep 17 00:00:00 2001 From: AvinashS Date: Mon, 25 Sep 2017 17:58:08 +0530 Subject: Add validation to market place Added Csar, Tosca, and Mainservice validation Change-Id: I43e5245b77cd5f096e8bd062546138ee311ab86c Issue-Id: VNFSDK-90 Signed-off-by: AvinashS --- vnfmarket-be/vnf-sdk-marketplace/pom.xml | 5 +++++ .../onap/vnfsdk/marketplace/wrapper/PackageWrapper.java | 17 +++++++++++++++++ 2 files changed, 22 insertions(+) (limited to 'vnfmarket-be') diff --git a/vnfmarket-be/vnf-sdk-marketplace/pom.xml b/vnfmarket-be/vnf-sdk-marketplace/pom.xml index d281b973..6a526b52 100644 --- a/vnfmarket-be/vnf-sdk-marketplace/pom.xml +++ b/vnfmarket-be/vnf-sdk-marketplace/pom.xml @@ -191,6 +191,11 @@ 2.4 + + org.onap.vnfsdk.validation + validation-csar + 1.0.0-SNAPSHOT + diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/wrapper/PackageWrapper.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/wrapper/PackageWrapper.java index b3773c5f..9178931e 100644 --- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/wrapper/PackageWrapper.java +++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/wrapper/PackageWrapper.java @@ -58,6 +58,8 @@ import org.onap.vnfsdk.marketplace.onboarding.onboardmanager.OnBoardingHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.onap.validation.csar.CsarValidator; + import net.sf.json.JSONObject; public class PackageWrapper { @@ -230,6 +232,21 @@ public class PackageWrapper { uploadedInputStream.close(); + try { + CsarValidator cv = new CsarValidator(packageId, fileLocation); + + if (!cv.validateCsar()) { + LOG.error("Could not validate failed"); + return Response.status(Status.EXPECTATION_FAILED).build(); + } + + + } catch (Exception e) { + LOG.error("CSAR validation panicked"); + return Response.status(Status.EXPECTATION_FAILED).build(); + } + + PackageBasicInfo basicInfo = PackageWrapperUtil.getPacageBasicInfo(fileLocation); UploadPackageResponse result = new UploadPackageResponse(); Boolean isEnd = PackageWrapperUtil.isUploadEnd(contentRange); -- cgit 1.2.3-korg