From 38f720752af4d4aad8c4e467a288d9048659f688 Mon Sep 17 00:00:00 2001 From: Rob Daugherty Date: Wed, 14 Mar 2018 02:07:32 -0400 Subject: AT&T 1712 and 1802 release code This is code from AT&T's 1712 and 1802 releases. Change-Id: Ie1e85851e94bc66c4d9514a0226c221939531a04 Issue-ID: SO-425 Signed-off-by: Rob Daugherty --- .../src/main/resources/META-INF/processes.xml | 32 -- .../org.openecomp.mso.client.RestProperties | 2 + .../org.openecomp.mso.client.dmaap.DmaapProperties | 1 + .../subprocess/BuildingBlock/AppCClient.bpmn | 127 +++++ .../subprocess/BuildingBlock/DecomposeService.bpmn | 2 +- .../resources/subprocess/BuildingBlock/Homing.bpmn | 502 +++++++++---------- .../subprocess/BuildingBlock/ManualHandling.bpmn | 192 ++++++-- .../subprocess/BuildingBlock/RainyDayHandler.bpmn | 4 +- .../subprocess/ReceiveWorkflowMessage.bpmn | 2 +- .../resources/subprocess/SDNCAdapterRestV2.bpmn | 539 +++++++++++++++++++++ .../src/main/resources/xsd/MSOWorkflowSchemaV1.xsd | 21 +- .../resources/xsd/MsoServiceRequestTypesV1.xsd | 21 +- bpmn/MSOCommonBPMN/src/main/resources/xsd/test.xsd | 68 +++ 13 files changed, 1161 insertions(+), 352 deletions(-) delete mode 100644 bpmn/MSOCommonBPMN/src/main/resources/META-INF/processes.xml create mode 100644 bpmn/MSOCommonBPMN/src/main/resources/META-INF/services/org.openecomp.mso.client.RestProperties create mode 100644 bpmn/MSOCommonBPMN/src/main/resources/META-INF/services/org.openecomp.mso.client.dmaap.DmaapProperties create mode 100644 bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/AppCClient.bpmn create mode 100644 bpmn/MSOCommonBPMN/src/main/resources/subprocess/SDNCAdapterRestV2.bpmn create mode 100644 bpmn/MSOCommonBPMN/src/main/resources/xsd/test.xsd (limited to 'bpmn/MSOCommonBPMN/src/main/resources') diff --git a/bpmn/MSOCommonBPMN/src/main/resources/META-INF/processes.xml b/bpmn/MSOCommonBPMN/src/main/resources/META-INF/processes.xml deleted file mode 100644 index 772867d3f2..0000000000 --- a/bpmn/MSOCommonBPMN/src/main/resources/META-INF/processes.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - default - - false - true - - - - diff --git a/bpmn/MSOCommonBPMN/src/main/resources/META-INF/services/org.openecomp.mso.client.RestProperties b/bpmn/MSOCommonBPMN/src/main/resources/META-INF/services/org.openecomp.mso.client.RestProperties new file mode 100644 index 0000000000..2668367d16 --- /dev/null +++ b/bpmn/MSOCommonBPMN/src/main/resources/META-INF/services/org.openecomp.mso.client.RestProperties @@ -0,0 +1,2 @@ +org.openecomp.mso.client.restproperties.AAIPropertiesImpl +org.openecomp.mso.client.restproperties.PolicyRestPropertiesImpl \ No newline at end of file diff --git a/bpmn/MSOCommonBPMN/src/main/resources/META-INF/services/org.openecomp.mso.client.dmaap.DmaapProperties b/bpmn/MSOCommonBPMN/src/main/resources/META-INF/services/org.openecomp.mso.client.dmaap.DmaapProperties new file mode 100644 index 0000000000..8010194263 --- /dev/null +++ b/bpmn/MSOCommonBPMN/src/main/resources/META-INF/services/org.openecomp.mso.client.dmaap.DmaapProperties @@ -0,0 +1 @@ +org.openecomp.mso.client.dmaaproperties.DefaultDmaapPropertiesImpl \ No newline at end of file diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/AppCClient.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/AppCClient.bpmn new file mode 100644 index 0000000000..fb25363a76 --- /dev/null +++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/AppCClient.bpmn @@ -0,0 +1,127 @@ + + + + + SequenceFlow_1wz1rfg + + + + SequenceFlow_1wz1rfg + SequenceFlow_14vlkf4 + + + + SequenceFlow_1j937vi + + + + + SequenceFlow_14vlkf4 + SequenceFlow_1j937vi + + + + + SequenceFlow_1wi3avf + + + + SequenceFlow_1gq753e + + + + + SequenceFlow_1wi3avf + SequenceFlow_1gq753e + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/DecomposeService.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/DecomposeService.bpmn index 8a89b43cde..841964211e 100644 --- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/DecomposeService.bpmn +++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/DecomposeService.bpmn @@ -11,7 +11,7 @@ SequenceFlow_0tgrn11 - + SequenceFlow_0g4aus9 diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/Homing.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/Homing.bpmn index a432417c21..481d1dfa6f 100644 --- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/Homing.bpmn +++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/Homing.bpmn @@ -1,259 +1,259 @@ - - - - - SequenceFlow_1x9usa6 - - - SequenceFlow_1x9usa6 - SequenceFlow_10x3ocp - - - - - - SequenceFlow_1rf4vs8 - - - - SequenceFlow_00nlh7l - - - - SequenceFlow_00nlh7l - SequenceFlow_1rf4vs8 + + + + + SequenceFlow_1x9usa6 + + + SequenceFlow_1x9usa6 + SequenceFlow_10x3ocp + + + + + + SequenceFlow_1rf4vs8 + + + + SequenceFlow_00nlh7l + + + + SequenceFlow_00nlh7l + SequenceFlow_1rf4vs8 - - - - - - - SequenceFlow_0kamg53 - SequenceFlow_1o7154s +ex.processSubflowsBPMNException(execution)]]> + + + + + + + SequenceFlow_0kamg53 + SequenceFlow_1o7154s - - - SequenceFlow_0kamg53 - - - - SequenceFlow_1o7154s - - - - - - - SequenceFlow_043r3j8 - SequenceFlow_1h9opg9 - - - - SequenceFlow_10x3ocp - badResponse - goodResponse - - - - badResponse - SequenceFlow_0clfkld +ex.processJavaException(execution)]]> + + + SequenceFlow_0kamg53 + + + + SequenceFlow_1o7154s + + + + + + + SequenceFlow_043r3j8 + SequenceFlow_1h9opg9 + + + + SequenceFlow_10x3ocp + badResponse + goodResponse + + + + badResponse + SequenceFlow_0clfkld - - - - - SequenceFlow_0clfkld - - - - - - - - - - - - - - - - goodResponse - SequenceFlow_043r3j8 - - - - SequenceFlow_1h9opg9 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +ex.buildAndThrowWorkflowException(execution, responseCode, "Received a Bad Sync Response from Sniro.")]]> + + + + + SequenceFlow_0clfkld + + + + + + + + + + + + + + + + goodResponse + SequenceFlow_043r3j8 + + + + SequenceFlow_1h9opg9 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/ManualHandling.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/ManualHandling.bpmn index 2f30864c39..4d31eee45a 100644 --- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/ManualHandling.bpmn +++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/ManualHandling.bpmn @@ -5,7 +5,7 @@ SequenceFlow_0jav6cu - SequenceFlow_192yimz + SequenceFlow_14cyk9v @@ -26,15 +26,7 @@ exceptionUtil.processJavaException(execution)]]> - - - SequenceFlow_0jav6cu - SequenceFlow_0zgg47r - - - + @@ -51,9 +43,87 @@ def mh = new ManualHandling() mh.setTaskVariables(task)]]> - SequenceFlow_0zgg47r + SequenceFlow_0igra4l SequenceFlow_192yimz + + + + + + + + + ${URN_mso_adapters_openecomp_db_endpoint} + + + + application/soap+xml + #{BasicAuthHeaderValueDB} + + + POST + + ${statusCode} + + soap-http-connector + + + SequenceFlow_0mbjrvr + SequenceFlow_0b84ki5 + + + SequenceFlow_0zgg47r + SequenceFlow_0mbjrvr + + + + SequenceFlow_192yimz + SequenceFlow_0zer29a + + + + + + + ${URN_mso_adapters_openecomp_db_endpoint} + + + + application/soap+xml + #{BasicAuthHeaderValueDB} + + + POST + + ${statusCode} + + soap-http-connector + + + SequenceFlow_0zer29a + SequenceFlow_14cyk9v + + + SequenceFlow_0jav6cu + SequenceFlow_0zgg47r + + + + + + SequenceFlow_0b84ki5 + SequenceFlow_0igra4l + + @@ -66,69 +136,119 @@ mh.setTaskVariables(task)]]> - + - + - + - + - + - + - + - - + + - + - + - - + + - + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + - - - + + + - + - - + + + + + + + + + diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/RainyDayHandler.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/RainyDayHandler.bpmn index 2638d85a8a..8183469798 100644 --- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/RainyDayHandler.bpmn +++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/BuildingBlock/RainyDayHandler.bpmn @@ -64,9 +64,11 @@ rdh.queryPolicy(execution)]]> - + + + SequenceFlow_0navei4 SequenceFlow_1f0bjoy diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/ReceiveWorkflowMessage.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/ReceiveWorkflowMessage.bpmn index ad857eddcd..abae950134 100644 --- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/ReceiveWorkflowMessage.bpmn +++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/ReceiveWorkflowMessage.bpmn @@ -181,4 +181,4 @@ receiveWorkflowMessage.processReceivedMessage(execution)]]> - \ No newline at end of file + diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/SDNCAdapterRestV2.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/SDNCAdapterRestV2.bpmn new file mode 100644 index 0000000000..68afc9ae5a --- /dev/null +++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/SDNCAdapterRestV2.bpmn @@ -0,0 +1,539 @@ + + + + This version of SDNCAdapterRest allows for interim notifications to be sent for any non-final response received from SDNC. + + SequenceFlow_3 + SequenceFlow_14 + + + + SequenceFlow_17 + SequenceFlow_35 + + + + SequenceFlow_23 + SequenceFlow_36 + + + + + SequenceFlow_14 + SequenceFlow_17 + SequenceFlow_23 + SequenceFlow_24 + + + + + + + + + + + SequenceFlow_35 + + + + SequenceFlow_36 + + + + + SequenceFlow_2 + SequenceFlow_3 + + + + + SequenceFlow_9 + SequenceFlow_2 + + + + + SequenceFlow_9 + + + + SequenceFlow_27 + SequenceFlow_34 + + + + + SequenceFlow_34 + + + + SequenceFlow_44 + SequenceFlow_1 + + + + + SequenceFlow_1 + + + SequenceFlow_27 + + ${SDNCREST_timeout} + + + + + SequenceFlow_24 + SequenceFlow_44 + + SequenceFlow_41 + SequenceFlow_42 + + + + + SequenceFlow_25 + + + + SequenceFlow_30 + SequenceFlow_39 + SequenceFlow_43 + + + + + + + SequenceFlow_42 + SequenceFlow_8 + SequenceFlow_30 + + + + + + + SequenceFlow_25 + SequenceFlow_0u48ihb + SequenceFlow_0vluoaq + SequenceFlow_41 + + + + + SequenceFlow_39 + + + SequenceFlow_8 + + + + SequenceFlow_43 + SequenceFlow_0u48ihb + SequenceFlow_1g8pswz + + + SequenceFlow_1g8pswz + SequenceFlow_0my3p6y + + + + + + + + + + + + + + SequenceFlow_0my3p6y + SequenceFlow_0vluoaq + + + + + + SequenceFlow_4 + + + + + SequenceFlow_4 + SequenceFlow_11 + + + + + SequenceFlow_11 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bpmn/MSOCommonBPMN/src/main/resources/xsd/MSOWorkflowSchemaV1.xsd b/bpmn/MSOCommonBPMN/src/main/resources/xsd/MSOWorkflowSchemaV1.xsd index a8b5fcc945..e743dc754e 100644 --- a/bpmn/MSOCommonBPMN/src/main/resources/xsd/MSOWorkflowSchemaV1.xsd +++ b/bpmn/MSOCommonBPMN/src/main/resources/xsd/MSOWorkflowSchemaV1.xsd @@ -1,20 +1,11 @@