logger.trace("Enter preProcessRequest()")
Map<String, Object> nssiMap = new HashMap<>()
int nsstCount=execution.getVariable("nsstCount") as int
- if(nsstCount==5){
+ if(nsstCount==6){
execution.setVariable("processFHandMH", true)
}
else{
SliceProfile sliceProfile = new SliceProfile()
sliceProfile.setProfileId(profileId)
- sliceProfile.setCoverageAreaTAList(anSliceProfile.coverageAreaTAList)
+ sliceProfile.setCoverageAreaTAList(anSliceProfile.coverageAreaTAList as String)
sliceProfile.setMaxNumberOfUEs(anSliceProfile.maxNumberOfUEs)
sliceProfile.setLatency(anSliceProfile.latency)
sliceProfile.setMaxNumberOfPDUSession(anSliceProfile.maxNumberOfPDUSession)
.sST(sliceTaskInfo.getSliceProfile().getSST() ?: sliceParams.getServiceProfile().get("sST") as String)
.nssiName(sliceTaskInfo.getSuggestNssiId() ? sliceTaskInfo.getNSSTInfo().getName() : allocateAnNssi.getNssiName())
.nssiId(sliceTaskInfo.getSuggestNssiId())
+ .resourceSharingLevel(sliceParams.serviceProfile.get("resourceSharingLevel") as String)
.build()
nbiRequest.setServiceInfo(serviceInfo)
serviceInfo.nssiId = sliceTaskInfo.suggestNssiId //if shared
serviceInfo.sST = sliceTaskInfo.sliceProfile.sST ?: sliceParams.serviceProfile.get("sST")
serviceInfo.nssiName = allocateCnNssi.nssiName
+ serviceInfo.resourceSharingLevel = sliceParams.serviceProfile.get("resourceSharingLevel")
nbiRequest.setServiceInfo(serviceInfo)
nbiRequest.setEsrInfo(esrInfo)
serviceInfo.nssiId = sliceTaskInfo.suggestNssiId
serviceInfo.sST = sliceTaskInfo.sliceProfile.sST ?: sliceParams.serviceProfile.get("sST")
serviceInfo.nssiName = "nssi_tn" + execution.getVariable("sliceServiceInstanceName")
+ serviceInfo.resourceSharingLevel = sliceParams.serviceProfile.get("resourceSharingLevel")
nbiRequest.setServiceInfo(serviceInfo)
nbiRequest.setEsrInfo(esrInfo)
TransportSliceNetwork transportSliceNetwork = new TransportSliceNetwork()
List<ConnectionLink> connectionLinks = new ArrayList<>()
ConnectionLink connectionLink = new ConnectionLink()
- connectionLink.setTransportEndpointA(execution.getVariable("tranportEp_ID_RU") as String)
- connectionLink.setTransportEndpointB(execution.getVariable("tranportEp_ID_DUIN") as String)
+ connectionLink.setTransportEndpointA(UUID.randomUUID().toString())
+ connectionLink.setTransportEndpointB(UUID.randomUUID().toString())
connectionLinks.add(connectionLink)
transportSliceNetwork.setConnectionLinks(connectionLinks)
transportSliceNetworks.add(transportSliceNetwork)
.subscriptionServiceType(subscriptionServiceType)
.nsiId(sliceParams.getSuggestNsiId())
.serviceInvariantUuid(sliceTaskInfo.getNSSTInfo().getInvariantUUID())
- .setServiceUuid(sliceTaskInfo.getNSSTInfo().getUUID())
+ .serviceUuid(sliceTaskInfo.getNSSTInfo().getUUID())
.nssiId(sliceTaskInfo.getSuggestNssiId())
.sST(sliceTaskInfo.getSliceProfile().getSST() ?: sliceParams.getServiceProfile().get("sST"))
.nssiName("nssi_tn_fh_" + execution.getVariable("sliceServiceInstanceName") as String)
execution.setVariable("TnFHAllocateNssiNbiRequest", nbiRequest)
execution.setVariable("tnFHSliceTaskInfo", sliceTaskInfo)
- execution.setVariable("tnFHSubnetType", SubnetType.TN_BH)
+ execution.setVariable("tnFHSubnetType", SubnetType.TN_FH)
}
/**
TransportSliceNetwork transportSliceNetwork = new TransportSliceNetwork()
List<ConnectionLink> connectionLinks = new ArrayList<>()
ConnectionLink connectionLink = new ConnectionLink()
- connectionLink.setTransportEndpointA(execution.getVariable("tranportEp_ID_DUEG") as String)
- connectionLink.setTransportEndpointB(execution.getVariable("tranportEp_ID_CUIN") as String)
+ connectionLink.setTransportEndpointA(UUID.randomUUID().toString())
+ connectionLink.setTransportEndpointB(UUID.randomUUID().toString())
connectionLinks.add(connectionLink)
transportSliceNetwork.setConnectionLinks(connectionLinks)
transportSliceNetworks.add(transportSliceNetwork)
.serviceUuid(sliceTaskInfo.getNSSTInfo().getUUID())
.nssiId(sliceTaskInfo.getSuggestNssiId())
.sST(sliceTaskInfo.getSliceProfile().getSST() ?: sliceParams.getServiceProfile().get("sST"))
- .nssiName("nssi_tn_bh_" + execution.getVariable("sliceServiceInstanceName") as String)
+ .nssiName("nssi_tn_mh_" + execution.getVariable("sliceServiceInstanceName") as String)
.build()
nbiRequest.setServiceInfo(serviceInfo)
execution.setVariable("TnMHAllocateNssiNbiRequest", nbiRequest)
execution.setVariable("tnMHSliceTaskInfo", sliceTaskInfo)
- execution.setVariable("tnMHSubnetType", SubnetType.TN_BH)
+ execution.setVariable("tnMHSubnetType", SubnetType.TN_MH)
}
/**