summaryrefslogtreecommitdiffstats
path: root/ms
AgeCommit message (Collapse)AuthorFilesLines
2019-07-04Enforce resolutionKey or resourceId/resourceTypeAlexis de Talhouët16-211/+512
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ët14-105/+236
Change-Id: I69ba541b4b301735a988cf01673827a79daf1f8c Issue-ID: CCSDK-1431 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-07-04Refactor resolution controllersAlexis de Talhouët17-532/+410
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-07-04Error: Could not find or load main classAlexis de Talhouët3-15/+4
Use oparent as root project pom Change-Id: Ibacb94a08051c2d3f48125a66c0579fa4da94e2d Issue-ID: CCSDK-1443 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-06-25Refractor blueprint script dependencyBrinda Santh20-144/+496
Change-Id: I2e6b4dd278c1a4a3069a44f648129599365909d4 Issue-ID: CCSDK-1428 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-06-25Merge "DSL to service template generator"Dan Timoney7-48/+482
2019-06-25Merge "Store resolution and expose with REST API"Dan Timoney18-157/+714
2019-06-25Merge "Allow multiple resolution for same node template"Dan Timoney5-121/+139
2019-06-25Merge "Added notes on remote python executor in dev env."Dan Timoney1-57/+75
2019-06-25Merge "Add blueprint domain DSL"Dan Timoney9-26/+508
2019-06-25Merge "python-executor will provide output line-by-line"Dan Timoney7-21/+28
2019-06-25Merge "InputResourceResolutionProcessorTest re-enabled"Dan Timoney1-13/+16
2019-06-25DSL to service template generatorBrinda Santh7-48/+482
Change-Id: I179bb3bf83d6c1688a13dce965a3d4388f011fcd Issue-ID: CCSDK-1421 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-06-25Store resolution and expose with REST APIAlexis de Talhouët18-157/+714
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ët5-121/+139
- 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-25Add blueprint domain DSLBrinda Santh9-26/+508
Change-Id: Id9f64605fa74f54d43af55357a521cf347fa8677 Issue-ID: CCSDK-1380 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-06-25python-executor will provide output line-by-lineOleg Mitsura7-21/+28
* python-executor STDOUT contains cleaner logs * return status has been reworked to return a list of lines Issue-ID: CCSDK-1404 Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com> Change-Id: Ib17495e92a136ff4f950bb6e049246a9e100eb7d
2019-06-21Added notes on remote python executor in dev env.Oleg Mitsura1-57/+75
Issue-ID: CCSDK-1415 Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com> Change-Id: I0c3892f6df398b2d4f87661f62a6125eedc4bca3
2019-06-21Fix httpclient classpath issueAlexis de Talhouët1-0/+1
Change-Id: Ie3cff0f5ea28086d9ebff90205e6872d69f6681b Issue-ID:CSDK-1420 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-06-21Add Jinja2 custom ResourceLocatorAlexis de Talhouët12-150/+96
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-18Fix wrong mapping of json to mapAlexis de Talhouët1-7/+9
This is causing jinja2 template rendering to be missing the nested element under a complex type within the json string. Change-Id: I607ee5ed8579a461a29b991e2bc77857048755d1 Issue-ID: CCSDK-1414 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2019-06-18Merge "Create REST API layer for resource resolution stored configlet"Dan Timoney10-10/+609
2019-06-18Merge "Add service template types DSL"Dan Timoney7-72/+427
2019-06-18Merge "Add service template assignments DSL"Dan Timoney6-2/+793
2019-06-18Merge "Python executor: Execution command and prepare environment log Also ↵Dan Timoney1-0/+2
fix error messages return when something goes wrong."
2019-06-18Create REST API layer for resource resolution stored configletSerge Simard10-10/+609
Issue-ID: CCSDK-1407 Signed-off-by: Serge Simard <serge@agilitae.com> Change-Id: I18db6b654cbf4f416af54596ee71f56eaa860d32
2019-06-14Python executor: Execution command and prepare environment logSteve Siani1-0/+2
Also fix error messages return when something goes wrong. Issue-ID: CCSDK-1404 Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com> Change-Id: Ifff396d8cee8d6608b6fb32d3a8e941a253ba24c
2019-06-14Correct netconf capability matching regexAbdelmuhaimen Seaudi1-2/+2
Issue-ID: CCSDK-1403 Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com> Change-Id: I0e8efc620f09af4fc776fbbf9d4e08e721dc8c63
2019-06-13Various bug fixes encountered during remote ansible executor development.Serge Simard6-6/+14
- 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-06-05Add service template types DSLBrinda Santh7-72/+427
Change-Id: I24684a6987150a02334b2b1b026893b240eb17a9 Issue-ID: CCSDK-1380 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-06-04Add service template assignments DSLBrinda Santh6-2/+793
Change-Id: I6159874ef2c1cf12232f432338b4540154ec7c64 Issue-ID: CCSDK-1380 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-06-03Merge "Improved error handling for remote ansible executor. - Aligned ↵Dan Timoney2-16/+26
error status with AWX job details status; i.e. lowercase - Fixed error message in Validation module; encountered during debug. - Added better handling of inventory name resolution failure. - Now supports json endpoint selector values, via DSL."
2019-06-03Improved error handling for remote ansible executor.Serge Simard2-16/+26
- Aligned error status with AWX job details status; i.e. lowercase - Fixed error message in Validation module; encountered during debug. - Added better handling of inventory name resolution failure. - Now supports json endpoint selector values, via DSL. Change-Id: I71735956e4b543e5ab62e891ef1e18f4963ffadb Issue-ID: CCSDK-1357 Signed-off-by: Serge Simard <serge@agilitae.com>
2019-06-02add SDNC MD-SAL Restconf URL settingsAbdelmuhaimen Seaudi1-1/+15
Issue-ID: CCSDK-1376 Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com> Change-Id: I2817e6282e982f07d60169b99adf4cb1c07d2541
2019-05-30Merge "Remote AWX ansible playbook executor"Dan Timoney10-0/+672
2019-05-29Merge "Include orig err in CBA upload errmsg"Dan Timoney1-2/+2
2019-05-28Merge "Bug fix: Enrichment fails for processor-db source"Dan Timoney3-15/+63
2019-05-28Returning null for unresolved variablesottero6-2/+130
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 Siani3-15/+63
Issue-ID: CCSDK-1324 Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com> Change-Id: I21705485de9a11a65c1e032fc121c89917334104
2019-05-27Remote AWX ansible playbook executorSerge Simard10-0/+672
Issue-ID: CCSDK-1357 Change-Id: I794ce5450b341606829a1a37d9efed48abab32cc Signed-off-by: Serge Simard <serge@agilitae.com>
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-23Include orig err in CBA upload errmsgOleg Mitsura1-2/+2
Issue-ID: CCSDK-1363 Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com> Change-Id: I064a9d8654e0ccd612b60f9a3a195980a0c16d0f
2019-05-23Add cli test blueprintsBrinda Santh15-83/+206
Change-Id: Ieab385f5e4ae60cca3d86f22c4304e4867e6fa96 Issue-ID: CCSDK-1335 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-05-23Add cli executor optionsBrinda Santh6-0/+45
Change-Id: I55abe099997bad1666b762b7f8355b084f691001 Issue-ID: CCSDK-1335 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-05-23Add cli executor componentBrinda Santh15-104/+322
Change-Id: I0997e9bc71b74bdff57bd2405a9b1ec962130715 Issue-ID: CCSDK-1335 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-05-23Add ssh client configuration serviceBrinda Santh11-1/+515
Change-Id: I88515b430311e7937ea45516cc0fb07b4dab3c2f Issue-ID: CCSDK-1335 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-05-23Add Kafka client servicesBrinda Santh10-0/+467
Change-Id: I76cf52f6df10e114539c4d65620f431e0f747644 Issue-ID: CCSDK-1349 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-05-22Fix payload has not been init in aysncAlexis de Talhouët1-1/+1
Change-Id: I6c8c0fca6ffd7f7cc9814a5b88889c5f67cbd52f Issue-ID: SO-1587 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>