diff options
Diffstat (limited to 'ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models')
4 files changed, 24 insertions, 30 deletions
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GNBCUUPFunction.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GNBCUUPFunction.java index 790a638..9b6e95a 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GNBCUUPFunction.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/GNBCUUPFunction.java @@ -40,7 +40,7 @@ public class GNBCUUPFunction implements Serializable { private static final long serialVersionUID = 1L; @Id @Column(name = "GNBCUUPID") - private Integer gNBCUUPId; + private String gNBCUUPId; @Column(name = "GNBID") private Integer gNBId; @Column(name = "GNBIDLENGTH") @@ -57,11 +57,11 @@ public class GNBCUUPFunction implements Serializable { @JoinColumn(name = "nearrtricid") private NearRTRIC nearRTRIC; - public Integer getgNBCUUPId() { + public String getgNBCUUPId() { return gNBCUUPId; } - public void setgNBCUUPId(Integer gNBCUUPId) { + public void setgNBCUUPId(String gNBCUUPId) { this.gNBCUUPId = gNBCUUPId; } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NearRTRIC.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NearRTRIC.java index 961e048..8173d06 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NearRTRIC.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NearRTRIC.java @@ -42,7 +42,7 @@ public class NearRTRIC implements Serializable { private Integer nearRTRICId; @Column(name = "GNBID") private Integer gNBId; - @ElementCollection//(targetClass = String.class) + @ElementCollection // (targetClass = String.class) @CollectionTable(name = "TRACKINGAREA", joinColumns = @JoinColumn(name = "nearrtricid")) private List<Integer> trackingArea; @Column(name = "RESOURCETYPE") diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/PLMNInfoModel.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/PLMNInfoModel.java index bdeb9b2..cab1c47 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/PLMNInfoModel.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/PLMNInfoModel.java @@ -20,23 +20,26 @@ package org.onap.ransim.rest.api.models; +import java.util.List; + +import org.onap.ransim.websocket.model.ConfigData; + public class PLMNInfoModel { private String pLMNId; private String snssai; private String status; private String gnbType; - private int gnbId; + private String gnbId; private int nrCellId; private String nearrtricid; - private String configParameter; - private Integer configValue; + private List<ConfigData> configData; public PLMNInfoModel() { } - public PLMNInfoModel(String pLMNId, String snssai, String status, String gnbType, int gnbId, int nrCellId, - String nearrtricid, String configParameter, Integer configValue) { + public PLMNInfoModel(String pLMNId, String snssai, String status, String gnbType, String gnbId, int nrCellId, + String nearrtricid, List<ConfigData> configData) { super(); this.pLMNId = pLMNId; this.snssai = snssai; @@ -45,8 +48,7 @@ public class PLMNInfoModel { this.gnbId = gnbId; this.nrCellId = nrCellId; this.nearrtricid = nearrtricid; - this.configParameter = configParameter; - this.configValue = configValue; + this.configData = configData; } public String getpLMNId() { @@ -81,11 +83,11 @@ public class PLMNInfoModel { this.gnbType = gnbType; } - public int getGnbId() { + public String getGnbId() { return gnbId; } - public void setGnbId(int gnbId) { + public void setGnbId(String gnbId) { this.gnbId = gnbId; } @@ -105,26 +107,18 @@ public class PLMNInfoModel { this.nearrtricid = nearrtricid; } - public String getConfigParameter() { - return configParameter; - } - - public void setConfigParameter(String configParameter) { - this.configParameter = configParameter; - } - - public Integer getConfigValue() { - return configValue; + public List<ConfigData> getConfigData() { + return configData; } - public void setConfigValue(Integer configValue) { - this.configValue = configValue; + public void setConfigData(List<ConfigData> configData) { + this.configData = configData; } @Override public String toString() { return "PLMNInfoModel [pLMNId=" + pLMNId + ", snssai=" + snssai + ", status=" + status + ", gnbType=" + gnbType - + ", gnbId=" + gnbId + ", nrCellId=" + nrCellId + ", nearrtricid=" + nearrtricid + ", configParameter=" - + configParameter + ", configValue=" + configValue + "]"; + + ", gnbId=" + gnbId + ", nrCellId=" + nrCellId + ", nearrtricid=" + nearrtricid + ", configData=" + + configData + "]"; } } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/RRMPolicyRatio.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/RRMPolicyRatio.java index 33546c3..aec625c 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/RRMPolicyRatio.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/RRMPolicyRatio.java @@ -37,7 +37,7 @@ public class RRMPolicyRatio implements Serializable { private static final long serialVersionUID = 1L; @Id @Column(name = "RRMPOLICYID") - private Integer rrmPolicyID; + private String rrmPolicyID; @Column(name = "RESOURCEID") private String resourceID; @Column(name = "RESOURCETYPE") @@ -56,11 +56,11 @@ public class RRMPolicyRatio implements Serializable { @Column(name = "RRMPOLICYDEDICATEDRATIO") private Integer rRMPolicyDedicatedRatio; - public Integer getRrmPolicyID() { + public String getRrmPolicyID() { return rrmPolicyID; } - public void setRrmPolicyID(Integer rrmPolicyID) { + public void setRrmPolicyID(String rrmPolicyID) { this.rrmPolicyID = rrmPolicyID; } |