X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=bpmn%2Fso-bpmn-infrastructure-common%2Fsrc%2Fmain%2Fgroovy%2Forg%2Fonap%2Fso%2Fbpmn%2Finfrastructure%2Fscripts%2FDoDeAllocateAccessNSSI.groovy;h=74a2d980f7da7625ff0e47f53180c2572ee66ce5;hb=08e64b98fc5f2067e596c2c407370612c716f253;hp=6fd8080ef0289f65cd0f08fea2755b5ccd63b0bd;hpb=131fd74f717f76bc23af1ef935f6e96654f703d6;p=so.git

diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeAllocateAccessNSSI.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeAllocateAccessNSSI.groovy
index 6fd8080ef0..74a2d980f7 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeAllocateAccessNSSI.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeAllocateAccessNSSI.groovy
@@ -40,6 +40,7 @@ import org.onap.so.beans.nsmf.DeAllocateNssi
 import org.onap.so.beans.nsmf.EsrInfo
 import org.onap.so.beans.nsmf.NetworkType
 import org.onap.so.beans.nsmf.ServiceInfo
+import org.onap.so.beans.nsmf.oof.SubnetType
 import org.onap.so.bpmn.common.scripts.AbstractServiceTaskProcessor
 import org.onap.so.bpmn.common.scripts.ExceptionUtil
 import org.onap.so.bpmn.common.scripts.NssmfAdapterUtils
@@ -333,9 +334,9 @@ class DoDeAllocateAccessNSSI extends AbstractServiceTaskProcessor {
 		logger.debug("Generated new job for Service Instance serviceId:" + serviceId + " operationId:" + modificationJobId)
 
 		ResourceOperationStatus initStatus = new ResourceOperationStatus()
-		initStatus.setServiceId(serviceId)
+		initStatus.setServiceId(nsiId)
 		initStatus.setOperationId(modificationJobId)
-		initStatus.setResourceTemplateUUID(nsiId)
+		initStatus.setResourceTemplateUUID(serviceId)
 		initStatus.setOperType("Modify-Deallocate")
 		requestDBUtil.prepareInitResourceOperationStatus(execution, initStatus)
 
@@ -347,13 +348,18 @@ class DoDeAllocateAccessNSSI extends AbstractServiceTaskProcessor {
 		String responseId = "1"
 		String globalSubscriberId = execution.getVariable("globalSubscriberId")
 		String subscriptionServiceType = execution.getVariable("subscriptionServiceType")
+		String anNssiId = execution.getVariable("anNssiId")
 
                 JsonObject esrInfo = new JsonObject()
                 esrInfo.addProperty("networkType", networkType)
                 esrInfo.addProperty("vendor", "ONAP_internal")
 
                 JsonObject serviceInfo = new JsonObject()
-                serviceInfo.addProperty("nsiId", execution.getVariable("nsiId"))
+                if (networkType.equals(SubnetType.AN.getSubnetType())) {
+                    serviceInfo.addProperty("nsiId", execution.getVariable("nsiId"))
+                } else {
+                    serviceInfo.addProperty("nsiId", anNssiId)
+                }
 		serviceInfo.addProperty("nssiId", instanceId)
                 serviceInfo.addProperty("globalSubscriberId", globalSubscriberId)
 		serviceInfo.addProperty("subscriptionServiceType", subscriptionServiceType)
@@ -526,7 +532,7 @@ class DoDeAllocateAccessNSSI extends AbstractServiceTaskProcessor {
 		Map<String, ServiceInstance> relatedSPs = execution.getVariable("relatedSPs")
 
 		DeAllocateNssi deallocateNssi = new DeAllocateNssi()
-		deallocateNssi.setNsiId(execution.getVariable("nsiId"))
+		deallocateNssi.setNsiId(anNssiId)
 		ServiceInstance tnNssi = relatedNssis.get(serviceFunction)
 		String nssiId = tnNssi.getServiceInstanceId()