Fix bugs found in TN Slicing integration involving OOF

[so.git] / common / src / main / java / org / onap / so / beans / nsmf / SliceProfileAdapter.java

diff --git a/common/src/main/java/org/onap/so/beans/nsmf/SliceProfileAdapter.java b/common/src/main/java/org/onap/so/beans/nsmf/SliceProfileAdapter.java
index 90cee27..2b31561 100644 (file)
--- a/common/src/main/java/org/onap/so/beans/nsmf/SliceProfileAdapter.java
+++ b/common/src/main/java/org/onap/so/beans/nsmf/SliceProfileAdapter.java
@@ -63,7 +63,7 @@ public class SliceProfileAdapter implements Serializable {
     private int maxBandwidth;
 
     @JsonProperty(value = "sST")
-    private String sST;
+    private String sST = "embb";
 
     @JsonProperty(value = "activityFactor")
     private int activityFactor;
@@ -131,6 +131,7 @@ public class SliceProfileAdapter implements Serializable {
 
         anSliceProfile.setUeMobilityLevel(UeMobilityLevel.fromString(this.ueMobilityLevel));
         anSliceProfile.setResourceSharingLevel(ResourceSharingLevel.fromString(this.resourceSharingLevel));
+        anSliceProfile.setMaxNumberOfPDUSession(this.maxNumberOfPDUSession);
         anSliceProfile.setPerfReq(generatePerfReq());
 
         return anSliceProfile;
@@ -160,7 +161,7 @@ public class SliceProfileAdapter implements Serializable {
             BeanUtils.copyProperties(this, perfReqEmbb);
             perfReqEmbbs.add(perfReqEmbb);
             perfReq.setPerfReqEmbbList(perfReqEmbbs);
-        } else if ("ullc".equalsIgnoreCase(sST)) {
+        } else if ("urllc".equalsIgnoreCase(sST)) {
             List<PerfReqUrllc> perfReqUrllcs = new ArrayList<>();
             PerfReqUrllc perfReqUrllc = new PerfReqUrllc();
             BeanUtils.copyProperties(this, perfReqUrllc);
@@ -175,6 +176,7 @@ public class SliceProfileAdapter implements Serializable {
         BeanUtils.copyProperties(this, tnSliceProfile);
         tnSliceProfile.setSNSSAIList(Arrays.asList(this.sNSSAIList.split("\\|")));
         tnSliceProfile.setPLMNIdList(Arrays.asList(this.pLMNIdList.split("\\|")));
+        tnSliceProfile.setResourceSharingLevel(ResourceSharingLevel.fromString(this.resourceSharingLevel));
         return tnSliceProfile;
     }
 }