diff options
| author |   Jan Malkiewicz <jan.malkiewicz@nokia.com> | 2021-02-09 08:39:23 +0100 |
|---|---|---|
| committer |   Christophe Closset <christophe.closset@intl.att.com> | 2021-02-20 07:07:31 +0000 |
| commit | 372c2470e613128f1e33cfc581ea2c5b1b732d2b (patch) | |
| tree | 7204e30f8ea609a057ec3e4449d1abfc4d4b4c27 /openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest | |
| parent | 6068ce140c9a65f13a0bd245c9b9a50befaddc32 (diff) | |
Add validation of manifest for helm packages.
For ONAP native zip packages added validation of manifest file.
HELM package is only valid if:
* isBase flag is set to 'true' for exactly one helm entry
* isBase flag is present for all helm entries
Zip package is considered to be a helm package if it contains HELM entries but does not contain any HEAT entries (however it may contains entries of other types).
Refactored method OnboardingPackageProcessor.processPackage():
* simplified logic
* enhanced exception handling
Issue-ID: SDC-3185
Signed-off-by: Jan Malkiewicz <jan.malkiewicz@nokia.com>
Change-Id: Ica3b1f1504ce4fc3a671c4b8fa8de2bf0236bd77
Diffstat (limited to 'openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest')
1 files changed, 2 insertions, 1 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/OrchestrationTemplateCandidateImpl.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/OrchestrationTemplateCandidateImpl.java index c331deb134..073400fd68 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/OrchestrationTemplateCandidateImpl.java +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/services/OrchestrationTemplateCandidateImpl.java @@ -1,5 +1,6 @@ /* * Copyright © 2016-2018 European Support Limited + * Copyright © 2021 Nokia * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -104,7 +105,7 @@ public class OrchestrationTemplateCandidateImpl implements OrchestrationTemplate final OnboardingPackageProcessor onboardingPackageProcessor = new OnboardingPackageProcessor(filename, fileToUploadBytes); if (onboardingPackageProcessor.hasErrors()) { final UploadFileResponseDto uploadFileResponseDto = - buildUploadResponseWithError(onboardingPackageProcessor.getErrorMessageSet().toArray(new ErrorMessage[0])); + buildUploadResponseWithError(onboardingPackageProcessor.getErrorMessages().toArray(new ErrorMessage[0])); return Response.ok(uploadFileResponseDto).build(); } |