summaryrefslogtreecommitdiffstats
path: root/ms/blueprintsprocessor
AgeCommit message (Collapse)AuthorFilesLines
2023-06-15Convert scripts to python3Dan Timoney2-4/+4
Convert python2 scripts to python3 Issue-ID: CCSDK-3906 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: I68b82108c5cd51a99735f65f964b8ebc16181c1b
2023-05-08Enhancing BluePrintJinjaTemplateServiceSingal, Kapil (ks220y)6-22/+70
* Using CustomJinjavaInterpreter to override getAsString API, and returning context.currentNode.master.image instead of empty string * Earlier rendered result was not keeping unresolved variable rather replacing with empty string, and above helps keeping those. * Upgrading jinja.version to 2.7.0 from 2.5.1 and adding related Junit Test Issue-ID: CCSDK-3895 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: I00da64811883957f44f819a44405e073ed7a7755
2023-05-02Release version 1.5.1 maven artifacts and roll versionDan Timoney42-42/+42
Release version 1.5.1 of CDS maven artifacts and roll to next snapshot version Issue-ID: CCSDK-3876 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: I2d865d2acad2e3594e140604076a421c5d352e0c
2023-04-27Update version to 1.5.1-SNAPSHOT1.5.1Dan Timoney42-42/+42
Update CDS to snapshot version 1.5.1-SNAPSHOT so that version 1.5.1 can be released Issue-ID: CCSDK-3876 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: I9c54710dfadcda134a3b3a08d50690a3cadccca3
2023-04-27Adding some minor featuresSingal, Kapil (ks220y)10-44/+172
* Adding proxy and ssl context to CloseableHttpClient * Adding paged capability to ResourceDictionary GET API, and adding POST APi to bulk load resource definitions * Adding more packages to swagger-maven-plugin to get more RestCOntroller generating swagger doc * Fixing maven artifact versions all places Issue-ID: CCSDK-3895 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: I096f80a2326cd00068029330b241da209e46e31d (cherry picked from commit 2f4cc180555b1891fb749443449bd969db408d9c)
2023-04-07Add db connection status check as option for readiness healthcheckLukasz Rajewski1-3/+16
Issue-ID: CCSDK-3887 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> Change-Id: I1e32dedc6abaf829fe82733548cb9c26ea386117
2023-03-29Change dockerfiles to use ccsdk java17 base imageLukasz Rajewski1-2/+2
Issue-ID: CCSDK-3813 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> Change-Id: I098eed2a911811c99473c0ac67fc34db8415c284
2023-03-29K8sPlugin: support UAT functionalityFrank Kimmlingen12-170/+286
K8sAbstractRestClientService and all derived classes K8sQueryRestClient K8sRbInstanceRestClient K8sDefinitionRestClient K8sUploadFileRestClientService does not support the spy / verify functionality of UatExecutor / UatServices Issue-ID: CCSDK-3872 Signed-off-by: Frank Kimmlingen <frank.kimmlingen@telekom.de> Change-Id: Iee30f48e9d86efd07a2ab6dde0d5743e4657934f
2023-03-17Enable JUnit tests and porting to java 17Frank Kimmlingen16-146/+211
JUnit tests are no more executed: spring-boot-starter-test does not execute any junit4 tests by default Fix enable tests and adopts the tests moslty to java 17 runtime Issue-ID: CCSDK-3859 Signed-off-by: Frank Kimmlingen <frank.kimmlingen@telekom.de> Signed-off-by: Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> Change-Id: I02a8d25350ca62262bfc6e07c2865cd8d7b4e6b2
2023-03-09Code changes needed to resolve openjdk17 issuesDan Timoney5-7/+7
Upgraded groovy maven plugin for openjdk17. Changed parent version to latest snapshot to pick up grpc upgrade needed to allow local compiles on newer macbooks, based on apple silicon. Issue-ID: CCSDK-3861 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: Ie11456682a3a038892a35a5ec3b3e0f2e8847b13
2023-01-04Use released version 2.5.1 parent pomsDan Timoney42-42/+0
Use released version 2.5.1 of parent pom Issue-ID: CCSDK-3831 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: Ic46287ef341abb1eb2bbdd68ecc890f80702b4a9
2022-10-31Add @transactional to delete data-dictionaryJozsef Csongvai2-2/+2
The delete endpoint was failing due to missing annotation. Issue-ID: CCSDK-3798 Change-Id: Ifa857a4842b9528d1e645e1fdeb6781121a930f7 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>
2022-10-28Update versions for LondonTimoney, Dan (dt5972)42-42/+84
Update version of master branch CDS for London relesae Issue-ID: CCSDK-3779 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com> Change-Id: I41a60427c902c731990a9cb570896551819959b6
2022-10-27Release version 1.4.1 maven artifactsTimoney, Dan (dt5972)42-42/+42
Release version 1.4.1 maven artifacts and roll to next snapshot Issue-ID: CCSDK-3777 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com> Change-Id: I37429e7e210a4620d4a2aed4618c501aa4836c02
2022-10-26Merge "UatExecutor does not support complex test scenarios"1.4.1Jozsef Csongvai3-4/+107
2022-10-25UatExecutor does not support complex test scenariosFrank Kimmlingen3-4/+107
Issue-ID: CCSDK-3793 Signed-off-by: Frank Kimmlingen <frank.kimmlingen@telekom.de> Change-Id: I6bb03a8e03a37aa9e87d381075bc5de8cadcc7f2
2022-10-25Add Rest client that do not add any default headersLukasz Rajewski6-12/+153
In consequence we can specify client without default headers. Still, we can specify additional headers in the client properties. We can use data disctionary definition to add extra headers. Sice Kohn we can also template the headers section in the data dictionary so ssuch headers can be created dynamically. Issue-ID: CCSDK-3787 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> Change-Id: I14c219251e11733c7cdfe059c87717f6b0fded0d
2022-10-22Upgrade spring boot parent and hazelcastJozsef Csongvai6-8/+8
The code changes are required for kotlin upgrade. New kotlin version is 1.5.32 (defined in spring-boot-parent) Issue-ID: CCSDK-3701 Issue-ID: CCSDK-3762 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca> Change-Id: I0d6ecc7bee8c21d2ecd3ac4364845c5c8e0e9738
2022-10-07Merge "UATExecutor support for k8sConnectionPlugin"KAPIL SINGAL5-5/+22
2022-10-06UATExecutor support for k8sConnectionPluginLukasz Rajewski5-5/+22
Issue-ID: CCSDK-3785 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> Change-Id: Ice34d61ac62fe8935a6df539376dcbb9e998beaf
2022-10-05Fix enrichment for multiplicated assignmentsLukasz Rajewski1-3/+1
When different assignment mappings declare assignments of the same name, only one of the data dictionaries used there is being enriched and others are ignored. This change removes this limitation. Issue-ID: CCSDK-3773 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> Change-Id: I492b18e01265471f89459c6dd5a28818aa479e5e
2022-10-04Fix the transform-templating for referenced complex typesLukasz Rajewski3-1/+75
After fix the transform-templating will be closer to the velocity artifact templating mechanism, what was not a case before, when templating with complex variables like json was not working. Issue-ID: CCSDK-3774 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> Change-Id: Icd5001cb2ea2de0220fe65a7c9c0510d1fba0911
2022-09-28Release version 1.4.0 CDS artifactsTimoney, Dan (dt5972)42-42/+42
Release version 1.4.0 of ccsdk/cds artifacts and roll to next snapshot Issue-ID: CCSDK-3754 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com> Change-Id: I2b3844a40f94885b3ad08847f6a8145950ac46e0
2022-09-09Make UatExecutor accessible inside a CBA JUnit testFrank Kimmlingen1-4/+4
Issue-ID: CCSDK-3748 Signed-off-by: Frank Kimmlingen <frank.kimmlingen@telekom.de> Change-Id: Icbc0a44d91fd08f2e06a12bcdf016655a2b2282d
2022-09-07Create dynamic data-type using all workflow stepsJozsef Csongvai1-1/+1
Only the first step was used to create dynamic data-type in imperative workflows. Unless the first step was targeting resource resolution component, the dynamic data-type would not be created. This prevents resolution of workflow input properties. Issue-ID: CCSDK-3764 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca> Change-Id: Ic51808f2ee0d74d6c4b07565e0caf12adc3e2590
2022-09-01SpyPostInterceptor in UatExecutor does not collect all responsesFrank Kimmlingen1-2/+6
For one mocked backend system (selector) only the last request/response pair is collected. With this fix all request/response pairs will be collected. Issue-ID: CCSDK-3747 Signed-off-by: Frank Kimmlingen <frank.kimmlingen@telekom.de> Change-Id: Iccebdb153752988e1644092a8786891bdb17d5e6
2022-09-01Http 204 response results with exception in rest resolutionFrank Kimmlingen2-3/+92
Issue-ID: CCSDK-3746 Signed-off-by: Frank Kimmlingen <frank.kimmlingen@telekom.de> Change-Id: I740c970de631e58902e6f92b9069aee8d3ae075b
2022-09-01Templating constants added to ResourceAssignmentLukasz Rajewski9-45/+63
Fixed values of inputs for resource assignment allow to build data dictionaries that are generic. Along with templating of outputs mapping, path, url and payload sdnc and aai dictionary entry may be one for support of all the attributes of specified object like for instance generic vnf one. Issue-ID: CCSDK-3716 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> Change-Id: I1817303e997a4dfb7dda9c32d9ac690ec723b3d8
2022-09-01Resolution processors tests and extendabilityLukasz Rajewski11-203/+233
- Open resolution processors for in-CBA customization - Improve resolution tests verification - Use RestProcessor for testing RestProcessor Issue-ID: CCSDK-3716 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> Change-Id: I7c05fc940647f40c20c37b4f7fcfe29f2c3076ba
2022-09-01CDS max-occurrence featureJuhi Arora7-3/+270
As part of occurrence feature, one or more version of the resource resolution can be resolved. However, user did not have granular control in case the user wants to resolve a specific value once and never again. Max-Occurrence feature implements the granular control to be give the user an option to specify the max number of times a resource to be resolved. It is specified as part of mapping in a cba. Max-occurrence value of 0 or not specifying it explicitly denotes the current default behaviour of unlimited resoltions. If a user specify a particular max-occurrence value then the resource is resolved that many times in subsquent requests and never again once we reached the max-occurrence limit of resource resolutions. Issue-ID: CCSDK-3736 Change-Id: Ie18764a313530e36be14531d8c7b93bf54f0b651 Signed-off-by: kuldipr <kuldip.rai@amdocs.com>
2022-08-31Change SQL query syntax for delete resource/templateJozsef Csongvai4-21/+35
The delete query does not work with Mariadb version 10.1.24. Changed the syntax so that it will work with both older and newer versions. Typo in method names has been fixed as well. Issue-ID: CCSDK-3735 Change-Id: I225752d62068e5aa44354624aa6542a4f4bae73b Signed-off-by: kuldipr <kuldip.rai@amdocs.com>
2022-08-31Add component for deleting resources and tempatesJozsef Csongvai2-0/+406
Users can now add component-resource-deletion as a nodetemplate in their CBA. This will delete resources and templates created by the cba, using resolution key or resource-id and resource-type. Issue-ID: CCSDK-3735 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca> Signed-off-by: kuldipr <kuldip.rai@amdocs.com> Change-Id: I22b7f2fe3369a3e5bac3b72a2114a81622d878dc
2022-08-29Add endpoint for deleting templatesJozsef Csongvai4-0/+199
Issue-ID: CCSDK-3735 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca> Signed-off-by: kuldipr <kuldip.rai@amdocs.com> Change-Id: I80d0da87651933da103e79d878902da743bb134e
2022-08-26Rest resolution enhancementsLukasz Rajewski1-8/+41
- Empty Output mapping means for JSON/MAP all keys and for other types extracting of primitive - Empty response is mapped to value is output mapping is empty (but not null) Issue-ID: CCSDK-3716 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> Change-Id: Ib67507eba07e08fad049307f7b69f7aac4c3ec45
2022-08-25Template headers, path and outputsmapping in the rest processorLukasz Rajewski1-9/+16
Issue-ID: CCSDK-3716 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> Change-Id: I4abc2cdf3eeff1d982d2e96670df262cf16931b3
2022-08-24Refactor rest clients and support timeoutsLukasz Rajewski8-363/+396
- Refactored rest clients to remove redundant code - Timeouts added to the configuration of rest clients Issue-ID: CCSDK-3716 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> Change-Id: I706b8efd8447570455b8b65bd5b1a22da474f62b
2022-08-22Refactoring Code to remove NRMSingal, Kapil (ks220y)4-29/+28
Renaming Classes, API's, variabled and removing NRM word from codebase Issue-ID: CCSDK-3741 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: I8150eec7e8fb0bc1d33e80991215e745e9aa79d0 (cherry picked from commit cc2dbf6d08840ba0e105e44022568d9afd130273)
2022-08-22Fix inconsistency introduced during commit b4cbb0ee9kuldipr1-8/+1
Issue-ID: CCSDK-3738 Signed-off-by: kuldipr <kuldip.rai@amdocs.com> Change-Id: I72ae642f3027fa3b4c8caa3105b2147ed654c159
2022-08-04Kafka producer parameters updated to be consistent with frankfurtOleg Mitsura2-6/+6
Issue-ID: CCSDK-3737 Signed-off-by: kuldipr <kuldip.rai@amdocs.com> Change-Id: I00cba2f644abf85778abf17ee3fb9e102ac5f42f
2022-08-03Enable deleting resources by lastN occurrencesJozsef Csongvai5-24/+213
Also enable deletion using resource-type and resource-id. Issue-ID: CCSDK-3735 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca> Signed-off-by: kuldipr <kuldip.rai@amdocs.com> Change-Id: Id1b487fce97f582bd3781dfd5bcff61a8df08c5c
2022-07-21[Blueprintsprocessor] Blueprint Model API returns 204 NO CONTENT if ↵Michal Jagiello1-1/+1
blueprint model does not exist Issue-ID: CCSDK-3729 Signed-off-by: Michal Jagiello <michal.jagiello@t-mobile.pl> Change-Id: Ie19128d1ece6b229e5c2e5636ab3a7add4e2f3ef
2022-07-19[Blueprintsprocessor] Use all source-db resources instead of only processor-dbMichal Jagiello3-4/+39
In DatabaseResourceAssignmentProcessor class filter resourceSourceMappings to get all source-db resources instead of using only one: processor-db Issue-ID: CCSDK-3699 Signed-off-by: Michal Jagiello <michal.jagiello@t-mobile.pl> Change-Id: I616ca6fe1336427b0b603a0386878ba4c8ea5828
2022-07-18Aligned attributes of CDS componentsLukasz Rajewski9-48/+100
Issue-ID: CCSDK-3698 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> Change-Id: Ie5c78a9a347373b5faf588627e42138806d69c0c
2022-07-12Change template query to return a result when duplicate rows existskuldipr1-0/+19
Issue-ID: CCSDK-3714 Change-Id: I516efc75d5d789903883437b6f3b50874bcfc79a Signed-off-by: kuldipr <kuldip.rai@amdocs.com>
2022-07-04Fixed Template API (resourceId and resoourceType) input validationkuldipr1-4/+4
Validation was always checking for resolutionKey even when it is not required when using resourceId and resourceType. Also artifactName which is always required could not have been sent along with resourceId and resourceType. Issue-ID: CCSDK-3713 Signed-off-by: kuldipr <kuldip.rai@amdocs.com> Change-Id: I4a2945397f10bf5c57a698894df09ee4fc5891d0
2022-06-07Improve log format consistencyJozsef Csongvai7-18/+67
Logs related to request processing should include: requestId, subrequestId and originatorId. Each API (rest,grpc,kafka) would produce different outputs, due to MDC context not being passed properly between coroutine contexts or values not being populated. Issue-ID: CCSDK-3686 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca> Change-Id: Ibafdffd3409b9724ad91633ca5840070f7e287f5
2022-06-07Merge "CCSDK-3684 ComponentRemotePYthonExecutor eliminate recursive call"Jozsef Csongvai1-2/+2
2022-06-07CCSDK-3684 ComponentRemotePYthonExecutor eliminate recursive callOleg Mitsura1-2/+2
Issue-ID: CCSDK-3684 prepareEnv (mistakenly) had a recursive call, but no decement. Simplified it in favour of the inner/outter flag instead of retry counter as in Frankfurt release. Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com> Change-Id: I5d7f623d6e206a844d33d95a15f85758da3a6681
2022-05-24Merge "Extend Template API to retrieve resolutions by occurrence"Jozsef Csongvai4-0/+284
2022-05-24API to resolve resources based on optional 'occurrence' optionskuldipr4-2/+270
User can specificy options to get firstN, lastN and by the Range (begin, end) of 'occurrence' to get the resolutions. If no options are specified, all the resolutions are returned in decending oder (latest on top). Map of resolutions are returned with 'occurrence' as the key to the corresponding list of resolutions. Issue-ID: CCSDK-3665 Signed-off-by: kuldipr <kuldip.rai@amdocs.com> Change-Id: I9ecbfb339bde76510e81cd695e03cc1e061396ee