summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoAllocateNSIandNSSI.groovy47
-rw-r--r--common/src/main/java/org/onap/so/beans/nsmf/QuerySubnetCapability.java26
2 files changed, 55 insertions, 18 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 aa34453892..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
@@ -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 = "nssi_An" + execution.getVariable("sliceServiceInstanceName")
+ allocateAnNssi.nssiName = "nssi_an" + execution.getVariable("sliceServiceInstanceName")
NsiInfo nsiInfo = new NsiInfo()
nsiInfo.nsiId = sliceParams.suggestNsiId
nsiInfo.nsiName = sliceParams.suggestNsiName
@@ -475,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)
@@ -501,7 +535,7 @@ class DoAllocateNSIandNSSI extends AbstractServiceTaskProcessor{
AllocateCnNssi allocateCnNssi = new AllocateCnNssi()
allocateCnNssi.nsstId = sliceTaskInfo.NSSTInfo.UUID
allocateCnNssi.nssiId = sliceTaskInfo.suggestNssiId
- allocateCnNssi.nssiName = "nssi_Cn" + execution.getVariable("sliceServiceInstanceName")
+ allocateCnNssi.nssiName = "nssi_cn" + execution.getVariable("sliceServiceInstanceName")
allocateCnNssi.sliceProfile = sliceTaskInfo.sliceProfile.trans2CnProfile()
NsiInfo nsiInfo = new NsiInfo()
nsiInfo.nsiId = sliceParams.suggestNsiId
@@ -599,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)
diff --git a/common/src/main/java/org/onap/so/beans/nsmf/QuerySubnetCapability.java b/common/src/main/java/org/onap/so/beans/nsmf/QuerySubnetCapability.java
index 7485b387d8..6b30af9339 100644
--- a/common/src/main/java/org/onap/so/beans/nsmf/QuerySubnetCapability.java
+++ b/common/src/main/java/org/onap/so/beans/nsmf/QuerySubnetCapability.java
@@ -2,19 +2,19 @@
* ============LICENSE_START=======================================================
* ONAP - SO
* ================================================================================
- * Copyright (C) 2020 Wipro Limited.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ # Copyright (c) 2020, CMCC Technologies Co., Ltd.
+ #
+ # Licensed under the Apache License, Version 2.0 (the "License")
+ # you may not use this file except in compliance with the License.
+ # You may obtain a copy of the License at
+ #
+ # http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing, software
+ # distributed under the License is distributed on an "AS IS" BASIS,
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
* ============LICENSE_END=========================================================
*/