aboutsummaryrefslogtreecommitdiffstats
path: root/ms/blueprintsprocessor/functions/resource-resolution
AgeCommit message (Collapse)AuthorFilesLines
2020-06-09Add ResourceResolutionResult to ResourceResolutionServiceJozsef Csongvai7-51/+60
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-27Fix sub-attribute parsing for accessing resolved valuesJozsef Csongvai6-1/+43
Added assignment-map attribute to ResourceResolutionComponent. This attribute will hold a json object with the resolved values for each artifact-prefix. It will enable accessing any resolved value, using get_attribute with JsonPath. Issue-ID: CCSDK-2389 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca> Change-Id: I3441569d9766fbd79703d2f224de448edd56dbb2
2020-05-19Improve logging for ResourceAssingmentUtilsJozsef Csongvai2-7/+16
Sort keys for generated resource param data logging Issue-ID: CCSDK-2381 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca> Change-Id: Iea0a88fbe915e41e399ced45d842a8ef14d052c1
2020-05-18Add Naming Service & IP Assign custom resource resolution capabilityPaira, Saurav(sp694w)7-22/+1052
Issue-ID: CCSDK-2185 Signed-off-by: Paira, Saurav(sp694w) <sp694w@att.com> Change-Id: I70550fe9582b2db0a70c7b66591438b674173411
2020-04-30Fix null safety - ResourceResolutionDBService.writeJozsef Csongvai2-5/+29
Issue-ID: CCSDK-2352 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca> Change-Id: I49a56dff0636617111f02be141764600e0a1e082
2020-04-29RestResourceResolutionProcessor should always set StatusJozsef Csongvai1-0/+3
Issue-ID: CCSDK-2350 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca> Change-Id: Ieadfb9b5931808f9eb298aa913d32cabbad67e2e
2020-04-16Fix default behavior for DatabaseResourceAssignmentProcessorJozsef Csongvai1-3/+3
If a data-dictionary did not declare an endpoint-selector, it would default to primary cds-db instead of using data-dictionary source to look up database configuration. Processor-db configurations were not used because of this. Also improved error messages and some refactoring. Issue-ID: CCSDK-2315 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca> Change-Id: I7122e1334951db4eec5b9ae8b01c1f66596636f6
2020-04-10Merge "Enable inline templating in mapping files"Dan Timoney4-0/+53
2020-04-10Merge "Fix parsing error for RestResourceSource"Dan Timoney2-2/+3
2020-04-09Fix parsing error for RestResourceSourceJozsef Csongvai2-2/+3
Issue-ID: CCSDK-2310 Change-Id: I3587187b115797ce00ffd8c9125d9ee5035e25be Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>
2020-04-09Remove unneeded backup filesDan Timoney1-63/+0
Remove unneeded backup files created by updParentVersion script Issue-ID: CCSDK-2308 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: I8d76b8ee3ccb2dbe563f22aadf1125f8226a104f
2020-04-09Enable inline templating in mapping filesJozsef Csongvai4-0/+53
Issue-ID: CCSDK-2306 Change-Id: I9657eb73b48659edfc1adfd842ed96f35a095197 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>
2020-04-08Merge "Refactoring BP Code with ErrorCatalog"Dan Timoney4-4/+28
2020-04-07Roll to next Guilin snapshotDan Timoney2-2/+66
Roll to next Guilin snapshot release Issue-ID: CCSDK-2152 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: I1a5ea68da8821ffe28ac84e60177af05e26b3585
2020-04-06Refactoring BP Code with ErrorCatalogBrinda Santh4-4/+28
Issue-ID: CCSDK-2124 Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com> Change-Id: Ief468a56f9e7b3ef86c357965aa7b15f0a4cfa22
2020-03-31Fix ResolutionSummary - return empty string instead of nullJozsef Csongvai2-9/+31
Issue-ID: CCSDK-2246 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca> Change-Id: I894bf605ee7f5b094d015fd637979ce055da5081
2020-03-30Roll to next Frankfurt snapshot and fix sonar buildDan Timoney1-2/+2
Roll to next Frankfurt snapshot. Also, fixed config to skip sonar for error-catalog, which has no scannable components. Sonar builds were failing because error-catalog does not have standard maven source and test directories (src/main, src/test) Issue-ID: CCSDK-2152 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: Iacb76b240e71206de8306af7e2447eaa07b0d33b
2020-03-19Fix kotlin cache lazy loadingSebastien Premont-Tendland2-0/+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-09add a rest endpoint to remove resourcesJulien Fontaine3-0/+44
Issue-ID: CCSDK-2159 Signed-off-by: Julien Fontaine <julien.fontaine@bell.ca> Change-Id: I504fa0aad6f4e7105a53e793d08d08d92bbb8df4
2020-03-03Add properties to ResolutionSummaryJozsef Csongvai3-19/+40
Also wrapping ResolutionSummary response to ease integration with SDNC. Issue-ID: CCSDK-2038 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca> Change-Id: Ic1b8959e22ef795065d37664fb60f100af235a90
2020-02-28Fix - ResolutionSummary should contain resolved request-payloadJozsef Csongvai3-2/+3
Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca> Change-Id: I87db63edcef6157da1f498bc9ab1af3cddf8c49a Issue-ID: CCSDK-2038
2020-02-21Eliminate Template RequirementJozsef Csongvai10-23/+260
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-13DB resolutions are picking inputKeyMapping values from DDSteve Siani1-1/+1
Issue-ID: CCSDK-2092 Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com> Change-Id: I07e726ae038bbad853d789841942e98c62b1e0a8
2020-02-12Refactoring Resource Resolution ServiceSingal, Kapil (ks220y)2-25/+33
Removing Node Template dependency Issue-ID: CCSDK-2078 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: I24f3e003c64f3ee40eee4699366cfadfc1d7147e
2020-01-31Spring boot, Kotlin version upgradesBrinda Santh3-16/+17
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
2019-12-31Flexible DSL Types and Templates definition.Brinda Santh1-4/+24
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-30Relationship Type and Templates modelsBrinda Santh1-11/+11
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 Csongvai3-25/+9
Issue-ID: CCSDK-2010 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca> Change-Id: I72a4d8d49a202cea0fa1a200c7466300de1ff0b0
2019-12-11Metadata for name, version, tags and typeBrinda Santh2-8/+11
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-11Separate jython implementation and dependencies.Brinda Santh2-26/+15
Refactored cds python capabilities to python-executor function, so that it will easy to disable and deprecation This change is not jython depreciation, just separating out Issue-ID: CCSDK-1865 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: I3727d72d7195c49d670c30a6fc4245f5a8599e3a
2019-11-29Optimize spring data JPA UT.Brinda Santh15-50/+159
Test case based database configuration, so that we can define what repositories and entities can be used for testing. Issue-ID: CCSDK-1735 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: I4f8a7eb4ed47fec9ab17eb9552648ebd0de01236
2019-11-26Formatting Code base with ktlintSingal, Kapil (ks220y)42-774/+1307
No Business logic change, just the code format. Competible with IntelliJ: https://github.com/pinterest/ktlint#option-3 To format run: mvn process-sources -P format Issue-ID: CCSDK-1947 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: Ic9e9209fb7023d77f434693ad5a01229f8d09331
2019-11-18Merge "CCSDK-1603:Changes in 'Config via netconf' BP to pull data from AAI"Dan Timoney2-1/+5
2019-11-13CCSDK-1603:Changes in 'Config via netconf' BP to pull data from AAItragait2-1/+5
This commit includes changes in blueprint for "Configuration over netconf", So that CDS can fetch data from AAI. It has enhancement in UAT test yaml file, so this blueprint can be tested. An enhancement is also included to introduce request headers in the source-rest. Change-Id: I4ff973538249925239b89da4c5720ec63ffe8037 Issue-ID: CCSDK-1603 Signed-off-by: tragait <rahul.tyagi@est.tech>
2019-11-09Convert component functions IT to UT.Brinda Santh4-14/+13
Issue-ID: CCSDK-1735 Convert Netconf and Restconf Executor IT to UT. Remove duplicate BluePrintProperties. Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: I2eafdbabb17a4df72541ab93c46e7fc9eb0fe8d7
2019-11-04Extension support for db configuration.Brinda Santh1-1/+2
Issue-ID: CCSDK-1046 Signed-off-by: Brinda Santh <bs2796@att.com> Change-Id: I404855eac4520f79ac33f70710dcdb6ae285891d
2019-10-29Provide ongoing occurrence value for scriptingAlexis de Talhouët2-0/+7
This patch fixes this for template https://gerrit.onap.org/r/#/c/ccsdk/cds/+/95081/ but not for script, where the occurrence value might be needed. In reality, this overall occurrence thing is a mistacke, but it's solving an issue that I yet don't know how to properly solve. Change-Id: I7f8579ad2bde3f96b06aaf09c8b8c67d4b97e7b0 Issue-ID: CCSDK-1693 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com> Signed-off-by: Shaaban Ebrahim <shaaban.eltanany.ext@orange.com>
2019-09-27ResourceAssignmentUtils Junit FixesSingal, Kapil (ks220y)1-2/+2
Fixing Junit which are failing in Windows due to carriage return type Issue-ID: CCSDK-1763 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: I83ba91608683963b839bf5bd3afb8509ef947e11
2019-09-26Resource Resolution RefactoringSingal, Kapil (ks220y)2-1/+3
Refactoring some logging statements and adding new loggers Issue-ID: CCSDK-1748 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: I5676659eea01056a7d29206f13473a4361516755
2019-09-26Fixing distribution and propertiesSingal, Kapil (ks220y)3-3/+6
Excluding to embedd Target path, and renaming blueprint to blueprints in properties Issue-ID: CCSDK-1758 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: Ie6f0ff177e0945fb252710a425a16afade1b01a3
2019-09-24Refactoring ResourceAssignmentUtilsSingal, Kapil (ks220y)4-32/+32
Changing isNull condition to isNullOrEmpty to make sure Empty value doesn't get assigned to resource Issue-ID: CCSDK-1748 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: I0744537c7ddec80f20ffd7e6545b947439f63743
2019-09-23Refactoring ResourceAssignmentUtilsSingal, Kapil (ks220y)1-32/+30
Refactoring ResourceAssignmentUtils parseResponseNodeForPrimitiveTypes API to remove cyclic value assignments Issue-ID: CCSDK-1748 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: I27b5a7d3ed2df38cf4e3e44686aec094ebdb5f25
2019-09-19Refactoring Resource Resolution ComponentSingal, Kapil (ks220y)9-239/+310
Use Case: ---------- Input Value (IV): It can be API Input Value or API Default value If a Resource is marked as Input -> pick IV If a Resource is marked as other than Input -> pick IV -> if IV is not present then resolve it as per DataDictionary Definition ** Return Error if Resource is not resolved using assert : ResourceAssignmentUtils.assertTemplateKeyValueNotNull Issue-ID: CCSDK-1746 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: Ia3aaaa36d0e32b0b468f016d57ed5d2c4ddf6a32
2019-09-19Bug-fix - CDS Processor-DB & Default Dictionary not workingSteve Siani6-273/+354
Issue-ID: CCSDK-1718 Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com> Change-Id: Ia15f36d7732058161aa2addc9268dd647330f069 Issue-ID: CCSDK-1717 Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com> Change-Id: Ia15f36d7732058161aa2addc9268dd647330f069
2019-09-18Optimizing Imports and Formatting codeSingal, Kapil (ks220y)1-6/+6
No Business logic change, no code change.. just optimizing imports and reformatting code Issue-ID: CCSDK-1744 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: I1fb2ed10525a6f392f3c0d963c2ed03cfe8dec7e
2019-09-18Refactoring Netconf NetconfMessageUtilsSingal, Kapil (ks220y)5-28/+9
Appending New Line before and after request body within doWrapRpc and removing new line is child API's which forms the request body Issue-ID: CCSDK-1743 Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com> Change-Id: Ic58566e24a21c71d545c45fb95a667c17de2fe66
2019-09-17Plugin to format/validate POMSINGAL, KAPIL (ks220y)1-1/+3
Adding tidy-maven-plugin and related profile to format/vaidate pom files To format POM Files just run mvn process-sources -P format Issue-ID: CCSDK-1739 Signed-off-by: SINGAL, KAPIL (ks220y) <ks220y@att.com> Change-Id: I58dc261ac7b3179a91a0ab5a06237990707543f5
2019-09-17Merge "Vault Client Rest API implementation for sensitive data"Dan Timoney3-31/+77
2019-09-17Fix deploy failure and other test cases.Brinda Santh1-0/+1
Change-Id: Ia43eebefb40190ed3fa6b65ee79f14c10ad222eb Issue-ID: CCSDK-1730 Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
2019-09-16Changing line separator type to LFSINGAL, KAPIL (ks220y)3-87/+87
Changed Line Separator for all files using find . -type f -not -name .* -exec dos2unix {} \; Issue-ID: CCSDK-1733 Signed-off-by: SINGAL, KAPIL (ks220y) <ks220y@att.com> Change-Id: I2efa3276c35c0a0159c6d4debe21c0bd0b4a7b85