summaryrefslogtreecommitdiffstats
path: root/catalog-model/src/main
AgeCommit message (Collapse)AuthorFilesLines
2021-07-05Refactor Substitution filters structureKrupaNagabhushan6-9/+21
The refactor removes unnecessary component id from the substitution filters structure, as the substitution filters belongs to and only to the component. This also avoid any copying issues during the new version creation, as there is not need to update the structure with a new component id. Issue-ID: SDC-3619 Signed-off-by: KrupaNagabhushan <krupa.nagabhushan@est.tech> Change-Id: Ibcfd9be0c8ceb95d5c1c3bd3f21c3dec26c398f7
2021-06-14Add models imports endpoint and persistence structureandre.schmid2-10/+133
Create the structure to persist the model imports. Changed create model API, allowing to create a model along its TOSCA descriptor import structure. Introduced an endpoint to update the imports of a model. Change-Id: Ic775ef544051c29c721cacc20b37c2fb20338be9 Issue-ID: SDC-3614 Signed-off-by: André Schmid <andre.schmid@est.tech>
2021-06-14Support adding capability types to modelMichaelMorris3-18/+71
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3612 Change-Id: I5d3713ba420c2392dd232b5651aef4d51560ab4a
2021-06-08Support adding data types to modelMichaelMorris5-54/+110
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3611 Change-Id: Ia9fd2437b71a2cd4fc853ff6a1f4fd37fe09a685
2021-06-08Support adding of relationship type to modelMichaelMorris3-56/+74
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3610 Change-Id: If315e21fa40e491cb1977dd9ceaf3e9b607e2f6f
2021-05-28Add Support for creating model typearibeiro4-0/+150
Add new vertex type called "model" was added to represent models Add new edge type called MODEL_ELEMENT was added to connect a tosca type to a model Add new edge type called MODEL was added to connect a resource/service to the model it is based on Issue-ID: SDC-3596 Signed-off-by: MichaelMorris <michael.morris@est.tech> Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I310e14d0cf5a9ca0eb0bda592efe8a3baf73749c
2021-05-27Update vulnerable package dependenciesvasraz9-9/+9
org.apache.commons.lang -> org.apache.commons.lang3:3.10 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Change-Id: I5806fd786394d278244fd88ea4925a91c2f05622 Issue-ID: SDC-3572
2021-05-24[SDC] Fix sonar issuessliard2-2/+5
Fix all blocker issues for catalog-be Issue-ID: SDC-3598 Signed-off-by: sliard <samuel.liard@gmail.com> Change-Id: I53907c1be4cac5dd94b6f20ab4e5848f6fcebed9
2021-05-15Improve test coveragevasraz1-39/+28
Change-Id: I2b02d85d9d395d9092d43bd54e21179aff29df91 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3584
2021-05-15Support for selection of capabilitiesandre.schmid5-5/+258
Change-Id: Ib1a3e3e1a59fc84c62620932c408e231acf77024 Issue-ID: SDC-3580 Signed-off-by: André Schmid <andre.schmid@est.tech>
2021-04-29Refactor data types cacheandre.schmid5-167/+204
Avoids potential issue of data type cache changes by external parties, by returning copies from the cache instead of the original. Refactors the code for more clarity. Change-Id: Ibb518bf638f2f4ee1f5e3869baaace374efb632a Issue-ID: SDC-3569 Signed-off-by: André Schmid <andre.schmid@est.tech>
2021-04-19Fix 'Unable to save changed attributes default value'vasraz1-0/+33
Implements missing functionality to save changed attribute Change-Id: I1bc828ef133c8a2bf2fd6333a51fb46fc41b6547 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3562
2021-04-09Set default value for ETSI versionMichaelMorris1-12/+12
Sets the default value for ETSI version and updates code to use the default value for any mandatory category specific metdata with null values. Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3548 Change-Id: I445443d1de9447945fb0dd8babd3fcebd8e8ed7d
2021-04-01Increase TOSCA integer validator supported rangevasraz1-22/+25
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Change-Id: Iebd6f977cec5f40ed7b07fceaf3dd62a3c138e2c Issue-ID: SDC-3541
2021-03-24Enable selection of base type of servicevasraz5-1/+148
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3506 Change-Id: Iaba39955fac9056cb0d0f1eccd223c05dfb9c5b4 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
2021-03-19Reformat catalog-modelvasraz272-13059/+9990
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3449 Change-Id: I8dca05304f656894cfb70329c45d8cd5d1ca925c
2021-03-17Improve test coveragexuegao2-77/+13
Use Lombok annotations to improve test coverage. Issue-ID: SDC-3428 Signed-off-by: xuegao <xue.gao@intl.att.com> Change-Id: I3701c1ae8f8a1648c17227095071a7a581eb8ac1
2021-03-12Adding unit testsxuegao1-6/+4
Adding unit tests to improve test coverage. Issue-ID: SDC-3428 Signed-off-by: xuegao <xue.gao@intl.att.com> Change-Id: I57da2ff92839cb78985e5f3d3c13dc575c1b6c17
2021-03-01Improve test coveragevasraz11-287/+8
- remove unused code - use lombok Change-Id: I8c52584249347c7ca2102022457225401f95b9a5 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3490
2021-02-27Improve test coveragevasraz4-66/+0
- remove unused code - use lombok Change-Id: I7f6591785243ecb866f4c4b2cf428ae8f3c5172b Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3490
2021-02-26Adding unit testsxuegao1-8/+6
Adding unit tests to improve test coverage. Issue-ID: SDC-3428 Change-Id: I64ed1937fb95b16f8af2df20aa10a6d7c45e42e8 Signed-off-by: xuegao <xue.gao@intl.att.com>
2021-02-25Fix bugs introduced by new codevasraz1-12/+8
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Change-Id: Ide809e2e83b3f620dd1f173266edbe94967454f5 Issue-ID: SDC-3475
2021-02-25Fix 'not deleting Outputs'vasraz1-0/+7
Change-Id: I1a5ab1dec4ab7ec381df157e9c12dc8fa00e82c4 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3448
2021-02-25Improve import and export VFC TOSCA attributesandre.schmid3-32/+21
Improve the import and export VFC TOSCA attributes, addressing the following concerns: - brings the import and export logic very close to the properties logic, as they are very similar structures - fix import/export default values for complex types and list of simple or complex types - fix export of unnecessary/empty attribute entries - creation of attributes during the initialization (base types) - inheritance of parent attributes Change-Id: Ic733e3455fc256595b5c2b1f48e19a13be27b5cc Issue-ID: SDC-3466 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2021-02-24Fix exception thrown in ToscaElementOperationMichaelMorris1-2/+9
This is caused by the absence of the metadataKeys property in the category definitions already in the DB Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3486 Change-Id: I58062955f3d79ca2b9496ce60f9d0c09aa6147fa
2021-02-24Implement Attributes/Outputs BE (part 2)vasraz15-121/+526
This commit includes support for: - declare Attribute as Output - undeclare Attribute as Output - export 'Tosca Artifacts' with Attributes/Outputs Change-Id: Iedfbf936e439fd2f7d252b660fe2c42b8d9b9113 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3448
2021-02-21Update node and data types for SOL001 3.3.1 + CNF enhancementsMichaelMorris3-5/+135
Types in 2.7.1 folder are types valid for v3.3.1 that have not changed from v2.7.1 Types in 4.1.1 folder are the CNF enhancements which it is assumed will be in v4.1.1 Includes some changes in functionality to support: 1. Deployment of both existing (2.5.1) versions of types and new versions of types through sdc-BE-init 2. Selection of the correct node type definition version at onboarding of an ETSI SOL004 VNF/CNF csar, based on the declared version supported in the csar (i.e. when a 3.3.1 csar is imported, the node type definitions valid for 3.3.1 are used (rather than current logic which always selects the latest version) Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3470 Change-Id: Iff835d230b173b9d44349caa6b0b11d783e8f8d3
2021-02-18Implement Attributes/Outputs BE (part 1)vasraz18-803/+796
This commit includes support for: - import VFC with attributes - add VFC to VF/Service - show attributes in VF/Service Change-Id: I2cda966ab878ae7aee4bcfecf266c5c251c91164 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3448 Signed-off-by: JulienBe <julien.bertozzi@intl.att.com>
2021-01-29Add support for updating interface operationsaribeiro2-7/+14
Allows to update interface operations on a component instance. Issue-ID: SDC-3446 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Signed-off-by: andre.schmid <andre.schmid@est.tech> Change-Id: I6a2c44997c04d9d9ea298e3d0bc971da7b137799
2021-01-25Handle ETSI versions in NSD Pluginandre.schmid1-0/+1
The plugin now considers the ETSI version in the component metadata to generate the correct imports of nsd types, i.e., aligned with the provided version. Change-Id: I54aee04722a4434eac59ea8b70c4f30f5c81645e Issue-ID: SDC-3447 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2021-01-20Fix error in service substitutionMichaelMorris1-1/+1
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3440 Change-Id: I3de45ac5f940a3ac24dec2b5520bdf8d297e63c4
2021-01-20Remove dead codeJulienBe10-135/+53
Remove unused variables Remove unnecessary statements Issue-ID: SDC-3428 Signed-off-by: JulienBe <julien.bertozzi@intl.att.com> Change-Id: Iddc8ffdc141edd409d50f90c03cb6612f6ebf042 Signed-off-by: JulienBe <julien.bertozzi@intl.att.com>
2021-01-15Initial support for relationship_templatesandre.schmid5-28/+194
Change-Id: Ia246b9f11a77815c0585abfa0b3de5433728001a Issue-ID: SDC-3435 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2021-01-14Create inputs independent of propertiesKrupaNagabhushan1-2/+41
Issue-ID: SDC-3431 Signed-off-by: KrupaNagabhushan <krupa.nagabhushan@est.tech> Change-Id: I4f29d0e490a14292fd1aa9f96ca6621b37f325d8
2021-01-13Enable updating of categoriesMichaelMorris2-2/+84
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3432 Change-Id: Iea0264db40f9d13462182cf0a37ffdd0278f6a1f
2021-01-12Improve test coverageJulien Bertozzi1-18/+4
Issue-ID: SDC-3428 Signed-off-by: JulienBe <julien.bertozzi@intl.att.com> Change-Id: I48b6991fbbea31279246d92692760fc6375c7eb5 Signed-off-by: JulienBe <julien.bertozzi@intl.att.com>
2021-01-12Support for category specific metadataMichaelMorris7-3/+87
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3412 Change-Id: I87392cc21dc25253b558bdc1d453d99659d049fa
2020-12-07Allow substitution_filter for a VFKrupaNagabhushan1-0/+1
Issue-ID: SDC-3365 Signed-off-by: KrupaNagabhushan <krupa.nagabhushan@est.tech> Change-Id: I5894bffbc8e605de26832d03c6f988f17413393b
2020-12-07Support interface input during import VFCandre.schmid1-12/+14
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-10-23Fix for substitution filter propertiesKrupaNagabhushan5-68/+37
Issue-ID: SDC-3325 Change-Id: If26bf895a0a2f914fb9c2b36e53466df9b7999fe Signed-off-by: KrupaNagabhushan <krupa.nagabhushan@est.tech>
2020-09-21Support for Test Topology Auto Design- Service Importzhaoxiangjun6664-3/+279
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 requirementsvasraz2-1/+73
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-07Add 'data_types' during import VFCsvasraz5-77/+117
Change-Id: Ib9974bbc1eb88633e7e6834cc7ef8ae95deda539 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3191