PNF WF post instantiation configuration

Add PNF ipv4/v6 address for config Deploy
Add Integration test for CreateVcpeResCustService_simplified.bpmn
Modify the PnfEventReadyDmaapClient to avoid one more running thread
Refactor the so-bpmn-infrastructure-flows test resources
Modify the CreateVcpeResCustService_simplified.bpmn
Add ConfigurePnfResource.bpmn
Add Delegates

Issue-ID: SO-1506
Change-Id: Iffb69d1441ef0b485ee8cd3fb5da5f1a35279a95
Signed-off-by: eeginux <henry.xie@est.tech>

2 files changed, 32 insertions, 2 deletions

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/cds/AbstractCDSProcessingBBUtils.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/cds/AbstractCDSProcessingBBUtils.java
index 0b2ef928ad..7a967d3159 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/cds/AbstractCDSProcessingBBUtils.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/cds/AbstractCDSProcessingBBUtils.java
@@ -128,9 +128,9 @@ public class AbstractCDSProcessingBBUtils implements CDSProcessingListener {
             ExecutionServiceInput executionServiceInput = (ExecutionServiceInput) execution
                     .getVariable("executionServiceInput");
 
-            CDSProcessingListener cdsProcessingListener = new AbstractCDSProcessingBBUtils();
+            //CDSProcessingListener cdsProcessingListener = new AbstractCDSProcessingBBUtils();
 
-            CDSProcessingClient cdsClient = new CDSProcessingClient(cdsProcessingListener);
+            CDSProcessingClient cdsClient = new CDSProcessingClient(this);
             CountDownLatch countDownLatch = cdsClient.sendRequest(executionServiceInput);
 
             try {
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/cds/beans/ConfigDeployPropertiesForPnf.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/cds/beans/ConfigDeployPropertiesForPnf.java
index b8fb5b96bd..6fadc7b55c 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/cds/beans/ConfigDeployPropertiesForPnf.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/cds/beans/ConfigDeployPropertiesForPnf.java
@@ -9,6 +9,8 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 "service-instance-id",
 "pnf-id",
 "pnf-name",
+"pnf-ipv4-address",
+"pnf-ipv6-address",
 "service-model-uuid",
 "pnf-customization-uuid"
 })
@@ -24,6 +26,15 @@ public class ConfigDeployPropertiesForPnf {
 	@JsonProperty("pnf-name")
 	private String pnfName;
 
+	/**
+	 * Config Deploy require IP address of PNF.
+	 */
+	@JsonProperty("pnf-ipv4-address")
+	private String pnfIpV4Address;
+
+	@JsonProperty("pnf-ipv6-address")
+	private String pnfIpV6Address;
+
 	@JsonProperty("service-model-uuid")
 	private String serviceModelUuid;
 
@@ -70,6 +81,23 @@ public class ConfigDeployPropertiesForPnf {
 		this.pnfCustomizationUuid = pnfCustomizationUuid;
 	}
 
+	public String getPnfIpV4Address() {
+		return pnfIpV4Address;
+	}
+
+	public void setPnfIpV4Address(String pnfIpV4Address) {
+		this.pnfIpV4Address = pnfIpV4Address;
+	}
+
+	public String getPnfIpV6Address() {
+		return pnfIpV6Address;
+	}
+
+	public void setPnfIpV6Address(String pnfIpV6Address) {
+		this.pnfIpV6Address = pnfIpV6Address;
+	}
+
+
 	@Override
 	public String toString() {
 
@@ -77,6 +105,8 @@ public class ConfigDeployPropertiesForPnf {
 		sb.append("\"service-instance-id\":").append("\"").append(serviceInstanceId).append("\"");
 		sb.append(", \"pnf-id\":").append("\"").append(pnfId).append("\"");
 		sb.append(", \"pnf-name\":").append("\"").append(pnfName).append("\"");
+		sb.append(", \"pnf-ipv4-address\":").append("\"").append(pnfIpV4Address).append("\"");
+		sb.append(", \"pnf-ipv6-address\":").append("\"").append(pnfIpV6Address).append("\"");
 		sb.append(", \"service-model-uuid\":").append("\"").append(serviceModelUuid).append("\"");
 		sb.append(", \"pnf-customization-uuid\":").append("\"").append(pnfCustomizationUuid).append("\"");