aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuanyu Chen <chenchuanyu@huawei.com>2020-09-07 09:18:20 +0000
committerGerrit Code Review <gerrit@onap.org>2020-09-07 09:18:20 +0000
commit34694adec31a273cdac4b7752c3bdd18f249f9c7 (patch)
tree7e045029a3e57a4fdf57cbbebc46f81cf6f2b375
parent2e715d8ceea7cb9f6e11af16bb21d37895ba8c9b (diff)
parent58bcd9d634485bfda2435191d7d4b5cbbcc4de3e (diff)
Merge "Update parameter processing of NSSMF adapter for External RAN NSSMF"
-rw-r--r--adapters/mso-nssmf-adapter/src/main/java/org/onap/so/adapters/nssmf/manager/impl/external/ExternalAnNssmfManager.java20
-rw-r--r--common/src/main/java/org/onap/so/beans/nsmf/AnSliceProfile.java22
2 files changed, 31 insertions, 11 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 ef979a660f..bc7a3d0bb7 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
@@ -33,12 +33,15 @@ import org.onap.so.beans.nsmf.NssmfAdapterNBIRequest;
import org.onap.so.db.request.beans.ResourceOperationStatus;
import java.util.HashMap;
import java.util.Map;
+import java.util.UUID;
import static org.onap.so.adapters.nssmf.util.NssmfAdapterUtil.marshal;
import static org.onap.so.adapters.nssmf.util.NssmfAdapterUtil.unMarshal;
public class ExternalAnNssmfManager extends ExternalNssmfManager {
+ private Map<String, String> bodyParams = new HashMap<>(); // request body params
+
@Override
protected String doWrapExtAllocateReqBody(NssmfAdapterNBIRequest nbiRequest) throws ApplicationException {
Map<String, Object> request = new HashMap<>();
@@ -49,13 +52,17 @@ public class ExternalAnNssmfManager extends ExternalNssmfManager {
@Override
protected void doAfterRequest() throws ApplicationException {
if (ActionType.ALLOCATE.equals(actionType) || ActionType.DEALLOCATE.equals(actionType)) {
- @SuppressWarnings("unchecked")
- Map<String, String> response = unMarshal(restResponse.getResponseContent(), Map.class);
-
- String nssiId = response.get("nSSId");
+ String nssiId;
+ if (ActionType.ALLOCATE.equals(actionType)) {
+ @SuppressWarnings("unchecked")
+ Map<String, String> response = unMarshal(restResponse.getResponseContent(), Map.class);
+ nssiId = response.get("href");
+ } else {
+ nssiId = this.bodyParams.get("nssiId");
+ }
NssiResponse resp = new NssiResponse();
- resp.setJobId(nssiId);
+ resp.setJobId(UUID.randomUUID().toString());
resp.setNssiId(nssiId);
RestResponse returnRsp = new RestResponse();
@@ -82,6 +89,9 @@ public class ExternalAnNssmfManager extends ExternalNssmfManager {
@Override
protected String doWrapDeAllocateReqBody(DeAllocateNssi deAllocateNssi) throws ApplicationException {
+ this.bodyParams.clear();
+ this.bodyParams.put("nssiId", deAllocateNssi.getNssiId());
+
Map<String, String> request = new HashMap<>();
request.put("nSSId", deAllocateNssi.getNssiId());
return marshal(request);
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 26c3c0012a..83675da5f0 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
@@ -21,6 +21,7 @@
package org.onap.so.beans.nsmf;
import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.util.List;
@@ -28,24 +29,33 @@ import java.util.List;
@Data
public class AnSliceProfile {
- private List<String> sNSSAIList;
-
+ @JsonProperty(value = "sliceProfileId", required = true)
private String sliceProfileId;
- private List<Integer> coverageAreaTAList;
-
- @JsonInclude(JsonInclude.Include.NON_DEFAULT)
- private int latency;
+ @JsonProperty(value = "sNSSAIList", required = true)
+ private List<String> sNSSAIList;
+ @JsonProperty(value = "pLMNIdList", required = true)
private List<String> pLMNIdList;
+ @JsonProperty(value = "perfReq", required = true)
private AnPerfReq 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;
}