aboutsummaryrefslogtreecommitdiffstats
path: root/ms/blueprintsprocessor/functions/resource-resolution
AgeCommit message (Collapse)AuthorFilesLines
2019-08-12Handle all Data Type and DD with complex typeSteve Siani4-105/+99
Issue-ID: CCSDK-1611 Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com> Change-Id: I6bb9878ab4fea7024125fa4ce6293bfb8faee316
2019-08-12Merge "Resource resolution should return a string"Dan Timoney1-4/+4
2019-08-12Resource resolution should return a stringAlexis de Talhouët1-4/+4
When being called by SDNC, expected response format is a String, not a Json, then within SDNC we call jsonToTCtx by passing the String as input. When we receive the Json instead of a string, that function throw an exception because it expects a String. Also, SDNC marshall directly within the SLI context the Json object, but the path isn't the one being looked for. Finally, resource resolution, by its definition, as per as its model, should set the returned value as a string, not a json. Change-Id: Iffae3128507069c2546e179c17e50fb16e43f310 Issue-ID: CCSDK-1606 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-08-09Add class model for workflow and resource data type.Brinda Santh2-0/+10
Change-Id: Ia42f56541bef0418dddb797c019ecda3afa6983b Issue-ID: CCSDK-1380 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-08-09Add resource definition resolution service.Brinda Santh11-168/+357
Change-Id: Ife75d290540e3ed0e0dfd0a82785a498607a2d25 Issue-ID: CCSDK-1577 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-08-09Merge "Fix occurrence really optional"Dan Timoney1-1/+1
2019-08-09Merge "Set resource data value when fetch from database"Dan Timoney1-3/+7
2019-08-09Merge "Default resolution status when storing result"Dan Timoney1-1/+1
2019-08-09Add resource assignment DSL.Brinda Santh2-11/+126
Change-Id: I44a3596c05b02faa171f90b9207f774ce34976a6 Issue-ID: CCSDK-1577 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-08-09Add resource definition DSL.Brinda Santh2-0/+172
Change-Id: I66d340727918842a26f07e8609a043c37e5089f4 Issue-ID: CCSDK-1577 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-08-09Add resource source template DSL.Brinda Santh3-74/+338
Change-Id: If68ce2e944700cb19380d34ff3b466a9c8633472 Issue-ID: CCSDK-1577 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-08-09Add property definition type DSL.Brinda Santh2-6/+6
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 Santh2-0/+200
Change-Id: If21c4964bda08e5d50e6fd11fb1d657e5bf8785c Issue-ID: CCSDK-1577 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-08-09Set resource data value when fetch from databaseAlexis de Talhouët1-3/+7
When doing resource resolution, if the same resolution-key, or the same resource-id/resource-type combo, is used, then the process will only try to resolve the resources set with a "failure" status from the RESOURCE_RESOLUTION db table. In the case the resource has previsously successfully been resolved, then we need to set its value in the resource assignemnt resolution store so it can be used later in the processing, for instance if another resource depends on it. Change-Id: Ifa3957fe3d2365e1f4347aa61ed963124f8a69f7 Issue-ID: CCSDK-1606 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-08-09Default resolution status when storing resultAlexis de Talhouët1-1/+1
It can happen the resolve fails, and the status end up not being set, hence to avoid any exception, we default to failure. Change-Id: Ia5fb9ad954c109f394425f33c506e66d7e1969e4 Issue-ID: CCSDK-1606 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-08-09Fix occurrence really optionalEliezio Oliveira1-1/+1
Change-Id: I18c4d0803e20ed18e4dde553288d37143dff936a Issue-ID: CCSDK-1572 Signed-off-by: Eliezio Oliveira <eliezio.oliveira@est.tech>
2019-08-09Added service for Edit CBAEzhilarasi1-1/+1
Added service for search result CBA Change-Id: Iba00f048abc59878e6dcda9d1de9f0fc823d9130 Issue-ID: CCSDK-1275 Signed-off-by: Ezhilarasi <ezhrajam@in.ibm.com>
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>