summaryrefslogtreecommitdiffstats
path: root/bpmn/so-bpmn-infrastructure-common
diff options
context:
space:
mode:
Diffstat (limited to 'bpmn/so-bpmn-infrastructure-common')
-rw-r--r--bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoAllocateNSIandNSSI.groovy54
-rw-r--r--bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoAllocateNSSI.groovy6
-rw-r--r--bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateSliceServiceInstance.groovy3
-rw-r--r--bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateSliceServiceOption.groovy4
-rw-r--r--bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateTnNssiInstance.groovy2
5 files changed, 56 insertions, 13 deletions
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoAllocateNSIandNSSI.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoAllocateNSIandNSSI.groovy
index 8b452d310b..0311c3d856 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoAllocateNSIandNSSI.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoAllocateNSIandNSSI.groovy
@@ -126,7 +126,7 @@ class DoAllocateNSIandNSSI extends AbstractServiceTaskProcessor{
String sliceInstanceName = "nsi_"+execution.getVariable("sliceServiceInstanceName")
- String serviceType = execution.getVariable("serviceType")
+ String serviceType = sliceParams.serviceProfile.get("sST")
String serviceStatus = "deactivated"
String modelInvariantUuid = sliceParams.getNSTInfo().invariantUUID
String modelUuid = sliceParams.getNSTInfo().UUID
@@ -300,7 +300,24 @@ class DoAllocateNSIandNSSI extends AbstractServiceTaskProcessor{
SliceProfile sliceProfile = new SliceProfile()
sliceProfile.setProfileId(profileId)
sliceProfile.setCoverageAreaTAList(anSliceProfile.coverageAreaTAList)
- //todo:...
+ sliceProfile.setMaxNumberOfUEs(anSliceProfile.maxNumberOfUEs)
+ sliceProfile.setLatency(anSliceProfile.latency)
+ sliceProfile.setMaxNumberOfPDUSession(anSliceProfile.maxNumberOfPDUSession)
+ sliceProfile.setExpDataRateDL(anSliceProfile.expDataRateDL)
+ sliceProfile.setExpDataRateUL(anSliceProfile.expDataRateUL)
+ sliceProfile.setAreaTrafficCapDL(anSliceProfile.areaTrafficCapDL)
+ sliceProfile.setAreaTrafficCapUL(anSliceProfile.areaTrafficCapUL)
+ sliceProfile.setOverallUserDensity(anSliceProfile.overallUserDensity)
+ sliceProfile.setActivityFactor(anSliceProfile.activityFactor)
+ sliceProfile.setUeMobilityLevel(anSliceProfile.ueMobilityLevel)
+ sliceProfile.setResourceSharingLevel(anSliceProfile.resourceSharingLevel)
+ sliceProfile.setCsAvailabilityTarget(anSliceProfile.csAvailabilityTarget)
+ sliceProfile.setCsReliabilityMeanTime(anSliceProfile.csReliabilityMeanTime)
+ sliceProfile.setExpDataRate(anSliceProfile.expDataRate)
+ sliceProfile.setMsgSizeByte(anSliceProfile.msgSizeByte)
+ sliceProfile.setTransferIntervalTarget(anSliceProfile.transferIntervalTarget)
+ sliceProfile.setSurvivalTime(anSliceProfile.survivalTime)
+
AAIResourceUri uri = AAIUriFactory.createResourceUri(
AAIFluentTypeBuilder.business().customer(globalSubscriberId)
.serviceSubscription(subscriptionServiceType)
@@ -379,7 +396,7 @@ class DoAllocateNSIandNSSI extends AbstractServiceTaskProcessor{
allocateAnNssi.sliceProfile = sliceTaskInfo.sliceProfile.trans2AnProfile()
allocateAnNssi.nsstId = sliceTaskInfo.NSSTInfo.UUID
allocateAnNssi.nssiId = sliceTaskInfo.suggestNssiId
- allocateAnNssi.nssiName = sliceTaskInfo.NSSTInfo.name
+ allocateAnNssi.nssiName = "nssi_an" + execution.getVariable("sliceServiceInstanceName")
NsiInfo nsiInfo = new NsiInfo()
nsiInfo.nsiId = sliceParams.suggestNsiId
nsiInfo.nsiName = sliceParams.suggestNsiName
@@ -406,6 +423,8 @@ class DoAllocateNSIandNSSI extends AbstractServiceTaskProcessor{
serviceInfo.nsiId = sliceParams.suggestNsiId
serviceInfo.serviceInvariantUuid = sliceTaskInfo.NSSTInfo.invariantUUID
serviceInfo.serviceUuid = sliceTaskInfo.NSSTInfo.UUID
+ serviceInfo.sST = sliceTaskInfo.sliceProfile.sST ?: sliceParams.serviceProfile.get("sST")
+ serviceInfo.nssiName = allocateAnNssi.nssiName
nbiRequest.setServiceInfo(serviceInfo)
nbiRequest.setEsrInfo(esrInfo)
@@ -473,7 +492,24 @@ class DoAllocateNSIandNSSI extends AbstractServiceTaskProcessor{
SliceProfile sliceProfile = new SliceProfile()
sliceProfile.setProfileId(profileId)
sliceProfile.setCoverageAreaTAList(cnSliceProfile.coverageAreaTAList as String)
- //todo:...
+ sliceProfile.setMaxNumberOfUEs(cnSliceProfile.maxNumberOfUEs)
+ sliceProfile.setLatency(cnSliceProfile.latency)
+ sliceProfile.setMaxNumberOfPDUSession(cnSliceProfile.maxNumberOfPDUSession)
+ sliceProfile.setExpDataRateDL(cnSliceProfile.expDataRateDL)
+ sliceProfile.setExpDataRateUL(cnSliceProfile.expDataRateUL)
+ sliceProfile.setAreaTrafficCapDL(cnSliceProfile.areaTrafficCapDL)
+ sliceProfile.setAreaTrafficCapUL(cnSliceProfile.areaTrafficCapUL)
+ sliceProfile.setOverallUserDensity(cnSliceProfile.overallUserDensity)
+ sliceProfile.setActivityFactor(cnSliceProfile.activityFactor)
+ sliceProfile.setUeMobilityLevel(cnSliceProfile.ueMobilityLevel)
+ sliceProfile.setResourceSharingLevel(cnSliceProfile.resourceSharingLevel)
+ sliceProfile.setCsAvailabilityTarget(cnSliceProfile.csAvailabilityTarget)
+ sliceProfile.setCsReliabilityMeanTime(cnSliceProfile.csReliabilityMeanTime)
+ sliceProfile.setExpDataRate(cnSliceProfile.expDataRate)
+ sliceProfile.setMsgSizeByte(cnSliceProfile.msgSizeByte)
+ sliceProfile.setTransferIntervalTarget(cnSliceProfile.transferIntervalTarget)
+ sliceProfile.setSurvivalTime(cnSliceProfile.survivalTime)
+
AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.business()
.customer(globalSubscriberId)
.serviceSubscription(subscriptionServiceType)
@@ -499,7 +535,7 @@ class DoAllocateNSIandNSSI extends AbstractServiceTaskProcessor{
AllocateCnNssi allocateCnNssi = new AllocateCnNssi()
allocateCnNssi.nsstId = sliceTaskInfo.NSSTInfo.UUID
allocateCnNssi.nssiId = sliceTaskInfo.suggestNssiId
- allocateCnNssi.nssiName = sliceTaskInfo.NSSTInfo.name
+ allocateCnNssi.nssiName = "nssi_cn" + execution.getVariable("sliceServiceInstanceName")
allocateCnNssi.sliceProfile = sliceTaskInfo.sliceProfile.trans2CnProfile()
NsiInfo nsiInfo = new NsiInfo()
nsiInfo.nsiId = sliceParams.suggestNsiId
@@ -528,6 +564,8 @@ class DoAllocateNSIandNSSI extends AbstractServiceTaskProcessor{
serviceInfo.serviceInvariantUuid = sliceTaskInfo.NSSTInfo.invariantUUID
serviceInfo.serviceUuid = sliceTaskInfo.NSSTInfo.UUID
serviceInfo.nssiId = sliceTaskInfo.suggestNssiId //if shared
+ serviceInfo.sST = sliceTaskInfo.sliceProfile.sST ?: sliceParams.serviceProfile.get("sST")
+ serviceInfo.nssiName = allocateCnNssi.nssiName
nbiRequest.setServiceInfo(serviceInfo)
nbiRequest.setEsrInfo(esrInfo)
@@ -595,7 +633,10 @@ class DoAllocateNSIandNSSI extends AbstractServiceTaskProcessor{
SliceProfile sliceProfile = new SliceProfile()
sliceProfile.setProfileId(profileId)
- //todo:...
+ sliceProfile.setLatency(tnSliceProfile.latency)
+ sliceProfile.setMaxBandwidth(tnSliceProfile.maxBandwidth)
+ sliceProfile.setJitter(tnSliceProfile.jitter)
+
AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIFluentTypeBuilder.business()
.customer(globalSubscriberId)
.serviceSubscription(subscriptionServiceType)
@@ -656,6 +697,7 @@ class DoAllocateNSIandNSSI extends AbstractServiceTaskProcessor{
serviceInfo.serviceInvariantUuid = sliceTaskInfo.NSSTInfo.invariantUUID
serviceInfo.serviceUuid = sliceTaskInfo.NSSTInfo.UUID
serviceInfo.nssiId = sliceTaskInfo.suggestNssiId
+ serviceInfo.sST = sliceTaskInfo.sliceProfile.sST ?: sliceParams.serviceProfile.get("sST")
nbiRequest.setServiceInfo(serviceInfo)
nbiRequest.setEsrInfo(esrInfo)
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoAllocateNSSI.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoAllocateNSSI.groovy
index 35079d2e58..e88b1c747f 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoAllocateNSSI.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoAllocateNSSI.groovy
@@ -62,8 +62,10 @@ class DoAllocateNSSI extends AbstractServiceTaskProcessor {
*/
void sendCreateRequestNSSMF(DelegateExecution execution) {
NssmfAdapterNBIRequest nbiRequest = execution.getVariable("nbiRequest") as NssmfAdapterNBIRequest
- String response = nssmfAdapterUtils.sendPostRequestNSSMF(execution, NSSMF_ALLOCATE_URL,
- objectMapper.writeValueAsString(nbiRequest))
+ String nssmfRequest = objectMapper.writeValueAsString(nbiRequest)
+ logger.debug("sendCreateRequestNSSMF: " + nssmfRequest)
+
+ String response = nssmfAdapterUtils.sendPostRequestNSSMF(execution, NSSMF_ALLOCATE_URL, nssmfRequest)
if (response != null) {
NssiResponse nssiResponse = objectMapper.readValue(response, NssiResponse.class)
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateSliceServiceInstance.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateSliceServiceInstance.groovy
index ec70bd3780..ccb04d9440 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateSliceServiceInstance.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateSliceServiceInstance.groovy
@@ -100,7 +100,6 @@ class DoCreateSliceServiceInstance extends AbstractServiceTaskProcessor{
* todo: role
*/
String serviceRole = "service-profile"
- String serviceType = execution.getVariable("serviceType")
String globalSubscriberId = execution.getVariable("globalSubscriberId")
String subscriptionServiceType = execution.getVariable("subscriptionServiceType")
@@ -111,7 +110,7 @@ class DoCreateSliceServiceInstance extends AbstractServiceTaskProcessor{
ss.setServiceInstanceId(ssInstanceId)
String sliceInstanceName = execution.getVariable("serviceInstanceName")
ss.setServiceInstanceName(sliceInstanceName)
- ss.setServiceType(serviceType)
+ ss.setServiceType(serviceProfile.get("sST"))
String serviceStatus = "deactivated"
ss.setOrchestrationStatus(serviceStatus)
String modelInvariantUuid = modelInfo.getModelInvariantUuid()
diff --git a/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
index 9450227467..25a7159264 100644
--- a/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
@@ -416,10 +416,10 @@ class DoCreateSliceServiceOption extends AbstractServiceTaskProcessor{
sliceProfile.remove("domainType")
SliceProfileAdapter adapter = objectMapper.readValue(objectMapper.writeValueAsString(sliceProfile), SliceProfileAdapter.class)
switch (domainType.toLowerCase()) {
- case "tn-bh":
+ case "tn_bh":
sliceParams.tnBHSliceTaskInfo.sliceProfile = adapter
break
- case "an-nf":
+ case "an_nf":
case "an":
sliceParams.anSliceTaskInfo.sliceProfile = adapter
break
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateTnNssiInstance.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateTnNssiInstance.groovy
index cf9a95ecfa..4eb70a5302 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateTnNssiInstance.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateTnNssiInstance.groovy
@@ -101,7 +101,7 @@ class DoCreateTnNssiInstance extends AbstractServiceTaskProcessor {
void createServiceInstance(DelegateExecution execution) {
- String serviceRole = "TN"
+ String serviceRole = "nssi"
String serviceType = execution.getVariable("subscriptionServiceType")
String ssInstanceId = execution.getVariable("sliceServiceInstanceId")
String sliceProfileStr = execution.getVariable("sliceProfile")