From 7861185045a47e86ea34afb22038cce3ab4196b7 Mon Sep 17 00:00:00 2001 From: Jozsef Csongvai Date: Fri, 26 Nov 2021 15:31:40 -0500 Subject: Add REST client for Api-handler This enables calling api-handler from bpmn-infra Issue-ID: SO-3811 Signed-off-by: Jozsef Csongvai Change-Id: I59a6c7859505f9fca4729089914f43834ceb6323 --- bpmn/so-bpmn-building-blocks/src/test/resources/application-test.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'bpmn/so-bpmn-building-blocks/src') diff --git a/bpmn/so-bpmn-building-blocks/src/test/resources/application-test.yaml b/bpmn/so-bpmn-building-blocks/src/test/resources/application-test.yaml index c36172c3bf..14640f4eec 100644 --- a/bpmn/so-bpmn-building-blocks/src/test/resources/application-test.yaml +++ b/bpmn/so-bpmn-building-blocks/src/test/resources/application-test.yaml @@ -75,7 +75,9 @@ mso: requestDb: auth: Basic YnBlbDptc28tZGItMTUwNyE= endpoint: http://localhost:8081 - + apihandler: + endpoint: http://localhost:8080 + auth: Basic dGVzdDp0ZXN0Cg== async: core-pool-size: 50 max-pool-size: 50 -- cgit From 18cc4f0fb16e1f03072222268eb2c5661d29bc23 Mon Sep 17 00:00:00 2001 From: Jozsef Csongvai Date: Fri, 26 Nov 2021 16:28:01 -0500 Subject: Add service composition building blocks Issue-ID: SO-3811 Signed-off-by: Jozsef Csongvai Change-Id: I1f3eb0b6ae0e6ac1ce90dbd10d3737bb195c673b --- .../BuildingBlock/CreateChildServiceBB.bpmn | 135 +++++++++++++++++++++ .../BuildingBlock/DeleteChildServiceBB.bpmn | 135 +++++++++++++++++++++ 2 files changed, 270 insertions(+) create mode 100644 bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateChildServiceBB.bpmn create mode 100644 bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteChildServiceBB.bpmn (limited to 'bpmn/so-bpmn-building-blocks/src') diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateChildServiceBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateChildServiceBB.bpmn new file mode 100644 index 0000000000..b681b999b1 --- /dev/null +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateChildServiceBB.bpmn @@ -0,0 +1,135 @@ + + + + + SequenceFlow_14q7e7i + + + SequenceFlow_143mdyp + + + + + + + + SequenceFlow_0x6xxb8 + SequenceFlow_0jahgui + + + SequenceFlow_0hmy1qr + + PT5H + + + + SequenceFlow_0hmy1qr + + + + + SequenceFlow_0jahgui + SequenceFlow_0zfixj7 + SequenceFlow_052tga4 + + + ${execution.getVariable("CHILD_SVC_REQ_STATUS")=="COMPLETED"} + + + + SequenceFlow_14q7e7i + SequenceFlow_0n5pwwk + + + SequenceFlow_0n5pwwk + SequenceFlow_0x6xxb8 + + + SequenceFlow_052tga4 + + + SequenceFlow_0zfixj7 + SequenceFlow_143mdyp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteChildServiceBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteChildServiceBB.bpmn new file mode 100644 index 0000000000..cfa55d2101 --- /dev/null +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteChildServiceBB.bpmn @@ -0,0 +1,135 @@ + + + + + SequenceFlow_01wirq3 + + + SequenceFlow_14d89qf + SequenceFlow_1ufwh0a + + + SequenceFlow_0o2ukb9 + + + + SequenceFlow_0o2ukb9 + + PT5H + + + + + + + + SequenceFlow_1ufwh0a + SequenceFlow_0v4loyx + SequenceFlow_12rysg7 + + + SequenceFlow_0v4loyx + SequenceFlow_096kfnj + + + SequenceFlow_096kfnj + + + ${execution.getVariable("CHILD_SVC_REQ_STATUS")=="COMPLETED"} + + + + + + SequenceFlow_01wirq3 + SequenceFlow_0q6aqsk + + + SequenceFlow_0q6aqsk + SequenceFlow_14d89qf + + + SequenceFlow_12rysg7 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit From 1e3c281b0ae601b3c1bed4ba52fc5cb9ae0b0f7a Mon Sep 17 00:00:00 2001 From: Jozsef Csongvai Date: Fri, 26 Nov 2021 17:24:42 -0500 Subject: Enable CreateChildServiceBB for Service-Macro-Create Issue-ID: SO-3811 Signed-off-by: Jozsef Csongvai Change-Id: I7979082a9f145a84f6f03cf2c44e9ccbca198c5a --- .../onap/so/bpmn/infrastructure/bpmn/process/WorkflowActionBBTest.java | 1 + 1 file changed, 1 insertion(+) (limited to 'bpmn/so-bpmn-building-blocks/src') diff --git a/bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/infrastructure/bpmn/process/WorkflowActionBBTest.java b/bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/infrastructure/bpmn/process/WorkflowActionBBTest.java index f492326b0c..6c732a1edb 100644 --- a/bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/infrastructure/bpmn/process/WorkflowActionBBTest.java +++ b/bpmn/so-bpmn-building-blocks/src/test/java/org/onap/so/bpmn/infrastructure/bpmn/process/WorkflowActionBBTest.java @@ -106,6 +106,7 @@ public class WorkflowActionBBTest extends BaseBPMNTest { } + @Test public void retrieveBBExecutionListerrorHandling() throws Exception { variables.put("isTopLevelFlow", true); -- cgit From f2f6144f8600f87b8dce092574c0541eb17389b8 Mon Sep 17 00:00:00 2001 From: sanket12345 Date: Wed, 9 Mar 2022 21:37:49 +0530 Subject: AAI Relationship for Parent - Child Services with Composed Resource Node -Code to add Relation between Parent & it's Child Services -Node used to connect parent and child in AAI is ComposedResource -Parent Service can be related with multiple Child Services via composedResource Node. Issue-ID: SO-3832 Change-ID: I73f97f986a817d423f92f8d922dcd9647b8a6adc Signed-off-by: sanket12345 Signed-off-by: Lukasz Rajewski --- .../subprocess/BuildingBlock/CreateChildServiceBB.bpmn | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'bpmn/so-bpmn-building-blocks/src') diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateChildServiceBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateChildServiceBB.bpmn index b681b999b1..9d361bf101 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateChildServiceBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/CreateChildServiceBB.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_14q7e7i @@ -47,10 +47,10 @@ SequenceFlow_052tga4 - + SequenceFlow_0zfixj7 SequenceFlow_143mdyp - + @@ -121,15 +121,15 @@ + + + - - - -- cgit From 7afa4fdaecb5df4e6e67f94a46825ebbe6050110 Mon Sep 17 00:00:00 2001 From: "mamed.mamedov" Date: Mon, 30 May 2022 17:37:24 +0300 Subject: Enable DeleteChildService functionality Issue-ID: SO-3830 Change-Id: I5cf8b1a998839813fd59576eb70eb79c72f2c2fe Signed-off-by: mamed.mamedov --- .../BuildingBlock/DeleteChildServiceBB.bpmn | 98 ++++++++++------------ 1 file changed, 43 insertions(+), 55 deletions(-) (limited to 'bpmn/so-bpmn-building-blocks/src') diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteChildServiceBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteChildServiceBB.bpmn index cfa55d2101..3be6d32792 100644 --- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteChildServiceBB.bpmn +++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/DeleteChildServiceBB.bpmn @@ -1,5 +1,5 @@ - + SequenceFlow_01wirq3 @@ -27,18 +27,13 @@ SequenceFlow_0v4loyx SequenceFlow_12rysg7 - - SequenceFlow_0v4loyx - SequenceFlow_096kfnj - - SequenceFlow_096kfnj + SequenceFlow_0v4loyx - + ${execution.getVariable("CHILD_SVC_REQ_STATUS")=="COMPLETED"} - SequenceFlow_01wirq3 @@ -56,71 +51,58 @@ - - - - - - - - - - - + + + + + + + - + - - - - - - - + + + + + + + + + + - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - @@ -130,6 +112,12 @@ + + + + + + -- cgit