From 3935e84e0306183450fc080a09fcc1d13ced345e Mon Sep 17 00:00:00 2001
From: Shailendra Borale <sb8915@att.com>
Date: Wed, 8 Nov 2017 11:49:28 -0500
Subject: Added input params to service-information section

Added input params to service-information section to facilitate sdnc
assign query subscriptionServiceType and globalCustomerId were added
to groovy, bpmn parentServiceInstanceId shd not be part of service-information,
serviceInstanceId  - corrected
Updated junit tests with new service-info fields.

Change-Id: I9fbfdf8a97b4e42881e187bec198c977241c0c13
Issue-Id: SO-318
Signed-off-by: Jim Hahn <jrh3@att.com>
---
 .../mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRG.groovy   | 10 +++++++---
 .../mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXC.groovy   | 10 +++++++---
 .../src/main/resources/process/CreateVcpeResCustService.bpmn   |  4 ++++
 3 files changed, 18 insertions(+), 6 deletions(-)

(limited to 'bpmn/MSOInfrastructureBPMN/src/main')

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRG.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRG.groovy
index 54e23a97e6..997757aa2c 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRG.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceBRG.groovy
@@ -45,6 +45,8 @@ import static org.apache.commons.lang3.StringUtils.*
  * @param - disableRollback
  * @param - failExists  - O
  * @param - serviceInstanceId
+ * @param - globalCustomerId - O
+ * @param - subscriptionServiceType - O
  * @param - parentServiceInstanceId
  * @param - allottedReourceId - O
  * @param - allottedResourceModelInfo
@@ -321,6 +323,8 @@ public class DoCreateAllottedResourceBRG extends AbstractServiceTaskProcessor{
 
 			String allottedResourceId = execution.getVariable("allottedResourceId")
 			String serviceInstanceId = execution.getVariable("serviceInstanceId")
+			String globalCustomerId = execution.getVariable("globalCustomerId")
+			String subscriptionServiceType = execution.getVariable("subscriptionServiceType")
 			String parentServiceInstanceId = execution.getVariable("parentServiceInstanceId")
 			String callbackUrl = execution.getVariable("sdncCallbackUrl")
 			String requestId = execution.getVariable("msoRequestId")
@@ -374,11 +378,11 @@ public class DoCreateAllottedResourceBRG extends AbstractServiceTaskProcessor{
 					</request-information>
 					<service-information>
 						<service-id></service-id>
-						<subscription-service-type></subscription-service-type>
+						<subscription-service-type>${subscriptionServiceType}</subscription-service-type>
 						<onap-model-information></onap-model-information>
-						<service-instance-id>${parentServiceInstanceId}</service-instance-id>
+						<service-instance-id>${serviceInstanceId}</service-instance-id>
 						<subscriber-name/>
-						<global-customer-id></global-customer-id>
+						<global-customer-id>${globalCustomerId}</global-customer-id>
 					</service-information>
 					<allotted-resource-information>
 						<allotted-resource-id>${allottedResourceId}</allotted-resource-id>    
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXC.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXC.groovy
index c9edf05d6c..602df6bc1f 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXC.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoCreateAllottedResourceTXC.groovy
@@ -45,6 +45,8 @@ import static org.apache.commons.lang3.StringUtils.*
  * @param - disableRollback
  * @param - failExists  - O
  * @param - serviceInstanceId
+ * @param - globalCustomerId - O
+ * @param - subscriptionServiceType - O
  * @param - parentServiceInstanceId
  * @param - allottedReourceId - O
  * @param - allottedResourceModelInfo
@@ -316,6 +318,8 @@ public class DoCreateAllottedResourceTXC extends AbstractServiceTaskProcessor{
 
 			String allottedResourceId = execution.getVariable("allottedResourceId")
 			String serviceInstanceId = execution.getVariable("serviceInstanceId")
+			String globalCustomerId = execution.getVariable("globalCustomerId")
+			String subscriptionServiceType = execution.getVariable("subscriptionServiceType")
 			String parentServiceInstanceId = execution.getVariable("parentServiceInstanceId")
 			String serviceChainServiceInstanceId = execution.getVariable("serviceChainServiceInstanceId")
 			String callbackUrl = execution.getVariable("sdncCallbackUrl")
@@ -368,11 +372,11 @@ public class DoCreateAllottedResourceTXC extends AbstractServiceTaskProcessor{
 					</request-information>
 					<service-information>
 						<service-id></service-id>
-						<subscription-service-type></subscription-service-type>
+						<subscription-service-type>${subscriptionServiceType}</subscription-service-type>
 						<onap-model-information></onap-model-information>
-						<service-instance-id>${parentServiceInstanceId}</service-instance-id>
+						<service-instance-id>${serviceInstanceId}</service-instance-id>
 						<subscriber-name/>
-						<global-customer-id></global-customer-id>
+						<global-customer-id>${globalCustomerId}</global-customer-id>
 					</service-information>
 					<allotted-resource-information>
 						<allotted-resource-id>${allottedResourceId}</allotted-resource-id>    
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVcpeResCustService.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVcpeResCustService.bpmn
index 175efaf8b5..9fe6815570 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVcpeResCustService.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVcpeResCustService.bpmn
@@ -569,6 +569,8 @@ CreateVcpeResCustService.prepareVnfAndModulesCreate(execution)]]></bpmn2:script>
         <camunda:out source="vgmuxLanIP" target="vgmuxLanIP" />
         <camunda:in source="allottedResourceTypeTXC" target="allottedResourceType" />
         <camunda:in source="brgWanMacAddress" target="brgWanMacAddress" />
+        <camunda:in source="globalCustomerId" target="globalCustomerId" />
+        <camunda:in source="subscriptionServiceType" target="subscriptionServiceType" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_16qob4p</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1cgpklo</bpmn2:outgoing>
@@ -610,6 +612,8 @@ CreateVcpeResCustService.validateVnfCreate(execution)]]></bpmn2:script>
         <camunda:in source="vni" target="vni" />
         <camunda:in source="vgmuxBearerIP" target="vgmuxBearerIP" />
         <camunda:in source="brgWanMacAddress" target="brgWanMacAddress" />
+        <camunda:in source="subscriptionServiceType" target="subscriptionServiceType" />
+        <camunda:in source="globalCustomerId" target="globalCustomerId" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_0b5ztoe</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0e9e6fo</bpmn2:outgoing>
-- 
cgit 1.2.3-korg