aboutsummaryrefslogtreecommitdiffstats
path: root/catalog-model/src
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-05-28Fix interface types creationandre.schmid1-5/+8
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-27Refactor CsarUtils::WriteArtifactDefinitionFrancis Toth1-0/+4
Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I167a05d8fbc2085a3e25eeb5bfd6b30f0e80462e Issue-ID: SDC-2812
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-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-07Support functions in TOSCA Simple Profile in YAMLvasraz3-44/+2
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-07Support configuring of tosca type for categoriesMichaelMorris7-353/+424
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-2877 Change-Id: I3160c5089979757628f31a44b01836236563b770
2020-05-06Make `collectNewCapabilities` return an empty MapChris André1-4/+6
- Made `collectNewCapabilities` return an empty HashMap instead of a null value Issue-ID: SDC-2924 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I58c35135be5a2614c3daeafbd766d53f401f917b
2020-05-06Work around potential NullPointerExceptions in `ToscaOperationFacade`Chris André1-41/+64
- Add tests in `getToscaElementByOperation` and `updateToscaElement` for null values - rewrite `getLatestCertifiedByToscaResourceName` in a more functional way - Rewrite some other usages of Either in a more functional way Issue-ID: SDC-2922 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I52b294ec91faf9e1054af572dcca4060e62fe571
2020-04-29Fix VFs and Service not visible in SDC Dashboardvasraz2-22/+8
Change-Id: Ia42775388c3ad9539b7d0020476f0f7a91ce8bb9 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2938
2020-04-22Handle null condition in TopologyTemplateOperationRodrigo Lima1-0/+1
- check if instanceId null in method isNotEmptyMapOfProperties Issue-ID: SDC-2920 Signed-off-by: Rodrigo Lima <rodrigo.lima@yoppworks.com> Change-Id: I70667142ed51834de638903ccae4ffcb896cccab
2020-04-22Add null test in ArtifactsOperationsChris André1-15/+23
- Added if statement in `updateArtifactOnGraph` to account for the case where variable `artifactInst` has not been properly initialized Issue-ID: SDC-2919 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I73fe3b3bcef59e5797a0f7cfe7b6894816d0d3fb
2020-04-19Configure a new Artifact Typeandre.schmid8-663/+72
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-19Fix non appearance VFCs on the Home tabvasraz2-3/+2
Change-Id: I1543da25b76adbe426726444bd855393267fabe5 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2868
2020-04-01Increase test coveragevasraz3-27/+86
Change-Id: I7b1d4b783d2d8e41a8ff92db15d77270ba4eef80 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2833
2020-03-30Increase test coveragevasraz20-2037/+239
Change-Id: Ibc6134e5954537258541ff018dc9794191d4e907 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2833
2020-03-30Increase test coveragevasraz8-145/+102
Change-Id: If9b371042a42213f38828f9628714d076261f25c Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2833
2020-03-26Increase test coveragevasraz3-76/+15
Change-Id: Ie28e36012be1313efa0082b34c0b36c325dc1b76 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2833
2020-03-26Increase test coveragevasraz5-685/+365
Change-Id: I90606d768c55ad13aa9df62bc4d3f533206db1bc Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2833
2020-03-24Increase test coveragevasraz4-33/+110
Change-Id: I08577d28ced96f94
d17c Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2738 2020-03-22Include derived_from types in generated csararibeiro5-201/+147 Issue-ID: SDC-2775 Change-Id: I7b90ff78c389e5680cacafda2065669f6baf1735 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> 2020-03-19Increase test coveragevasraz2-30/+18 Change-Id: I5b666658061bf8838e1af952f3b808da6e113c7a Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2833 2020-03-19Increase test coveragevasraz2-25/+58 Change-Id: I8d9495d49aa867aee203e4af1fdcc843099f1b07 Issue-ID: SDC-2833 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> 2020-03-19Increase test coveragevasraz2-70/+59 catalog-model/src/main/java/org/openecomp/sdc/be/model/CatalogUpdateTimestamp.java Change-Id: I7c4218d09472196c0ddd7590dc6e5a4ba71f842a Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2833 2020-03-19Increase test coveragevasraz2-149/+78 Change-Id: Icb947bec2b36d6706dc2e214320c6018cabbca15 Issue-ID: SDC-2833 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> 2020-03-19Increase test coveragevasraz2-3/+44 Change-Id: I433f8d0cd27532b099ba902a83a4b067fd61e467 Issue-ID: SDC-2833 Signed-off-by: vasraz <vasyl.razinkov@est.tech> 2020-03-05Fix policy property type issueDmitry Puzikov1-15/+14 When VF is exported as csar, policy properties are typed regardless types in the related shemas. This patch fixes this issue. Change-Id: Ib34f329888d454283c89a8a1aec6349069ea7234 Issue-ID: SDC-2773 Signed-off-by: Dmitry Puzikov <d.puzikov2@partner.samsung.com> 2020-02-25Policies import when import VSPDmitry Puzikov3-32/+38 Polices import implemented. Error type added for invalid policies. Import tests added. Fix test failures. Got rid of Either in the new code. Change-Id: I3e91cc6d24433c2b3862f407348e71e1e67c3b4e Issue-ID: SDC-2728 Signed-off-by: Dmitry Puzikov <d.puzikov2@partner.samsung.com> 2020-02-24Fix Null Pointer Exception when loading resources from home page.aribeiro1-5/+7 Issue-ID: SDC-2777 Change-Id: Ia25f34736a8926b6ebe622114b0beb1f806f4791 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> 2020-02-18Configuration file runtime reloadandre.schmid2-6/+1 Reloads the backend configuration file when the file listener catches a change. Forces validations errors when the configuration file could not be parsed. Remove not used configurations. Change-Id: Ic6fcb2b557d52ec53074c38ab8e0fcfa96e9be67 Issue-ID: SDC-2758 Signed-off-by: andre.schmid <andre.schmid@est.tech> 2020-01-26Increase junit TCsvasraz2-57/+70 1. Re-enable disabled TCs (enable = true) 2. Enable @Ignored TCs 3. Add some Assert when missing 4. Remove old unused TCs (covered in UI) Change-Id: I900e52f4860b1fdc5bd1e529a1fe7f5c3491465b Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2672 2020-01-22Catalog alignmentys9693107-2007/+2404 Issue-ID: SDC-2724 Signed-off-by: ys9693 <ys9693@att.com> Change-Id: I52b4aacb58cbd432ca0e1ff7ff1f7dd52099c6fe 2019-12-05Fix impossible to drag and drop same service twice into the compositionSatoshi Fujii2-1/+51 When a service proxy instance including underscore in its name is added into the composition, instance ID suffix is not properly calculated and that results in duplicate key error due to ID conflict. This change normalizes the name to find existing proxy instances to get suffix number calculated properly. Change-Id: I6f2ceb4b9cf020e1523264a99e1347b6caa98965 Issue-ID: SDC-2043 Signed-off-by: Satoshi Fujii <fujii-satoshi@jp.fujitsu.com> 2019-11-25Fix Sonar issuevasraz2-2/+2 Major SmellCode: Replace StringBuffer with StringBuilder Change-Id: I0283e5160e5c1f23423c66110015f18c8163411e Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2670 2019-11-20Onboard PNF software versionandre.schmid2-34/+65 Change-Id: Id9e32e01f6c2f4c39c8ff10816d982cbb3063bf7 Issue-ID: SDC-2589 Signed-off-by: andre.schmid <andre.schmid@est.tech> 2019-11-19Fix for scalar-unit type value.aribeiro3-43/+40 Issue-ID: SDC-323 Change-Id: I7f19a7356e1cd34deca0a168b3cb707ef657b9cb Signed-off-by: aribeiro <anderson.ribeiro@est.tech> 2019-11-03Create new non-mano Artifact Type entry for pnf software informationaribeiro2-0/+14 Issue-ID: SDC-2615 Change-Id: I4dd879d50b1dec58aceeaf0c265901c62d038071 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> 2019-10-30Fix zip slip security flawandre.schmid2-64/+6 Apply zip slip checking in zip operations throughout the system. Centralizes most of the zip logic in one class. Create tests to zip functionalities and zip slip problem. Change-Id: I721f3d44b34fe6d242c9537f5a515ce1bb534c9a Issue-ID: SDC-1401 Signed-off-by: andre.schmid <andre.schmid@est.tech> 2019-10-30add artifacts support in TOSCA exported yml fileLiang Ding3-73/+45 Change-Id: I56f8a6a1ce758876e83a7ee8318b79644ae7d5cb Issue-ID: SDC-1952 Signed-off-by: Liang Ding <liang.ding@intel.com> 2019-10-04Revert "Sonar fix NullPointerException"Ofir Sonsino1-1/+1 This reverts commit b0f96a46e2720c75eb035bbe94015e5a1c6b0b32. Issue-ID: SDC-2542 Change-Id: I63b5349670c8e5fa814d686cfa93173d0ea6297e Signed-off-by: Ofir Sonsino <os0695@intl.att.com> 2019-10-03Sonar fix NullPointerExceptionArindam Mondal1-1/+1 Issue-ID: SDC-2542 Change-Id: I08a93932d2776c40a982bb802aeac994c1f35841 Signed-off-by: arindamm <arind.mondal@samsung.com> 2019-09-06fix a nested node type issueLiang Ding1-0/+7 the newly added node type is considered as nested when substitution_mapping is enabled in TOSCA yaml file Change-Id: Ibdee29d7a553c7b1ce085cbe971ceace6c4488f5 Issue-ID: SDC-2282 Signed-off-by: Liang Ding <liang.ding@intel.com> 2019-09-04unit tests - catalog-modelTomasz Golabek3-0/+246 Coverage increasing Change-Id: Idb7902578aca65eaee1a63871e9b84e3c4767233 Issue-ID: SDC-2326 Signed-off-by: Tomasz Golabek <tomasz.golabek@nokia.com> 2019-09-03unit tests - catalog-modelTomasz Golabek4-117/+182 Additional junit tests for be-model Change-Id: I7364cd33411d7f6eb69f9a02b2aea889c594ea7b Issue-ID: SDC-2326 Signed-off-by: Tomasz Golabek <tomasz.golabek@nokia.com> 2019-09-02unit tests - catalog-modelTomasz Golabek1-15/+154 Additional junit tests for ToscaListValueConverter Change-Id: I41e8b501129ceb0640e54e4173b3cdf13983ccd8 Issue-ID: SDC-2326 Signed-off-by: Tomasz Golabek <tomasz.golabek@nokia.com> 2019-08-26unit tests - catalog-modelTomasz Golabek5-0/+221 Additional junit tests Change-Id: I82f88ec4cc1fb18314cfb33dd9aafa58688318e0 Issue-ID: SDC-2326 Signed-off-by: Tomasz Golabek <tomasz.golabek@nokia.com> 2019-08-22unit tests - catalog-modelTomasz Golabek15-151/+400 Additional junit tests Change-Id: I9952933895ba22114fb0bf19a51e54f1a232c8f3 Issue-ID: SDC-2326 Signed-off-by: Tomasz Golabek <tomasz.golabek@nokia.com>