From 4d43829503cbd767b50a25549feab45947b6b7f5 Mon Sep 17 00:00:00 2001 From: Enbo Wang Date: Sun, 30 Aug 2020 22:12:53 +0800 Subject: Update NSSMF adapter to support External RAN NSSMF Issue-ID: SO-3202 Signed-off-by: Enbo Wang Change-Id: I65b8143ad38017117ffb0677054bad3f76ae90e4 --- .../java/org/onap/so/beans/nsmf/AnPerfReq.java | 47 +++++++ .../org/onap/so/beans/nsmf/AnSliceProfile.java | 7 +- .../onap/so/beans/nsmf/NssmfAdapterNBIRequest.java | 3 +- .../main/java/org/onap/so/beans/nsmf/PerfReq.java | 12 +- .../java/org/onap/so/beans/nsmf/PerfReqEmbb.java | 93 ++++++++++++++ .../org/onap/so/beans/nsmf/PerfReqEmbbList.java | 82 ------------- .../java/org/onap/so/beans/nsmf/PerfReqUrllc.java | 135 +++++++++++++++++++++ .../org/onap/so/beans/nsmf/PerfReqUrllcList.java | 135 --------------------- 8 files changed, 285 insertions(+), 229 deletions(-) create mode 100644 common/src/main/java/org/onap/so/beans/nsmf/AnPerfReq.java create mode 100644 common/src/main/java/org/onap/so/beans/nsmf/PerfReqEmbb.java delete mode 100644 common/src/main/java/org/onap/so/beans/nsmf/PerfReqEmbbList.java create mode 100644 common/src/main/java/org/onap/so/beans/nsmf/PerfReqUrllc.java delete mode 100644 common/src/main/java/org/onap/so/beans/nsmf/PerfReqUrllcList.java (limited to 'common') diff --git a/common/src/main/java/org/onap/so/beans/nsmf/AnPerfReq.java b/common/src/main/java/org/onap/so/beans/nsmf/AnPerfReq.java new file mode 100644 index 0000000000..418f8a5065 --- /dev/null +++ b/common/src/main/java/org/onap/so/beans/nsmf/AnPerfReq.java @@ -0,0 +1,47 @@ +/*- + * ============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.beans.nsmf; + +import com.fasterxml.jackson.annotation.JsonInclude; + +@JsonInclude(JsonInclude.Include.NON_NULL) +public class AnPerfReq { + + private PerfReqEmbb perfReqEmbb; + + private PerfReqUrllc perfReqUrllc; + + public PerfReqEmbb getPerfReqEmbb() { + return perfReqEmbb; + } + + public void setPerfReqEmbb(PerfReqEmbb perfReqEmbb) { + this.perfReqEmbb = perfReqEmbb; + } + + public PerfReqUrllc getPerfReqUrllc() { + return perfReqUrllc; + } + + public void setPerfReqUrllc(PerfReqUrllc perfReqUrllc) { + this.perfReqUrllc = perfReqUrllc; + } +} 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 653f9ac495..26c3c0012a 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,7 +21,6 @@ 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; @@ -33,17 +32,17 @@ public class AnSliceProfile { private String sliceProfileId; - private List coverageAreaTAList; + private List coverageAreaTAList; @JsonInclude(JsonInclude.Include.NON_DEFAULT) private int latency; private List pLMNIdList; - private PerfReq perfReq; + private AnPerfReq perfReq; @JsonInclude(JsonInclude.Include.NON_DEFAULT) - private int maxNumberofUEs; + private long maxNumberofUEs; private UeMobilityLevel uEMobilityLevel; diff --git a/common/src/main/java/org/onap/so/beans/nsmf/NssmfAdapterNBIRequest.java b/common/src/main/java/org/onap/so/beans/nsmf/NssmfAdapterNBIRequest.java index 7061ec2ff3..a44dbd636f 100644 --- a/common/src/main/java/org/onap/so/beans/nsmf/NssmfAdapterNBIRequest.java +++ b/common/src/main/java/org/onap/so/beans/nsmf/NssmfAdapterNBIRequest.java @@ -24,15 +24,14 @@ import lombok.Data; import java.io.Serializable; +@JsonInclude(JsonInclude.Include.NON_NULL) @Data public class NssmfAdapterNBIRequest implements Serializable { private static final long serialVersionUID = -454145891489457960L; - @JsonInclude(JsonInclude.Include.NON_NULL) private EsrInfo esrInfo; - @JsonInclude(JsonInclude.Include.NON_NULL) private ServiceInfo serviceInfo; private AllocateCnNssi allocateCnNssi; diff --git a/common/src/main/java/org/onap/so/beans/nsmf/PerfReq.java b/common/src/main/java/org/onap/so/beans/nsmf/PerfReq.java index 4aabc3f26f..c67f193a02 100644 --- a/common/src/main/java/org/onap/so/beans/nsmf/PerfReq.java +++ b/common/src/main/java/org/onap/so/beans/nsmf/PerfReq.java @@ -26,23 +26,23 @@ import java.util.List; @JsonInclude(JsonInclude.Include.NON_NULL) public class PerfReq { - private List perfReqEmbbList; + private List perfReqEmbbList; - private List perfReqUrllcList; + private List perfReqUrllcList; - public List getPerfReqEmbbList() { + public List getPerfReqEmbbList() { return perfReqEmbbList; } - public void setPerfReqEmbbList(List perfReqEmbbList) { + public void setPerfReqEmbbList(List perfReqEmbbList) { this.perfReqEmbbList = perfReqEmbbList; } - public List getPerfReqUrllcList() { + public List getPerfReqUrllcList() { return perfReqUrllcList; } - public void setPerfReqUrllcList(List perfReqUrllcList) { + public void setPerfReqUrllcList(List perfReqUrllcList) { this.perfReqUrllcList = perfReqUrllcList; } } diff --git a/common/src/main/java/org/onap/so/beans/nsmf/PerfReqEmbb.java b/common/src/main/java/org/onap/so/beans/nsmf/PerfReqEmbb.java new file mode 100644 index 0000000000..bce0d56f9a --- /dev/null +++ b/common/src/main/java/org/onap/so/beans/nsmf/PerfReqEmbb.java @@ -0,0 +1,93 @@ +/*- + * ============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.beans.nsmf; + +import com.fasterxml.jackson.annotation.JsonInclude; + +@JsonInclude(JsonInclude.Include.NON_NULL) +public class PerfReqEmbb { + + @JsonInclude(JsonInclude.Include.NON_DEFAULT) + private int expDataRateDL; + + @JsonInclude(JsonInclude.Include.NON_DEFAULT) + private int expDataRateUL; + + @JsonInclude(JsonInclude.Include.NON_DEFAULT) + private int areaTrafficCapDL; + + @JsonInclude(JsonInclude.Include.NON_DEFAULT) + private int areaTrafficCapUL; + + @JsonInclude(JsonInclude.Include.NON_DEFAULT) + private int overallUserDensity; + + @JsonInclude(JsonInclude.Include.NON_DEFAULT) + private int activityFactor; + + public int getExpDataRateDL() { + return expDataRateDL; + } + + public void setExpDataRateDL(int expDataRateDL) { + this.expDataRateDL = expDataRateDL; + } + + public int getExpDataRateUL() { + return expDataRateUL; + } + + public void setExpDataRateUL(int expDataRateUL) { + this.expDataRateUL = expDataRateUL; + } + + public int getAreaTrafficCapDL() { + return areaTrafficCapDL; + } + + public void setAreaTrafficCapDL(int areaTrafficCapDL) { + this.areaTrafficCapDL = areaTrafficCapDL; + } + + public int getAreaTrafficCapUL() { + return areaTrafficCapUL; + } + + public void setAreaTrafficCapUL(int areaTrafficCapUL) { + this.areaTrafficCapUL = areaTrafficCapUL; + } + + public int getOverallUserDensity() { + return overallUserDensity; + } + + public void setOverallUserDensity(int overallUserDensity) { + this.overallUserDensity = overallUserDensity; + } + + public int getActivityFactor() { + return activityFactor; + } + + public void setActivityFactor(int activityFactor) { + this.activityFactor = activityFactor; + } +} diff --git a/common/src/main/java/org/onap/so/beans/nsmf/PerfReqEmbbList.java b/common/src/main/java/org/onap/so/beans/nsmf/PerfReqEmbbList.java deleted file mode 100644 index 9e9fcaa19e..0000000000 --- a/common/src/main/java/org/onap/so/beans/nsmf/PerfReqEmbbList.java +++ /dev/null @@ -1,82 +0,0 @@ -/*- - * ============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.beans.nsmf; - -import com.fasterxml.jackson.annotation.JsonInclude; - -@JsonInclude(JsonInclude.Include.NON_NULL) -public class PerfReqEmbbList { - - @JsonInclude(JsonInclude.Include.NON_DEFAULT) - private int expDataRateDL; - - @JsonInclude(JsonInclude.Include.NON_DEFAULT) - private int expDataRateUL; - - @JsonInclude(JsonInclude.Include.NON_DEFAULT) - private int areaTrafficCapDL; - - @JsonInclude(JsonInclude.Include.NON_DEFAULT) - private int areaTrafficCapUL; - - @JsonInclude(JsonInclude.Include.NON_DEFAULT) - private int activityFactor; - - public int getExpDataRateDL() { - return expDataRateDL; - } - - public void setExpDataRateDL(int expDataRateDL) { - this.expDataRateDL = expDataRateDL; - } - - public int getExpDataRateUL() { - return expDataRateUL; - } - - public void setExpDataRateUL(int expDataRateUL) { - this.expDataRateUL = expDataRateUL; - } - - public int getAreaTrafficCapDL() { - return areaTrafficCapDL; - } - - public void setAreaTrafficCapDL(int areaTrafficCapDL) { - this.areaTrafficCapDL = areaTrafficCapDL; - } - - public int getAreaTrafficCapUL() { - return areaTrafficCapUL; - } - - public void setAreaTrafficCapUL(int areaTrafficCapUL) { - this.areaTrafficCapUL = areaTrafficCapUL; - } - - public int getActivityFactor() { - return activityFactor; - } - - public void setActivityFactor(int activityFactor) { - this.activityFactor = activityFactor; - } -} diff --git a/common/src/main/java/org/onap/so/beans/nsmf/PerfReqUrllc.java b/common/src/main/java/org/onap/so/beans/nsmf/PerfReqUrllc.java new file mode 100644 index 0000000000..0b05d39bab --- /dev/null +++ b/common/src/main/java/org/onap/so/beans/nsmf/PerfReqUrllc.java @@ -0,0 +1,135 @@ +/*- + * ============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.beans.nsmf; + +import com.fasterxml.jackson.annotation.JsonInclude; + +@JsonInclude(JsonInclude.Include.NON_NULL) +public class PerfReqUrllc { + + @JsonInclude(JsonInclude.Include.NON_DEFAULT) + private int e2eLatency; + + @JsonInclude(JsonInclude.Include.NON_DEFAULT) + private int jitter; + + @JsonInclude(JsonInclude.Include.NON_DEFAULT) + private int survivalTime; + + @JsonInclude(JsonInclude.Include.NON_DEFAULT) + private float csAvailability; + + @JsonInclude(JsonInclude.Include.NON_DEFAULT) + private float reliability; + + @JsonInclude(JsonInclude.Include.NON_DEFAULT) + private int expDataRate; + + private String payloadSize; + + @JsonInclude(JsonInclude.Include.NON_DEFAULT) + private int trafficDensity; + + @JsonInclude(JsonInclude.Include.NON_DEFAULT) + private int connDensity; + + private String serviceAreaDimension; + + public int getE2eLatency() { + return e2eLatency; + } + + public void setE2eLatency(int e2eLatency) { + this.e2eLatency = e2eLatency; + } + + public int getJitter() { + return jitter; + } + + public void setJitter(int jitter) { + this.jitter = jitter; + } + + public int getSurvivalTime() { + return survivalTime; + } + + public void setSurvivalTime(int survivalTime) { + this.survivalTime = survivalTime; + } + + public float getReliability() { + return reliability; + } + + public void setReliability(float reliability) { + this.reliability = reliability; + } + + public int getExpDataRate() { + return expDataRate; + } + + public void setExpDataRate(int expDataRate) { + this.expDataRate = expDataRate; + } + + public String getPayloadSize() { + return payloadSize; + } + + public void setPayloadSize(String payloadSize) { + this.payloadSize = payloadSize; + } + + public int getTrafficDensity() { + return trafficDensity; + } + + public void setTrafficDensity(int trafficDensity) { + this.trafficDensity = trafficDensity; + } + + public int getConnDensity() { + return connDensity; + } + + public void setConnDensity(int connDensity) { + this.connDensity = connDensity; + } + + public String getServiceAreaDimension() { + return serviceAreaDimension; + } + + public void setServiceAreaDimension(String serviceAreaDimension) { + this.serviceAreaDimension = serviceAreaDimension; + } + + public float getCsAvailability() { + return csAvailability; + } + + public void setCsAvailability(float csAvailability) { + this.csAvailability = csAvailability; + } +} diff --git a/common/src/main/java/org/onap/so/beans/nsmf/PerfReqUrllcList.java b/common/src/main/java/org/onap/so/beans/nsmf/PerfReqUrllcList.java deleted file mode 100644 index 00f0a917aa..0000000000 --- a/common/src/main/java/org/onap/so/beans/nsmf/PerfReqUrllcList.java +++ /dev/null @@ -1,135 +0,0 @@ -/*- - * ============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.beans.nsmf; - -import com.fasterxml.jackson.annotation.JsonInclude; - -@JsonInclude(JsonInclude.Include.NON_NULL) -public class PerfReqUrllcList { - - @JsonInclude(JsonInclude.Include.NON_DEFAULT) - private int e2eLatency; - - @JsonInclude(JsonInclude.Include.NON_DEFAULT) - private int jitter; - - @JsonInclude(JsonInclude.Include.NON_DEFAULT) - private int survivalTime; - - @JsonInclude(JsonInclude.Include.NON_DEFAULT) - private float csAvailability; - - @JsonInclude(JsonInclude.Include.NON_DEFAULT) - private float reliability; - - @JsonInclude(JsonInclude.Include.NON_DEFAULT) - private int expDataRate; - - private String payloadSize; - - @JsonInclude(JsonInclude.Include.NON_DEFAULT) - private int trafficDensity; - - @JsonInclude(JsonInclude.Include.NON_DEFAULT) - private int connDensity; - - private String serviceAreaDimension; - - public int getE2eLatency() { - return e2eLatency; - } - - public void setE2eLatency(int e2eLatency) { - this.e2eLatency = e2eLatency; - } - - public int getJitter() { - return jitter; - } - - public void setJitter(int jitter) { - this.jitter = jitter; - } - - public int getSurvivalTime() { - return survivalTime; - } - - public void setSurvivalTime(int survivalTime) { - this.survivalTime = survivalTime; - } - - public float getReliability() { - return reliability; - } - - public void setReliability(float reliability) { - this.reliability = reliability; - } - - public int getExpDataRate() { - return expDataRate; - } - - public void setExpDataRate(int expDataRate) { - this.expDataRate = expDataRate; - } - - public String getPayloadSize() { - return payloadSize; - } - - public void setPayloadSize(String payloadSize) { - this.payloadSize = payloadSize; - } - - public int getTrafficDensity() { - return trafficDensity; - } - - public void setTrafficDensity(int trafficDensity) { - this.trafficDensity = trafficDensity; - } - - public int getConnDensity() { - return connDensity; - } - - public void setConnDensity(int connDensity) { - this.connDensity = connDensity; - } - - public String getServiceAreaDimension() { - return serviceAreaDimension; - } - - public void setServiceAreaDimension(String serviceAreaDimension) { - this.serviceAreaDimension = serviceAreaDimension; - } - - public float getCsAvailability() { - return csAvailability; - } - - public void setCsAvailability(float csAvailability) { - this.csAvailability = csAvailability; - } -} -- cgit 1.2.3-korg