summaryrefslogtreecommitdiffstats
path: root/catalog-be
AgeCommit message (Collapse)AuthorFilesLines
2020-08-10Revert "Refactor CsarUtils::addInnerComponentsToCSAR"Sébastien Determe3-260/+161
This reverts commit f4165e2af8ae596d574aecae2fcf174420396b2e. Reason for revert: This PR has broken the API tests and the csar generation (csar.meta) is not present anymore. Therefore some components may not be able to open the CSAR with the sdc-tosca libraries We must rollback for now, until a fix is provided Change-Id: I3af8b9f08dd28b6abdb4df9acdcf9ab2623d10e5 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Issue-ID: SDC-3225
2020-08-06Remove needless Getter/Setter testingvasraz2-92/+10
Change-Id: I4802e15a57b01d520e875db295df2eb826b6b5c0 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-2708
2020-07-29Config. allowed instances in component compositionandre.schmid10-164/+258
During the creation of Resource and Services components, the allowed types to add in its composition are hard-coded. This change allows those types to be configurable using the configuration.yaml backend file. Change-Id: If48849b57fe5124468db3d55f2f06391348935fb Issue-ID: SDC-3177 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-07-15Align onap/base_sdc-xyz versionsvasraz1-1/+1
Change-Id: Ic2e53bb76b0b6bc54de3336f5e5916eba189fe18 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3201
2020-07-15Fix missing referenced node_typesKrupaNagabhushan5-0/+46
Issue-ID: SDC-3153 Signed-off-by: KrupaNagabhushan <krupa.nagabhushan@est.tech> Change-Id: I0b17ac92a49e1f006f5708b20af82a62ee769a9e
2020-07-12Refactor CsarUtils::addInnerComponentsToCSARFrancis Toth3-161/+260
Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I4f9a52950d4d6ffadf9a5cb170c99d229ac83a35 Issue-ID: SDC-2812
2020-07-12Add substitution_filter endpoints unit testsaribeiro1-0/+440
Issue-ID: SDC-3166 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: Ie01f7abc5eccc36e8f1159cbece329a7fadeacd5
2020-07-12Add endpoints for supporting substitution_filteraribeiro4-59/+335
Issue-ID: SDC-3160 Change-Id: Ibc722f283451fecde7655e867654880ae50cc645 Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
2020-07-09Add substitution_filter business logic unit testsaribeiro1-0/+482
Issue-ID: SDC-3165 Change-Id: I91f3075c43d04add450c16614b07f08219ad743d Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
2020-07-09Add support for substitution_filter business logicaribeiro14-649/+1092
Tosca simple YAML profile allows for substitution_filter to be specified for a topology template to provide processing instructions to the orchestrator. Issue-ID: SDC-3147 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: Ia94b8c447d3157e614f9d1524ad4520b3980ba4d
2020-07-05Fix sonar issuessebdet3-105/+95
Fix sonar/checkstyle issues in sdc code Issue-ID: SDC-3158 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I33638b39d39b7e918437cb9f3e0f15d52fa92218
2020-07-05Fix sonar issuessebdet4-45/+58
Fix sonar/checkstyle issues in sdc code Issue-ID: SDC-3158 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I004b0f579ff1f273f39a155217972f5efcdcf5cb
2020-07-05Fix sonar issuessebdet1-44/+40
Fix sonar/checkstyle issues in sdc code Issue-ID: SDC-3158 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I0ae188c5f0e2d96fd94de66fe0dcd0c47bcd9af5
2020-07-05Fix sonar issuessebdet5-150/+110
Fix sonar/checkstyle issues in sdc code Issue-ID: SDC-3116 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: Ic29f9233838e15b195d1a339bfac8e6d56888609
2020-07-05Clean CsarUtils::MainYamlWithDependenciesFrancis Toth8-212/+112
Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I593dd7bb6a20445899a14da793e8c550e1e14e09 Issue-ID: SDC-2812
2020-06-30Fix test coverage drop introduced by #109510vasraz1-6/+0
Change-Id: Ic74f11f60ff7673330a8c3521da49a92f70ae0fb Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3149
2020-06-25Rationalize maven dependenciesJulienBe1-15/+0
Issue-ID: SDC-3149 Signed-off-by: JulienBe <julien.bertozzi@intl.att.com> Change-Id: I1ee42494a4cc5b185b6dfcbee44399d2960cf880
2020-06-25add a new profil for fast buildJulienBe1-0/+1
Issue-ID: SDC-3148 Signed-off-by: JulienBe <julien.bertozzi@intl.att.com> Change-Id: Ie98194fe6d136f57491a0590ab2afc9db59fbfbd
2020-06-25Fix AssertChrisC1-3/+3
Fix Sonar Asserts Issue-ID: SDC-3116 Signed-off-by: ChrisC <christophe.closset@intl.att.com> Change-Id: I92dcd21a3cec903792c20275be8b955c5910e566
2020-06-24Fix for name clash in csar generationKrupaNagabhushan1-2/+6
Issue-ID: SDC-3144 Change-Id: Ia9b66bb14bbff3add70eed8dfe41acc55c72b35b Signed-off-by: KrupaNagabhushan <krupa.nagabhushan@est.tech>
2020-06-24Improvement sdc-BE-init python scriptsk.kedron18-105/+253
- Implemented retries when request fail - Moved configuration variables to the Properties file - Extended sdcBeProxy - Implemented script to run import/update (should fix deployment glitch) - Updated the import_Normatives recipes to use new script Issue-ID: SDC-2784 Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com> Change-Id: I83fab898783ad8d3b3d532af43d75bc54d033c33
2020-06-24Refactoring the check backend, create consumersk.kedron13-174/+138
Continue refactoring: - added script for healthCheck, create new consumers - also update chef recipes to use new script Issue-ID: SDC-2784 Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com> Change-Id: I158d816362f91f74b217fe85112cf7c14da8f1ec
2020-06-24Add Node Filter Business Logic Unit Testsaribeiro3-23/+502
Issue-ID: SDC-3125 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I80c755f4fffa813396ceb85c6aa7fde5b32590cd
2020-06-24Refactoring the sdc-BE-init python scriptsk.kedron74-3542/+1568
Deeper refactoring of python script: - create the python package with init script - support for python 3.x - reuse code - new design - support for .json conf file - update the docker chef script Issue-ID: SDC-2784 Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com> Change-Id: I02169eb7d0e3e90851ba1811536d1712c3b4145f
2020-06-21Toggletalio9-122/+333
Add toggling mechanism to catalog side. The first toggleable feature is healing - this was added to healing flow, in healJanusGraphDao Issue-ID: SDC-2874 Signed-off-by: talio <talio@amdocs.com> Change-Id: If386651cab8304ebaf13497ded3a7a50bd60e477 Signed-off-by: talio <talio@amdocs.com>
2020-06-21Add Node Filter Servlets Unit Testsaribeiro4-25/+515
Issue-ID: SDC-3117 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I84e728f21290a59c7674f97d5977b945b93ef546
2020-06-21Add Support for node_filtersaribeiro13-934/+1036
Allows for node_filter to be specified for a node template to provide processing instructions to the orchestrator Issue-ID: SDC-3095 Change-Id: I4e496e300552049d9bfd00df878b86d9fb97312b Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
2020-06-19Fix Sonar issuesChrisC1-3/+4
Fix assertThat usage and tests Issue-ID: SDC-3116 Signed-off-by: ChrisC <christophe.closset@intl.att.com> Change-Id: Ife533a479096047c4ccb7ae46dfaaa6e2ece974d
2020-06-18Importing VSP with node_type in separate fileMichaelMorris4-5/+88
Import fails when a node_type referenced in the main template is defined in a separate yaml file in the csar even when that separate file is correctly imported in the main template Change-Id: I6abe074585c2ce592fe9bed7abe76f0856bcfe93 Issue-ID: SDC-2850 Signed-off-by: MichaelMorris <michael.morris@est.tech>
2020-06-17Refactor ArtifactsBusinessLogic::getUpdatedGroupInstancesFrancis Toth1-23/+20
Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I6d62c1f916aa820f84328d25d2afbc7470397b0d Issue-ID: SDC-2961
2020-06-17Extract ComponentCache from CsarUtilsFrancis Toth4-89/+306
This commit aims to decouple the component caching logic from CsarUtils to its own class. Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: Ia7e9284639ec8cd87ca5107e12f295e2eb599768 Issue-ID: SDC-2812
2020-06-17Support the substitution_mappings in the VNFDMichaelMorris3-10/+44
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-2957 Change-Id: I8a385b02568b3bf3d83a250cbe36a7e7f61e710c
2020-06-15Add some unit testsSatoshi Fujii1-151/+403
This change added some unit tests for ComponentInstanceBusinessLogic to increase test coverage and removed unused variables for better readability. Also the test class was rewritten to use JUnit 5. Change-Id: I519976d00d8eccc194f8f1168d45f95392808652 Signed-off-by: Satoshi Fujii <fujii-satoshi@jp.fujitsu.com> Issue-ID: SDC-2885
2020-06-15Fix Critical security vulnerabilityvasraz1-11/+68
com.fasterxml.jackson.core : jackson-databind : 2.9.9 Change-Id: I81af7879cb1fbcd158177a3dc220b704ff2f3388 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3111
2020-06-14Use dummy info for distribution-engineOfir Sonsino1-11/+10
Change-Id: I7679e0ed8ce4c4217cf6c5f4a646fe06cf32372d Issue-ID: SDC-3115 Signed-off-by: Ofir Sonsino <os0695@intl.att.com>
2020-06-14Add support for directives on VFCaribeiro1-0/+1
This change also updates the directives values according to Tosca 1.3 spec Issue-ID: SDC-3074 Change-Id: Ia6a68c9a23a71a2c17ba2c006990342811aa7b4e Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
2020-06-11Rewrite of `updateArtifactOnInterfaceOperationByResourceUUID` to remove NPEChris André1-24/+25
Issue-ID: SDC-2978 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I60942ab1767bf65c806ce796ca62365396b20d93
2020-06-10Set properties on XML parsers to prevent XXE attackNeil Derraugh2-2/+10
- Set ACCESS_EXTERNAL_DTD and ACCESS_EXTERNAL_SCHEMA properties on XML parsers to prevent XXE attacks Issue-ID: SDC-3106 Signed-off-by: Neil Derraugh <neil.derraugh@yoppworks.com> Change-Id: If4e835858dd3d718d37b3ee41fb2fd0c94574c24
2020-06-10Fix sonar bugssebdet2-71/+67
Fix all sonar bugs reported in SwitchoverDetector class + fix all checkstyle issues Issue-ID: SDC-2931 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: Ic86a3526fc7030e10a61b150058c04a391c40c7b
2020-06-10Support setting SDC-BE configuration at deployment timevasraz3-6/+11
Change-Id: I4b384bc911630d6041a0c5c235d3aaf3ac148090 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3076
2020-06-08Make Directive values Tosca compliantaribeiro7-148/+128
Issue-ID: SDC-3079 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: Ie711c61244a4e2d68a96e2814ba2db52e067c6e4
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-28Fix interface types creationandre.schmid4-28/+196
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-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