summaryrefslogtreecommitdiffstats
path: root/bpmn/so-bpmn-tasks/src/main/java
AgeCommit message (Collapse)AuthorFilesLines
2021-08-04Merge "Support instantiation of same model vnfs/vf-modules"Seshu Kumar M4-11/+89
2021-07-30Support instantiation of same model vnfs/vf-modulesMichael Pruss4-11/+89
When instantiating a service with multiple vnfs and/or vfmodules SO would differentiate using ModelCustomizationId. This would cause issues when creating multiple instances of same model resource, and each lookup would return the same object. Instead of using ModelCustomizationId, this patch enables SO to use instanceName parameter to differentiate the resources. Validation was added to ensure that instanceNames are provided if there are multiple resources of the same model. If there are no duplicate resources and instanceName is not set, SO will default to previous logic using ModelCustomizationId. In order to properly associate vfmodules with their parent vnfs, the Resource class was augmented with a parent reference which maintains the relationship in further processing. Id generation logic was corrected to ensure that multiple resources of the same model are assigned unique instance ids and references to parent instanceId. Issue-ID: SO-3677 Change-Id: If39a0138f501177e12262f8e911137012e287fca Signed-off-by: Michael Pruss <michael.pruss@bell.ca>
2021-07-28Merge "Fix ControllerExecutionBB flow."Lukasz Muszkieta1-9/+12
2021-07-28Change rb-definition-version identifierLukasz Rajewski2-27/+36
Change rb-definition-version identifier. As a consequnece the vf-module-model-customization-uuid will be used to identify the version of the rb definition. Also cleaned property setup for CNFAdapter create instance request Issue-ID: MULTICLOUD-1377 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com> Change-Id: Ieafc7be91a6b25df3bec89701fa2c26c6d7a47d8
2021-07-27Fix ControllerExecutionBB flow.k.kedron1-9/+12
Adding the condition block on the end, like in the CDS actor path. Issue-ID: SO-3719 Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com> Change-Id: I3ff8f4b63fda8e4404594b630fb6e5411540c697
2021-07-19Merge "Fix macro flow resource blocks processing order"Seshu Kumar M7-175/+486
2021-07-11Fix macro flow resource blocks processing orderLukasz Rajewski7-175/+486
Change-Id: I9941cf15d65b5c463126d99e03aa4eb0c2e8c183 Issue-ID: SO-3705 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
2021-06-30Fixing XML parsers security bugwaqas.ikram1-6/+12
Change-Id: I1fbf2b2bd42669d9a3c059c32bb39278bd483d60 Issue-ID: SO-3668 Signed-off-by: waqas.ikram <waqas.ikram@est.tech>
2021-06-29Fixing XML parsers security bugwaqas.ikram1-2/+7
Change-Id: I8a4f156196af47272a2732b1fbddafb6f0eb1f4d Issue-ID: SO-3668 Signed-off-by: waqas.ikram <waqas.ikram@est.tech>
2021-06-28Fixing XML parsers sonar issuewaqas.ikram1-7/+17
Change-Id: Id67c01bbe19057902127e8a66ba0382589789537 Issue-ID: SO-3665 Signed-off-by: waqas.ikram <waqas.ikram@est.tech>
2021-06-18Add VNF-Macro-Create and VNF-Macro-DeleteJozsef Csongvai5-55/+57
These macros enable creation and deletion of a vnf with vfmodules for an existing service instance using building blocks. Also: - No longer force alaCarte=true for these use cases - Fix broken vfModule sorting logic for baseFirst/baseLast - Minor refactoring replacing String literals with constants Issue-ID: SO-3635 Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca> Change-Id: I16975f3561f2d978dede20679927ac3531def900
2021-04-30Merge "SO refactor - extract junit from WorkflowActionTest to ↵Lukasz Muszkieta3-3/+1
ServiceEBBLoaderTest Issue-ID: SO-3489"
2021-04-21Added logging statements for skip post inst conf classKalkere Ramesh, Sharan (sk720x)2-4/+12
Issue-ID: SO-3626 Change-Id: I618b6b6b6049f94bc6c9bfe6be893ac022f2449e Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com>
2021-04-20SO refactor - extract junit from WorkflowActionTest to ServiceEBBLoaderTestMarcin Rzepecki3-3/+1
Issue-ID: SO-3489 Signed-off-by: Marcin Rzepecki <marcin.rzepecki@nokia.com> Change-Id: I54b3a72e1ddd34b3039eccbb3ef3c32a3428ad99
2021-04-06Merge "CNF release name deliverd to CNF adapter"Seshu Kumar M3-44/+13
2021-04-01CNF release name deliverd to CNF adapterLukasz Rajewski3-44/+13
CNF release name deliverd to CNF adapter from SO request allows to provide custome name of the release what helps to avoid problem with incorrect name geenrated today from vf-module-id Issue-ID: SO-3607 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com> Change-Id: I579b4d78d409701b28306763d11c60b9e75dd0ea
2021-03-29SO refactor - extract Workflow type ServiceMarcin Rzepecki5-431/+504
Issue-ID: SO-3581 Signed-off-by: Marcin Rzepecki <marcin.rzepecki@nokia.com> Change-Id: I5bbe63371045333213542c275e763ac7305369a1
2021-03-24request db endpoint and bpmn cleanupKULESHOV, ELENA2-45/+43
added new request db adapter endpoint use bpmn constants when available allow bpmn input setup parameter to be extended Issue-ID: SO-3606 Signed-off-by: AT&T Open Source <g22940@att.com> Change-Id: Ibde4d82cc7432ea3cdd9a75aef0dc695ebbf9a1b
2021-03-19Merge "SO refactor II - refactor VnfEBBLoader.java"Byung-Woo Jun1-68/+74
2021-03-18SO refactor - refactor class UserParamsServiceTraversalMarcin Rzepecki1-43/+39
Issue-ID: SO-3489 Signed-off-by: Marcin Rzepecki <marcin.rzepecki@nokia.com> Change-Id: I3f465fdd1846686c66f34c7a3e2868fa1f1b5845
2021-03-16Merge "SO refactor - extract private method from ↵Lukasz Muszkieta1-91/+136
getResourceListFromUserParams Issue-ID: SO-3489"
2021-03-16SO refactor II - refactor VnfEBBLoader.javapwielebs1-68/+74
Issue-ID: SO-3581 Signed-off-by: pwielebs <piotr.wielebski@nokia.com> Change-Id: I1567a025e18ac4bf1f77ae4b2d7a499dfca0a4cc
2021-03-15SO refactor - extract Workflow type VNFpwielebs3-114/+191
Issue-ID: SO-3581 Signed-off-by: pwielebs <piotr.wielebski@nokia.com> Change-Id: If5fe112f618c8fa8f7063df69af341df2db6b8f7
2021-03-15SO refactor - extract private method from getResourceListFromUserParamsMarcin Rzepecki1-91/+136
Issue-ID: SO-3489 Signed-off-by: Marcin Rzepecki <marcin.rzepecki@nokia.com> Change-Id: I12e988127c1944ecb63cd0ec7af4ea0cf165195a
2021-03-09Add junit tests for UserParamsServiceTraversal classMarcin Rzepecki1-1/+2
Issue-ID: SO-3489 Signed-off-by: Marcin Rzepecki <marcin.rzepecki@nokia.com> Change-Id: I7c9304534e566f6ec36f420ae058cf5b81e797da
2021-03-07improve error handling in postProcessingExecuteBBKALKERE RAMESH, SHARAN1-11/+18
improve error handling in postProcessingExecuteBB Issue-ID: SO-3572 Signed-off-by: AT&T Open Source <g22940@att.com> Change-Id: Idcccdf8f5f10db8445a42536d0bd891bc2cf5a42 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
2021-03-05Merge "create post flow manipulator"Max Benjamin5-8/+10
2021-03-04create post flow manipulatorBENJAMIN, MAX5-8/+10
create post flow manipulator Issue-ID: SO-3568 Signed-off-by: AT&T Open Source <g22940@att.com> Change-Id: I8afe9cb0184c1f52754097f9912e123e56cfab98 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
2021-03-04restore not NULL verificationMNUSHKIN, DMITRY1-2/+4
restore not NULL verification on user params include test file missed in commit Issue-ID: SO-3564 Signed-off-by: AT&T Open Source <g22940@att.com> Change-Id: I2ad7cff33081b1ccc5369cfc54dccf0eab1f6fbf Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
2021-02-18Increase code coverage for ExecuteBuildingBlockBuilder classpwielebs1-1/+1
Change-Id: I87ce8344f2f2329066639e6aa2d415eac06ef622 Issue-ID: SO-3538 Signed-off-by: pwielebs <piotr.wielebski@nokia.com>
2021-02-04sonar fixLukasz Muszkieta2-20/+38
- improving logging - throwing more specific excpetions - using "Optional" improvement Issue-ID: SO-3428 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com> Change-Id: I873ad4b557265778e7dc0321a1e39439cfa77155
2021-01-29Merge "WorkflowAction refactor - separate code for macro and alaCarte"Seshu Kumar M1-136/+153
2021-01-22Merge "updated post skip instantiation to non primitive"Steve Smokowski2-2/+2
2021-01-21WorkflowAction refactor - separate code for macro and alaCarteLukasz Muszkieta1-136/+153
selectExecutionList method is enormous with lots of if...else statements. The code for macro and alaCarte service is separated to private methods. Issue-ID: SO-3489 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com> Change-Id: Ie1fc725316fb42216d0b16d00c4371608882999c Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>
2021-01-19SO WorkflowAction refactor IIpwielebs3-168/+254
- extract buildExecuteBuildingBlock(), buildExecuteBuildingBlockList() methods from WorkflowAction class and move it to new ExecuteBuildingBlockBuilder class in the same package as WorkflowAction - all methods used only in traverseUserParamsService() also moved - all existing tests for moved methods, moved to corresponding test class Issue-ID: SO-3422 Signed-off-by: pwielebs <piotr.wielebski@nokia.com> Change-Id: I64110de339fed4a0c80c746e45302cefd5e194ff
2021-01-12updated post skip instantiation to non primitiveKalkere Ramesh, Sharan2-2/+2
updated post skip instantiation to non primitive set default Issue-ID: SO-3477 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: Icbc5bf21592237cf04f2653313fb69a3ff9bf8b6
2021-01-05only add config create after activate is doneBenjamin, Max (mb388a)2-61/+65
only add config create after activate is done fix unit tests that were broken from last commit fixed unit test that failed as request details was not set Issue-ID: SO-3466 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: I9616d64f5d73e29c4a37b31887fcfec5d96b5af1
2021-01-04SO WorkflowAction refactorLukasz Muszkieta2-194/+223
- extracting validateResourceIdInAAI method from WorkflowAction class to new ResourceIdValidator class - all test for validateResourceIdInAAI method are moved to corresponding new class - the content of the method and tests is not changed Issue-ID: SO-3447 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com> Change-Id: I70e20f59ab67857601aee2793967632d1ce06d65 Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>
2020-12-17SO WorkflowAction refactorpwielebs3-204/+334
- extract traverseUserParamsService() method from WorkflowAction class to UserParamsServiceTraversal class - move methods used only in traverseUserParamsService() method to UserParamsServiceTraversal class - change method signature from traverseUserParamsService to getResourceListFromUserParams() - create WorkFlowActionCommon for duplicated code Issue-ID: SO-3422 Signed-off-by: pwielebs <piotr.wielebski@nokia.com> Change-Id: Ic6a567eb7b323939e47335aa7938b83498f7a8f8
2020-12-09added in support for delete instance cnfKalkere Ramesh, Sharan2-0/+85
Issue-ID: SO-3404 Change-Id: I1dccebefdeea8f53c4889cc7c61108462de0bf9c Signed-off-by: Kalkere Ramesh, Sharan <sk720x@att.com>
2020-12-03Merge "Further changes for cnf-adpter in bpmn infra"Seshu Kumar M2-3/+19
2020-12-03Further changes for cnf-adpter in bpmn infraLukasz Rajewski2-3/+19
Issue-ID: SO-3403 Change-Id: Iae2a27431797283553f0e329e8c2f3e4514001ef Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
2020-11-30Merge "incorrect filtering of config bbs on"Steve Smokowski1-6/+10
2020-11-24Update CnfAdapter EndpointLukasz Rajewski1-2/+2
Update CnfAdapter Endpoint Change-Id: I26aae1fb3d26edc72e0ddc7985517b9a23a0166f Issue-ID: SO-3399 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@orange.com>
2020-11-23update pojo to have json property and remove constructorKalkere Ramesh, Sharan3-9/+10
Issue-ID: SO-3399 Change-Id: Ied4baf50f17d5ea6593fb8ac816d799b42ad8565 Signed-off-by: Kalkere Ramesh, Sharan <sk720x@att.com>
2020-11-19incorrect filtering of config bbs onKuleshov, Elena1-6/+10
Fix configuration BB setup for replaceInstance cases Fix configuration BB setup for replaceInstance cases Formatting fixes for workflowAction. Issue-ID: SO-3396 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: Ia08e5d9c9057d2b991fb33fa89bfd833afc50d12
2020-11-19Merge "Catch exceptions during the select BB method for"Steve Smokowski1-13/+17
2020-11-19Merge "added in fix for new vnfc model id populate in"Steve Smokowski1-21/+34
2020-11-18Catch exceptions during the select BB method forBoslet, Cory1-13/+17
Catch exceptions during the select BB method for more info Removed unused import added by mistake Issue-ID: SO-3392 Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com> Change-Id: Ieb63a10708d9f023f4f3ae1e27ffafb28b8858e1
2020-11-13Remove unnecessary logger error line for not found volume group1.7.10Kalkere Ramesh, Sharan1-2/+1
Issue-ID: SO-3346 Change-Id: Ibd4bb7af617b1e84b1d7a2dc1c274a34826664d0 Signed-off-by: Kalkere Ramesh, Sharan <sk720x@att.com>