diff options
author | Enbo Wang <wangenbo@huawei.com> | 2020-11-17 17:22:07 +0800 |
---|---|---|
committer | Enbo Wang <wangenbo@huawei.com> | 2020-11-17 23:12:55 +0800 |
commit | 5653437b03967aa0bc46666df4afb801b5aa9830 (patch) | |
tree | 2b627fcf19a339510c1be964286a3e575859fb64 /common/src/main/java/org/onap | |
parent | aa3265046ac4de992884032613eeed5f7e16e2ef (diff) |
Fix issue of PerfReq for RAN SliceProfile
Issue-ID: SO-3274
Signed-off-by: Enbo Wang <wangenbo@huawei.com>
Change-Id: I612d4e7acee9cab440354035a416d024cefec62c
Diffstat (limited to 'common/src/main/java/org/onap')
5 files changed, 13 insertions, 54 deletions
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 deleted file mode 100644 index e2c2e999ec..0000000000 --- a/common/src/main/java/org/onap/so/beans/nsmf/AnPerfReq.java +++ /dev/null @@ -1,50 +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; -import java.io.Serializable; - -@JsonInclude(JsonInclude.Include.NON_NULL) -public class AnPerfReq implements Serializable { - - private static final long serialVersionUID = -7415880702887244040L; - - 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 eef0396205..14918c7873 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 @@ -31,6 +31,9 @@ import java.util.List; @Data @ToString public class AnSliceProfile implements Serializable { + /* + * Reference 3GPP TS 28.541 V16.5.0, Section 6.3.4. + */ private static final long serialVersionUID = -3057342171549542794L; @@ -44,7 +47,7 @@ public class AnSliceProfile implements Serializable { private List<String> pLMNIdList; @JsonProperty(value = "perfReq", required = true) - private AnPerfReq perfReq; + private PerfReq perfReq; @JsonInclude(JsonInclude.Include.NON_DEFAULT) @JsonProperty(value = "maxNumberofUEs") 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 c67f193a02..6697c8d8a0 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 @@ -21,10 +21,13 @@ package org.onap.so.beans.nsmf; import com.fasterxml.jackson.annotation.JsonInclude; +import java.io.Serializable; import java.util.List; @JsonInclude(JsonInclude.Include.NON_NULL) -public class PerfReq { +public class PerfReq implements Serializable { + + private static final long serialVersionUID = 8463835350563510267L; private List<PerfReqEmbb> perfReqEmbbList; 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 index f6e945e368..1db009cdb9 100644 --- a/common/src/main/java/org/onap/so/beans/nsmf/PerfReqEmbb.java +++ b/common/src/main/java/org/onap/so/beans/nsmf/PerfReqEmbb.java @@ -25,6 +25,9 @@ import java.io.Serializable; @JsonInclude(JsonInclude.Include.NON_NULL) public class PerfReqEmbb implements Serializable { + /* + * Reference 3GPP TS 28.541 V16.5.0, Section 6.4.1. + */ private static final long serialVersionUID = 8886635511695277599L; 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 c64af1d958..9b6df0fa9e 100644 --- a/common/src/main/java/org/onap/so/beans/nsmf/SliceProfileAdapter.java +++ b/common/src/main/java/org/onap/so/beans/nsmf/SliceProfileAdapter.java @@ -83,9 +83,9 @@ public class SliceProfileAdapter implements Serializable { anSliceProfile.setCoverageAreaTAList(Arrays.asList(areasRes)); anSliceProfile.setUEMobilityLevel(UeMobilityLevel.fromString(this.uEMobilityLevel)); anSliceProfile.setResourceSharingLevel(ResourceSharingLevel.fromString(this.resourceSharingLevel)); - AnPerfReq anPerfReq = new AnPerfReq(); + PerfReq perfReq = new PerfReq(); // todo - anSliceProfile.setPerfReq(anPerfReq); + anSliceProfile.setPerfReq(perfReq); return anSliceProfile; } |