summaryrefslogtreecommitdiffstats
path: root/ms/blueprintsprocessor/functions/resource-resolution/src/test
AgeCommit message (Collapse)AuthorFilesLines
2019-12-30Relationship Type and Templates modelsBrinda Santh1-11/+11
Enrichment Support for Relationship Types and Templates. Relationship DSL support for ConnectTo connections ( RestClient, SshClient, MessageProducer, MessageConsume, Nats) Moved datatype map from collection to complex type Issue-ID: CCSDK-1054 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: I0f18db2cb52e1e93dfab04498b8298587cba2540
2019-12-11Metadata for name, version, tags and typeBrinda Santh2-8/+11
Mandate Tosca.meta template name, version, type and tags. Auto copy metadata from Tosca.meta to ServiceTemplate definitions. Optimize Blueprint context and runtime creation from file path. Removed attached CBA zip file in test repository dirs Issue-ID: CCSDK-1992 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: I5d9d7a4599234a38d431328dbd9b74bd831e0115
2019-12-11Separate jython implementation and dependencies.Brinda Santh1-22/+15
Refactored cds python capabilities to python-executor function, so that it will easy to disable and deprecation This change is not jython depreciation, just separating out Issue-ID: CCSDK-1865 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: I3727d72d7195c49d670c30a6fc4245f5a8599e3a
2019-11-29Optimize spring data JPA UT.Brinda Santh12-49/+154
Test case based database configuration, so that we can define what repositories and entities can be used for testing. Issue-ID: CCSDK-1735 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: I4f8a7eb4ed47fec9ab17eb9552648ebd0de01236
2019-11-26Formatting Code base with ktlintSingal, Kapil (ks220y)17-264/+400
No Business logic change, just the code format. Competible with IntelliJ: https://github.com/pinterest/ktlint#option-3 To format run: mvn process-sources -P format Issue-ID: CCSDK-1947 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: Ic9e9209fb7023d77f434693ad5a01229f8d09331
2019-11-09Convert component functions IT to UT.Brinda Santh4-14/+13
Issue-ID: CCSDK-1735 Convert Netconf and Restconf Executor IT to UT. Remove duplicate BluePrintProperties. Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: I2eafdbabb17a4df72541ab93c46e7fc9eb0fe8d7
2019-11-04Extension support for db configuration.Brinda Santh1-1/+2
Issue-ID: CCSDK-1046 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: I404855eac4520f79ac33f70710dcdb6ae285891d
2019-10-29Provide ongoing occurrence value for scriptingAlexis de Talhouët1-0/+1
This patch fixes this for template https://gerrit.onap.org/r/#/c/ccsdk/cds/+/95081/ but not for script, where the occurrence value might be needed. In reality, this overall occurrence thing is a mistacke, but it's solving an issue that I yet don't know how to properly solve. Change-Id: I7f8579ad2bde3f96b06aaf09c8b8c67d4b97e7b0 Issue-ID: CCSDK-1693 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com> Signed-off-by: Shaaban Ebrahim <shaaban.eltanany.ext@orange.com>
2019-09-27ResourceAssignmentUtils Junit FixesSingal, Kapil (ks220y)1-2/+2
Fixing Junit which are failing in Windows due to carriage return type Issue-ID: CCSDK-1763 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: I83ba91608683963b839bf5bd3afb8509ef947e11
2019-09-26Fixing distribution and propertiesSingal, Kapil (ks220y)1-1/+2
Excluding to embedd Target path, and renaming blueprint to blueprints in properties Issue-ID: CCSDK-1758 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: Ie6f0ff177e0945fb252710a425a16afade1b01a3
2019-09-19Refactoring Resource Resolution ComponentSingal, Kapil (ks220y)2-26/+39
Use Case: ---------- Input Value (IV): It can be API Input Value or API Default value If a Resource is marked as Input -> pick IV If a Resource is marked as other than Input -> pick IV -> if IV is not present then resolve it as per DataDictionary Definition ** Return Error if Resource is not resolved using assert : ResourceAssignmentUtils.assertTemplateKeyValueNotNull Issue-ID: CCSDK-1746 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: Ia3aaaa36d0e32b0b468f016d57ed5d2c4ddf6a32
2019-09-19Bug-fix - CDS Processor-DB & Default Dictionary not workingSteve Siani1-130/+130
Issue-ID: CCSDK-1718 Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com> Change-Id: Ia15f36d7732058161aa2addc9268dd647330f069 Issue-ID: CCSDK-1717 Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com> Change-Id: Ia15f36d7732058161aa2addc9268dd647330f069
2019-09-18Optimizing Imports and Formatting codeSingal, Kapil (ks220y)1-6/+6
No Business logic change, no code change.. just optimizing imports and reformatting code Issue-ID: CCSDK-1744 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: I1fb2ed10525a6f392f3c0d963c2ed03cfe8dec7e
2019-09-18Refactoring Netconf NetconfMessageUtilsSingal, Kapil (ks220y)2-9/+6
Appending New Line before and after request body within doWrapRpc and removing new line is child API's which forms the request body Issue-ID: CCSDK-1743 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: Ic58566e24a21c71d545c45fb95a667c17de2fe66
2019-09-16Changing line separator type to LFSINGAL, KAPIL (ks220y)3-87/+87
Changed Line Separator for all files using find . -type f -not -name .* -exec dos2unix {} \; Issue-ID: CCSDK-1733 Signed-off-by: SINGAL, KAPIL (ks220y) <ks220y@att.com> Change-Id: I2efa3276c35c0a0159c6d4debe21c0bd0b4a7b85
2019-09-05Merge "RR Complex types and Unit tests coverage"Dan Timoney1-2/+311
2019-09-04RR Complex types and Unit tests coverageSteve Siani1-2/+311
Issue-ID: CCSDK-1615 Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com> Change-Id: I1035aa05b4b038095c9d17fdcd00c462bed5085a
2019-08-29Resolve duplicate application property valuesBrinda Santh1-2/+2
Change-Id: I0813ff96388bce77eba9fbc9eff0eccf59a6be6a Issue-ID: CCSDK-1663 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-08-28rename config-data=>sdncOleg Mitsura2-5/+5
Issue-ID: CCSDK-1623 Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com> Change-Id: Id203a2c9673e732cba5425f8e301f84711fe3705
2019-08-27Make source-db consistent across samplesOleg Mitsura7-145/+145
Issue-Id: CCSDK-1623 Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com> Change-Id: Iec7c6909c39c34894be11bfdac45f6394010d9cf
2019-08-09Add resource definition resolution service.Brinda Santh2-75/+155
Change-Id: Ife75d290540e3ed0e0dfd0a82785a498607a2d25 Issue-ID: CCSDK-1577 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-08-09Add resource assignment DSL.Brinda Santh1-4/+37
Change-Id: I44a3596c05b02faa171f90b9207f774ce34976a6 Issue-ID: CCSDK-1577 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-08-09Add resource definition DSL.Brinda Santh1-0/+78
Change-Id: I66d340727918842a26f07e8609a043c37e5089f4 Issue-ID: CCSDK-1577 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-08-09Add resource source template DSL.Brinda Santh1-14/+89
Change-Id: If68ce2e944700cb19380d34ff3b466a9c8633472 Issue-ID: CCSDK-1577 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-08-09Add property definition type DSL.Brinda Santh1-1/+1
Change-Id: I83a3d1391c60cd426236b55d0d399e273e7c15dc Issue-ID: CCSDK-1577 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-08-09Add resource source node type DSL definitions.Brinda Santh1-0/+59
Change-Id: If21c4964bda08e5d50e6fd11fb1d657e5bf8785c Issue-ID: CCSDK-1577 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-08-01Add remote python executor DSL propertiesBrinda Santh1-1/+1
Change-Id: I7888ac302da2a51ca34c531b7553d04af13786ac Issue-ID: CCSDK-1380 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-07-31Fix conflicting catalog service instance names.Brinda Santh1-3/+8
Change-Id: Iec330d87f9609d42c05f8d4c7c8515fa37310a6e Issue-ID: CCSDK-1046 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-07-30Add resource resolution component DSLBrinda Santh1-0/+60
Change-Id: Icd12c87e017d4b8586bb60f63abce6cda3c7751c Issue-ID: CCSDK-1380 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-07-23Clean restconf duplicate models and Implementation.Brinda Santh1-0/+1
Change-Id: Id439ac5ded631aac0ee7fc69846ebe9bca650bb2 Issue-ID: CCSDK-1499 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-07-17Fail to get assignment-params when error occurAlexis de Talhouët1-1/+2
Exception is always thrown due to the contract, enforcing the get attribute to throw an exception if not found. For the resource resolution result, we can simply initialize the property to an empty json, so system won't throw an exception if user request the output, but process failed. Change-Id: I39e288590502c75495e2938a44b874dfd0671155 Issue-ID: CCSDK-1495 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-07-15Merge "Minor updates in ResourceResolutionComponent class"Dan Timoney1-14/+15
2019-07-12Minor updates in ResourceResolutionComponent classPrathamesh Morde1-14/+15
Issue-ID: CCSDK-1479 Signed-off-by: Prathamesh Morde <prathamesh.morde@bell.ca> Change-Id: I37fbce8d4621d85d3a47d38464eeeee267d46741 Signed-off-by: Prathamesh Morde <prathamesh_morde@yahoo.ca>
2019-07-10Refractor blueprint-script to avoid cyclic dependency.Brinda Santh1-1/+1
There is a possibility of cyclic dependencies between blueprint-script module and code module. To avoid cyclic dependency blueprint-script implementation should be moved to Core module. This implementation has zero impact on code functionality and code testing. Change-Id: Ic18ea848cb2e1e2e7a5f1c144714de26d1495cee Issue-ID: CCSDK-1469 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-07-04Add UT for ResourceResolutionService/ComponentAlexis de Talhouët5-130/+216
Change-Id: I460b3747ffdf5f4cfcb486803097939d1ae1fec0 Issue-ID: CCSDK-1046 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-07-04Add unit test for resolution repositoryAlexis de Talhouët3-1/+352
Change-Id: If66670cc5397b0bcce340092ec6ff9ec008677bc Issue-ID: CCSDK-1423 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-07-04Share RR context within node templateAlexis de Talhouët1-3/+13
Also, mark resolution as failed for capability when failure. Change-Id: I3c1704b5b99ace7096f1d9e1cd9bb7f5b595db13 Issue-ID: CCSDK-1422 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-06-25Merge "Store resolution and expose with REST API"Dan Timoney1-6/+1
2019-06-25Store resolution and expose with REST APIAlexis de Talhouët1-6/+1
Change-Id: Ie1fe9c02542ccd5fbfa18f1e2d6ddb633f55c214 Issue-ID: CCSDK-1423 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-06-20InputResourceResolutionProcessorTest re-enabledottero1-13/+16
Issue-ID: CCSDK-1419 Change-Id: Id71e1abdc493b26f08965fffeeb2111a76271dcf Signed-off-by: ottero <rodrigo.ottero@est.tech>
2019-05-28Merge "Bug fix: Enrichment fails for processor-db source"Dan Timoney1-1/+28
2019-05-28Returning null for unresolved variablesottero1-0/+79
When Blueprints Processor was not able to evaluate a variable, it would set its value to null. The expected behaviour would be to set the value to the default repres- entation in the formal notation as defined by Apache Velocity, which is a dollar followed by the name of the variable between curly braces. For example, if the value of the variable pnf-id could not be evaluated in runtime, its value would be defined as the string "${pnf-id}". The problem happened during evaluation of the variables that would be later sent to the template-meshing code for processing. The fix was to add a check before the value was assigned to the varia- ble; if the was not null, the assignment will happen normally. Otherwi- se, if the evaluation resolves to null, the variable receives the defa- ult value (string "${<variable name>}"). Besides the tests that were put in place to test the code changed for this fix, two tests were added to the existing test case of the templa- te meshing code, to act as regression test. Change-Id: I635afb1eba4c0d45b821811f0119fa6c87ea9542 Issue-ID: CCSDK-1358 Signed-off-by: ottero <rodrigo.ottero@est.tech>
2019-05-28Bug fix: Enrichment fails for processor-db sourceSteve Siani1-1/+28
Issue-ID: CCSDK-1324 Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com> Change-Id: I21705485de9a11a65c1e032fc121c89917334104
2019-05-23make templating service support JsonNode instead of any.Steve Siani1-8/+13
Issue-ID: CCSDK-1360 Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com> Change-Id: I374a6a013514df9062ffdfc1ab278bd9e00776d9
2019-05-15BlueprintWebClientService: added return statusOleg Mitsura2-10/+14
Issue-ID: CCSDK-1331 Change-Id: I8dab8ad4eaebf1863f11c4d38c52cf7f64b0a4d5 Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com>
2019-04-15AAI Junit test and Blueprint support configsSteve Siani7-10/+417
Change-Id: I2bbfc80634f211b336c9ea85b86dbc8dcd2e1ee0 Issue-ID: CCSDK-1202 Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com>
2019-04-09Jinja template for Blueprint template serviceSteve Siani1-3/+1
Change-Id: Iec777e4500c2a040faccc8375b1d2dd24c27cb7f Issue-ID: CCSDK-1193 Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com>
2019-04-04Improve step data access.Muthuramalingam, Brinda Santh4-10/+33
Change-Id: I3917905b1e38cebcb26e4422784a5553e2dbac9f Issue-ID: CCSDK-1127 Signed-off-by: Muthuramalingam, Brinda Santh <brindasanth@in.ibm.com>
2019-04-02Fix: Complementary JUnit tests in BlueprintProcessorSteve Siani1-25/+26
Change-Id: I4fdad443f46e674d7cf61604105c7797e2889e11 Issue-ID: CCSDK-1187 Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com>
2019-04-02Merge "Complementary Junit test coverage"Dan Timoney9-16/+393