summaryrefslogtreecommitdiffstats
path: root/catalog-be
AgeCommit message (Collapse)AuthorFilesLines
2021-09-03Fix CSAR generation default imports file conflictandre.schmid4-4/+129
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-09-02Test for ValidateGenerateVfModuleGroupNamesstasys101-3/+59
Issue-ID: SDC-3702 Signed-off-by: stasys10 <stasys.jurgaitis@est.tech> Change-Id: Ib493ed976a7e92844c6822c2537a194bb48d2316
2021-09-02Fix mismatch in requirement name in sub mappingMichaelMorris3-10/+20
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3701 Change-Id: I0898d8b16c6e5cda035f33024f26644d7c6b1ef5
2021-08-31Fix additional types import file generationandre.schmid8-19/+17
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.schmid5-62/+82
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-27Improve invalid artifact label error messageKrupaNagabhushan2-1/+10
Issue-ID: SDC-3691 Signed-off-by: KrupaNagabhushan <krupa.nagabhushan@est.tech> Change-Id: I72f0fbec5839ecb343a73a9ca537e2e0a6437363
2021-08-27Fix get capability type with uidMichaelMorris2-4/+4
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3688 Change-Id: I2e74e612d90c984071cbf8f1dd43cf55a26034f5
2021-08-27Support querying of model by typeMichaelMorris8-12/+42
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3678 Change-Id: I5fd19eefe475113df501901628b2ee8669004399
2021-08-26Add types to importsvasraz17-268/+349
Change-Id: Ifa1dea17841d8667044aff4e7a9a17b2a75b78e4 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3684
2021-08-26Add ETSI SOL001 v2.5.1 model types to backend initdavsad37-6/+2203
Issue-ID: SDC-3685 Change-Id: I59e56cbe071c21467d0f683c7c977a8ceca6e221 Signed-off-by: davsad <david.sadlier@est.tech>
2021-08-26Remove usage of outdated library JMockit (catalog-dao)vasraz53-214/+228
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.schmid9-95/+321
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-26Fix broken buildvasraz1-3/+1
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Change-Id: I513b244dec9d420cd9314468647191f91314a3e0 Issue-ID: SDC-3687
2021-08-25Import VSP with non-standard data typesMichaelMorris11-38/+122
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3673 Change-Id: I0fd16410788da3a82c74b1d38ffa4458e85e6ccc
2021-08-25Fix service csar with model download failureMichaelMorris2-4/+5
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3681 Change-Id: I824b38de5d0669db8aa3d47530fa02dcdf0d4871
2021-08-24Update backend-init to use new endpoints allowing specific modeldavsad5-21/+69
Issue-ID: SDC-3676 Signed-off-by: davsad <david.sadlier@est.tech> Change-Id: I5e77185dcaa0f3172958ac93198ae2df2f17366b
2021-08-24Fix artifact name invalid error messageKrupaNagabhushan3-4/+11
Issue-ID: SDC-3680 Signed-off-by: KrupaNagabhushan <krupa.nagabhushan@est.tech> Change-Id: I859953a9a0d8065437589cd7592137b14b29c7e5
2021-08-23Filter catalog in UI based on modeldavsad2-14/+29
Issue-ID: SDC-3679 Signed-off-by: davsad <david.sadlier@est.tech> Change-Id: Icd0eeb13dbfb1cc27745c7adf6a3212210e00a4a
2021-08-23Load model default imports during CSAR GenerationKrupaNagabhushan4-21/+73
Issue-ID: SDC-3674 Signed-off-by: KrupaNagabhushan <krupa.nagabhushan@est.tech> Change-Id: I89dc555a2a90f1ac44b44655e36a75a79ac38bd0
2021-08-19Fix the license issue - javax.jms: 1.1vasraz1-7/+6
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Change-Id: I3cc500def5309467a091d581f56f4fb94e7a1600 Issue-ID: SDC-1877
2021-08-19Align all SDC dependencies versionsvasraz1-2/+2
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Change-Id: Iba19bd39ba5a136436ac1e9ca0a7dcc164d6f7bf Issue-ID: SDC-2875
2021-08-17Validate model exists when associating typesKrupaNagabhushan12-17/+103
Issue-ID: SDC-3665 Signed-off-by: KrupaNagabhushan <krupa.nagabhushan@est.tech> Change-Id: I44de1c5bbd8854d02ae512f65833507aa3cbed6d
2021-08-13Support models extending modelsMichaelMorris2-1/+16
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3668 Change-Id: Iad4d2a28c1c982e55e8835d4f30a9a212aefb6be
2021-08-12Update base types based on modelMichaelMorris19-52/+54
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 modelaribeiro37-485/+434
Issue-ID: SDC-3660 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I09c533eb39277532b29e581e4dd57e9df952e8e6
2021-08-06Consider component model when retrieving interface typesdavsad9-79/+95
Issue-ID: SDC-3414 Signed-off-by: davsad <david.sadlier@est.tech> Change-Id: Ie16a2604cfdff042e32bfa4f9a3a509b5da22226
2021-08-05Disable locking during deploymentdavsad4-10/+235
Issue-ID: SDC-3643 Signed-off-by: davsad <david.sadlier@est.tech> Change-Id: I1a04c253d70bf5aebf33bba7b2b9f83bd559ae64
2021-08-04Import VSP top. template handling non SDC modelMichaelMorris11-104/+523
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 typesKrupaNagabhushan13-50/+141
Issue-ID: SDC-3659 Signed-off-by: KrupaNagabhushan <krupa.nagabhushan@est.tech> Change-Id: I6d58e51e70085adf114e6efd0c29b00b14358b39
2021-07-30Fix init upgrade fail for polictyTypesKrupaNagabhushan2-0/+30
Issue-ID: SDC-3658 Signed-off-by: KrupaNagabhushan <krupa.nagabhushan@est.tech> Change-Id: I13a0d97c543213bda289157f602b019c74811cbc
2021-07-28Upgrade springframework to latest version (5.3.8)vasraz1-0/+58
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Change-Id: I5611f4f275f7a81a7f1b65fde36b2c84894f4619 Issue-ID: SDC-3648
2021-07-28Consider component model when retrieving capability typesKrupaNagabhushan2-4/+5
Issue-ID: SDC-3642 Signed-off-by: KrupaNagabhushan <krupa.nagabhushan@est.tech> Change-Id: Ie09b5f8d64b95fc2db14f19d3857a9935075b2fe
2021-07-27Remove dependency vulnerabilityvasraz1-0/+8
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Change-Id: Id6f1a33b86369b54af70094686d3a15d4dca3b15 Issue-ID: SDC-3572
2021-07-23Reduce usage of outdated library JMockit (catalog-be)vasraz11-707/+561
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Change-Id: I9a0e4cb7a5853e7f0d9e4eb819d4e63dacadfdf2 Issue-ID: SDC-3379
2021-07-23Fix upgrade for different vendor releaseandre.schmid3-70/+89
Change-Id: Id5769b45c4b41fd40b7bac25407c046b8fe787e7 Issue-ID: SDC-3644 Signed-off-by: André Schmid <andre.schmid@est.tech>
2021-07-23Remove commented code from PolicyBusinessLogicandre.schmid1-167/+1
Change-Id: I171a9b613625fd9d34fcfbd6aed8cd44f9fc1892 Issue-ID: SDC-3645 Signed-off-by: André Schmid <andre.schmid@est.tech>
2021-07-21Remove dependency vulnerabilityvasraz2-50/+64
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Change-Id: Ia703de3d5bad1780e63be401ce0b435cb665f505 Issue-ID: SDC-3572
2021-07-21Consider component model when retrieving relationship typesKrupaNagabhushan2-4/+8
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-8/+18
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 modelsKrupaNagabhushan6-25/+43
Issue-ID: SDC-3641 Signed-off-by: KrupaNagabhushan <krupa.nagabhushan@est.tech> Change-Id: I68f5d13dd41b577cf76555b11d9c90d7a5cc4832
2021-07-21Display model namearibeiro1-0/+1
Issue-ID: SDC-3632 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I7c6ec805298dee7b8327769b48c157f2bf0c30f9
2021-07-15Allow only types from selected model in service creationaribeiro11-52/+70
Issue-ID: SDC-3629 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I98edb8a1133b2df8d884782f3fb2758b42b94158
2021-07-15Specify model at service creationaribeiro6-10/+16
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-13Exposing new parameters in chef config for SDCmarine3-5/+11
Issue-ID: SDC-3633 Change-Id: Ib59ecbe151b3d7fb5b52241102f5c7dfc520003b Signed-off-by: xuegao <xue.gao@intl.att.com>
2021-07-05Support for associating node types to modelsaribeiro24-70/+600
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.schmid4-17/+109
Change-Id: Ifca0095d84d5da4ab4b055942d893e9c6a259eb7 Issue-ID: SDC-3622 Signed-off-by: André Schmid <andre.schmid@est.tech>
2021-07-05Refactor Substitution filters structureKrupaNagabhushan2-14/+42
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-14Init ONAP model imports using the model APIandre.schmid11-34/+2436
Creates a client for the model endpoint in the catalog init scripts. Introduces the directory structure to provide the models along its imports, separated by init/upgrade phase. Each model structure will be zipped and uploaded to the endpoint, based on the model directory name. Change-Id: I0392c1e6d3a29b30567b11016041a8e9cccbc745 Issue-ID: SDC-3615 Signed-off-by: André Schmid <andre.schmid@est.tech>
2021-06-14Add models imports endpoint and persistence structureandre.schmid11-53/+426
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 modelMichaelMorris4-11/+34
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3612 Change-Id: I5d3713ba420c2392dd232b5651aef4d51560ab4a