aboutsummaryrefslogtreecommitdiffstats
path: root/catalog-dao
AgeCommit message (Collapse)AuthorFilesLines
2021-07-21Consider component model when retrieving relationship typesKrupaNagabhushan1-19/+42
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-15Allow only types from selected model in service creationaribeiro2-4/+7
Issue-ID: SDC-3629 Signed-off-by: aribeiro <anderson.ribeiro@est.tech> Change-Id: I98edb8a1133b2df8d884782f3fb2758b42b94158
2021-07-15Specify model at service creationaribeiro1-1/+2
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 modelsaribeiro4-1/+9
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-05Reduce usage of outdated library JMockit (catalog-dao)vasraz7-263/+178
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3379 Change-Id: I6b46049b71eafbfedfd3d40c68c743efff13ef54
2021-06-14Add models imports endpoint and persistence structureandre.schmid10-11/+454
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-08Support adding of relationship type to modelMichaelMorris3-18/+102
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3610 Change-Id: If315e21fa40e491cb1977dd9ceaf3e9b607e2f6f
2021-06-04Fix dependencies with Critical Violationsvasraz1-7/+36
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Change-Id: Ic4fb2577c260c80e0204bc68df508f41d9835734 Issue-ID: SDC-3572
2021-05-28Add Support for creating model typearibeiro6-2/+135
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 dependenciesvasraz1-1/+1
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-15Update vulnerable package dependenciesvasraz1-0/+10
commons-io -> 2.7 org.freemarker -> 2.3.30 Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Change-Id: Ie18bd3abffdb64017ab49331864325beea8aa2c4 Issue-ID: SDC-3572
2021-05-15Support for selection of capabilitiesandre.schmid1-0/+5
Change-Id: Ib1a3e3e1a59fc84c62620932c408e231acf77024 Issue-ID: SDC-3580 Signed-off-by: André Schmid <andre.schmid@est.tech>
2021-04-09Allow property to take its value from defined input listKrupaNagabhushan1-1/+2
Issue-ID: SDC-3547 Change-Id: Ic438e8f8943d0f1c656e386611b88b25f879e83b Signed-off-by: KrupaNagabhushan <krupa.nagabhushan@est.tech> Signed-off-by: andre.schmid <andre.schmid@est.tech>
2021-03-26Improve test coveragexuegao1-35/+43
Add unit tests to improve test coverage. Issue-ID: SDC-3428 Change-Id: Ifd9e6eb25fa3ec9f4f93d283277574120edff835 Signed-off-by: xuegao <xue.gao@intl.att.com>
2021-03-25Improve test coveragexuegao1-0/+39
Add unit tests to improve test coverage. Issue-ID: SDC-3428 Change-Id: I47da0decd6b6df93ace68b2af586b255ef0b792e Signed-off-by: xuegao <xue.gao@intl.att.com>
2021-03-24Reformat catalog-daovasraz172-10073/+8617
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3449 Change-Id: I2180aed0f50e12a62cf6e55fbb4d3d9647e301ac
2021-03-24Improve test coveragexuegao6-53/+121
Add unit tests to improve test coverage. Issue-ID: SDC-3428 Change-Id: I29a8f1d49f1dfd6bca79f3d873d1e1ff7adc4fb2 Signed-off-by: xuegao <xue.gao@intl.att.com>
2021-03-22Update Master to IstambulChrisC1-1/+1
Set version 1.9.0 to ensure no clash of dockers when H branch stage jobs are going to produce stage dockers Issue-ID: SDC-3527 Signed-off-by: ChrisC <christophe.closset@intl.att.com> Change-Id: I008a90101d89bbd50fae98cc7ce5caae1958059b
2021-03-17Update SDC versionChrisC1-1/+1
Prepare for RC1 build for H release Issue-ID: SDC-3479 Signed-off-by: ChrisC <christophe.closset@intl.att.com> Change-Id: I91ce37170a98d17b71cd30ff9a43ec5fe63b8cad
2021-03-16Improve test coveragexuegao1-19/+6
Use Lombok annotations to improve test coverage. Issue-ID: SDC-3428 Change-Id: I78a9fa6171ba26e431b5e587b24548322c464ecc Signed-off-by: xuegao <xue.gao@intl.att.com>
2021-03-16Improve test coveragexuegao12-1079/+113
Use Lombok annotations to improve test coverage. Issue-ID: SDC-3428 Signed-off-by: xuegao <xue.gao@intl.att.com> Change-Id: I120d5f472e3bf8b1e417ec817c91bde33b0c901e
2021-03-12Adding unit testsxuegao1-57/+18
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-11Adding unit testsxuegao7-687/+70
Adding unit tests to improve test coverage. Issue-ID: SDC-3428 Signed-off-by: xuegao <xue.gao@intl.att.com> Change-Id: Icea75db44575c2ea9e6b51a34730e83b0d35f03f
2021-03-04Update to 1.8.31.8.3ChrisC1-1/+1
Update Version to prepare for release Issue-ID: SDC-3464 Signed-off-by: ChrisC <christophe.closset@intl.att.com> Change-Id: Ie23d18d3124ec8cf8edb77a468538c8548a11375
2021-02-27Improve test coveragevasraz18-375/+136
- 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-20/+9
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-26Improve test coveragevasraz1-38/+0
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3490 Change-Id: Idb71d433834a8612a5434c84c7f0fdef5573cea2
2021-02-25Update version to 1.8.21.8.2ChrisC1-1/+1
Update SDC poms to 1.8.2 to prepare for release Issue-ID: SDC-3464 Signed-off-by: ChrisC <christophe.closset@intl.att.com> Change-Id: I4a82d521dc8ec80b65082a12a1bc43598ae37e25
2021-02-25Improve import and export VFC TOSCA attributesandre.schmid2-5/+7
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-24Implement Attributes/Outputs BE (part 2)vasraz3-0/+8
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-22Fix locally failing TCs in catalog-bevasraz1-0/+10
Migrate to Junit 5 TCs that extends JerseyTest Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Change-Id: I4c81e70836ee5e634291d74cd1773d221dce3702 Issue-ID: SDC-3377 Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
2021-02-21Update node and data types for SOL001 3.3.1 + CNF enhancementsMichaelMorris1-19/+22
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)vasraz1-1/+2
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-30Update project version 1.8.0 -> 1.8.11.8.1Joanna Jeremicz1-1/+1
Version updated due to minor feature, introduced recently: Trim inputs in Property assignment Issue-ID: SDC-3390 Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com>, ChrisC <christophe.closset@intl.att.com> Change-Id: I35c8d5228278ce29b4134e649aae0eb220fe63ab
2021-01-20Remove dead codeJulienBe3-18/+9
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-14Create inputs independent of propertiesKrupaNagabhushan1-0/+3
Issue-ID: SDC-3431 Signed-off-by: KrupaNagabhushan <krupa.nagabhushan@est.tech> Change-Id: I4f29d0e490a14292fd1aa9f96ca6621b37f325d8
2021-01-12Support for category specific metadataMichaelMorris4-1/+30
Signed-off-by: MichaelMorris <michael.morris@est.tech> Issue-ID: SDC-3412 Change-Id: I87392cc21dc25253b558bdc1d453d99659d049fa
2020-12-07Support interface input during import VFCandre.schmid1-0/+2
Change-Id: I097ce258a7dadbedf1aff6ce53dd1286da074552 Issue-ID: SDC-3372 Signed-off-by: andre.schmid <andre.schmid@est.tech>
2020-12-03[SDC] Validate PMDictionary content in Deployment artifacts tabAdam Wudzinski1-4/+2
Validate PMDictionary file content when adding or updating PMDictionary in Deployment artifacts tab. Fix dependencies conflict. Issue-ID: SDC-3390 Signed-off-by: Adam Wudzinski <adam.wudzinski@nokia.com> Change-Id: I6f6bb196ef061419a309a8ded5fdbe116982a037
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-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 Importzhaoxiangjun6662-5/+18
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 SONARvasraz6-78/+28
Change-Id: I8f4e173a4ea5111db55eebaf15be86f1583082ad Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech> Issue-ID: SDC-3248
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-04Support for Nested/Hierarchical ServicesMichaelMorris2-1/+6
Change-Id: I478cf2e1f9cf96443a3e35bf22ac2c9d72bca8f1 Issue-ID: SDC-3145 Signed-off-by: MichaelMorris <michael.morris@est.tech>
2020-09-02Optimize Buildsebdet1-1/+10
Optimize the time required to compute the tests so that the build can be faster Issue-ID: SDC-3232 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I0ccbc3a0f9d895e75dcf5e4c1ef35ebf3ba06808 Signed-off-by: sebdet <sebastien.determe@intl.att.com>
2020-09-02Support for defining attributes on a node_typevasraz1-1/+2
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-07-29Upgrade Vulnerable Direct Dependencies [log4j]amohamad2-8/+13
Signed-off-by: amohamad <a.mohamad@queensu.ca> Issue-ID: SDC-3051 Upgrade from the vulnerable log4j 1.x to log4j 2.13.1 Add a log4j version property in sdc-main pom.xml Add two maven dependencies to respective child pom.xml Change name of log4j .properties and .xml config files to reflect log4j2 naming Update the configuration files to the totally new log4j 2 config syntax Replace PropertyConfigurator with LoggerContext Remove the abandoned log4j.lf5.util.ResourceUtils Signed-off-by: amohamad <a.mohamad@queensu.ca> Change-Id: Ie0f141eb2e0337ee5b63b61dc1395ccd8040558d
2020-07-09Add support for substitution_filter business logicaribeiro3-2/+27
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