aboutsummaryrefslogtreecommitdiffstats
path: root/catalog-be/src/main/java
AgeCommit message (Collapse)AuthorFilesLines
2020-09-21Support for Test Topology Auto Design- Service Importzhaoxiangjun66631-106/+8205
Add some test code and use lombok in catalog-model Test Topology Auto Design （NFV Testing Automatic Platform） Delete useless test code and add test code for new function Issue-ID: SDC-3179 Issue-ID: SDC-3085 Signed-off-by: zhaoxiangjun666 <xjzhaop@isoftstone.com> Change-Id: I7f555633a00848c273014caa18ea0e30d0b22113
2020-09-07Fix Vulnerabilities reported by SONARvasraz3-11/+10
Change-Id: I8f4e173a4ea5111db55eebaf15be86f1583082ad Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3248
2020-09-07Make directives options configurable backendaribeiro3-54/+50
Issue-ID: SDC-3277 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I51ece01c0b0deb93cc7ab79ce8dcb9e1c5503074
2020-09-07Make directives options configurablearibeiro1-0/+104
Issue-ID: SDC-3275 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: Ia91655f02c45d033ebae45bd6d9f252c2f6d6f47
2020-09-07Enable selection of requirementsvasraz3-1/+124
Instead of all requirements of the component instances in a component being exposed outside the component, this change will enable the component designer to specifiy which should be exposed outside the component and which are to be internal to the component Change-Id: Ib063f7b8b0aca94896e78a46f069725bae3d494d Issue-ID: SDC-2771 Signed-off-by: MichaelMorris <michael.morris@est.tech> Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
2020-09-07Use meaningful workflow namexuegao1-4/+5
When generate csar, use meaningful workflow name instead of null. Issue-ID: SDC-3230 Signed-off-by: xuegao <xg353y@intl.att.com> Change-Id: I250e2f928aa33b2da86a7c458c098713c43a5074
2020-09-07Replace artifact folder ONBOARDED_PACKAGE in CSARvasraz1-0/+4
Replace artifact folder ONBOARDED_PACKAGE for ETSI_PACKAGE in TOSCA CSAR. Also included VF artifacts will also have the same folder replaced. Change-Id: If03f13a80894e98a0abe1b849322f86a27dfd3f1 Issue-ID: SDC-3261 Signed-off-by: andre.schmid <andre.schmid@est.tech> Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
2020-09-07Add 'data_types' during import VFCsvasraz3-101/+225
Change-Id: Ib9974bbc1eb88633e7e6834cc7ef8ae95deda539 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3191
2020-09-07Retrieve node_filter capabilitiesaribeiro1-10/+27
Issue-ID: SDC-3270 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: Ieb1b3c4d31a50e73112fc34cdd8d5fd9ba9e6a30
2020-09-07Add support for TOSCA 1.3vasraz1-1/+2
Change-Id: I57da82df0f035803f4921db5b3ec9ede3ff7a952 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3273
2020-09-07Map topology inputs to properties in substitution mappingaribeiro2-1/+14
Allows to map properties of the node_type to inputs of the topology template for a service Issue-ID: SDC-3254 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: Iee49fe0ac29a39b98d8dc8185401f4d1c4aeffbb
2020-09-07Update node_filter capabilitiesaribeiro2-9/+49
Issue-ID: SDC-3265 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: Ib2dbd299ff5fc336258bf29a303210eacfd984cf
2020-09-07Delete node_filter capabilitiesaribeiro2-4/+13
Issue-ID: SDC-3264 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I91bb476819aaf247ec106139a3af1afe327a700c
2020-09-07Add node_filter capabilitiesaribeiro2-14/+59
Issue-ID: SDC-3263 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I2965c8b0b9331b035ba5f9cc7f58d9ea3af26402
2020-09-07Adjusting check condition for ZipOutputStreamKrupaNagabhushan1-2/+4
Issue-ID: SDC-3226 Signed-off-by: KrupaNagabhushan <krupa.nagabhushan@est.tech> Change-Id: I49e8916e23a7883832a02e6f294fd3f2a537f3a2
2020-09-04Support for Nested/Hierarchical ServicesMichaelMorris3-51/+141
Change-Id: I478cf2e1f9cf96443a3e35bf22ac2c9d72bca8f1 Issue-ID: SDC-3145 Signed-off-by: MichaelMorris <michael.morris@est.tech>
2020-09-04Upgrade Vulnerable Direct Dependencies [jackson]amohamad1-1/+1
Issue-ID: SDC-3051 Upgrade from jackson-databind 1.9 and 2.10 to 2.11 upgrade the respective pom.xml files Upgrade the 1.9 imports and required code changes Upgrade the beans-services.xml files Change-Id: I56b59e08d65a0a1888c8caeb5470bc0c6a028ddd Signed-off-by: amohamad <a.mohamad@queensu.ca>
2020-09-02Support for defining attributes on a node_typevasraz10-450/+522
This commit aims to add support of attributes on node_type. It is first of several commits to cover all support. It includes: - new classes: AttributeDefinition ComponentInstanceAttribute IAttributeInputCommon IAttributeInputCommon AttributeDataDefinition MapAttributesDataDefinition - support of 'Import of VFC with attributes' - TCs fix for changed code Next commit(s) will cover: - support of "Onboarding packages with attributes" - support of "Download TOSCA Artifacts - Tosca Model" - support of "Import onboarded VSP" Change-Id: I0167abc58e8aeef3d631833cc323e466f8e71492 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3200
2020-08-24Expose generic Service properties as propertiesandre.schmid1-12/+33
During the Service creation, the properties declared in the Generic Service Type are being parsed to inputs, but not to properties. The change parses the properties also to properties, keeping the previous input logic. Change-Id: I3ceba3adeaab56cd49fc8fbd657b02aa7c93e79b Issue-ID: SDC-3061 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-08-11Fix workflow designer issuexuegao1-0/+1
Fix the issue so that the workflow bpmn will be packed into csar again. Issue-ID: SDC-3181 Signed-off-by: xuegao <xg353y@intl.att.com> Change-Id: I5f8ca112fe1bd2a7abf1529f491400237d88ce56
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 testingvasraz1-27/+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.schmid3-127/+68
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-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 endpoints for supporting substitution_filteraribeiro3-48/+328
Issue-ID: SDC-3160 Change-Id: Ibc722f283451fecde7655e867654880ae50cc645 Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
2020-07-09Add support for substitution_filter business logicaribeiro12-621/+1064
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 issuessebdet1-39/+52
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 Toth5-68/+40
Signed-off-by: Francis Toth <francis.toth@yoppworks.com> Change-Id: I593dd7bb6a20445899a14da793e8c550e1e14e09 Issue-ID: SDC-2812
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-24Add Node Filter Business Logic Unit Testsaribeiro2-23/+22
Issue-ID: SDC-3125 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I80c755f4fffa813396ceb85c6aa7fde5b32590cd
2020-06-21Toggletalio4-54/+241
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 Testsaribeiro3-25/+20
Issue-ID: SDC-3117 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I84e728f21290a59c7674f97d5977b945b93ef546
2020-06-21Add Support for node_filtersaribeiro9-870/+986
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-18Importing VSP with node_type in separate fileMichaelMorris2-4/+75
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 Toth2-70/+203
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 VNFDMichaelMorris1-5/+23
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-2957 Change-Id: I8a385b02568b3bf3d83a250cbe36a7e7f61e710c
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 bugssebdet1-70/+66
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-08Make Directive values Tosca compliantaribeiro5-131/+110
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 handlingvasraz5-75/+177
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