summaryrefslogtreecommitdiffstats
path: root/catalog-be
AgeCommit message (Collapse)AuthorFilesLines
2020-05-10Refactor to remove false positives from SonarChris André2-47/+111
- change `updateResourceInstancesNames` to account for case where `preparedResource` is null - change `findInputByName` to return an Either<InputDefinition, RuntimeException> in order to make exceptions explicit - create `rollbackWithEither` (+ tests) to make exceptions more explicit Issue-ID: SDC-2992 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I487994a3f9e88b0a2b14d2679c3587d85d8aa12d
2020-05-10Refactor ArtifactsBusinessLogic::handleDelete and ↵Francis Toth6-63/+53
ArtifactsBusinessLogic::deleteArtifactByInterface Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I89f12c70f388375ed13554edf62bf6a442c9036a Issue-ID: SDC-2812
2020-05-10Allow any extension to WORKFLOW artifact typeandre.schmid1-2/+0
Allow any extension to WORKFLOW artifact as it was before the artifact type configuration change SDC-2754. Change-Id: I6c497cd83e36fe4df0cc800b9301010c22aa79f7 Issue-ID: SDC-3019 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-05-10Moved ArtifactsBusinessLogic::buildJsonStringForCsarVfcArtifact to JsonUtilsFrancis Toth4-28/+125
Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: Ia3bb9fe9f97e1759e4e5b70eb5e5396ed87d716d Issue-ID: SDC-2961
2020-05-08Refactor CsarUtil::addComponentToCacheFrancis Toth1-17/+40
Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: Ib78be78780a97c873e710d805dd26273159d5354 Issue-ID: SDC-2812
2020-05-08Clean normatives file during mvn cleanandre.schmid1-3/+1
The configuration to clean the normatives.tar.gz was incorrect, so the file was not being cleaned up during mvn clean, which could create an inconsistent sdc-backend-init docker image. Change-Id: I15e3f4c49f404c147532c88c50f131cb61aea9c0 Issue-ID: SDC-3041 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-05-07Reduce scope from 'compile' to 'test' for 'junit-vintage-engine'vasraz1-6/+1
Change-Id: I39b0be6ba6650c9a7215acf359f3d74e0a24e553 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2844 Issue-ID: SDC-2983
2020-05-07Support functions in TOSCA Simple Profile in YAMLvasraz10-10/+14
This commit aim to generalize usage of ToscaFunctions enum Change-Id: Iab3529e101f75db5f856778334a852afb532cdb6 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2982
2020-05-06Prepare for Junit5vasraz9-1207/+1279
Remove unused/duplicated dependencies Change-Id: Iee0d9510ffbe3e2e14574e22ba965d6829fd568b Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2844 Issue-ID: SDC-2983
2020-05-06fix bug - Error 500 while adding an OperationYuli Shlosberg1-5/+0
Change-Id: I7def95b3688877acbc9332cf4174c9d92226f2e2 Issue-ID: SDC-2953 Signed-off-by: Yuli Shlosberg <ys9693@att.com>
2020-05-06fix bug - Unable to link CSAR artifactYuli Shlosberg2-5/+13
Change-Id: I586637f988b84b3b858e2c8d567c6844be38322b Issue-ID: SDC-2972 Signed-off-by: Yuli Shlosberg <ys9693@att.com>
2020-05-06Handle null case in `addCalculatedCapabilitiesWithPropertiesToComponent`Chris André1-6/+15
- Change code to handle a null value for `groupDefinitions` as if it was an empty List Issue-ID: SDC-2910 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I5fca0ab76886e5f6a73a8f05ec35d38848f96dd8
2020-05-05Add tests for the presence of Optional valuesChris André1-14/+24
Issue-ID: SDC-3012 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I56cbf7fb5bd04ad2fbc496231d6abe72066124fe
2020-05-05Remove call to `get` on Optional variablesChris André1-12/+21
- Made multiple variables Optional Issue-ID: SDC-2991 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: If3dbfd37e933d10698ad1a93b6762c84e30f69b8
2020-05-05Refactor CsarUtil::getLatestSchemaFilesFromCassandraFrancis Toth1-16/+31
Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I3f96d76a07fd32bdbd8b59beb5409eab0b0f3aa8 Issue-ID: SDC-2812
2020-05-05Refactor CsarUtil::getFromCassandraFrancis Toth1-11/+6
Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I510d1d7fb4f4a7d7152fd5ea6d4d5ff61deea23a Issue-ID: SDC-2812
2020-05-05Refactor CsarUtils::collectComponentTypeArtifactsFrancis Toth1-14/+22
This commit is a minor refactoring required to refactor CsarUtils::collectComponentInstanceArtifacts. In order to keep this commit small, we only focused CsarUtils::collectComponentTypeArtifacts, and removed any output that is not reflected by the function's result type. Modifying an argument is a actually a bad practice as explained in Clean Code by Robert Martin (cf. "Output arguments should be avoided"). This commit aims to enforce this aspect. Change-Id: Ice4d6c9a78e7706c639dd60bc272253e298bc7be Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Issue-ID: SDC-2812
2020-05-05Remove all thrift's dependenciesvasraz1-5/+0
Remove unused/duplicated dependencies Change-Id: Ic2239acc5ddde1d0874b5139c228934ec1e61cd0 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2985
2020-05-03Refactor CsarUtils::createCsarFrancis Toth1-7/+6
Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I41994c98515844030eed1d6f2756c9779e864cff Issue-ID: SDC-2812
2020-05-03Extract ArtifactOperationInfo from ArtifactsBusinessLogicFrancis Toth13-99/+150
This commit only intends to extract the inner static class ArtifactOperationInfo from the ArtifactsBusinessLogic class. In addition, getters have been added to get the artifactOperationEnum field's state (this allowed to reduce some boilerplate). Change-Id: Ib79a75893ef11ba0d25e0578d7e95f60284589d0 Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Issue-ID: SDC-2961
2020-05-03Refactor CsarUtils::validateNonMetaArtifactFrancis Toth1-20/+22
This commit aims to refactor the CsarUtils::validateNonMetaArtifact function and make it up to standards regarding how fj.Either should be used. Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: Icadfce7229839e53bd09926b6865f2872c39d1a5 Issue-ID: SDC-2812
2020-04-30Replace call to `get` with a call to `ifPresent`Chris André1-3/+6
Issue-ID: SDC-2989 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I7fe273d869035f8852dbc398de60cc49dec2ce6e
2020-04-28Handle null case in `GroupVersionUpdater`Chris André2-13/+330
- change in the final condition of `isGenerateGroupUUID` - Added tests related to modified code Issue-ID: SDC-2913 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I22738f9f4922467209a16a4d6b3b78d7bfac11c9
2020-04-28Refactor CsarUtils::getEntryDataFrancis Toth1-20/+18
Change-Id: I1732ae05cfbe93c1bef8c249e16088a0cad34106 Issue-ID: SDC-2812 Signed-off-by: Francis Toth <francis.toth@yoppworks.com>
2020-04-28Refactor CsarUtils::populateZipFrancis Toth1-30/+55
Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I136ebda0ff92d6c42368f102ccf2b10f37524808 Issue-ID: SDC-2812
2020-04-27Add null test to ComponentBusinessLogicChris André1-13/+14
- Added test in `getFilteredComponentInstanceProperties` for null value - Removed nested `if` statements in `isMatchingComplexPropertyByRecursively` Issue-ID: SDC-2907 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I13a47b0dfe7aa6dec845a856c58bba8be5c1eead
2020-04-26Update WORKFLOW Artifact Type configurationandre.schmid1-0/+2
To add an operation with an existing Workflow in a RESOURCE, the Artifact Type WORKFLOW needs to support the extension "bpmn" and the component type "RESOURCE". Change-Id: Ic7eb9afe3ced0348f7aadcc43edf121a0bdcf015 Issue-ID: SDC-2954 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-04-26Fix potential NPE in ArtifactsBusinessLogicandre.schmid1-8/+15
Fixes potential NPE in ArtifactsBusinessLogic introduced by SDC-2754. Change-Id: If53915ffc41ddd0dbcf00ea318cdae6f1b5471ad Issue-ID: SDC-2959 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-04-23Minor cleanups for BasicAuthenticationFilterChris André1-17/+17
- Changed String representing encoding to Java's StandardCharsets.UTF_8 - Added explicit else condition in order to not rely on `abortWith`'s side effects Issue-ID: SDC-2917 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I81cb94c399ff1d810e85c7b63fde195928ab1b08
2020-04-23Add null testsChris André1-15/+16
- Change `isPropertiesListSizesNotEquals` to `isPropertiesListSizesEquals` - Added assertions to silence SonarCloud Issue-ID: SDC-2914 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I88003de54aea6c28575fecf0f41b4c5ef36ef154
2020-04-23Fix null pointer exception warningsRodrigo Lima1-33/+48
Issue-ID: SDC-2911 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: Ic7f0ef631ed98e8baf2ea32b6bfc56a7142738f8
2020-04-22Fix unit tests not runningBaumel, Dvir (db384r)1-7/+0
Change-Id: I06462b6180a1f1a310aae994f4e703a498f80247 Issue-ID: SDC-2933 Signed-off-by: Baumel, Dvir (db384r) <dvir.baumel@intl.att.com>
2020-04-22Used `configurationManager` instead of `getConfigurationManager`Chris André1-10/+9
Issue-ID: SDC-2890 Change-Id: I1559ebc60076bd0884ae1136c9c904f7ab46e72e Signed-off-by: Chris Andre <chris.andre@yoppworks.com>
2020-04-22Fix bug for class SwitchoverDetectorReo Inoue1-1/+1
Signed-off-by: Reo Inoue <inoue.reo@jp.fujitsu.com> Issue-ID: SDC-2931 Change-Id: I6b40f538ff9ce7eed22ce71c542b188a8c866f26
2020-04-22Add null test to DistributionMonitoringBusinessLogicChris André1-3/+12
- Added test in `handleAuditingDaoResponse` for null value related to `resAuditingGenericEvent` Issue-ID: SDC-2909 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I422629cdbd4f05e10609cd78b7328c4e9f45538b
2020-04-22Handle null condition in ResourceImportManagerRodrigo Lima1-6/+7
- check if parentResource null in methods setRequirements and setCapabilities Issue-ID: SDC-2912 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: I1ea5a8cf26e3883b5d26fb970bc0abc4cbf1ee9a
2020-04-22Add null test to test in `UpgradeBusinessLogic`Chris André1-2/+2
Issue-ID: SDC-2915 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I4e6f27b707b1bdbbecf9a97606c9a655d834fe56
2020-04-22Add null tests in `createComponentExternal`Chris André1-3/+3
Issue-ID: SDC-2916 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: Ieb0a79c8d3a891a08cd758e1a4ebab7679166476
2020-04-20Fix Tosca properties declarationaribeiro3-6/+4
Remove duplicated entries Default value for Boolean type should not be a String According to the description for the keyname 'attachments:' it should be of type List rather than String Issue-ID: SDC-2870 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: Iac2b4f89dac16a6aef9dcabea74def5cacff99a6
2020-04-19Validates artifact configurationandre.schmid2-0/+86
Validates if all the SDC base artifacts are configured. The base artifacts are provided by the ArtifactTypeEnum. Change-Id: Iffa38d6ba276014940afad71f7472bc8d730fcf8 Issue-ID: SDC-2929 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-04-19Configure a new Artifact Typeandre.schmid29-2284/+1995
Centralizes artifact configuration in one yaml entry. Allow the configuration of a new artifact type without the need of code changes. The configuration file now is used as a source of artifacts types instead the artifact type enum. The enum will be used as a source of base artifact types and also in hard coded business rules. Change-Id: Id0383d9fca9bce0519a4d52a4ecb3a68c8713f0f Issue-ID: SDC-2754 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-04-19Unable to update VSP (heat template) version in VFSebastien Premont-Tendland1-5/+0
This seems to fix the issue, we can still onboard CBA at VF level and the CBA get included in the distributed CSAR under the directory Artifacts/*/Deployment/CONTROLLER_BLUEPRINT_ARCHIVE/ as expected Issue-ID: SDC-2892 Signed-off-by: Sebastien Premont-Tendland <sebastien.premont@bell.ca> Change-Id: Ie9f9cd7b8d2cf5eb3ff3c41a4b04eedd788265a6
2020-04-19Fix GAB problem in ui-ci testsandre.schmid1-0/+2
Generic Artifact Browser is failing in tests due mainly to a removal of the default constructor in GAB class. Change-Id: Id10b8d8d81c224e2658002b9c928e8aef7ca8e32 Issue-ID: SDC-2903 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-04-16Upgrade Junit to version 5.6Baumel, Dvir (db384r)4-30/+59
Issue-ID: SDC-2844 Change-Id: I4716bf7920f9bb79c450ebfd48e9d4fba54fdfdd Signed-off-by: Baumel, Dvir (db384r) <dvir.baumel@intl.att.com>
2020-04-16Add some unit testsReo Inoue1-0/+71
This change adds unit tests for ComponentLogi to increase test coverage. Issue-ID: SDC-2885 Change-Id: I53e5da1a1022ef2a6e29119cc531b61dcc3020b1 Signed-off-by: Reo Inoue <inoue.reo@jp.fujitsu.com>
2020-04-07Added more tests.k.kedron1-160/+294
Added more unit tests for cover CapabilityRequirementConverter. Issue-ID: SDC-2869 Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com> Change-Id: If4f252f63cf126aab0961199c296581c0d089b21
2020-04-06Fix ready probe exit codeandre.schmid1-7/+5
The exit code ranges from 0 to 255, so it should not be returning the http status code. This was breaking the health check for the docker_run.sh script, which was always getting a 0 return code in a case of 503 http status for example. Change-Id: I52b2923cdfc0d7389894917ccc4aa58468ac8bdc Issue-ID: SDC-2867 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-04-05Fix sdc-backend image context.xml creationandre.schmid1-1/+1
The file was not being overwritten during the build process. It was not changing after the first build, causing war artifact version problems while running the container. Change-Id: I8b1ab741c82f9274a2049bb4c2d1c3a8c1c8ee38 Issue-ID: SDC-2862 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-04-05Fix data type properties declarationaribeiro2-38/+38
According to TOSCA Network properties definition the keyname 'ip_version:' should have Integer as valid_values rather than String Where the keyname 'count:' is declared as a String type the default value should be String rather than Integer Fix misspelled ONAP types 'onap.datatypes.monitoring.measurementType' and 'onap.datatypes.monitoring.managedObjectDNsBasic' Fix the keynames 'upstream:' and 'downstream:' as both are declared as a String type the valid_values should be String rather than Integer Issue-ID: SDC-2864 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I56afdf2818b5f2463fb6088cd8b468fd38ef5086
2020-04-05Fix keyname 'constraints:' according to TOSCA property definitionaribeiro1-1/+1
Issue-ID: SDC-2863 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I955af393b4f10ca56a01bfcb2f62c37496c484d6