summaryrefslogtreecommitdiffstats
path: root/ms/blueprintsprocessor/functions/resource-resolution
AgeCommit message (Collapse)AuthorFilesLines
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
2019-04-01Complementary Junit test coverageSteve Siani9-16/+393
Change-Id: I5eec76918c63d1fa248a9fc353f8dc02ae925364 Issue-ID: CCSDK-1187 Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com>
2019-04-01Improve bulk processingMuthuramalingam, Brinda Santh4-84/+98
Change-Id: Ia8bd447563072284aa71e00eab0ef9b93e1776b1 Issue-ID: CCSDK-1127 Signed-off-by: Muthuramalingam, Brinda Santh <brindasanth@in.ibm.com>
2019-04-01Improve function interfacesMuthuramalingam, Brinda Santh11-99/+162
Change-Id: I24f45d39ac05491a4217101e00bcbf8d122e4e1a Issue-ID: CCSDK-1137 Signed-off-by: Muthuramalingam, Brinda Santh <brindasanth@in.ibm.com>
2019-03-29Fix logging dependency conflictAlexis de Talhouët1-3/+2
- use spring logging framework - get rid of EELF - do not get sl4fj transitivly Change-Id: I1d47749b53dca2f3a815a2d9898b7a0388725655 Issue-ID: SDNC-710 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com> Signed-off-by: prathamesh morde <prathamesh.morde@bell.ca>
2019-03-27Add Restconf Kotlin script sampleMuthuramalingam, Brinda Santh1-0/+36
Change-Id: Ia6196c7e45b1f3d8a3598f858f0d8380a3463ae9 Issue-ID: CCSDK-1080 Signed-off-by: Muthuramalingam, Brinda Santh <brindasanth@in.ibm.com>
2019-03-25Migrate ccsdk/apps to ccsdk/cdsAlexis de Talhouët22-227/+227
Issue-ID: CCSDK-1177 Issue-ID: CCSDK-1178 Change-Id: I0c02702fbec52211ca367abbba72aebecee8cbaa Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-03-22Merge "Ressource resolution using configurable database"Dan Timoney3-55/+64
2019-03-21Compile against Fluorine SR2Timoney, Dan (dt5972)1-1/+1
Updated to compile against Fluorine SR2 Change-Id: I434068531ce4a661a04c20201e0fddf3f6b92f47 Issue-ID: CCSDK-1156 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
2019-03-18Ressource resolution using configurable databasevinal patel3-55/+64
Change-Id: I40338a221884d6f4df4c8a7dc3dac1f58f142074 Issue-ID: CCSDK-1092 Signed-off-by: vinal patel <vinal.narendrabhai.patel@ibm.com>
2019-03-18Propagate exceptions correctlyAlexis de Talhouët8-5/+22
Change-Id: Idaf66eeaa6e57d27c576099fd6ffdeb8b6d8d6c6 Issue-ID: CCSDK-1120 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-03-15Prepare for release 0.4.1Timoney, Dan (dt5972)1-2/+1
Prepare to create release version 0.4.1 by using released version of parent pom Change-Id: Icf8432e14626a55b916b6f4d4a8992b79c29eff7 Issue-ID: CCSDK-1156 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
2019-03-13Improve RA capability processor.Muthuramalingam, Brinda Santh5-154/+81
Change-Id: I44a8157c9e2a27b49aa8af00a857ebc7b3e845c3 Issue-ID: CCSDK-1137 Signed-off-by: Muthuramalingam, Brinda Santh <brindasanth@in.ibm.com>
2019-03-12Empty MissingNode from input during RRAlexis de Talhouët4-23/+24
Change-Id: Ib09e5403b17d62d61272e64a6c990de42b1aa58f Issue-ID: CCSDK-1137 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-03-11Mesh input-key-mapping using velocityAlexis de Talhouët3-45/+37
Change-Id: Ic7190c86fc4e3f66fe7223c1c3575279c2c1d105 Issue-ID: CCSDK-1131 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-03-11Enhance / fix REST resource resolutionAlexis de Talhouët4-23/+58
- provide sync web client - add support for VERB - add support for payload - fix URI resolution from input-key-mapping Change-Id: Id4f1973a15778ad4f2ab0f7e2a4b2c61054a234d Issue-ID: CCSDK-1131 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-03-11Add blueprint runtime validatorMuthuramalingam, Brinda Santh8-63/+78
Change-Id: I9e2aa1aec392fc4191d547115fa90e8811f0f9e9 Issue-ID: CCSDK-1110 Signed-off-by: Muthuramalingam, Brinda Santh <brindasanth@in.ibm.com>