summaryrefslogtreecommitdiffstats
path: root/catalog-model/src/main
AgeCommit message (Collapse)AuthorFilesLines
2021-09-20Fix update VSP missing VSP version idandre.schmid4-3/+9
Fills the gaps of persisting and loading the VSP version id Change-Id: I4d6c63bd2309777fdfb337cf98c1a0f9daaa434b Issue-ID: SDC-3731 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2021-09-17Fix Update VSP when no version id is providedandre.schmid3-0/+69
Issue-ID: SDC-3730 Change-Id: Ic5a5a6ecf3b6775e022be649145e44b0907cbecf Signed-off-by: andre.schmid <andre.schmid@est.tech>
2021-09-10Fix model initaribeiro1-1/+2
When upgrading, the model type for "ETSI SOL001 v2.5.1" is being updated and then the request for retrieving all model types with "NORMATIVE" type returns empty Issue-ID: SDC-3720 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: Ibc71bd05426532416eb2ac09f598e7456777403b
2021-09-06Fix data type cache issue for model extensionsMichaelMorris2-36/+50
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3713 Change-Id: I56b8de3065848942a4ba8dd8486a7d87e7d8029e
2021-09-03Fix CSAR generation default imports file conflictandre.schmid1-0/+7
When generating a CSAR for a resource that is associated with a derived model, the default imports for the derived and parent model can conflict in path, therefore causing an issue during the CSAR zip generation which can't stand two entries with the same path. The fix adds a logic to rename a file when conflicting, by adding the model id as the file prefix. Change-Id: Ife7168f1c69f90be9c2cfd8ba75efad316c477f6 Issue-ID: SDC-3710 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2021-08-31Fix additional types import file generationandre.schmid2-61/+86
The additional_type_definitions.yaml is missing types entries and header. Also, the solution is not considering the types entries, i.e. 'data_types:', 'policy_types:', etc., when replacing types and generating the new file, which renders the solution broken. This change aims to fix the related problems. Change-Id: I412683b49966c09dd067ecbf8a1d778155b23fa6 Issue-ID: SDC-3703 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2021-08-30Include custom data types from VSP in csar importsandre.schmid1-0/+19
When a model with custom data types is created, the data types are now being added as part of the default model imports files. When a CSAR is generated from a Service Template that is associated to a derived model, the default imports from the parent model are also included in the package. Change-Id: I027d25d7237989a40085edec7fdd399ac09c4db1 Issue-ID: SDC-3692 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2021-08-27Support querying of model by typeMichaelMorris5-16/+43
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3678 Change-Id: I5fd19eefe475113df501901628b2ee8669004399
2021-08-26Add types to importsvasraz1-11/+88
Change-Id: Ifa1dea17841d8667044aff4e7a9a17b2a75b78e4 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3684
2021-08-26Remove usage of outdated library JMockit (catalog-dao)vasraz10-10/+10
Move JanusGraph to correct folder Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Change-Id: I726b2a714e0b59422865ef6ca2e7ba9f5881353b Issue-ID: SDC-3379
2021-08-26Validate the Resource Model before importing VSPandre.schmid10-197/+482
Validates the Resource Model selected during the Import VSP. This model must be aligned with one of the models that the imported VSP relates to. Fix VSP package retrieval to get the exact version from the VSP chosen during the Import VSP process. Introduces a client in the Catalog to retrieve from the Onboarding backend a VSP information using its Id and version Id. Change-Id: Ic8fb52b6daadc0e7203c81a9c15c3e46d5b9fffb Issue-ID: SDC-3675 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2021-08-25Import VSP with non-standard data typesMichaelMorris6-9/+7
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3673 Change-Id: I0fd16410788da3a82c74b1d38ffa4458e85e6ccc
2021-08-23Filter catalog in UI based on modeldavsad2-0/+2
Issue-ID: SDC-3679 Signed-off-by: davsad <david.sadlier@est.tech> Change-Id: Icd0eeb13dbfb1cc27745c7adf6a3212210e00a4a
2021-08-13Support models extending modelsMichaelMorris3-4/+59
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3668 Change-Id: Iad4d2a28c1c982e55e8835d4f30a9a212aefb6be
2021-08-12Update base types based on modelMichaelMorris4-26/+24
Also made some changes where model was not being considered Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3666 Change-Id: I450c5261239cf4104c494abe6711cb61368a2b4a
2021-08-06Retrieve data types based on component modelaribeiro8-94/+236
Issue-ID: SDC-3660 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I09c533eb39277532b29e581e4dd57e9df952e8e6
2021-08-06Consider component model when retrieving interface typesdavsad2-4/+7
Issue-ID: SDC-3414 Signed-off-by: davsad <david.sadlier@est.tech> Change-Id: Ie16a2604cfdff042e32bfa4f9a3a509b5da22226
2021-08-05Disable locking during deploymentdavsad2-8/+17
Issue-ID: SDC-3643 Signed-off-by: davsad <david.sadlier@est.tech> Change-Id: I1a04c253d70bf5aebf33bba7b2b9f83bd559ae64
2021-08-04Import VSP top. template handling non SDC modelMichaelMorris3-3/+41
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3649 Change-Id: I2e2004187f5694f92d65b73139436fc990e7a6af
2021-08-04Consider component model when retrieving group and policy typesKrupaNagabhushan4-68/+53
Issue-ID: SDC-3659 Signed-off-by: KrupaNagabhushan <krupa.nagabhushan@est.tech> Change-Id: I6d58e51e70085adf114e6efd0c29b00b14358b39
2021-07-28Consider component model when retrieving capability typesKrupaNagabhushan2-3/+3
Issue-ID: SDC-3642 Signed-off-by: KrupaNagabhushan <krupa.nagabhushan@est.tech> Change-Id: Ie09b5f8d64b95fc2db14f19d3857a9935075b2fe
2021-07-23Fix upgrade for different vendor releaseandre.schmid1-16/+15
Change-Id: Id5769b45c4b41fd40b7bac25407c046b8fe787e7 Issue-ID: SDC-3644 Signed-off-by: André Schmid <andre.schmid@est.tech>
2021-07-21Consider component model when retrieving relationship typesKrupaNagabhushan1-5/+4
Issue-ID: SDC-3640 Signed-off-by: MichaelMorris <michael.morris@est.tech> Change-Id: Ic06a9085b8aa2f44b8d33d7de12eadf691106131 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Signed-off-by: KrupaNagabhushan <krupa.nagabhushan@est.tech>
2021-07-21Support for associating interface types to modelsdavsad3-10/+54
Issue-ID: SDC-3639 Change-Id: I5eaa9ffbe3c88416bf17ff9a94e76faad79fe888 Signed-off-by: davsad <david.sadlier@est.tech>
2021-07-21Support for associating policy and group types to modelsKrupaNagabhushan5-65/+139
Issue-ID: SDC-3641 Signed-off-by: KrupaNagabhushan <krupa.nagabhushan@est.tech> Change-Id: I68f5d13dd41b577cf76555b11d9c90d7a5cc4832
2021-07-15Allow only types from selected model in service creationaribeiro6-38/+102
Issue-ID: SDC-3629 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I98edb8a1133b2df8d884782f3fb2758b42b94158
2021-07-15Specify model at service creationaribeiro8-6/+18
Allows a user to select a model when designing a service Issue-ID: SDC-3621 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I386e43ddeb649a4ba0805f153e4b47e8a528cff0
2021-07-05Support for associating node types to modelsaribeiro8-23/+177
Issue-ID: SDC-3597 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Signed-off-by: MichaelMorris <michael.morris@est.tech> Change-Id: Icd0066240b78ba98d8f0efab66d11756f18cb251
2021-07-05Create REST endpoint to retrieve modelsandre.schmid2-13/+48
Change-Id: Ifca0095d84d5da4ab4b055942d893e9c6a259eb7 Issue-ID: SDC-3622 Signed-off-by: André Schmid <andre.schmid@est.tech>
2021-07-05Remove usage of outdated library JMockit (catalog-model)vasraz1-28/+26
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Change-Id: I3888fb6f9a4c89aefc3dcb124529abd726c400d9 Issue-ID: SDC-3379
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