aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--adapters/mso-catalog-db-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml5
-rw-r--r--adapters/mso-network-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml7
-rw-r--r--adapters/mso-vnf-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml9
-rw-r--r--bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/HealthCheckHandler.java19
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy (renamed from bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateGenericE2EServiceInstance.groovy)39
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVFCNetworkServiceInstance.bpmn234
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/jboss-deployment-structure.xml7
-rw-r--r--mso-catalog-db/src/main/resources/VnfResourceCustomization.hbm.xml6
-rw-r--r--packages/arquillian-unit-tests/src/test/resources/docker/mso/mso-docker.json3
9 files changed, 161 insertions, 168 deletions
diff --git a/adapters/mso-catalog-db-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml b/adapters/mso-catalog-db-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
index 05f0a32844..53bdbc9ea7 100644
--- a/adapters/mso-catalog-db-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
+++ b/adapters/mso-catalog-db-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
@@ -5,12 +5,17 @@
<module name="org.apache.log4j" />
<module name="org.slf4j" />
<module name="org.slf4j.impl" />
+ <module name="org.jboss.resteasy.resteasy-jackson-provider" />
+ <module name="org.jboss.resteasy.resteasy-jettison-provider" />
</exclusions>
<dependencies>
<module name="org.jboss.jandex" slot="main" />
<module name="org.javassist" slot="main" />
<module name="org.antlr" slot="main" />
<module name="org.dom4j" slot="main" />
+ <module name="org.jboss.resteasy.resteasy-jackson2-provider" services="import" />
+ <!-- This module contain the ProviderBase class: -->
+ <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" export="true" />
</dependencies>
</deployment>
</jboss-deployment-structure>
diff --git a/adapters/mso-network-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml b/adapters/mso-network-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
index 58ddb4a08f..fb268917f2 100644
--- a/adapters/mso-network-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
+++ b/adapters/mso-network-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
@@ -5,12 +5,17 @@
<module name="org.apache.log4j" />
<module name="org.slf4j" />
<module name="org.slf4j.impl" />
+ <module name="org.jboss.resteasy.resteasy-jackson-provider" />
+ <module name="org.jboss.resteasy.resteasy-jettison-provider" />
</exclusions>
<dependencies>
<module name="org.jboss.jandex" slot="main" />
<module name="org.javassist" slot="main" />
<module name="org.antlr" slot="main" />
<module name="org.dom4j" slot="main" />
+ <module name="org.jboss.resteasy.resteasy-jackson2-provider" services="import" />
+ <!-- This module contain the ProviderBase class: -->
+ <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" export="true" />
</dependencies>
</deployment>
-</jboss-deployment-structure> \ No newline at end of file
+</jboss-deployment-structure>
diff --git a/adapters/mso-vnf-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml b/adapters/mso-vnf-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
index 58ddb4a08f..56e2023f04 100644
--- a/adapters/mso-vnf-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
+++ b/adapters/mso-vnf-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
@@ -5,12 +5,17 @@
<module name="org.apache.log4j" />
<module name="org.slf4j" />
<module name="org.slf4j.impl" />
+ <module name="org.jboss.resteasy.resteasy-jackson-provider" />
+ <module name="org.jboss.resteasy.resteasy-jettison-provider" />
</exclusions>
<dependencies>
<module name="org.jboss.jandex" slot="main" />
<module name="org.javassist" slot="main" />
<module name="org.antlr" slot="main" />
<module name="org.dom4j" slot="main" />
- </dependencies>
+ <module name="org.jboss.resteasy.resteasy-jackson2-provider" services="import" />
+ <!-- This module contain the ProviderBase class: -->
+ <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" export="true" />
+ </dependencies>
</deployment>
-</jboss-deployment-structure> \ No newline at end of file
+</jboss-deployment-structure>
diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/HealthCheckHandler.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/HealthCheckHandler.java
index 55f6221dfb..75858b14ec 100644
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/HealthCheckHandler.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/HealthCheckHandler.java
@@ -54,8 +54,8 @@ public class HealthCheckHandler {
private static MsoLogger msoLogger = MsoLogger.getMsoLogger(MsoLogger.Catalog.BPEL);
private static final String SITENAME = "mso.sitename";
- private static final String ADPTER_ENDPOINT = "mso.openecomp.adapters.db.endpoint";
- private static final String OPENECOMP_ADAPTER_NAMESPACE = "mso.openecomp.adapter.namespace";
+ private static final String ADAPTER_ENDPOINT = "mso.adapters.db.endpoint";
+ private static final String ADAPTER_NAMESPACE = "mso.adapters.namespace";
private static final String CONFIG = "mso.bpmn.urn.properties";
private static final String CREDENTIAL = "mso.adapters.db.auth";
private static final String MSOKEY = "mso.msoKey";
@@ -94,17 +94,17 @@ public class HealthCheckHandler {
}
String siteName = props.get(SITENAME);
- String endpoint = props.get(ADPTER_ENDPOINT);
+ String endpoint = props.get(ADAPTER_ENDPOINT);
if (null == siteName || siteName.length () == 0 || null == endpoint || endpoint.length () == 0) {
- msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.DataError, "Unable to load key attributes (" + SITENAME + " or " + ADPTER_ENDPOINT + ") from the config file:" + CONFIG);
+ msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.DataError, "Unable to load key attributes (" + SITENAME + " or " + ADAPTER_ENDPOINT + ") from the config file:" + CONFIG);
return NOT_STARTED_RESPONSE;
}
try {
- if (!this.getSiteStatus (endpoint, siteName, props.get(CREDENTIAL), props.get(MSOKEY), props.get(OPENECOMP_ADAPTER_NAMESPACE))) {
+ if (!this.getSiteStatus (endpoint, siteName, props.get(CREDENTIAL), props.get(MSOKEY), props.get(ADAPTER_NAMESPACE))) {
msoLogger.debug("This site is currently disabled for maintenance.");
return HEALTH_CHECK_NOK_RESPONSE;
}
@@ -146,17 +146,17 @@ public class HealthCheckHandler {
}
String siteName = props.get(SITENAME);
- String endpoint = props.get(ADPTER_ENDPOINT);
+ String endpoint = props.get(ADAPTER_ENDPOINT);
if (null == siteName || siteName.length () == 0 || null == endpoint || endpoint.length () == 0) {
- msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.DataError, "Unable to load key attributes (" + SITENAME + " or " + ADPTER_ENDPOINT + ") from the config file:" + CONFIG);
+ msoLogger.error(MessageEnum.BPMN_GENERAL_EXCEPTION, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.DataError, "Unable to load key attributes (" + SITENAME + " or " + ADAPTER_ENDPOINT + ") from the config file:" + CONFIG);
return NOT_STARTED_RESPONSE;
}
try {
- if (!this.getSiteStatus (endpoint, siteName, props.get(CREDENTIAL), props.get(MSOKEY), props.get(OPENECOMP_ADAPTER_NAMESPACE))) {
+ if (!this.getSiteStatus (endpoint, siteName, props.get(CREDENTIAL), props.get(MSOKEY), props.get(ADAPTER_NAMESPACE))) {
msoLogger.debug("This site is currently disabled for maintenance.");
return HEALTH_CHECK_NOK_RESPONSE;
}
@@ -169,7 +169,8 @@ public class HealthCheckHandler {
}
try {
- ProcessEngines.getDefaultProcessEngine().getIdentityService().createGroupQuery().list();
+ // TODO: check the appropriate process engine
+ // ProcessEngines.getDefaultProcessEngine().getIdentityService().createGroupQuery().list();
} catch (final Exception e) {
msoLogger.error(MessageEnum.GENERAL_EXCEPTION_ARG, "BPMN", MsoLogger.getServiceName(), MsoLogger.ErrorCode.UnknownError, "Exception while verifying Camunda engine", e);
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateGenericE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy
index 3302210416..2029d15d5c 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateGenericE2EServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateVFCNetworkServiceInstance.groovy
@@ -58,7 +58,7 @@ public class CreateGenericE2EServiceInstance extends AbstractServiceTaskProcesso
* generate the operation id
*/
public void preProcessRequest (Execution execution) {
- def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
+ /* def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
String msg = ""
utils.log("DEBUG", " *** preProcessRequest() *** ", isDebugEnabled)
try {
@@ -114,47 +114,22 @@ public class CreateGenericE2EServiceInstance extends AbstractServiceTaskProcesso
utils.log("DEBUG", msg, isDebugEnabled)
exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
}
- utils.log("DEBUG"," ***** Exit preProcessRequest *****", isDebugEnabled)
+ utils.log("DEBUG"," ***** Exit preProcessRequest *****", isDebugEnabled)*/
}
- /**
- * send the sync response
- * the response incloudes the instance id and the operation id
- */
- public void sendSyncResponse(Execution execution) {
- def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
- utils.log("DEBUG", " *** sendSyncResponse *** ", isDebugEnabled)
-
- try {
- String requestId = execution.getVariable("msoRequestId")
- String serviceInstanceId = execution.getVariable("serviceInstanceId")
- String operationId = execution.getVariable("operationId")
- // RESTResponse for API Handler (APIH) Reply Task
- String createServiceRestResponse = """{"service":{"serviceId":"${serviceInstanceId}","operationId":"${operationId}"}}""".trim()
- utils.log("DEBUG", " sendSyncResponse to APIH:" + "\n" + createServiceRestResponse, isDebugEnabled)
- sendWorkflowResponse(execution, 202, createServiceRestResponse)
- execution.setVariable("sentSyncResponse", true)
-
- } catch (Exception ex) {
- String msg = "Exceptuion in sendSyncResponse:" + ex.getMessage()
- utils.log("DEBUG", msg, isDebugEnabled)
- exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
- }
- utils.log("DEBUG"," ***** Exit sendSyncResopnse *****", isDebugEnabled)
- }
- public void preCreateRequest(Execution execution) {
+ public void createNetworkService(Execution execution) {
}
- public void postConfigRequest(Execution execution) {
+ public void instantiateNetworkService(Execution execution) {
}
- public void preVFCRequest(Execution execution) {
+ public void queryNSProgress(Execution execution) {
}
- public void preAdaptorDataRequest(Execution execution) {
+ public void timeDelay(Execution execution) {
}
- public void preSDNCRequest(Execution execution) {
+ public void finishNSCreate(Execution execution) {
}
}
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVFCNetworkServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVFCNetworkServiceInstance.bpmn
index 4fc1fc6907..58eb1f04f2 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVFCNetworkServiceInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVFCNetworkServiceInstance.bpmn
@@ -1,100 +1,108 @@
<?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.7.2">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.10.0">
<bpmn:process id="DoCreateVFCNetworkServiceInstance" name="DoCreateVFCNetworkServiceInstance" isExecutable="true">
- <bpmn:startEvent id="StartEvent_1">
+ <bpmn:startEvent id="createNS_StartEvent" name="createNS_StartEvent">
<bpmn:outgoing>SequenceFlow_1qo2pln</bpmn:outgoing>
</bpmn:startEvent>
- <bpmn:sequenceFlow id="SequenceFlow_1qo2pln" sourceRef="StartEvent_1" targetRef="Task_0h2p1i1" />
- <bpmn:sequenceFlow id="SequenceFlow_0khtova" sourceRef="Task_0h2p1i1" targetRef="Task_09nzhwk" />
+ <bpmn:sequenceFlow id="SequenceFlow_1qo2pln" sourceRef="createNS_StartEvent" targetRef="PreprocessIncomingRequest_task" />
+ <bpmn:sequenceFlow id="SequenceFlow_0khtova" sourceRef="PreprocessIncomingRequest_task" targetRef="Task_09nzhwk" />
<bpmn:sequenceFlow id="SequenceFlow_1uiz85h" sourceRef="Task_09nzhwk" targetRef="ExclusiveGateway_0zfksms" />
- <bpmn:scriptTask id="Task_09nzhwk" name="Create Network Service">
+ <bpmn:scriptTask id="Task_09nzhwk" name="Create Network Service" scriptFormat="groovy">
<bpmn:incoming>SequenceFlow_0khtova</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_1uiz85h</bpmn:outgoing>
<bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def csi = new DoCreateE2EServiceInstance()
-csi.preSDNCRequest(execution)]]></bpmn:script>
+def dcsi = new DoCreateVFCNetworkServiceInstance()
+dcsi.createNetworkService(execution)]]></bpmn:script>
</bpmn:scriptTask>
- <bpmn:scriptTask id="Task_0h2p1i1" name="Preprocess Incoming Request">
+ <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 csi = new DoCreateE2EServiceInstance()
-csi.preSDNCRequest(execution)]]></bpmn:script>
+def dcsi = new DoCreateVFCNetworkServiceInstance()
+dcsi.preProcessRequest(execution)]]></bpmn:script>
</bpmn:scriptTask>
- <bpmn:scriptTask id="Task_15v20es" name="Instantiate Network Service">
- <bpmn:incoming>SequenceFlow_1rt03zl</bpmn:incoming>
+ <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 csi = new DoCreateE2EServiceInstance()
-csi.preSDNCRequest(execution)]]></bpmn:script>
+def dcsi = new DoCreateVFCNetworkServiceInstance()
+dcsi.instantiateNetworkService(execution)]]></bpmn:script>
</bpmn:scriptTask>
- <bpmn:exclusiveGateway id="ExclusiveGateway_0zfksms" name="Create NS Success?" default="SequenceFlow_0df541u">
+ <bpmn:exclusiveGateway id="ExclusiveGateway_0zfksms" name="Create NS Success?">
<bpmn:incoming>SequenceFlow_1uiz85h</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_1rt03zl</bpmn:outgoing>
- <bpmn:outgoing>SequenceFlow_0df541u</bpmn:outgoing>
+ <bpmn:outgoing>createNSSuccess_SequenceFlow</bpmn:outgoing>
+ <bpmn:outgoing>createNSFailed_SequenceFlow</bpmn:outgoing>
</bpmn:exclusiveGateway>
- <bpmn:sequenceFlow id="SequenceFlow_1rt03zl" name="yes" sourceRef="ExclusiveGateway_0zfksms" targetRef="Task_15v20es">
- <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression" />
+ <bpmn:sequenceFlow id="createNSSuccess_SequenceFlow" name="yes" sourceRef="ExclusiveGateway_0zfksms" targetRef="instantiate_NSTask">
+ <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{(execution.getVariable("nsInstanceName" ) != null && execution.getVariable("nsInstanceName" ) != "" )}]]></bpmn:conditionExpression>
</bpmn:sequenceFlow>
- <bpmn:sequenceFlow id="SequenceFlow_0df541u" name="no" sourceRef="ExclusiveGateway_0zfksms" targetRef="EndEvent_1tncafd" />
- <bpmn:exclusiveGateway id="ExclusiveGateway_1is7zys" name="Instantiate NS Success?" default="SequenceFlow_0j7xo94">
+ <bpmn:sequenceFlow id="createNSFailed_SequenceFlow" name="no" sourceRef="ExclusiveGateway_0zfksms" targetRef="createNSFailed_EndEvent">
+ <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{(execution.getVariable("nsInstanceName" ) == null || execution.getVariable("nsInstanceName" ) == "" )}]]></bpmn:conditionExpression>
+ </bpmn:sequenceFlow>
+ <bpmn:exclusiveGateway id="ExclusiveGateway_1is7zys" name="Instantiate NS Success?">
<bpmn:incoming>SequenceFlow_1ywe21t</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_0j7xo94</bpmn:outgoing>
- <bpmn:outgoing>SequenceFlow_1ui2n9l</bpmn:outgoing>
- </bpmn:exclusiveGateway>
- <bpmn:sequenceFlow id="SequenceFlow_1ywe21t" sourceRef="Task_15v20es" targetRef="ExclusiveGateway_1is7zys" />
- <bpmn:sequenceFlow id="SequenceFlow_0j7xo94" name="no" sourceRef="ExclusiveGateway_1is7zys" targetRef="EndEvent_1gkvvpn" />
- <bpmn:sequenceFlow id="SequenceFlow_1ui2n9l" name="yes" sourceRef="ExclusiveGateway_1is7zys" targetRef="Task_0ff3d5r" />
- <bpmn:exclusiveGateway id="ExclusiveGateway_0y0tqb7" name="Query Job Success?" default="SequenceFlow_0yegc4p">
- <bpmn:incoming>SequenceFlow_1jaltbk</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_0yegc4p</bpmn:outgoing>
- <bpmn:outgoing>SequenceFlow_118dtip</bpmn:outgoing>
+ <bpmn:outgoing>instantiateFailed_SequenceFlow</bpmn:outgoing>
+ <bpmn:outgoing>instantiateSuccess_SequenceFlow</bpmn:outgoing>
</bpmn:exclusiveGateway>
- <bpmn:sequenceFlow id="SequenceFlow_1jaltbk" sourceRef="Task_0ff3d5r" targetRef="ExclusiveGateway_0y0tqb7" />
- <bpmn:sequenceFlow id="SequenceFlow_0yegc4p" name="no" sourceRef="ExclusiveGateway_0y0tqb7" targetRef="EndEvent_0ev3qbb" />
- <bpmn:exclusiveGateway id="ExclusiveGateway_15492gl" name="Instantiate Finished?" default="SequenceFlow_0omec46">
- <bpmn:incoming>SequenceFlow_118dtip</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_0hftgi6</bpmn:outgoing>
- <bpmn:outgoing>SequenceFlow_0omec46</bpmn:outgoing>
+ <bpmn:sequenceFlow id="SequenceFlow_1ywe21t" sourceRef="instantiate_NSTask" targetRef="ExclusiveGateway_1is7zys" />
+ <bpmn:sequenceFlow id="instantiateFailed_SequenceFlow" name="no" sourceRef="ExclusiveGateway_1is7zys" targetRef="EndEvent_1gkvvpn">
+ <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{(execution.getVariable("jobId" ) == null || execution.getVariable("jobId" ) == "" )}]]></bpmn:conditionExpression>
+ </bpmn:sequenceFlow>
+ <bpmn:sequenceFlow id="instantiateSuccess_SequenceFlow" name="yes" sourceRef="ExclusiveGateway_1is7zys" targetRef="queryJob_Task">
+ <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{(execution.getVariable("jobId" ) != null && execution.getVariable("jobId" ) != "" )}]]></bpmn:conditionExpression>
+ </bpmn:sequenceFlow>
+ <bpmn:exclusiveGateway id="ExclusiveGateway_15492gl" name="Instantiate Finished?">
+ <bpmn:incoming>SequenceFlow_0xqo13p</bpmn:incoming>
+ <bpmn:outgoing>operationFinished_SequenceFlow</bpmn:outgoing>
+ <bpmn:outgoing>operationProcessing_SequenceFlow</bpmn:outgoing>
</bpmn:exclusiveGateway>
- <bpmn:sequenceFlow id="SequenceFlow_118dtip" name="yes" sourceRef="ExclusiveGateway_0y0tqb7" targetRef="ExclusiveGateway_15492gl" />
- <bpmn:sequenceFlow id="SequenceFlow_0hftgi6" name="yes" sourceRef="ExclusiveGateway_15492gl" targetRef="Task_0hltnyg" />
- <bpmn:sequenceFlow id="SequenceFlow_0omec46" name="no" sourceRef="ExclusiveGateway_15492gl" targetRef="Task_0ff3d5r" />
- <bpmn:sequenceFlow id="SequenceFlow_0cq2q6g" sourceRef="Task_0hltnyg" targetRef="EndEvent_1x6k78c" />
- <bpmn:endEvent id="EndEvent_1tncafd">
- <bpmn:incoming>SequenceFlow_0df541u</bpmn:incoming>
+ <bpmn:sequenceFlow id="operationFinished_SequenceFlow" name="yes" sourceRef="ExclusiveGateway_15492gl" targetRef="finishNSCreate_Task">
+ <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{(execution.getVariable("operationStatus" ) != "processing" )}]]></bpmn:conditionExpression>
+ </bpmn:sequenceFlow>
+ <bpmn:sequenceFlow id="operationProcessing_SequenceFlow" name="no" sourceRef="ExclusiveGateway_15492gl" targetRef="timeDelay_Task">
+ <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{(execution.getVariable("operationStatus" ) == "processing" )}]]></bpmn:conditionExpression>
+ </bpmn:sequenceFlow>
+ <bpmn:sequenceFlow id="SequenceFlow_0cq2q6g" sourceRef="finishNSCreate_Task" targetRef="EndEvent_1x6k78c" />
+ <bpmn:endEvent id="createNSFailed_EndEvent" name="createNSFailed">
+ <bpmn:incoming>createNSFailed_SequenceFlow</bpmn:incoming>
</bpmn:endEvent>
<bpmn:endEvent id="EndEvent_1gkvvpn">
- <bpmn:incoming>SequenceFlow_0j7xo94</bpmn:incoming>
- </bpmn:endEvent>
- <bpmn:endEvent id="EndEvent_0ev3qbb">
- <bpmn:incoming>SequenceFlow_0yegc4p</bpmn:incoming>
+ <bpmn:incoming>instantiateFailed_SequenceFlow</bpmn:incoming>
</bpmn:endEvent>
<bpmn:endEvent id="EndEvent_1x6k78c">
<bpmn:incoming>SequenceFlow_0cq2q6g</bpmn:incoming>
</bpmn:endEvent>
- <bpmn:scriptTask id="Task_0ff3d5r" name="Query NS Progress">
- <bpmn:incoming>SequenceFlow_1ui2n9l</bpmn:incoming>
- <bpmn:incoming>SequenceFlow_0omec46</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_1jaltbk</bpmn:outgoing>
+ <bpmn:scriptTask id="queryJob_Task" name="Query NS Progress" scriptFormat="groovy">
+ <bpmn:incoming>instantiateSuccess_SequenceFlow</bpmn:incoming>
+ <bpmn:incoming>SequenceFlow_1gsbpxj</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_0xqo13p</bpmn:outgoing>
<bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def csi = new DoCreateE2EServiceInstance()
-csi.preSDNCRequest(execution)]]></bpmn:script>
+def dcsi = new DoCreateVFCNetworkServiceInstance()
+dcsi.queryNSProgress(execution)]]></bpmn:script>
</bpmn:scriptTask>
- <bpmn:scriptTask id="Task_0hltnyg" name="Finish NS Create">
- <bpmn:incoming>SequenceFlow_0hftgi6</bpmn:incoming>
+ <bpmn:scriptTask id="finishNSCreate_Task" name="Finish NS Create">
+ <bpmn:incoming>operationFinished_SequenceFlow</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_0cq2q6g</bpmn:outgoing>
<bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
-def csi = new DoCreateE2EServiceInstance()
-csi.preSDNCRequest(execution)]]></bpmn:script>
+def dcsi = new DoCreateVFCNetworkServiceInstance()
+dcsi.finishNSCreate(execution)]]></bpmn:script>
</bpmn:scriptTask>
+ <bpmn:sequenceFlow id="SequenceFlow_0xqo13p" sourceRef="queryJob_Task" targetRef="ExclusiveGateway_15492gl" />
+ <bpmn:scriptTask id="timeDelay_Task" name="timeDelay" scriptFormat="groovy">
+ <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()
+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:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
+ <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="createNS_StartEvent">
<dc:Bounds x="175" y="111" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="148" y="147" width="90" height="20" />
+ <dc:Bounds x="152" y="147" width="83" height="24" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1qo2pln_di" bpmnElement="SequenceFlow_1qo2pln">
@@ -123,26 +131,26 @@ csi.preSDNCRequest(execution)]]></bpmn:script>
<bpmndi:BPMNShape id="ScriptTask_1dw39hg_di" bpmnElement="Task_09nzhwk">
<dc:Bounds x="479" y="89" width="100" height="80" />
</bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="ScriptTask_03j6ogo_di" bpmnElement="Task_0h2p1i1">
+ <bpmndi:BPMNShape id="ScriptTask_03j6ogo_di" bpmnElement="PreprocessIncomingRequest_task">
<dc:Bounds x="293" y="89" width="100" height="80" />
</bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="ScriptTask_1qmmew8_di" bpmnElement="Task_15v20es">
+ <bpmndi:BPMNShape id="ScriptTask_1qmmew8_di" bpmnElement="instantiate_NSTask">
<dc:Bounds x="839" y="89" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ExclusiveGateway_0zfksms_di" bpmnElement="ExclusiveGateway_0zfksms" isMarkerVisible="true">
<dc:Bounds x="683" y="104" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="685" y="158" width="51" height="24" />
+ <dc:Bounds x="685" y="158" width="52" height="24" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_1rt03zl_di" bpmnElement="SequenceFlow_1rt03zl">
+ <bpmndi:BPMNEdge id="SequenceFlow_1rt03zl_di" bpmnElement="createNSSuccess_SequenceFlow">
<di:waypoint xsi:type="dc:Point" x="733" y="129" />
<di:waypoint xsi:type="dc:Point" x="839" y="129" />
<bpmndi:BPMNLabel>
<dc:Bounds x="777" y="108" width="19" height="12" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_0df541u_di" bpmnElement="SequenceFlow_0df541u">
+ <bpmndi:BPMNEdge id="SequenceFlow_0df541u_di" bpmnElement="createNSFailed_SequenceFlow">
<di:waypoint xsi:type="dc:Point" x="708" y="104" />
<di:waypoint xsi:type="dc:Point" x="708" y="33" />
<bpmndi:BPMNLabel>
@@ -152,7 +160,7 @@ csi.preSDNCRequest(execution)]]></bpmn:script>
<bpmndi:BPMNShape id="ExclusiveGateway_1is7zys_di" bpmnElement="ExclusiveGateway_1is7zys" isMarkerVisible="true">
<dc:Bounds x="1034" y="105" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1029" y="159" width="68" height="24" />
+ <dc:Bounds x="1029" y="159" width="69" height="24" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1ywe21t_di" bpmnElement="SequenceFlow_1ywe21t">
@@ -162,39 +170,18 @@ csi.preSDNCRequest(execution)]]></bpmn:script>
<dc:Bounds x="986.5" y="108.5" width="0" height="12" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_0j7xo94_di" bpmnElement="SequenceFlow_0j7xo94">
+ <bpmndi:BPMNEdge id="SequenceFlow_0j7xo94_di" bpmnElement="instantiateFailed_SequenceFlow">
<di:waypoint xsi:type="dc:Point" x="1059" y="105" />
<di:waypoint xsi:type="dc:Point" x="1059" y="33" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1068" y="63" width="12" height="12" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_1ui2n9l_di" bpmnElement="SequenceFlow_1ui2n9l">
+ <bpmndi:BPMNEdge id="SequenceFlow_1ui2n9l_di" bpmnElement="instantiateSuccess_SequenceFlow">
<di:waypoint xsi:type="dc:Point" x="1059" y="155" />
<di:waypoint xsi:type="dc:Point" x="1059" y="271" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1066" y="207" width="18" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="ExclusiveGateway_0y0tqb7_di" bpmnElement="ExclusiveGateway_0y0tqb7" isMarkerVisible="true">
- <dc:Bounds x="1181" y="429" width="50" height="50" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1183" y="483" width="52" height="24" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_1jaltbk_di" bpmnElement="SequenceFlow_1jaltbk">
- <di:waypoint xsi:type="dc:Point" x="1109" y="311" />
- <di:waypoint xsi:type="dc:Point" x="1206" y="311" />
- <di:waypoint xsi:type="dc:Point" x="1206" y="429" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1112.5" y="290" width="90" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_0yegc4p_di" bpmnElement="SequenceFlow_0yegc4p">
- <di:waypoint xsi:type="dc:Point" x="1231" y="454" />
- <di:waypoint xsi:type="dc:Point" x="1323" y="454" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1271" y="433" width="12" height="12" />
+ <dc:Bounds x="1066" y="207" width="19" height="12" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ExclusiveGateway_15492gl_di" bpmnElement="ExclusiveGateway_15492gl" isMarkerVisible="true">
@@ -203,39 +190,34 @@ csi.preSDNCRequest(execution)]]></bpmn:script>
<dc:Bounds x="1038" y="624" width="50" height="24" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
- <bpmndi:BPMNEdge id="SequenceFlow_118dtip_di" bpmnElement="SequenceFlow_118dtip">
- <di:waypoint xsi:type="dc:Point" x="1206" y="479" />
- <di:waypoint xsi:type="dc:Point" x="1206" y="595" />
- <di:waypoint xsi:type="dc:Point" x="1084" y="595" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1212" y="589" width="19" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_0hftgi6_di" bpmnElement="SequenceFlow_0hftgi6">
+ <bpmndi:BPMNEdge id="SequenceFlow_0hftgi6_di" bpmnElement="operationFinished_SequenceFlow">
<di:waypoint xsi:type="dc:Point" x="1034" y="595" />
- <di:waypoint xsi:type="dc:Point" x="840" y="595" />
+ <di:waypoint xsi:type="dc:Point" x="909" y="595" />
+ <di:waypoint xsi:type="dc:Point" x="909" y="595" />
+ <di:waypoint xsi:type="dc:Point" x="783" y="595" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="929" y="574" width="18" height="12" />
+ <dc:Bounds x="963" y="574" width="19" height="12" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_0omec46_di" bpmnElement="SequenceFlow_0omec46">
- <di:waypoint xsi:type="dc:Point" x="1059" y="570" />
- <di:waypoint xsi:type="dc:Point" x="1059" y="351" />
+ <bpmndi:BPMNEdge id="SequenceFlow_0omec46_di" bpmnElement="operationProcessing_SequenceFlow">
+ <di:waypoint xsi:type="dc:Point" x="1084" y="595" />
+ <di:waypoint xsi:type="dc:Point" x="1212" y="595" />
+ <di:waypoint xsi:type="dc:Point" x="1212" y="486" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="1077" y="405" width="12" height="12" />
+ <dc:Bounds x="1131" y="607" width="12" height="12" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0cq2q6g_di" bpmnElement="SequenceFlow_0cq2q6g">
- <di:waypoint xsi:type="dc:Point" x="740" y="595" />
- <di:waypoint xsi:type="dc:Point" x="612" y="595" />
+ <di:waypoint xsi:type="dc:Point" x="683" y="595" />
+ <di:waypoint xsi:type="dc:Point" x="520" y="595" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="631" y="574" width="90" height="12" />
+ <dc:Bounds x="556.5" y="574" width="90" height="12" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="EndEvent_1ido9wi_di" bpmnElement="EndEvent_1tncafd">
+ <bpmndi:BPMNShape id="EndEvent_1ido9wi_di" bpmnElement="createNSFailed_EndEvent">
<dc:Bounds x="690" y="-3" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="663" y="37" width="0" height="12" />
+ <dc:Bounds x="626" y="37" width="75" height="12" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="EndEvent_0xgvlmx_di" bpmnElement="EndEvent_1gkvvpn">
@@ -244,24 +226,36 @@ csi.preSDNCRequest(execution)]]></bpmn:script>
<dc:Bounds x="1014" y="37" width="0" height="12" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="EndEvent_09lhjod_di" bpmnElement="EndEvent_0ev3qbb">
- <dc:Bounds x="1323" y="436" width="36" height="36" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="1296" y="476" width="0" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="EndEvent_15pcuuc_di" bpmnElement="EndEvent_1x6k78c">
- <dc:Bounds x="576" y="577" width="36" height="36" />
+ <dc:Bounds x="484" y="577" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="549" y="617" width="0" height="12" />
+ <dc:Bounds x="412" y="617" width="90" height="12" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="ScriptTask_0sxy5we_di" bpmnElement="Task_0ff3d5r">
+ <bpmndi:BPMNShape id="ScriptTask_0sxy5we_di" bpmnElement="queryJob_Task">
<dc:Bounds x="1009" y="271" width="100" height="80" />
</bpmndi:BPMNShape>
- <bpmndi:BPMNShape id="ScriptTask_0xxyfku_di" bpmnElement="Task_0hltnyg">
- <dc:Bounds x="740" y="555" width="100" height="80" />
+ <bpmndi:BPMNShape id="ScriptTask_0xxyfku_di" bpmnElement="finishNSCreate_Task">
+ <dc:Bounds x="683" y="555" width="100" height="80" />
</bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_0xqo13p_di" bpmnElement="SequenceFlow_0xqo13p">
+ <di:waypoint xsi:type="dc:Point" x="1059" y="351" />
+ <di:waypoint xsi:type="dc:Point" x="1059" y="570" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1074" y="454.5" width="0" height="12" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="ScriptTask_0rb5agx_di" bpmnElement="timeDelay_Task">
+ <dc:Bounds x="1162" y="406" width="100" height="80" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_1gsbpxj_di" bpmnElement="SequenceFlow_1gsbpxj">
+ <di:waypoint xsi:type="dc:Point" x="1212" y="406" />
+ <di:waypoint xsi:type="dc:Point" x="1212" y="311" />
+ <di:waypoint xsi:type="dc:Point" x="1109" y="311" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1227" y="352.5" width="0" height="12" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn:definitions>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
index 3dbfcce36f..fa35eadba8 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -25,7 +25,14 @@
<module name="org.apache.log4j" />
<module name="org.slf4j" />
<module name="org.slf4j.impl" />
+ <module name="org.jboss.resteasy.resteasy-jackson-provider" />
+ <module name="org.jboss.resteasy.resteasy-jettison-provider" />
</exclusions>
+ <dependencies>
+ <module name="org.jboss.resteasy.resteasy-jackson2-provider" services="import" />
+ <!-- This module contain the ProviderBase class: -->
+ <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" export="true" />
+ </dependencies>
</deployment>
</jboss-deployment-structure>
diff --git a/mso-catalog-db/src/main/resources/VnfResourceCustomization.hbm.xml b/mso-catalog-db/src/main/resources/VnfResourceCustomization.hbm.xml
index a3e738bbed..b068e66e1e 100644
--- a/mso-catalog-db/src/main/resources/VnfResourceCustomization.hbm.xml
+++ b/mso-catalog-db/src/main/resources/VnfResourceCustomization.hbm.xml
@@ -40,9 +40,9 @@
<property name="created" type="timestamp" generated="insert" update="false" insert="false" column="CREATION_TIMESTAMP" not-null="true"/>
- <set name="serviceResourceCustomizations" inverse="true" cascade="all">
- <key column="SERVICE_MODEL_UUID" not-null="true" />
- <one-to-many class="ServiceToResourceCustomization" />
+ <set name="vfModuleCustomizations" inverse="true" cascade="all">
+ <key column="VNF_RESOURCE_MODEL_UUID" not-null="true" />
+ <one-to-many class="VnfResCustomToVfModuleCustom" />
</set>
</class>
</hibernate-mapping>
diff --git a/packages/arquillian-unit-tests/src/test/resources/docker/mso/mso-docker.json b/packages/arquillian-unit-tests/src/test/resources/docker/mso/mso-docker.json
index 0b2c7aa807..5552efe6a5 100644
--- a/packages/arquillian-unit-tests/src/test/resources/docker/mso/mso-docker.json
+++ b/packages/arquillian-unit-tests/src/test/resources/docker/mso/mso-docker.json
@@ -169,6 +169,7 @@
"logDebugUpdateNetworkInstanceInfra": "false",
"aaiEndpoint": "http://mso:8080/aai-emul",
"adaptersCompletemsoprocessEndpoint": "http://mso:8080/CompleteMsoProcess",
+ "adaptersNamespace": "http://org.openecomp.mso",
"adaptersDbEndpoint": "http://mso:8080/dbadapters/RequestsDbAdapter",
"adaptersSdncEndpoint": "http://mso:8080/adapters/SDNCAdapter",
"adaptersTenantEndpoint": "http://mso:8080/tenants/TenantAdapter",
@@ -217,4 +218,4 @@
{
"mso-config": "~> 1.0.0"
}
-} \ No newline at end of file
+}