Merge "Fix issues in AN NSSMF - Allocate workflow"

2 files changed, 48 insertions, 57 deletions

diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/AnNssmfutils.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/AnNssmfutils.groovy
index 1d8de352fb..da9584771c 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/AnNssmfutils.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/AnNssmfutils.groovy
@@ -55,7 +55,7 @@ import org.onap.aai.domain.yang.ServiceInstance
 import org.onap.aai.domain.yang.SliceProfile
 import org.onap.aai.domain.yang.SliceProfiles
 import org.onap.aai.domain.yang.Relationship
-
+import com.google.gson.Gson
 
 class AnNssmfUtils {
 
@@ -193,7 +193,7 @@ public void createSliceProfilesInAai(DelegateExecution execution) {
 	ANNF_sliceProfileInstance.setServiceType(serviceType)
 	String serviceStatus = "deactivated"
 	ANNF_sliceProfileInstance.setOrchestrationStatus(serviceStatus)
-	String serviceInstanceLocationid = jsonUtil.getJsonValue(execution.getVariable("ranNfSliceProfile"), "pLMNIdList")
+	String serviceInstanceLocationid = jsonUtil.getJsonValue(execution.getVariable("ranNfSliceProfile"), "plmnIdList")
 	ANNF_sliceProfileInstance.setServiceInstanceLocationId(serviceInstanceLocationid)
 	String serviceRole = "slice-profile-instance"
 	ANNF_sliceProfileInstance.setServiceRole(serviceRole)
@@ -213,7 +213,7 @@ public void createSliceProfilesInAai(DelegateExecution execution) {
 	serviceType = jsonUtil.getJsonValue(execution.getVariable("tnFhSliceProfile"), "sST")
 	TNFH_sliceProfileInstance.setServiceType(serviceType)
 	TNFH_sliceProfileInstance.setOrchestrationStatus(serviceStatus)
-	serviceInstanceLocationid = jsonUtil.getJsonValue(execution.getVariable("tnFhSliceProfile"), "pLMNIdList")
+	serviceInstanceLocationid = jsonUtil.getJsonValue(execution.getVariable("tnFhSliceProfile"), "plmnIdList")
 	TNFH_sliceProfileInstance.setServiceInstanceLocationId(serviceInstanceLocationid)
 	TNFH_sliceProfileInstance.setServiceRole(serviceRole)
 	TNFH_sliceProfileInstance.setEnvironmentContext(snssai)
@@ -230,7 +230,7 @@ public void createSliceProfilesInAai(DelegateExecution execution) {
 	serviceType = jsonUtil.getJsonValue(execution.getVariable("tnMhSliceProfile"), "sST")
 	TNMH_sliceProfileInstance.setServiceType(serviceType)
 	TNMH_sliceProfileInstance.setOrchestrationStatus(serviceStatus)
-	serviceInstanceLocationid = jsonUtil.getJsonValue(execution.getVariable("tnMhSliceProfile"), "pLMNIdList")
+	serviceInstanceLocationid = jsonUtil.getJsonValue(execution.getVariable("tnMhSliceProfile"), "plmnIdList")
 	TNMH_sliceProfileInstance.setServiceInstanceLocationId(serviceInstanceLocationid)
 	TNMH_sliceProfileInstance.setServiceRole(serviceRole)
 	TNMH_sliceProfileInstance.setEnvironmentContext(snssai)
@@ -268,7 +268,7 @@ private SliceProfile createSliceProfile(String domainType, DelegateExecution exe
 	Map<String,Object> profile
 	switch(domainType) {
 		case "AN-NF":
-			profile = objectMapper.readValue(execution.getVariable("ranNfSliceProfile"), Map.class)//pending fields - maxBandwidth, sST, pLMNIdList, cSReliabilityMeanTime, 
+			profile = objectMapper.readValue(execution.getVariable("ranNfSliceProfile"), Map.class)//pending fields - maxBandwidth, sST, plmnIdList, cSReliabilityMeanTime, 
 																									//msgSizeByte, maxNumberofPDUSessions,overallUserDensity,transferIntervalTarget
 			result.setJitter(profile.get("jitter"))
 			result.setLatency(profile.get("latency"))
@@ -286,14 +286,14 @@ private SliceProfile createSliceProfile(String domainType, DelegateExecution exe
 			result.setProfileId(execution.getVariable("ANNF_sliceProfileId"))
 			break
 		case "TN-FH":
-			profile = objectMapper.readValue(execution.getVariable("tnFhSliceProfile"), Map.class) //pending fields - maxBandwidth, sST, pLMNIdList
+			profile = objectMapper.readValue(execution.getVariable("tnFhSliceProfile"), Map.class) //pending fields - maxBandwidth, sST, plmnIdList
 			result.setJitter(profile.get("jitter"))
 			result.setLatency(profile.get("latency"))
 			result.setResourceSharingLevel(profile.get("resourceSharingLevel"))
 			result.setProfileId(execution.getVariable("TNFH_sliceProfileId"))
 			break
 		case "TN-MH":
-			profile = objectMapper.readValue(execution.getVariable("tnMhSliceProfile"), Map.class)//pending fields - maxBandwidth, sST, pLMNIdList
+			profile = objectMapper.readValue(execution.getVariable("tnMhSliceProfile"), Map.class)//pending fields - maxBandwidth, sST, plmnIdList
 			result.setJitter(profile.get("jitter"))
 			result.setLatency(profile.get("latency"))
 			result.setResourceSharingLevel(profile.get("resourceSharingLevel"))
@@ -342,16 +342,17 @@ private SliceProfile createSliceProfile(String domainType, DelegateExecution exe
 	
 	public String buildCreateNSSMFRequest(DelegateExecution execution, String domainType, String action) {
 		JsonObject esrInfo = new JsonObject()
-	    esrInfo.addProperty("networkType", "tn")
-	    esrInfo.addProperty("vendor", "ONAP_internal")
+	        esrInfo.addProperty("networkType", "tn")
+	        esrInfo.addProperty("vendor", "ONAP_internal")
 		JsonObject response = new JsonObject()
 		JsonObject allocateTnNssi = new JsonObject()
 		JsonObject serviceInfo = new JsonObject()
 		JsonArray transportSliceNetworksList  = new JsonArray()
 		JsonArray connectionLinksList = new JsonArray()
 		JsonObject connectionLinks = new JsonObject()
+		Gson jsonConverter = new Gson()
 		if(action.equals("allocate")){
-			Map<String, String> endpoints
+			JsonObject endpoints = new JsonObject()
 			if(domainType.equals("TN_FH")) {
 				serviceInfo.addProperty("serviceInvariantUuid", execution.getVariable("TNFH_modelInvariantUuid"))
 				serviceInfo.addProperty("serviceUuid", execution.getVariable("TNFH_modelUuid"))
@@ -359,12 +360,10 @@ private SliceProfile createSliceProfile(String domainType, DelegateExecution exe
 				allocateTnNssi.addProperty("nssiName", execution.getVariable("TNFH_modelName"))
 				Map<String,Object> sliceProfile = objectMapper.readValue(execution.getVariable("tnFhSliceProfile"), Map.class)
 				sliceProfile.put("sliceProfileId", execution.getVariable("TNFH_sliceProfileInstanceId"))
-				String sliceProfileString = objectMapper.writeValueAsString(sliceProfile)
-				allocateTnNssi.addProperty("sliceProfile", sliceProfileString)
-				endpoints.put("transportEndpointA", execution.getVariable("tranportEp_ID_RU"))
-				endpoints.put("transportEndpointB", execution.getVariable("tranportEp_ID_DUIN"))
-				String endpointsString = objectMapper.writeValueAsString(endpoints)
-				connectionLinksList.add(endpointsString)
+				allocateTnNssi.add("sliceProfile", jsonConverter.toJsonTree(sliceProfile))
+				endpoints.addProperty("transportEndpointA", execution.getVariable("tranportEp_ID_RU"))
+				endpoints.addProperty("transportEndpointB", execution.getVariable("tranportEp_ID_DUIN"))
+				connectionLinksList.add(endpoints)
 			}else if(domainType.equals("TN_MH")) {
 				serviceInfo.addProperty("serviceInvariantUuid", execution.getVariable("TNMH_modelInvariantUuid"))
 				serviceInfo.addProperty("serviceUuid", execution.getVariable("TNMH_modelUuid"))
@@ -372,41 +371,32 @@ private SliceProfile createSliceProfile(String domainType, DelegateExecution exe
 				allocateTnNssi.addProperty("nssiName", execution.getVariable("TNMH_modelName"))
 				Map<String,Object> sliceProfile = objectMapper.readValue(execution.getVariable("tnMhSliceProfile"), Map.class)
 				sliceProfile.put("sliceProfileId", execution.getVariable("TNMH_sliceProfileInstanceId"))
-				String sliceProfileString = objectMapper.writeValueAsString(sliceProfile)
-				allocateTnNssi.addProperty("sliceProfile", sliceProfileString)
-				endpoints.put("transportEndpointA", execution.getVariable("tranportEp_ID_DUEG"))
-				endpoints.put("transportEndpointB", execution.getVariable("tranportEp_ID_CUIN"))
-				String endpointsString = objectMapper.writeValueAsString(endpoints)
-				connectionLinksList.add(endpointsString)
+				allocateTnNssi.add("sliceProfile", jsonConverter.toJsonTree(sliceProfile))
+                                endpoints.addProperty("transportEndpointA", execution.getVariable("tranportEp_ID_DUEG"))
+				endpoints.addProperty("transportEndpointB", execution.getVariable("tranportEp_ID_CUIN"))
+				connectionLinksList.add(endpoints)
 			}
 			
 			//Connection links
 			connectionLinks.add("connectionLinks", connectionLinksList)
 			transportSliceNetworksList.add(connectionLinks)
 			allocateTnNssi.add("transportSliceNetworks", transportSliceNetworksList)
-			allocateTnNssi.addProperty("nssiId", null)
-			serviceInfo.addProperty("nssiId", null)
 		}else if(action.equals("modify-allocate")) {
 			if(domainType.equals("TN_FH")) {
-				serviceInfo.addProperty("serviceInvariantUuid", null)
-				serviceInfo.addProperty("serviceUuid", null)
-				allocateTnNssi.addProperty("nsstId", null)
 				allocateTnNssi.addProperty("nssiName", execution.getVariable("TNFH_nssiName"))
 				allocateTnNssi.addProperty("sliceProfileId", execution.getVariable("TNFH_sliceProfileInstanceId"))
 				allocateTnNssi.addProperty("nssiId", execution.getVariable("TNFH_NSSI"))
 				serviceInfo.addProperty("nssiId", execution.getVariable("TNFH_NSSI"))
 			}else if(domainType.equals("TN_MH")) {
-				serviceInfo.addProperty("serviceInvariantUuid", null)
-				serviceInfo.addProperty("serviceUuid", null)
-				allocateTnNssi.addProperty("nsstId", null)
 				allocateTnNssi.addProperty("nssiName", execution.getVariable("TNMH_nssiName"))
 				allocateTnNssi.addProperty("sliceProfileId", execution.getVariable("TNMH_sliceProfileInstanceId"))
 				allocateTnNssi.addProperty("nssiId", execution.getVariable("TNMH_NSSI"))
 				serviceInfo.addProperty("nssiId", execution.getVariable("TNMH_NSSI"))
 			}
 		}
+		JsonParser parser = new JsonParser()
 		String nsiInfo = jsonUtil.getJsonValue(execution.getVariable("sliceParams"), "nsiInfo")
-		allocateTnNssi.addProperty("nsiInfo", nsiInfo)
+		allocateTnNssi.add("nsiInfo",(JsonObject) parser.parse(nsiInfo))
 		allocateTnNssi.addProperty("scriptName", "TN1")
 		serviceInfo.addProperty("nsiId", execution.getVariable("nsiId"))
 		serviceInfo.addProperty("globalSubscriberId", execution.getVariable("globalSubscriberId"))
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoAllocateAccessNSSI.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoAllocateAccessNSSI.groovy
index e1719aa5d6..33724bd011 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoAllocateAccessNSSI.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoAllocateAccessNSSI.groovy
@@ -34,6 +34,7 @@ import org.slf4j.LoggerFactory
 import java.util.List
 import static org.apache.commons.lang3.StringUtils.isBlank
 import com.google.gson.JsonObject
+import com.google.gson.Gson
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.google.gson.JsonArray
 import com.google.gson.JsonParser
@@ -98,8 +99,8 @@ class DoAllocateAccessNSSI extends AbstractServiceTaskProcessor {
 				execution.setVariable("sliceProfile", sliceProfile)
 			}
 			String sliceProfileId = jsonUtil.getJsonValue(sliceProfile, "sliceProfileId")
-			def snssaiList = jsonUtil.StringArrayToList(jsonUtil.getJsonValue(sliceProfile, "sNSSAI"))
-			def plmnIdList = jsonUtil.StringArrayToList(jsonUtil.getJsonValue(sliceProfile, "pLMNIdList"))
+			def snssaiList = jsonUtil.StringArrayToList(jsonUtil.getJsonValue(sliceProfile, "snssaiList"))
+			def plmnIdList = jsonUtil.StringArrayToList(jsonUtil.getJsonValue(sliceProfile, "plmnIdList"))
 			def coverageAreaTAList = jsonUtil.StringArrayToList(jsonUtil.getJsonValue(sliceProfile, "coverageAreaTAList"))
 
 			if (isBlank(sliceProfileId) || (snssaiList.empty) || (plmnIdList.empty)
@@ -577,7 +578,7 @@ class DoAllocateAccessNSSI extends AbstractServiceTaskProcessor {
 	def createSdnrRequest = { DelegateExecution execution ->
 		logger.debug(Prefix+"createSdnrRequest method start")
 		String callbackUrl = UrnPropertiesReader.getVariable("mso.workflow.message.endpoint") + "/AsyncSdnrResponse/"+execution.getVariable("msoRequestId")
-		String sdnrRequest = buildSdnrAllocateRequest(execution, "allocate", "InstantiateRANSlice", callbackUrl)
+		String sdnrRequest = buildSdnrAllocateRequest(execution, "allocate", "instantiateRANSlice", callbackUrl)
 		execution.setVariable("createNSSI_sdnrRequest", sdnrRequest)
 		execution.setVariable("createNSSI_timeout", "PT10M")
 		execution.setVariable("createNSSI_correlator", execution.getVariable("msoRequestId"))
@@ -697,12 +698,12 @@ class DoAllocateAccessNSSI extends AbstractServiceTaskProcessor {
 	}
 	
 	def createFhAllocateNssiJobQuery = { DelegateExecution execution ->
-		logger.debug(Prefix+"createModifyNssiQueryJobStatus method start")
+		logger.debug(Prefix+"createFhAllocateNssiJobQuery method start")
 		createTnAllocateNssiJobQuery(execution, "TN_FH")		
 	}
 	
 	def createMhAllocateNssiJobQuery = { DelegateExecution execution ->
-		logger.debug(Prefix+"createModifyNssiQueryJobStatus method start")
+		logger.debug(Prefix+"createMhAllocateNssiJobQuery method start")
 		createTnAllocateNssiJobQuery(execution, "TN_MH")
 	}
 	
@@ -712,7 +713,6 @@ class DoAllocateAccessNSSI extends AbstractServiceTaskProcessor {
 	    esrInfo.addProperty("vendor", "ONAP_internal")
 		execution.setVariable("esrInfo", esrInfo.toString())
 		JsonObject serviceInfo = new JsonObject()
-		serviceInfo.addProperty("nssiId", null)
 		serviceInfo.addProperty("nsiId", execution.getVariable("nsiId"))
 		String sST = jsonUtil.getJsonValue(execution.getVariable("sliceProfile"), "sST")
 		serviceInfo.addProperty("sST", sST)
@@ -736,14 +736,14 @@ class DoAllocateAccessNSSI extends AbstractServiceTaskProcessor {
 		logger.debug(Prefix+"processJobStatusRsp method start")
 		String jobResponse = execution.getVariable("TNFH_jobResponse")
 		logger.debug("Job status response "+jobResponse)
-		String status = jsonUtil.getJsonValue(jobResponse, "responseDescriptor.status")
-		String nssi = jsonUtil.getJsonValue(jobResponse, "responseDescriptor.nssi")
+		String status = jsonUtil.getJsonValue(jobResponse, "status")
+		String nssi = jsonUtil.getJsonValue(jobResponse, "nssiId")
 		if(status.equalsIgnoreCase("finished")) {
 			execution.setVariable("TNFH_NSSI", nssi)
 			logger.debug("Job successfully completed ... proceeding with flow for nssi : "+nssi)
 		}
 		else {
-			String statusDescription = jsonUtil.getJsonValue(jobResponse, "responseDescriptor.statusDescription")
+			String statusDescription = jsonUtil.getJsonValue(jobResponse, "statusDescription")
 			logger.error("received failed status from job status query for nssi : "+nssi+" with status description : "+ statusDescription)
 			exceptionUtil.buildAndThrowWorkflowException(execution, 7000,"received failed status from job status query for nssi : "+nssi+" with status description : "+ statusDescription)
 		}
@@ -753,14 +753,14 @@ class DoAllocateAccessNSSI extends AbstractServiceTaskProcessor {
 		logger.debug(Prefix+"processJobStatusRsp method start")
 		String jobResponse = execution.getVariable("TNMH_jobResponse")
 		logger.debug("Job status response "+jobResponse)
-		String status = jsonUtil.getJsonValue(jobResponse, "responseDescriptor.status")
-		String nssi = jsonUtil.getJsonValue(jobResponse, "responseDescriptor.nssi")
+		String status = jsonUtil.getJsonValue(jobResponse, "status")
+		String nssi = jsonUtil.getJsonValue(jobResponse, "nssiId")
 		if(status.equalsIgnoreCase("finished")) {
 			execution.setVariable("TNMH_NSSI", nssi)
 			logger.debug("Job successfully completed ... proceeding with flow for nssi : "+nssi)
 		}
 		else {
-			String statusDescription = jsonUtil.getJsonValue(jobResponse, "responseDescriptor.statusDescription")
+			String statusDescription = jsonUtil.getJsonValue(jobResponse, "statusDescription")
 			logger.error("received failed status from job status query for nssi : "+nssi+" with status description : "+ statusDescription)
 			exceptionUtil.buildAndThrowWorkflowException(execution, 7000,"received failed status from job status query for nssi : "+nssi+" with status description : "+ statusDescription)
 		}
@@ -770,13 +770,13 @@ class DoAllocateAccessNSSI extends AbstractServiceTaskProcessor {
 		logger.debug(Prefix+"processJobStatusRsp method start")
 		String jobResponse = execution.getVariable("jobResponse")
 		logger.debug("Job status response "+jobResponse)
-		String status = jsonUtil.getJsonValue(jobResponse, "responseDescriptor.status")
-		String nssi = jsonUtil.getJsonValue(jobResponse, "responseDescriptor.nssi")
+		String status = jsonUtil.getJsonValue(jobResponse, "status")
+		String nssi = jsonUtil.getJsonValue(jobResponse, "nssiId")
 		if(status.equalsIgnoreCase("finished")) {
 			logger.debug("Job successfully completed ... proceeding with flow for nssi : "+nssi)
 		}
 		else {
-			String statusDescription = jsonUtil.getJsonValue(jobResponse, "responseDescriptor.statusDescription")
+			String statusDescription = jsonUtil.getJsonValue(jobResponse, "statusDescription")
 			logger.error("received failed status from job status query for nssi : "+nssi+" with status description : "+ statusDescription)
 			exceptionUtil.buildAndThrowWorkflowException(execution, 7000,"received failed status from job status query for nssi : "+nssi+" with status description : "+ statusDescription)
 		}
@@ -899,29 +899,30 @@ class DoAllocateAccessNSSI extends AbstractServiceTaskProcessor {
 		sliceProfile.put("maxNumberofConns", sliceProfile.get("maxNumberofPDUSessions"))
 		sliceProfile.put("uLThptPerSlice", sliceProfile.get("expDataRateUL"))
 		sliceProfile.put("dLThptPerSlice", sliceProfile.get("expDataRateDL"))
-		String sliceProfileString = objectMapper.writeValueAsString(sliceProfile)
+
 		JsonObject response = new JsonObject()
 		JsonObject body = new JsonObject()
 		JsonObject input = new JsonObject()
 		JsonObject commonHeader = new JsonObject()
 		JsonObject payload = new JsonObject()
 		JsonObject payloadInput = new JsonObject()
-		commonHeader.addProperty("TimeStamp",new Date(System.currentTimeMillis()).format("yyyy-MM-dd'T'HH:mm:ss.sss", TimeZone.getDefault()))
-		commonHeader.addProperty("APIver", "1.0")
-		commonHeader.addProperty("RequestID", requestId)
-		commonHeader.addProperty("SubRequestID", "1")
-		commonHeader.add("RequestTrack", new JsonObject())
-		commonHeader.add("Flags", new JsonObject())
-		payloadInput.addProperty("sliceProfile", sliceProfileString)
+		commonHeader.addProperty("TimeStamp",new Date(System.currentTimeMillis()).format("yyyy-MM-dd'T'HH:mm:ss.sss'Z'", TimeZone.getDefault()))
+		commonHeader.addProperty("api-ver", "1.0")
+		commonHeader.addProperty("request-id", requestId)
+		commonHeader.addProperty("sub-request-id", "1")
+		commonHeader.add("request-track", new JsonObject())
+		commonHeader.add("flags", new JsonObject())
+	        Gson jsonConverter = new Gson() 
+         	payloadInput.add("sliceProfile", jsonConverter.toJsonTree(sliceProfile))
 		payloadInput.addProperty("RANNSSIId", execution.getVariable("RANServiceInstanceId"))
 		payloadInput.addProperty("NSIID", execution.getVariable("nsiId"))
 		payloadInput.addProperty("RANNFNSSIId", execution.getVariable("RANNFServiceInstanceId"))
 		payloadInput.addProperty("callbackURL", callbackUrl)
 		payloadInput.add("additionalproperties", new JsonObject())
 		payload.add("input", payloadInput)
-		input.add("CommonHeader", commonHeader)
-		input.addProperty("Action", action)
-		input.addProperty("Payload", payload.toString())
+		input.add("common-header", commonHeader)
+		input.addProperty("action", action)
+		input.addProperty("payload", payload.toString())
 		body.add("input", input)
 		response.add("body", body)
 		response.addProperty("version", "1.0")