diff options
Diffstat (limited to 'ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models')
5 files changed, 67 insertions, 9 deletions
diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/FmAlarmInfo.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/FmAlarmInfo.java index ef81d3b..5b4acba 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/FmAlarmInfo.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/FmAlarmInfo.java @@ -26,7 +26,7 @@ public class FmAlarmInfo { private String problem; private String collisions; - private HashMap<Long, String> confusions; + private HashMap<Integer, Integer> confusions; public FmAlarmInfo() { @@ -43,7 +43,7 @@ public class FmAlarmInfo { * @param confusions * Cell ids that causes confusion. */ - public FmAlarmInfo(String problem, String collisions, HashMap<Long, String> confusions) { + public FmAlarmInfo(String problem, String collisions, HashMap<Integer, Integer> confusions) { super(); this.problem = problem; this.collisions = collisions; @@ -66,11 +66,11 @@ public class FmAlarmInfo { this.collisions = collisions; } - public HashMap<Long, String> getConfusions(){ + public HashMap<Integer, Integer> getConfusions(){ return confusions; } - public void setConfusions(HashMap<Long, String> confusions) { + public void setConfusions(HashMap<Integer, Integer> confusions) { this.confusions = confusions; } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/ModifyACellReq.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/ModifyACellReq.java index ff715e3..c7921ce 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/ModifyACellReq.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/ModifyACellReq.java @@ -23,7 +23,7 @@ package org.onap.ransim.rest.api.models; public class ModifyACellReq { private String nodeId; - private Long newPhysicalCellId; + private Integer newPhysicalCellId; private String newNbrs; /** @@ -33,7 +33,7 @@ public class ModifyACellReq { * @param newPhysicalCellId new PCI number for the cell * @param newNbrs new neighbor list for the cell */ - public ModifyACellReq(String nodeId, Long newPhysicalCellId, String newNbrs) { + public ModifyACellReq(String nodeId, Integer newPhysicalCellId, String newNbrs) { super(); this.nodeId = nodeId; this.newPhysicalCellId = newPhysicalCellId; @@ -54,11 +54,11 @@ public class ModifyACellReq { this.nodeId = nodeId; } - public Long getNewPhysicalCellId() { + public Integer getNewPhysicalCellId() { return newPhysicalCellId; } - public void setNewPhysicalCellId(Long newPhysicalCellId) { + public void setNewPhysicalCellId(Integer newPhysicalCellId) { this.newPhysicalCellId = newPhysicalCellId; } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NRCellCU.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NRCellCU.java index af552e3..9666bca 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NRCellCU.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NRCellCU.java @@ -47,6 +47,10 @@ public class NRCellCU implements Serializable, Comparable<NRCellCU> { private Integer cellLocalId; @Column(name = "RESOURCETYPE") private String resourceType; + @Column(name = "SCREENX") + private float screenX; + @Column(name = "SCREENY") + private float screenY; @ElementCollection(fetch = FetchType.EAGER) @CollectionTable(name = "PLMNINFO", joinColumns = @JoinColumn(name = "nrcellcu_celllocalid")) private List<PLMNInfo> pLMNInfoList; @@ -57,6 +61,34 @@ public class NRCellCU implements Serializable, Comparable<NRCellCU> { @JoinColumn(name = "gnbcuname") private GNBCUCPFunction gNBCUCPFunction; + private boolean pciCollisionDetected; + private boolean pciConfusionDetected; + private String color; + + public boolean isPciCollisionDetected() { + return pciCollisionDetected; + } + + public void setPciCollisionDetected(boolean pciCollisionDetected) { + this.pciCollisionDetected = pciCollisionDetected; + } + + public boolean isPciConfusionDetected() { + return pciConfusionDetected; + } + + public void setPciConfusionDetected(boolean pciConfusionDetected) { + this.pciConfusionDetected = pciConfusionDetected; + } + + public String getColor() { + return color; + } + + public void setColor(String color) { + this.color = color; + } + public Integer getCellLocalId() { return cellLocalId; } @@ -94,6 +126,12 @@ public class NRCellCU implements Serializable, Comparable<NRCellCU> { this.resourceType = resourceType; } + public void setScreenX(float screenX){ this.screenX = screenX; } + public float getScreenX(){ return screenX; } + + public void setScreenY(float screenY){ this.screenY = screenY; } + public float getScreenY(){ return screenY; } + static Logger log = Logger.getLogger(RansimController.class.getName()); public void display() { diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NRCellRelation.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NRCellRelation.java index e825b04..ae7acb2 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NRCellRelation.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NRCellRelation.java @@ -56,6 +56,16 @@ public class NRCellRelation implements Serializable { @JoinColumn(name = "celllocalid", referencedColumnName="celllocalid") private NRCellCU cellLocalId; + public NRCellRelation() {} + + public NRCellRelation(Integer idNRCellRelation, Integer nRTCI, boolean isHOAllowed, NRCellCU cellLocalId) { + super(); + this.idNRCellRelation = idNRCellRelation; + this.nRTCI = nRTCI; + this.isHOAllowed = isHOAllowed; + this.cellLocalId = cellLocalId; + } + public NRCellCU getCellLocalId() { return cellLocalId; } public void setCellLocalId(NRCellCU cellLocalId) { this.cellLocalId = cellLocalId; } diff --git a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NetconfServers.java b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NetconfServers.java index 3c56e26..3eaa1f4 100644 --- a/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NetconfServers.java +++ b/ransim/ransimctrlr/RANSIM-CTRLR/src/main/java/org/onap/ransim/rest/api/models/NetconfServers.java @@ -47,7 +47,9 @@ public class NetconfServers { @OneToMany(targetEntity = NRCellCU.class, fetch = FetchType.EAGER, cascade = CascadeType.ALL) private Set<NRCellCU> cellCUList; - + + @OneToMany(targetEntity = NRCellDU.class, fetch = FetchType.EAGER, cascade = CascadeType.ALL) + private Set<NRCellDU> cellDUList; public NetconfServers() { @@ -108,4 +110,12 @@ public class NetconfServers { public void setCellList(Set<NRCellCU> cellCUList) { this.cellCUList = cellCUList; } + + public Set<NRCellDU> getDUList() { + return cellDUList; + } + + public void setDUList(Set<NRCellDU> cellDUList) { + this.cellDUList = cellDUList; + } } |