Merge "Fix issues in shared RAN NSSI flow"

diff --combined bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoAllocateAccessNSSI.groovy
index 10acd6e,9e59f73..9800428
--- 1/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoAllocateAccessNSSI.groovy
--- 2/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
@@@ -654,8 -654,7 +654,8 @@@ class DoAllocateAccessNSSI extends Abst
                logger.debug("completed AN service instance build " + ANServiceInstance.toString())
                //create RAN NF NSSI
                ANNFServiceInstance.setServiceInstanceId(execution.getVariable("RANNFServiceInstanceId") as String)
 -              sliceInstanceName = "nssi_"+execution.getVariable("ANNF_modelName")
 +                String ANNF_nssiInstanceId = UUID.randomUUID().toString()
 +              sliceInstanceName = "nssi_an_nf_" + ANNF_nssiInstanceId
                ANNFServiceInstance.setServiceInstanceName(sliceInstanceName)
                ANNFServiceInstance.setServiceType(execution.getVariable("sst") as String)
                ANNFServiceInstance.setOrchestrationStatus(serviceStatus)
@@@ -664,7 -663,7 +664,7 @@@
                ANNFServiceInstance.setServiceRole(serviceRole)
                snssaiList = jsonUtil.StringArrayToList(execution.getVariable("snssaiList") as String)
                snssai = snssaiList.get(0)
 -              ANNFServiceInstance.setEnvironmentContext(snssai)
 +              ANNFServiceInstance.setEnvironmentContext(execution.getVariable("networkType") as String)
                  ANNFServiceInstance.setModelInvariantId(execution.getVariable("ANNF_modelInvariantUuid"))
                  ANNFServiceInstance.setModelVersionId(execution.getVariable("ANNF_modelUuid"))
                ANNFServiceInstance.setWorkloadContext("AN_NF")
@@@ -1033,7 -1032,7 +1033,7 @@@
                RU_ep.setType(type)
                RU_ep.setIpAddress("192.168.100.4")
                RU_ep.setLogicalInterfaceId("1234")
-               RU_ep.setNextHop("Host1")
+               RU_ep.setNextHop("networkId-providerId-10-clientId-0-topologyId-2-nodeId-10.1.1.1-ltpId-512")
                RU_ep.setPrefixLength(prefixLength)
                RU_ep.setAddressFamily(addressFamily)
                //DU Ingress
@@@ -1047,7 -1046,7 +1047,7 @@@
                DU_ep.setType(type)
                DU_ep.setIpAddress("192.168.100.5")
                DU_ep.setLogicalInterfaceId("1234")
-               DU_ep.setNextHop("Host2")
+               DU_ep.setNextHop("networkId-providerId-20-clientId-0-topologyId-2-nodeId-10.2.1.2-ltpId-512")
                DU_ep.setPrefixLength(prefixLength)
                DU_ep.setAddressFamily(addressFamily)
                //MH RAN end point update
@@@ -1063,7 -1062,7 +1063,7 @@@
                  DUEG_ep.setLogicalInterfaceId("1234")
                  DUEG_ep.setPrefixLength(prefixLength)
                  DUEG_ep.setAddressFamily(addressFamily)
-               DUEG_ep.setNextHop("Host3")
+               DUEG_ep.setNextHop("networkId-providerId-10-clientId-0-topologyId-2-nodeId-10.1.1.1-ltpId-512")
                //CUIN
                String CUIN_routeId = UUID.randomUUID().toString()
                execution.setVariable("tranportEp_ID_CUIN", CUIN_routeId)
@@@ -1074,7 -1073,7 +1074,7 @@@
                CUIN_ep.setType(type)
                CUIN_ep.setIpAddress("192.168.100.6")
                CUIN_ep.setLogicalInterfaceId("1234")
-               CUIN_ep.setNextHop("Host4")
+               CUIN_ep.setNextHop("networkId-providerId-20-clientId-0-topologyId-2-nodeId-10.2.1.2-ltpId-512")
                CUIN_ep.setPrefixLength(prefixLength)
                CUIN_ep.setAddressFamily(addressFamily)
                try {

diff --combined bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateSliceServiceOption.groovy
index 90dd831,fc86f35..7571f07
--- 1/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateSliceServiceOption.groovy
--- 2/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateSliceServiceOption.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateSliceServiceOption.groovy
@@@ -21,6 -21,7 +21,7 @@@
  package org.onap.so.bpmn.infrastructure.scripts
  
  import com.fasterxml.jackson.databind.ObjectMapper
+ import com.fasterxml.jackson.core.type.TypeReference
  import org.camunda.bpm.engine.delegate.DelegateExecution
  import org.onap.aai.domain.yang.ServiceInstance
  import org.onap.so.beans.nsmf.EsrInfo
@@@ -271,22 -272,24 +272,22 @@@ class DoCreateSliceServiceOption extend
       * @return
       */
      private SubnetType convertServiceCategory(String serviceCategory){
 -        if("CN NSST".equals(serviceCategory)){
 +        if(serviceCategory ==~ /CN.*/){
              return SubnetType.CN
          }
 -        if ("AN NF NSST".equals(serviceCategory)){
 -            return SubnetType.AN_NF
 -        }
 -        if ("AN NSST".equals(serviceCategory)){
 +        if (serviceCategory ==~ /AN.*/){
              return SubnetType.AN
          }
 -        if ("TN BH NSST".equals(serviceCategory)){
 +        if (serviceCategory ==~ /TN.*BH.*/){
              return SubnetType.TN_BH
          }
 -        if("TN MH NSST".equals(serviceCategory)){
 +        if(serviceCategory ==~ /TN.*MH.*/){
              return SubnetType.TN_MH
          }
 -        if("TN FH NSST".equals(serviceCategory)){
 +        if(serviceCategory ==~ /TN.*FH.*/){
              return SubnetType.TN_FH
          }
 +
          return null
      }
  
@@@ -473,7 -476,10 +474,10 @@@
       */
      void getNSSISelectionCap4AN(DelegateExecution execution) {
  
-         def vendor = execution.getVariable("vendor") as String
+        SliceTaskParamsAdapter sliceParams =
+                 execution.getVariable("sliceTaskParams") as SliceTaskParamsAdapter
+ 
+         def vendor = sliceParams.anSliceTaskInfo.vendor
  
          String strRequest = buildNSSISelectionReq(vendor, NetworkType.ACCESS)
  
@@@ -495,7 -501,10 +499,10 @@@
       */
      void getNSSISelectionCap4TN(DelegateExecution execution) {
  
-         def vendor = execution.getVariable("vendor") as String
+         SliceTaskParamsAdapter sliceParams =
+                 execution.getVariable("sliceTaskParams") as SliceTaskParamsAdapter
+ 
+         def vendor = sliceParams.tnBHSliceTaskInfo.vendor
  
          String strRequest = buildNSSISelectionReq(vendor, NetworkType.TRANSPORT)
  
@@@ -516,7 -525,10 +523,10 @@@
       */
      void getNSSISelectionCap4CN(DelegateExecution execution) {
  
-         def vendor = execution.getVariable("vendor") as String
+         SliceTaskParamsAdapter sliceParams =
+                 execution.getVariable("sliceTaskParams") as SliceTaskParamsAdapter
+ 
+         def vendor = sliceParams.cnSliceTaskInfo.vendor
  
          String strRequest = buildNSSISelectionReq(vendor, NetworkType.CORE)
  
@@@ -624,8 -636,10 +634,10 @@@
          Map nssiNeedHandlerInfo = nssiNeedHandlerInfos.get(currNssiIndex) as Map
  
          TemplateInfo nsstInfo = nssiNeedHandlerInfo.get("nsstInfo") as TemplateInfo
-         Map<String, Object> profileInfo = nssiNeedHandlerInfo.get("sliceProfile") as Map
-         //profileInfo.remove("profileId")
+         SliceProfileAdapter sliceProfileInfo = nssiNeedHandlerInfo.get("sliceProfile") as SliceProfileAdapter
+ 
+         Map profileInfo = objectMapper.convertValue(sliceProfileInfo, new TypeReference<Map<String, Object>>() {});
+         while (profileInfo.values().remove(null));
  
          String urlString = UrnPropertiesReader.getVariable("mso.oof.endpoint", execution)
          logger.debug( "get NSI option OOF Url: " + urlString)
@@@ -639,8 -653,8 +651,8 @@@
          String timeout = UrnPropertiesReader.getVariable("mso.adapters.oof.timeout", execution)
          execution.setVariable("nssiSelection_timeout", timeout)
  
-         String oofRequest = oofUtils.buildSelectNSSIRequest(requestId, nsstInfo, messageType,
-                 profileInfo, 600)
+         String oofRequest = oofUtils.buildSelectNSSIRequest(requestId, messageType, nsstInfo.UUID,
+                 nsstInfo.invariantUUID, nsstInfo.name, profileInfo)
  
          execution.setVariable("nssiSelection_oofRequest", oofRequest)
          logger.debug("Sending request to OOF: " + oofRequest)
@@@ -670,13 -684,10 +682,10 @@@
  
          Map<String, Object> resMap = objectMapper.readValue(OOFResponse, Map.class)
          List<Map<String, Object>> nsiSolutions = (List<Map<String, Object>>) resMap.get("solutions")
-         Map<String, Object> solution = nsiSolutions.get(0)
- 
-         String resourceSharingLevel = execution.getVariable("resourceSharingLevel")
-         Boolean isSharable = resourceSharingLevel == "shared"   //todo
  
-         if (isSharable && solution != null) {
-             processNssiResult(sliceTaskParams, subnetType, solution)
+         if(nsiSolutions.size()>=1) {
+         Map<String,Object> solution = nsiSolutions.get(0) as Map
+         processNssiResult(sliceTaskParams, subnetType, solution)
          }
  
          execution.setVariable("sliceTaskParams", sliceTaskParams)