summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2020-06-03Rewrite of `certifyToscaElement` to remove NPEChris André1-42/+77
- Modularized `certifyToscaElement` in smaller, less complex methods (`handleRelationsBeforeCertifyingAndProcessClone`, `cloneToscaElementAndHandleRelations`, `handleRelationsOfNewestCertifiedToscaElementAndReturn` & `logDebugMessageAndReturnStorageOperationStatus`) - Removed potential NPE flagged by Sonar in `certifyToscaElement` Issue-ID: SDC-2966 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: Id65871cbfd611abdcc878e61c1541f01ff972828
2020-06-03Refactor method 'undoCheckout' to simplify it and remove potential NPEChris André1-44/+70
- Extracted methods 'retrieveAndUpdatePreviousVersion' and 'updateEdgeToCatalogRootAndReturnPreVersionElement' from 'undoCheckout' Issue-ID: SDC-2965 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I52faffdaf2e99a9de8c2e566da26a5be6e7fd667
2020-06-02ArtifactsBusinessLogic refactor to remove NullPointerExceptionChris André1-3/+11
- Reformatted `downloadResourceInstanceArtifactByUUIDs` - Fixed Sonar-related warning regarding a NPE in `validateInput` Issue-ID: SDC-2979 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I5a62daabcc436f28fba1f09317c5723281df15bf
2020-06-02Add constraints structure to ToscaPropertyandre.schmid3-47/+109
Add constraints structure to ToscaProperty and implements the valid_values property. Change-Id: Id69581582839a8937f0c76c24d6a6bfcc7f0a957 Issue-ID: SDC-3084 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-06-02Refactor CsarUtils::writeComponentInterfaceFrancis Toth3-13/+150
This commit aims to decouple the zip file writing logic from the CsarUtils::writeComponentInterface function. This should provide a higher level of testability and maintenance thanks to inversion of control. An extra helper has also been added to help the migration from the FJ library to VAVR. Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I4f2df4749cae3082906a80acc39045ac8887ec39 Issue-ID: SDC-2812
2020-06-01Remove boolean entries in TOSCA MetadataMichaelMorris1-6/+6
Change-Id: I0101bbe35656b4c7d7405429d95939b892e85402 Issue-ID: SDC-2876 Signed-off-by: MichaelMorris <michael.morris@est.tech>
2020-06-01Add interface inputs handlingvasraz6-76/+178
Enables interface inputs specified in a node_type to be imported and included in the generated csar Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Change-Id: Ia3acaad50b4091831d0c0471b07ba2b2e9bd380d Issue-ID: SDC-3077
2020-06-01Plugin to customize prop. during Service creationandre.schmid3-21/+118
Creates an entry point to customize properties of a Service Component before its creation. Change-Id: I102a70b37eec498dd9c6df009c38da57d0e5b17f Issue-ID: SDC-3062 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-05-28Finalize Documentation R6Ofir Sonsino1-3/+3
Change-Id: I66837d0b314c1a529bd6ca2e29c9527899286c6f Issue-ID: SDC-2949 Signed-off-by: Ofir Sonsino <os0695@intl.att.com>
2020-05-28Fix interface types creationandre.schmid7-35/+218
Interface types creation logic was not interpreting some allowed TOSCA entries, that, when declared, were breaking the interface type creation. Every entry under the interface type was being considered as an interface operation, but it is possible to have "derived_from", "version", "metadata" and "description". Also it is not considering the Interface Type entries "inputs", "operations" and "notifications". Another thing is that TOSCA 1.3 changes the way operations should be declared, deprecating the previous way. Now there should be an entry "operations" with the operations entries under it, instead of having the operations entries direct under the interface type. The change allows both types, following the TOSCA rule: if operations entry is not present, then the deprecated way is considered. Change-Id: I13218bda60b29d19b9c5565cbfd63ae3250a78bf Issue-ID: SDC-3075 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-05-28Entry points in ToscaExportHandler for plugin useandre.schmid1-2/+2
Open the access for two methods in ToscaExportHandler so they can be called in a CsarEntryGenerator plugin. Change-Id: I0ee1daab348c0fc85db56428369a5ec190cb0101 Issue-ID: SDC-3083 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-05-28Encapsulate ReportManager's failedVerticesPerTask and resultsPerVertex in ReportFrancis Toth22-113/+197
This commit aims to encapsulate the static fields failedVerticesPerTask and resultsPerVertex in their own class (called Report). In the short terms, any state needing to be passed around will be stored there. Unfortunately, this commit required many minor changes in functions signature (to pass the Report instance). Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I3756d9a939cbd0f2856be72aa2bd24a3980dde49 Issue-ID: SDC-2499
2020-05-28Extract artifact component belonging logicFrancis Toth5-119/+417
This commit extracts checkArtifactInComponent and checkArtifactInResourceInstance from ArtifactsBusinessLogic. Tests have been added along with a some utility functions designed to generate randomized test data. The former tests were deleted as they were not doing any assertions. Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I1b27c55d064cf4e9a40cd7b152e7ea6032a09276 Issue-ID: SDC-2961
2020-05-28Allow global types generationaribeiro8-31/+234
This change allows to configure which global type file will be added to the generated CSAR Issue-ID: SDC-3021 Change-Id: I83c0c3f317c4a4e5e8dbf22cb3dbd47e63562d3a Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
2020-05-27Revert "Java 11 migration: fixing problems on 'catalog-fe'"aribeiro2-3/+8
This reverts commit 50906f4dcd00b0162298d1f86d72dcfc4d3caee9. Issue-ID: SDC-3088 Change-Id: I13c48243b3a137c7e66da1ef217a0ecbbd55f216 Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
2020-05-27Refactor CsarUtils::WriteArtifactDefinitionFrancis Toth4-70/+73
Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I167a05d8fbc2085a3e25eeb5bfd6b30f0e80462e Issue-ID: SDC-2812
2020-05-27Add ArtifactsBusinessLogic::fetchLatestComponentMetadataFrancis Toth1-43/+47
Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: Ibb8621a91551a2e4ffcac1145f85ed7983063d02 Issue-ID: SDC-2812
2020-05-27Work on unchecked Optional accessChris André1-21/+58
- extract code to static methods - throw an explicit exception now if element not found Issue-ID: SDC-2987 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I693bb53059b056235b567ac1f9f752a33512505a
2020-05-26Fix for locked componentaribeiro2-13/+22
After add, update or remove node_filter the component was left locked on SDC Issue-ID: SDC-3072 Change-Id: I27058760704bd6261619946becda3612a6386432 Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
2020-05-26Fix wrong tests directory structurevasraz6-0/+0
Change-Id: I0538e5ad56c9a77a0e9cb40d629739e979b67495 Issue-ID: SDC-3073 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
2020-05-26Java 11 migration: fixing problem on 'openecomp-tosca-converter-core'Chris André1-2/+2
- Explicitely indicate the type associated with 'Collection' Issue-ID: SDC-3030 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I557eb205598c337b75b06a2c7d705276aeb543a1
2020-05-25Java 11 migration: fixing problems on 'catalog-fe'Chris André2-8/+3
- Upgrade `jersey-bom` version variable to the most recent stable one - Removed `jersey-common` version variable and replaced its references with `jersey-bom` Issue-ID: SDC-3036 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I414e3814d6d4fc1d927b302efb5dd08659676dc2
2020-05-25Refactor CsarUtil::addInnerComponentsToCSARFrancis Toth1-20/+36
Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I7f32d729a96f696c217631cd019105c17cb36a8c Issue-ID: SDC-2812
2020-05-24Support setting SDC-BE configuration at deployment timevasraz2-76/+77
Change-Id: Id1ebcb01d81b8e0cd681dcb304aa77bb3248d69c Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3076
2020-05-24Fix potential NullPointer in SchemaFileImportandre.schmid1-10/+17
While reading the YAML to import, if the content was missing the entry node_types it was causing a NullPointerException. Also the exception was being suppressed, making very difficult to understand what happened. Change-Id: I44badbee1c739ddf6db08b4e518adb33c430fa84 Issue-ID: SDC-3070 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-05-24500 error at WFD artifact-deliveries apiBen David, Elad (eb7504)1-3/+4
Change-Id: I9227387c26b6ee4c68c635b78c4980a9c07b3d35 Issue-ID: SDC-3052 Signed-off-by: Ben David, Elad (eb7504) <eb7504@intl.att.com>
2020-05-24Work around potential NullPointerExceptions in ToscaElementLifecycleOperationChris André2-26/+252
- Rewrite of `checkinToscaELement` - Extracted methods from `checkinToscaELement` Issue-ID: SDC-2964 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I99d2c5aaa73b955ef5aa60eeb7644bb47ac12bd6
2020-05-21Refactor ArtifactsBusinessLogic::getRelatedComponentInstanceFrancis Toth1-51/+49
This commit aims to refactor the ArtifactsBusinessLogic::getRelatedComponentInstance, and getRelatedComponentComponentInstance. It improves how Either is used, fixes a potential NullPointerException, reduces some duplication along with cyclomatic complexity. Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I2503f5e2a697f793e4dcf32d7793f83c4a25ff46 Issue-ID: SDC-2812
2020-05-20Remove wildcard pattern when retrieving componentsFrancis Toth3-40/+71
This commit aims to remove a redundant cast while preparing the field for some Either refactoring in ArtifactsBusinessLogic. The reasons for removing the wildcard pattern are explained in SDC-3040 (a sub-task of SDC-2812). Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I573c01eca56f096ccb54e564d0144291121bde22 Issue-ID: SDC-2812
2020-05-20Refactor ArtifactsBusinessLogic::handleDeleteInternalFrancis Toth1-18/+42
This commit is a first step towards the ArtifactsBusinessLogic::handleDeleteInternal function refactoring. It aims to improve how Either is used, and to reduce its cyclomatic complexity along with some duplications. Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I1b476ccc0e0341975b80c10dc79c5dc1592267f4 Issue-ID: SDC-2812
2020-05-19remove powermock dependency from pom xmlsRodrigo Lima16-193/+18
- Remove powermock from pom xml files - Remove powermock from ActivityLogManagerFactoryImplTest Issue-ID: SDC-3071 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: I4c4b8b0751f4ce8895617a951429111fc08d8e2e
2020-05-19Add null test to ComponentInstanceBusinessLogicChris André1-55/+81
- Added test in `changeInstanceVersion` for null value Issue-ID: SDC-2908 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I42a428c4b245a55b7229e2ec9b781e9af4403662
2020-05-19Refactor ArtifactsBusinessLogic::generateAndSaveToscaArtifactFrancis Toth1-34/+30
This commit aims to make some minor refactoring related to the either used in ArtifactsBusinessLogic::generateAndSaveToscaArtifact. Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I4923e014146a17f1cd035db3513359a2ab8f38f2 Issue-ID: SDC-2812
2020-05-18Refactor CsarUtil::extractVfcArtifactFrancis Toth2-38/+58
Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: Ica8d17d4f3c763920f406ccb89fb3e464d05eab4 Issue-ID: SDC-2812
2020-05-18Refactor tosca representation retrieval in CsarUtils::populateZipFrancis Toth1-30/+56
This commit aims to simplify CsarUtils::populateZip by extracting how a tosca representation is fetched to another function. this enables to reduce the overall cyclomatic complexity of the function. Some additional work still needs to be done especially regarding the ToscaRepresentation and MainYamlWithDependencies classes (These happen to be really similar). This will be done in another change in the near future. Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I93600d0752565de523cf2285b1fa2ba43a96334f Issue-ID: SDC-2812
2020-05-18OrchestrationTemplateDaoZusammenImpl - Add tests for the presence of ↵Chris André1-28/+37
Optional values Issue-ID: SDC-3015 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: Iae0ce3d1b4bb5a72f04f0cd8a890c84eb15b214c
2020-05-17Remove powermock from ContextTrackerRodrigo Lima2-74/+78
- Remove powermock from ContextTrackerTest - Add package level constructor to ContextTracker to pass clear and put functions Issue-ID: SDC-3058 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: I82519538b763b00f2768801f06929773bfb58013
2020-05-17Remove powermock from ValidationConfigManagerTestRodrigo Lima1-8/+2
- Remove powermock reference from ValidationConfigManagerTest Issue-ID: SDC-3064 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: Ib330b0fcaf132e5d67f65b482a80b5b75f8c336b
2020-05-17Remove powermock from ArtifactValidationUtilsTestRodrigo Lima1-24/+17
- Remove powermock reference from ArtifactValidationUtilsTest - Use junit 5 imports instead of junit 4 Issue-ID: SDC-3067 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: I6388e133024ed1e7604e90fc24ba3e84a33da4f7
2020-05-17Remove powermock from ReportManagerTestRodrigo Lima1-19/+9
- Remove powermock reference from ReportManagerTest - Use Junit 5 imports instead of junit 4 Issue-ID: SDC-3066 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: Iece6e5741d5f2f5bc5db2ec7c85c63948776d601
2020-05-17Remove powermock from HostAddressCacheTestRodrigo Lima2-28/+51
- Remove powermock and easymock from HostAddressCacheTest - Add package level constructor to HostAddressCache and pass read address function to verified in unit test Issue-ID: SDC-3068 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: I749211393d9e0ecb3ff3b587dc0f811b58bb967c
2020-05-17sdc-backend-init does not restart on healthcheck failureFuss, Areli (af732p)2-1/+3
Issue-ID: SDC-3063 Change-Id: I6c4a796f42060832ee8a37a708dedda7e7e98c70 Signed-off-by: Fuss, Areli (af732p) <areli.fuss@intl.att.com>
2020-05-17Fix edit deployment artifact icon, and downloadTufman, Shay (st198j)1-5/+10
Change-Id: I9e66870b03fcc5edcea30a18809cf8a2c539e674 Issue-ID: SDC-3053 Signed-off-by: Tufman, Shay (st198j) <st198j@att.com>
2020-05-17Work around potential NullPointerExceptions in ComponentInstanceOperationChris André1-36/+37
- Rewrite of `updateAttributeValueInResourceInstance` Issue-ID: SDC-2923 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I1becdec8c10515976835e7d8fb0208b9cbad10bb
2020-05-12Add tests for the presence of Optional valuesChris André1-11/+20
Issue-ID: SDC-3014 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I041c0109c41bb1a716792074c004fd8f54857038
2020-05-12Increase test coverage - openecomp-sdc-vendor-software-product-corevasraz14-0/+568
Change-Id: I1af31c1f14d72fbc30a026f7ae787ae9d4b03b36 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3001
2020-05-12Remove powermock from SecurityManagerTestRodrigo Lima2-15/+10
- Add new package level constructor to SecurityManager - Remove powermock from SecurityManagerTest Issue-ID: SDC-3054 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: I04c53601f31d2aad84de8f8801f6889f8b9d4260
2020-05-12Remove unused ArtifactsBusinessLogic::updateArtifactsFlowForInterfaceOperationsFrancis Toth1-63/+0
This commit deletes the ArtifactsBusinessLogic::updateArtifactsFlowForInterfaceOperations function as it is no longer used anywhere. Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I1dd950930485fc83bb02c889dafc5461192accbc Issue-ID: SDC-2812
2020-05-12Remove outputFullFilePath from ValidationConfigManagerFrancis Toth35-673/+629
This commit aims to extract the outputFullFilePath field from ValidationConfigManager in order to improve testability. This commit contains multiple minor modifications resulting from bubbling up the outputFullFilePath static field to where it is actually set. Most of the modifications result from changing the signature of the functions which formerly relied on ValidationConfigManager.getOutputFullFilePath. Change-Id: I0a28e527cabe606de8af62b8dcbc4b4e70db98ed Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Issue-ID: SDC-2499
2020-05-11Fix security issues in SecurityUtilNeil Derraugh2-203/+0
- Removed hard coded key - Specified mode and padding to address risky algorithm Issue-ID: SDC-3017 Signed-off-by: Neil Derraugh <neil.derraugh@yoppworks.com> Change-Id: I6c21174003fcb5669de49158d8dd6bf9907f50c6