diff options
author | Chuanyu Chen <chenchuanyu@huawei.com> | 2018-03-13 09:11:30 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-03-13 09:11:30 +0000 |
commit | a7e1fba375e9c336fda83a72e908623c5baf7ce6 (patch) | |
tree | 9fbba789cb91805cf293bfb3661479eda4cd87f0 /bpmn/MSOInfrastructureBPMN/src | |
parent | c573cd3b92759bab6bd3b3691262fbc976c14dff (diff) | |
parent | 55df4ebf98a50871ef08794c78fea63a6b329c36 (diff) |
Merge "Rename vfc ns workflow groovy class name"
Diffstat (limited to 'bpmn/MSOInfrastructureBPMN/src')
-rw-r--r-- | bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVFCNSResource.groovy (renamed from bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy) | 4 | ||||
-rw-r--r-- | bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVFCNSResource.bpmn | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVFCNSResource.groovy index 06cf8c3cd1..970a4f7d07 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateVFCNSResource.groovy @@ -44,7 +44,7 @@ import org.openecomp.mso.rest.APIResponse; * This groovy class supports the <class>DoCreateVFCNetworkServiceInstance.bpmn</class> process.
* flow for VFC Network Service Create
*/
-public class DoCreateVFCNetworkServiceInstance extends AbstractServiceTaskProcessor {
+public class CreateVFCNSResource extends AbstractServiceTaskProcessor {
String vfcUrl = "/vfc/rest/v1/vfcadapter"
@@ -54,7 +54,7 @@ public class DoCreateVFCNetworkServiceInstance extends AbstractServiceTaskProces JsonUtils jsonUtil = new JsonUtils()
- /**
+ /**CreateVFCNSResource
* Pre Process the BPMN Flow Request
* Inclouds:
* generate the nsOperationKey
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVFCNSResource.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVFCNSResource.bpmn index 29dbca4e55..e6d4af3a6b 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVFCNSResource.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVFCNSResource.bpmn @@ -11,21 +11,21 @@ <bpmn:incoming>SequenceFlow_0khtova</bpmn:incoming> <bpmn:outgoing>SequenceFlow_1uiz85h</bpmn:outgoing> <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* -def dcsi = new DoCreateVFCNetworkServiceInstance() +def dcsi = new CreateVFCNSResource() dcsi.createNetworkService(execution)]]></bpmn:script> </bpmn:scriptTask> <bpmn:scriptTask id="PreprocessIncomingRequest_task" name="Preprocess Incoming Request" scriptFormat="groovy"> <bpmn:incoming>SequenceFlow_1qo2pln</bpmn:incoming> <bpmn:outgoing>SequenceFlow_0khtova</bpmn:outgoing> <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* -def dcsi = new DoCreateVFCNetworkServiceInstance() +def dcsi = new CreateVFCNSResource() dcsi.preProcessRequest(execution)]]></bpmn:script> </bpmn:scriptTask> <bpmn:scriptTask id="instantiate_NSTask" name="Instantiate Network Service" scriptFormat="groovy"> <bpmn:incoming>createNSSuccess_SequenceFlow</bpmn:incoming> <bpmn:outgoing>SequenceFlow_1ywe21t</bpmn:outgoing> <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* -def dcsi = new DoCreateVFCNetworkServiceInstance() +def dcsi = new CreateVFCNSResource() dcsi.instantiateNetworkService(execution)]]></bpmn:script> </bpmn:scriptTask> <bpmn:exclusiveGateway id="ExclusiveGateway_0zfksms" name="Create NS Success?"> @@ -77,14 +77,14 @@ dcsi.instantiateNetworkService(execution)]]></bpmn:script> <bpmn:incoming>SequenceFlow_1gsbpxj</bpmn:incoming> <bpmn:outgoing>SequenceFlow_0xqo13p</bpmn:outgoing> <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* -def dcsi = new DoCreateVFCNetworkServiceInstance() +def dcsi = new CreateVFCNSResource() dcsi.queryNSProgress(execution)]]></bpmn:script> </bpmn:scriptTask> <bpmn:scriptTask id="finishNSCreate_Task" name="Add NS RelationShip" scriptFormat="groovy"> <bpmn:incoming>operationFinished_SequenceFlow</bpmn:incoming> <bpmn:outgoing>SequenceFlow_0cq2q6g</bpmn:outgoing> <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* -def dcsi = new DoCreateVFCNetworkServiceInstance() +def dcsi = new CreateVFCNSResource() dcsi.addNSRelationship(execution)]]></bpmn:script> </bpmn:scriptTask> <bpmn:sequenceFlow id="SequenceFlow_0xqo13p" sourceRef="queryJob_Task" targetRef="ExclusiveGateway_15492gl" /> @@ -92,13 +92,13 @@ dcsi.addNSRelationship(execution)]]></bpmn:script> <bpmn:incoming>operationProcessing_SequenceFlow</bpmn:incoming> <bpmn:outgoing>SequenceFlow_1gsbpxj</bpmn:outgoing> <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.* -def dcsi = new DoCreateVFCNetworkServiceInstance() +def dcsi = new CreateVFCNSResource() dcsi.timeDelay(execution)]]></bpmn:script> </bpmn:scriptTask> <bpmn:sequenceFlow id="SequenceFlow_1gsbpxj" sourceRef="timeDelay_Task" targetRef="queryJob_Task" /> </bpmn:process> <bpmndi:BPMNDiagram id="BPMNDiagram_1"> - <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoCreateVFCNetworkServiceInstance"> + <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="CreateVFCNSResource"> <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="createNS_StartEvent"> <dc:Bounds x="175" y="111" width="36" height="36" /> <bpmndi:BPMNLabel> |