Fix SliceProfile for External RAN NSSMF

Issue-ID: SO-3274
Signed-off-by: Enbo Wang <wangenbo@huawei.com>
Change-Id: Ie142fdbef529c98cba9374b92aed97455af770f9

3 files changed, 87 insertions, 2 deletions

diff --git a/adapters/mso-nssmf-adapter/src/main/java/org/onap/so/adapters/nssmf/manager/impl/external/ExternalAnNssmfManager.java b/adapters/mso-nssmf-adapter/src/main/java/org/onap/so/adapters/nssmf/manager/impl/external/ExternalAnNssmfManager.java
index c51b72d61e..3d0d0926fd 100644
--- a/adapters/mso-nssmf-adapter/src/main/java/org/onap/so/adapters/nssmf/manager/impl/external/ExternalAnNssmfManager.java
+++ b/adapters/mso-nssmf-adapter/src/main/java/org/onap/so/adapters/nssmf/manager/impl/external/ExternalAnNssmfManager.java
@@ -27,6 +27,7 @@ import org.onap.so.adapters.nssmf.enums.SelectionType;
 import org.onap.so.adapters.nssmf.exceptions.ApplicationException;
 import org.onap.so.adapters.nssmf.manager.impl.ExternalNssmfManager;
 import org.onap.so.adapters.nssmf.util.NssmfAdapterUtil;
+import org.onap.so.beans.nsmf.AnSliceProfile;
 import org.onap.so.beans.nsmf.DeAllocateNssi;
 import org.onap.so.beans.nsmf.NssiResponse;
 import org.onap.so.beans.nsmf.NssmfAdapterNBIRequest;
@@ -47,7 +48,21 @@ public class ExternalAnNssmfManager extends ExternalNssmfManager {
     @Override
     protected String doWrapExtAllocateReqBody(NssmfAdapterNBIRequest nbiRequest) throws ApplicationException {
         Map<String, Object> request = new HashMap<>();
-        request.put("attributeListIn", nbiRequest.getAllocateAnNssi().getSliceProfile());
+
+        AnSliceProfile anSliceProfile = nbiRequest.getAllocateAnNssi().getSliceProfile();
+
+        RanSliceProfile ranSliceProfile = new RanSliceProfile();
+        ranSliceProfile.setSliceProfileId(anSliceProfile.getSliceProfileId());
+        ranSliceProfile.setSNSSAIList(anSliceProfile.getSNSSAIList());
+        ranSliceProfile.setPLMNIdList(anSliceProfile.getPLMNIdList());
+        ranSliceProfile.setPerfReq(anSliceProfile.getPerfReq());
+        ranSliceProfile.setMaxNumberofUEs(anSliceProfile.getMaxNumberOfUEs());
+        ranSliceProfile.setCoverageAreaTAList(anSliceProfile.getCoverageAreaTAList());
+        ranSliceProfile.setLatency(anSliceProfile.getLatency());
+        ranSliceProfile.setUEMobilityLevel(anSliceProfile.getUeMobilityLevel());
+        ranSliceProfile.setResourceSharingLevel(anSliceProfile.getResourceSharingLevel());
+
+        request.put("attributeListIn", ranSliceProfile);
         return marshal(request);
     }
 
diff --git a/adapters/mso-nssmf-adapter/src/main/java/org/onap/so/adapters/nssmf/manager/impl/external/RanSliceProfile.java b/adapters/mso-nssmf-adapter/src/main/java/org/onap/so/adapters/nssmf/manager/impl/external/RanSliceProfile.java
new file mode 100644
index 0000000000..7035456d75
--- /dev/null
+++ b/adapters/mso-nssmf-adapter/src/main/java/org/onap/so/adapters/nssmf/manager/impl/external/RanSliceProfile.java
@@ -0,0 +1,70 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2020 Huawei Technologies Co., Ltd. All rights reserved.
+ * ================================================================================
+ * 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=========================================================
+ */
+
+package org.onap.so.adapters.nssmf.manager.impl.external;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import java.io.Serializable;
+import java.util.List;
+import org.onap.so.beans.nsmf.PerfReq;
+import org.onap.so.beans.nsmf.UeMobilityLevel;
+import org.onap.so.beans.nsmf.ResourceSharingLevel;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@Data
+public class RanSliceProfile implements Serializable {
+    /*
+     * Reference 3GPP TS 28.541 V16.5.0, Section 6.3.4.
+     */
+
+    private static final long serialVersionUID = 172447042469370448L;
+
+    @JsonProperty(value = "sliceProfileId", required = true)
+    private String sliceProfileId;
+
+    @JsonProperty(value = "sNSSAIList", required = true)
+    private List<String> sNSSAIList;
+
+    @JsonProperty(value = "pLMNIdList", required = true)
+    private List<String> pLMNIdList;
+
+    @JsonProperty(value = "perfReq", required = true)
+    private PerfReq perfReq;
+
+    @JsonInclude(JsonInclude.Include.NON_DEFAULT)
+    @JsonProperty(value = "maxNumberofUEs")
+    private long maxNumberofUEs;
+
+    @JsonProperty(value = "coverageAreaTAList")
+    private List<Integer> coverageAreaTAList;
+
+    @JsonInclude(JsonInclude.Include.NON_DEFAULT)
+    @JsonProperty(value = "latency")
+    private int latency;
+
+    @JsonProperty(value = "uEMobilityLevel")
+    private UeMobilityLevel uEMobilityLevel;
+
+    @JsonProperty(value = "resourceSharingLevel")
+    private ResourceSharingLevel resourceSharingLevel;
+
+}
diff --git a/common/src/main/java/org/onap/so/beans/nsmf/AnSliceProfile.java b/common/src/main/java/org/onap/so/beans/nsmf/AnSliceProfile.java
index 5edeb7e74f..3d0f70805c 100644
--- a/common/src/main/java/org/onap/so/beans/nsmf/AnSliceProfile.java
+++ b/common/src/main/java/org/onap/so/beans/nsmf/AnSliceProfile.java
@@ -32,7 +32,7 @@ import java.util.List;
 @ToString
 public class AnSliceProfile implements Serializable {
     /*
-     * Reference 3GPP TS 28.541 V16.5.0, Section 6.3.4.
+     * Reference 3GPP TS 28.541 V16.5.0.
      */
 
     private static final long serialVersionUID = -3057342171549542794L;