summaryrefslogtreecommitdiffstats
path: root/ms/blueprintsprocessor/functions/resource-resolution
AgeCommit message (Collapse)AuthorFilesLines
2019-08-06Roll version to recreate release artifactsTimoney, Dan (dt5972)1-1/+1
Roll versions to 0.5.1 - need to re-release El Alto early release Change-Id: Ifc0d4af8920065ca4ae8f509c63f98dc6e112322 Issue-ID: CCSDK-1563 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
2019-08-01Add remote python executor DSL propertiesBrinda Santh2-33/+13
Change-Id: I7888ac302da2a51ca34c531b7553d04af13786ac Issue-ID: CCSDK-1380 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-07-31Merge "Fix conflicting catalog service instance names."Dan Timoney1-3/+8
2019-07-31Merge "Add resource resolution component DSL"Dan Timoney3-0/+266
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 Santh3-0/+266
Change-Id: Icd12c87e017d4b8586bb60f63abce6cda3c7751c Issue-ID: CCSDK-1380 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-07-30Merge "TemplateResolutionService default #occurrence 0->1"Dan Timoney2-7/+10
2019-07-30TemplateResolutionService default #occurrence 0->1Oleg Mitsura2-7/+10
JPA repository functions .findBy......... needs occurence value the API in the TemplateResolutionService was defaulting it to 1. Issue-Id: CCSDK-1526 Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com> Change-Id: Iea1e7c50d57c60323eb5c71c0caf61d1ad573bfb
2019-07-26Upgrade cds spring and kotlin versions.Brinda Santh1-0/+0
Change-Id: I0f323bd13c433d9ef0e207f51234d10cd8c22858 Issue-ID: CCSDK-1352 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-23Refactor Netconf script component parent.Brinda Santh2-68/+73
Change-Id: Ibbec8cd5785372a89e14a86d4e6ff7f9fed4aad2 Issue-ID: CCSDK-1499 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com> Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com>
2019-07-18Resolve Attribute and properties fails with subPropertyNameSteve Siani1-8/+8
Issue-ID: CCSDK-1489 Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com> Change-Id: If27c0dd301f2c0e63cecc662cd89b1a72d1b21f1
2019-07-17Fail to get assignment-params when error occurAlexis de Talhouët2-2/+6
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 Timoney2-22/+25
2019-07-15Merge "Refractor blueprint-script to avoid cyclic dependency. There is a ↵Dan Timoney1-1/+1
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."
2019-07-12Minor updates in ResourceResolutionComponent classPrathamesh Morde2-22/+25
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-11Merge "Handle blank reponse body for PUT capability"Dan Timoney1-1/+5
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-10Handle blank reponse body for PUT capabilityAbdelmuhaimen Seaudi1-1/+5
Issue-Id: CCSDK-1467 Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com> Change-Id: Ibc50be0bf9986c49d2c7546f895c85c6851447bb
2019-07-10Check null instead of "null" JSON node.prathameshmo1-3/+3
ISSUE-ID: CCSDK-1463 Signed-off-by: prathameshmo <prathamesh.morde@bell.ca> Change-Id: Id4e9827d94999a585b79460f147562bdd655ccfb
2019-07-09SLF4J conflict: exclude logging in where it is redundantSteve Siani1-0/+6
Issue-ID: CCSDK-1461 Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com> Change-Id: I25521090a2ab8e5b9d7a9edef3178ba83b463657
2019-07-04Add UT for ResourceResolutionService/ComponentAlexis de Talhouët11-139/+223
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-04Enforce resolutionKey or resourceId/resourceTypeAlexis de Talhouët8-123/+393
There are three existing ways to perform the resolution: either we don't store the results at all, whether for resource or template either we store using the resolution key. The combination of blueprintName, blueprintVersion, artifactName and resolutionKey has to be unique. If it is re-used, it is considered as a new attempt for that specific resolution request, and process will only try to resolve resources not marked at SUCCESS in the database. either we store using the resourceId and resourceType. As previous point, the combination of blueprintName, blueprintVersion, artifactName and resolutionKey has to be unique. If it is re-used, it is considered as a new attempt for that specific resolution request, and process will only try to resolve resources not marked at SUCCESS in the database. TBD: add uni tests Issue-ID: CCSDK-1423 Change-Id: I6b7198453cf0002edfa7a0c9ea3179555211b5dc Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-07-04Share RR context within node templateAlexis de Talhouët5-21/+43
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-07-04Fix swagger definition for blueprint processorAlexis de Talhouët4-6/+32
Change-Id: I69ba541b4b301735a988cf01673827a79daf1f8c Issue-ID: CCSDK-1431 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-07-04Refactor resolution controllersAlexis de Talhouët5-87/+97
tempalte and resources for get/put API Change-Id: Ia00bdb08f5f52231481edc6de232f850c66874e9 Issue-ID: CCSDK-1423 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-06-25Refractor blueprint script dependencyBrinda Santh1-0/+57
Change-Id: I2e6b4dd278c1a4a3069a44f648129599365909d4 Issue-ID: CCSDK-1428 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-06-25Merge "Store resolution and expose with REST API"Dan Timoney9-84/+340
2019-06-25Merge "Allow multiple resolution for same node template"Dan Timoney3-30/+42
2019-06-25Merge "InputResourceResolutionProcessorTest re-enabled"Dan Timoney1-13/+16
2019-06-25Store resolution and expose with REST APIAlexis de Talhouët9-84/+340
Change-Id: Ie1fe9c02542ccd5fbfa18f1e2d6ddb633f55c214 Issue-ID: CCSDK-1423 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-06-25Allow multiple resolution for same node templateAlexis de Talhouët3-30/+42
- also fixing default mechanism - fixes rest resolution when NullNode is returned as input value - fixes rest resolution when data type specified so raw json isn't returned, only the parsed json based on the data type Change-Id: I1f4a35c6c97000b52620c9b0cc911f15016c4e80 Issue-ID: CCSDK-1422 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-06-21Add Jinja2 custom ResourceLocatorAlexis de Talhouët1-2/+3
This will allow to include template within template to create template hierarchy Change-Id: I21c5deaf51d391e1a51b9863a905c26b1891db16 Issue-ID: CCSDK-1417 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-06-18Create REST API layer for resource resolution stored configletSerge Simard1-10/+22
Issue-ID: CCSDK-1407 Signed-off-by: Serge Simard <serge@agilitae.com> Change-Id: I18db6b654cbf4f416af54596ee71f56eaa860d32
2019-06-13Various bug fixes encountered during remote ansible executor development.Serge Simard3-3/+3
- Upload CBA sometimes failed because Property files were left opened. - Default value were ignored on datatype elements. - Various erroneous error messages - Fixed job template lookup by name encoding when name contains blanks. Issue-ID: CCSDK-1357 Signed-off-by: Serge Simard <serge@agilitae.com> Change-Id: If9d4b0339d647e6c99121f5464a1b6da787761a0 Signed-off-by: Serge Simard <serge@agilitae.com>
2019-05-28Merge "Bug fix: Enrichment fails for processor-db source"Dan Timoney2-2/+30
2019-05-28Returning null for unresolved variablesottero2-1/+90
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 Siani2-2/+30
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 Siani2-18/+18
Issue-ID: CCSDK-1360 Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com> Change-Id: I374a6a013514df9062ffdfc1ab278bd9e00776d9
2019-05-23Add cli test blueprintsBrinda Santh2-10/+12
Change-Id: Ieab385f5e4ae60cca3d86f22c4304e4867e6fa96 Issue-ID: CCSDK-1335 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-05-15BlueprintWebClientService: added return statusOleg Mitsura3-15/+22
Issue-ID: CCSDK-1331 Change-Id: I8dab8ad4eaebf1863f11c4d38c52cf7f64b0a4d5 Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com>
2019-04-30Roll master to El AltoTimoney, Dan (dt5972)1-1/+1
Roll master version to El Alto versions Change-Id: I75400c5d7dda6b306b0b2e3aa5cd583380dab461 Issue-ID: CCSDK-1222 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
2019-04-15AAI Junit test and Blueprint support configsSteve Siani8-18/+420
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 Siani4-22/+25
Change-Id: Iec777e4500c2a040faccc8375b1d2dd24c27cb7f Issue-ID: CCSDK-1193 Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com>
2019-04-04Improve data type handlingMuthuramalingam, Brinda Santh3-61/+88
Change-Id: I5ebcfcecdf1781e30be1ca929b4bf9e1526691a3 Issue-ID: CCSDK-1127 Signed-off-by: Muthuramalingam, Brinda Santh <brindasanth@in.ibm.com>
2019-04-04Improve step data access.Muthuramalingam, Brinda Santh9-74/+101
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