summaryrefslogtreecommitdiffstats
path: root/catalog-model
AgeCommit message (Collapse)AuthorFilesLines
2020-12-07Support interface input during import VFCandre.schmid2-53/+44
Change-Id: I097ce258a7dadbedf1aff6ce53dd1286da074552 Issue-ID: SDC-3372 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-11-17Fix import VFC with attributesaribeiro8-39/+506
Fix import VFC with default attribute value Fix Update, create and delete attribute action Make attribute definition tosca compliant Issue-ID: SDC-3381 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: Ibbd36b105b8c86d1e750f3b6d55752d63fe6530e
2020-11-17When submitting the service CSAR file import, duplicate key null appears in ↵zhaoxiangjun6661-1/+1
the log Issue-ID: SDC-3382 Change-Id: I7679cd7677f9e9bb6e7c8efd8f081fba4972d1bd Signed-off-by: zhaoxiangjun666 <xjzhaop@isoftstone.com>
2020-11-16Fix node filter capability filtersaribeiro1-2/+1
Issue-ID: SDC-3335 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I6ffc1e0fb079ac0e33262f16a62deefda97f7616 Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
2020-11-05Add substitution_mapping attributes mappingvasraz2-0/+39
Add support of mapping the outputs to attributes in substitution_mapping Change-Id: Ifbe95a1fdfd476aa7aca17502ee9b30bea906874 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3320
2020-11-05Update master to HonoluluChrisC1-1/+1
Update pom to 1.8 so that staging images are created for H release Issue-ID: SDC-3349 Signed-off-by: ChrisC <christophe.closset@intl.att.com> Change-Id: Ied353406c6ff40a43e7176f0c5b42408d7f4dd56
2020-10-26Fix broken local build1.7.2vasraz1-1/+1
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3333 Change-Id: Ia246d909488517b037c01c9e0907d910b31e9db6
2020-10-23Fix for substitution filter propertiesKrupaNagabhushan5-68/+37
Issue-ID: SDC-3325 Change-Id: If26bf895a0a2f914fb9c2b36e53466df9b7999fe Signed-off-by: KrupaNagabhushan <krupa.nagabhushan@est.tech>
2020-10-20Upgrade to 1.7.2sebdet1-1/+1
Prepare for release 1.7.2 Issue-ID: SDC-3323 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: Ie36a6fd164eefd776cc90b0c5d9527993e87cc02
2020-09-21Support for Test Topology Auto Design- Service Importzhaoxiangjun6666-3/+472
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-14Fix VSP updating issuexuegao1-1/+3
Fix the issue during the VSP updating. Issue-ID: SDC-3104 Signed-off-by: xuegao <xg353y@intl.att.com> Change-Id: If58aa1a7f1846b0269a7f759b47c7f00f834ae1f
2020-09-08Upgrade to java 11sebdet1-2/+3
MOve SDC to Java 11, this is one of the PR to move to Jdk 11, jenkins will have to be changed as well Issue-ID: SDC-2725 Change-Id: I85f13f14ba8004f6e9656093a837465a2e4af3e1 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Signed-off-by: xuegao <xg353y@intl.att.com> Signed-off-by: sebdet <sebastien.determe@intl.att.com>
2020-09-07Fix Vulnerabilities reported by SONARvasraz1-1/+1
Change-Id: I8f4e173a4ea5111db55eebaf15be86f1583082ad Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3248
2020-09-07Enable selection of requirementsvasraz4-3/+139
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-07Update version to 1.7.1sebdet1-1/+1
Update the pom to 1.7.1 so that we could deliver when we want Issue-ID: SDC-3274 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I1cea02ebe28cc7cbb03ea5dd3ced98953e32dfc1 Signed-off-by: sebdet <sebastien.determe@intl.att.com>
2020-09-07Add 'data_types' during import VFCsvasraz6-129/+233
Change-Id: Ib9974bbc1eb88633e7e6834cc7ef8ae95deda539 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3191
2020-09-07Retrieve node_filter capabilitiesaribeiro1-1/+1
Issue-ID: SDC-3270 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: Ieb1b3c4d31a50e73112fc34cdd8d5fd9ba9e6a30
2020-09-07Update node_filter capabilitiesaribeiro1-4/+16
Issue-ID: SDC-3265 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: Ib2dbd299ff5fc336258bf29a303210eacfd984cf
2020-09-07Delete node_filter capabilitiesaribeiro1-4/+14
Issue-ID: SDC-3264 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I91bb476819aaf247ec106139a3af1afe327a700c
2020-09-07Add node_filter capabilitiesaribeiro1-0/+17
Issue-ID: SDC-3263 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I2965c8b0b9331b035ba5f9cc7f58d9ea3af26402
2020-09-04Rewrite of `cloneToscaElementForCertify` to remove NPEChris André1-25/+46
- Modularized `cloneToscaElementForCertify` in smaller, less complex parts (`updateEdgesDeleteNotCertifiedVersionsAndHandlePreviousVersions`) Issue-ID: SDC-2967 Signed-off-by: Chris Andre <chris.andre@yoppworks.com> Change-Id: I7f9e8a9e337147fd48c1c4c742eff5abf7ebacf8
2020-09-04Support for Nested/Hierarchical ServicesMichaelMorris5-4/+57
Change-Id: I478cf2e1f9cf96443a3e35bf22ac2c9d72bca8f1 Issue-ID: SDC-3145 Signed-off-by: MichaelMorris <michael.morris@est.tech>
2020-09-02Support for defining attributes on a node_typevasraz24-1068/+350
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-24Fix Error Updating VSP in Rresource Template for PNFajay_dp0012-20/+23
Issue-ID: SDC-3090 Signed-off-by: ajay_dp001 <ajay.deep.singh@est.tech> Change-Id: I3389a9a942c74f41ed037b9f13498b9cf999d441
2020-07-29Config. allowed instances in component compositionandre.schmid8-28/+431
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-09Add support for substitution_filter business logicaribeiro10-155/+302
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-06-25Rationalize maven dependenciesJulienBe1-21/+1
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-24Add Node Filter Business Logic Unit Testsaribeiro1-5/+7
Issue-ID: SDC-3125 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I80c755f4fffa813396ceb85c6aa7fde5b32590cd
2020-06-23Refactor ToscaTypeTestxuegao2-29/+114
Adding more tests and adding assert for old tests. Issue-ID: SDC-3143 Signed-off-by: xuegao <xg353y@intl.att.com> Change-Id: Id7cf5ec763b0d43dece9493613e336a4b3df9b72 Signed-off-by: xuegao <xg353y@intl.att.com>
2020-06-21Add Support for node_filtersaribeiro1-14/+12
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-49/+46
Assert params updated to be in correct order Issue-ID: SDC-3116 Signed-off-by: ChrisC <christophe.closset@intl.att.com> Change-Id: I8be2dec4a1d5ec9ab59ea8fddab540958fe25511
2020-06-15Fix Critical security vulnerabilityvasraz1-1/+24
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-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-19remove powermock dependency from pom xmlsRodrigo Lima1-12/+0
- 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-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-07Reduce scope from 'compile' to 'test' for 'junit-vintage-engine'vasraz1-0/+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 YAMLvasraz4-44/+7
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-06Prepare for Junit5vasraz1-358/+366
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-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-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-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