aboutsummaryrefslogtreecommitdiffstats
path: root/ms/blueprintsprocessor/modules/blueprints/blueprint-core/src/main/kotlin/org/onap/ccsdk
AgeCommit message (Collapse)AuthorFilesLines
2023-05-08Enhancing BluePrintJinjaTemplateServiceSingal, Kapil (ks220y)1-13/+36
* 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
2022-10-22Upgrade spring boot parent and hazelcastJozsef Csongvai2-4/+4
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-05-16Re-enable formatting and fix formatting issuesJozsef Csongvai1-1/+1
Issue-ID: CCSDK-3657 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca> Change-Id: Idd1871e82a319325b042c339741a66c06499692c
2022-04-12Return errormessages in failing imperative workflowsJozsef Csongvai1-0/+2
Instead of discarding error messages after each node has executed, they are now kept until the workflow completes. If the workflow completes without exceptions, it means that all errors were handled and the error messages can be cleared. If the workflow does complete with exceptions, all error messages will be propagated in the response. Also update UatExecutor to enable expected status codes other than 200. Issue-ID: CCSDK-3630 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca> Change-Id: I94fd81c342ad2a798e64051c603beb62bf1aaacd
2021-09-21Metrics on command-executor blueprints processor sideMichael Pruss1-0/+2
Issue-ID: CCSDK-3471 Signed-off-by: Michael Pruss <michprus@amdocs.com> Change-Id: I871a032ff5c9ebfd408aaa28a7d24185dee7c953
2021-09-10Upgrading velocity version to v2.3 due to some vulnerabilities in previous ↵meriem zidane2-2/+17
version Issue-ID: CCSDK-3430 Signed-off-by: Meriem Zidane <meriem.zidane@bell.ca> Change-Id: I82dad1c2dd7f8e4cc5712e9fddde5b1bb5429b7f
2021-07-28Revert "Renaming Files having BluePrint to have Blueprint"Jozsef Csongvai58-1129/+1129
The renaming in CCSDK-3098 caused breaking changes to the grpc api and compile issues for kotlin scripts. Issue-ID: CCSDK-3385 Change-Id: I0d745cb858371678eabcb2284671c1fd76a1ab6d Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>
2021-04-26Fix for CCSDK-3271 added kotlin compiler option java 11vmuthukrishnan@aarnanetworks.com1-0/+2
Issue-ID: CCSDK-3271 Change-Id: I9c007c9e332206fb1631442d6acfd41a1e57a882 Signed-off-by: vmuthukrishnan@aarnanetworks.com <vmuthukrishnan@aarnanetworks.com>
2021-03-22Bug fixes for config template and config value componentsLukasz Rajewski2-0/+17
Issue-ID: CCSDK-3232 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com> Change-Id: I817d83001a76ba480472c7aa2da15eba65b39c20
2021-03-19Prohibit cycles in imperative workflowsJozsef Csongvai2-13/+30
Issue-ID: CCSDK-3221 Change-Id: I767003dde40c0fc53a673c4a41cb2430624d7b04 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>
2021-03-17Refactoring to enable on_failure for imperative workflowJozsef Csongvai2-8/+20
BlueprintError needs to associate errors with the steps in which they occurred in order for imperative workflow to handle on_failure properly. Made stepName more accessible and corrected places where stepName was assigned to nodeTemplateName. Issue-ID: CCSDK-3219 Change-Id: I7e5805745c63558cff6be533e1b99c32ad06c3db Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>
2021-02-11Added Kafka metrics for CDS workersJulien Fontaine1-0/+8
Added counters to gather metrics on CDS Kafka workers. This will enable us to get metrics on how many messages we consumer and produce to/from kafka. For consumers we count how many messages we consume and how many failed ie. consumed but not able to be processed (parsing error). For producers we count how many messages we produce and how many failed ie. failed to be pushed to the cluster (unavailable brokers, network error, ...). Relocated metrics tag constants to BlueprintConstants so that they can be use by any CDS module. If they make sense for other metrics then they should be shared. Issue-ID: CCSDK-3155 Signed-off-by: Julien Fontaine <julien.fontaine@bell.ca> Change-Id: Iad6aba588766f655f3a74cd626e0f74e29188f96
2021-01-22Renaming Files having BluePrint to have BlueprintKAPIL SINGAL58-1123/+1123
Replacing BluePrint with Blueprint throughout Issue-ID: CCSDK-3098 Signed-off-by: KAPIL SINGAL <ks220y@att.com> Change-Id: Ibee8bad07ae7d9287073db2d4f2f2cd730fa8b96
2020-12-16Fixed NoClassDefFoundError when USE_SCRIPT_COMPILE_CACHE is set to falseJulien Fontaine4-13/+12
USE_SCRIPT_COMPILE_CACHE set to false cleans the Class Loader cache after each kotlin script execution. When several kotlin script are executed in parallel (ie no dependency between them) and USE_SCRIPT_COMPILE_CACHE=false then the class loader from the cache may be deleted before one of those executed kotlin script get the time to finish which to the NoClassDefFoundError. Removed cleanupInstance method for kotlin script executors that where causing the class loader to be removed prematurely. Now the behaviour is to remove the class loader from the cache only when we publish a new CBA which was already the case when CDS run with a single instance. In cluster mode, a topic has been added to hazelcast to allow the instance publishing the updated CBA to communicate to the other instances by sending a message to clean the class loader for this CBA from their cache. Added mutex on kotlin script compilation to fix race condition. For concurrent kotlin script execution each process wanted to compile an executable but it was causing a race condition if a process tries to execute while another still compile. Mutex on the execution path prevent this behaviour Issue-ID: CCSDK-3052 Signed-off-by: Julien Fontaine <julien.fontaine@bell.ca> Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca> Change-Id: I6ab002352b3272898ad0b183341ee664652c8ae3
2020-12-14Pass on MDCContext to imperative workflowJozsef Csongvai1-1/+1
Issue-ID: CCSDK-3032 Change-Id: Id62ab38064d5d3b1a24db674804d710ca407940e Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>
2020-09-30Fix service blueprintsJozsef Csongvai2-0/+2
Blueprints were failing enrichment. Cba's were referencing requirement restconf-connection which is not defined in component-netconf-executor. Added new capability for restconf and fixed referencing Issue-ID: CCSDK-2859 Change-Id: I13f8800ea5fad9daed8a8b7b81cc3649efbebbc9 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>
2020-09-22Enabling Code FormatterSingal, Kapil (ks220y)34-176/+319
Code Formatter was turned off due to java 11 migation Issue-ID: CCSDK-2852 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: I3d02ed3cc7a93d7551fe25356512cfe8db1517d8
2020-09-07Add k8s-upload-profile templating and packagingLukasz Rajewski2-0/+17
Issue-ID: CCSDK-2631 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com> Change-Id: Id520338ffc2f43821d114b037467fbcc2f042b66
2020-08-24Add request IDs in command-executor logJulien Fontaine1-1/+3
* Update gRPC interface to handle SubRequestID and Originator ID * Update command-executor log format to handle request IDs in the log statement * Add SubRequest ID and Originator ID in BP log statement Issue-ID: CCSDK-2687 Change-Id: If261bb0912df5800ed2fc65371c5ee784d6a45fb Signed-off-by: Julien Fontaine <julien.fontaine@bell.ca>
2020-08-12Append input param true in workflow-specjananib1-0/+2
Workflow spec Change-Id: Iac833abcc3d1079fbe8d12a354fd7ceff1aa758e Issue-ID: CCSDK-422 Signed-off-by: jananib <janani.b@huawei.com>
2020-08-07Kafka Audit Service: Error during sensitive data hidingJulien Fontaine1-0/+2
Changed behaviour during sensitive data hiding. Instead of looking for every node template defined in the CBA we only check for the ones declared for the current executed workflow. This prevent the issue when you have two independant workflows defined in the same CBA and one of those has a node template using a get_input expression for template-prefix in a component-resource-resolution. If you execute the other workflow audit service was still trying to resolve this expression which was making it fail. Issue-ID: CCSDK-2636 Signed-off-by: Julien Fontaine <julien.fontaine@bell.ca> Change-Id: Ib232c26ebf930917e19e7970e1a56c15e676888f
2020-06-19Implement nodetemplate locking featureJozsef Csongvai1-0/+7
Enables locking execution of a nodetemplate using a lock key and lock acquire timeout. Issue-ID: CCSDK-2460 Change-Id: I308d4d89dab44b7f7a766d5b62258e67b051eab1 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>
2020-06-19Error when template-prefix-names list is set as an inputJulien Fontaine1-1/+1
Case when template-prefix-names list for resource resolution is passed as an input was not handled. When the audit service was trying to get input-prefix-names values he was only getting {"get_input": "..."} and was not resolving this expression. Issue-ID: CCSDK-2456 Change-Id: If9ebbf0aa6b6eae3e44a7bfe0b930f622dfd3c1e Signed-off-by: Julien Fontaine <julien.fontaine@bell.ca>
2020-06-15add package description to be at Entry definitionShaabanEltanany1-0/+1
Issue-ID: CCSDK-2438 Signed-off-by: ShaabanEltanany <shaaban.eltanany.ext@orange.com> Change-Id: I8657560cd55a21421dc6849d7aac64c02e83db42
2020-06-09Add ResourceResolutionResult to ResourceResolutionServiceJozsef Csongvai1-2/+2
In order to ensure consistent behavior for assignment-map, supporting occurences and multiple artifact-prefixes, ResourceResolutionService needs to return assignment-map alongside generated template content. Issue-ID: CCSDK-2389 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca> Change-Id: I54c1991d23d65217f3492b08a2170a6d41b6482d
2020-05-13Kafka Audit Service : Error with CBA using dg-generic node templateJulien Fontaine1-0/+2
* Fixed issue with dg-generic node template * Changed behaviour for hiding sensitive data -> Instead of just checking the node-template targeted by the workflow, we check every node-template declared in the CBA. If we find one or more component-resource-resolution node-template, we verify if we need to hide sensitive data in the kafka message. Issue-ID: CCSDK-2372 Signed-off-by: Julien Fontaine <julien.fontaine@bell.ca> Change-Id: I079ee29ae532b3947cdc8efe3438678309ca50b7
2020-04-06Refactoring BP Code with ErrorCatalogBrinda Santh1-8/+44
Issue-ID: CCSDK-2124 Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com> Change-Id: Ief468a56f9e7b3ef86c357965aa7b15f0a4cfa22
2020-03-19Fix kotlin cache lazy loadingSebastien Premont-Tendland3-12/+10
When USE_SCRIPT_COMPILATION_CACHE is set to false the classLoader is closed after the class is instantiated. This is causing an issue when lazy loading is happening during the script execution. Lazy loading occurs when a suspendible function returning something is called from "processNB", kotlin will create a second class that will be loaded during execution (needs to be in the classpath during execution). Issue-ID: CCSDK-2150 Signed-off-by: Sebastien Premont-Tendland <sebastien.premont@bell.ca> Change-Id: I64780287352d762325662e0e5d5b94038dedee7f
2020-03-18Fix GroupId and package name in Error CatalogDan Timoney1-4/+5
Issue-ID: CCSDK-2180 Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com> Change-Id: Ibe00fc1f2a905821b7100ae4f221ea1e0b934894
2020-03-11Error Catalog Management Core Library.Brinda Santh2-35/+101
Issue-ID: CCSDK-2076 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: I9e8e67bdee77fb359a791f4ef4c2963aa78ab93a Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com>
2020-02-26API for list of workflow and I/O for a workflow namejananib1-0/+2
REST API for CDS workflow Issue-ID: CCSDK-422 Change-Id: Ia26287214941a20287c810dc27c030d974a8847a Signed-off-by: jananib <janani.b@huawei.com>
2020-02-24Add tar.gz compression capabilityLukasz Rajewski1-36/+150
The change modifies ArchiveUtils by change of the library responsible for compression and decompression of zip files. After change of library for appache compression tar.gz was added as another format which archive utils can support. For ZIP files there is kept backward compatibility because new lib keeps implementation of ZipFile similar to the one used before in the utils. Issue-ID: INT-1458 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com> Change-Id: I78388ef8c5e7a23ac6664ae49c00638af38d8c8a
2020-02-21Eliminate Template RequirementJozsef Csongvai3-9/+10
Enables resource assignment without the use of a template. If no template is defined by the CBA, the default output is a kev-value map. If operation input: resolution-summary is set to true, output will be a list of ResolutionSummary. Issue-ID: CCSDK-2038 Change-Id: I5f6bcefcacec6e83cffac1134b13690b500a7563 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>
2020-02-12Refactoring Resource Resolution ServiceSingal, Kapil (ks220y)1-4/+6
Removing Node Template dependency Issue-ID: CCSDK-2078 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: I24f3e003c64f3ee40eee4699366cfadfc1d7147e
2020-02-12Cluster co-ordination with Hazelcast.Brinda Santh1-2/+1
Remove Atomix implementation, due to Kubernetes clustering issues. Cluster environment property changes. Issue-ID: CCSDK-2011 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: I23f40c92c0adc6b3ab8690871385f78525c76433
2020-01-31Spring boot, Kotlin version upgradesBrinda Santh2-4/+4
Dependent Patch : https://gerrit.onap.org/r/c/ccsdk/parent/+/100990 Fixed Jackson set method according to latest version. Fixed Security properties issues for failed JUnit test cases. Reused maven properties from parent for Spring boot, Nats, Kafka, etc Issue-ID: CCSDK-1737 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: I04bb0e535161e05897f587a0f08a2689e10c5f41
2020-01-22Enhancement better error messages.Oleg Mitsura1-3/+32
Issue-ID: CCSDK-2036 rev1: initial commit. Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com> Change-Id: I0bc31a2a17a6dfedbb1870470e8bf6304be782b5
2020-01-17Fix scheduler shutdown config function.Brinda Santh1-3/+1
Optimize application name accessing in Docker Compose. Issue-ID: CCSDK-1917 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: I6b055de7ef5a8ac4a0c103499997ed272bd74ac6
2020-01-16Prioritization Optional NATS consumer supportBrinda Santh2-0/+13
Add prioritization NATS consumer service and configuration data beans. Optimizing message prioritization service interface. Added Integration testing for NATS simulation. Updated sample docker compose for NATS support Issue-ID: CCSDK-1917 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: Icd21e5e2ab7b64d6e6e4b0610599ca947555ee15
2020-01-13Prioritization expiry and clean scheduler serviceBrinda Santh1-0/+9
Add prioritization expiry and clean scheduler service implementation. Optimizing message passing between processors. Added message sorting utils. Issue-ID: CCSDK-1917 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: I049ea3bae2e2c546244136f15c3d89deda1e7053
2019-12-31Flexible DSL Types and Templates definition.Brinda Santh3-14/+74
Easy search definitions Types and Templates inside ServiceTemplate DSL builder. Unit test modifications to support this change. Issue-ID: CCSDK-1054 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: Ie944ff5f75f80c852555306e1a4e0fa7f5b803d7
2019-12-30Runtime services for Relationship Type and TemplatesBrinda Santh6-131/+323
Added and improved blueprint runtime service property resolution api. Relationship template CBA sample Performance improvement on Artifact resolutions. Added connection config DSL for DB, GRPC connections. Added starter relationship connection config models. Issue-ID: CCSDK-1054 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: I73e1deed708dc924352867ddd1d1b2271c8ea106
2019-12-30Relationship Type and Templates modelsBrinda Santh10-116/+355
Enrichment Support for Relationship Types and Templates. Relationship DSL support for ConnectTo connections ( RestClient, SshClient, MessageProducer, MessageConsume, Nats) Moved datatype map from collection to complex type Issue-ID: CCSDK-1054 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: I0f18db2cb52e1e93dfab04498b8298587cba2540
2019-12-24Refactoring log-protect for hiding sensitive data in logsJozsef Csongvai4-21/+59
Issue-ID: CCSDK-2010 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca> Change-Id: I72a4d8d49a202cea0fa1a200c7466300de1ff0b0
2019-12-23Cluster distributed lock service.Brinda Santh2-3/+9
Included and fixed clustered env properties and utils. Fixed docker compose instance sequence numbers. Issue-ID: CCSDK-2011 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: Ie28935ae7cb3de8c77cd7110993304eb49799b6c
2019-12-19Cluster communication channelsBrinda Santh2-12/+26
Add NATS property and library services both . NATS Messaging Services with Token Auth and TLS Auth implementation Docker Compose for NATS Streaming instance. Documentation : https://docs.nats.io/ Issue-ID: CCSDK-2007 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: Ieebaa8f2b18ae89d02a4f38a8027eda495a9db43
2019-12-16Cluster distributed data storeBrinda Santh2-0/+36
Add experimental cluster co-ordination service using Atomic framework. Included distributed data store creation utilities. Sample docker compose data cluster between cds controller and resource-resolution instances. Issue-ID: CCSDK-2000 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: I4de00e773a996e08fd1d260fc27ed18832433883
2019-12-11Metadata for name, version, tags and typeBrinda Santh5-25/+98
Mandate Tosca.meta template name, version, type and tags. Auto copy metadata from Tosca.meta to ServiceTemplate definitions. Optimize Blueprint context and runtime creation from file path. Removed attached CBA zip file in test repository dirs Issue-ID: CCSDK-1992 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: I5d9d7a4599234a38d431328dbd9b74bd831e0115
2019-12-09Added option to disable kotlin script cacheSebastien Premont-Tendland4-62/+89
using environment variable USE_SCRIPT_COMPILE_CACHE. Disabling the cache allow to scale out the BP pod without having lock file issue when using k8s NFS provisioner for PV. It also forces each pod to read the jar from disk at every request. This way they always create an instance with the latest jar file. Issue-ID: CCSDK-1969 Signed-off-by: Sebastien Premont-Tendland <sebastien.premont@bell.ca> Change-Id: I05afbdb4d49847761142542d1beca78947f032f3
2019-12-06Refractor controller blueprint modulesBrinda Santh65-0/+10724
Move controller blueprints modules to blueprints processor and change the maven group name. Fix test cba and model type paths Fix dependencies issues. Issue-ID: CCSDK-1663 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: I3654e6f04811470327acba90e8a452b66e3e189b